diff --git a/app-admin/localepurge/localepurge-0.5.3.3.ebuild b/app-admin/localepurge/localepurge-0.5.3.3.ebuild
index 239be54ecd92..905739be6b0f 100644
--- a/app-admin/localepurge/localepurge-0.5.3.3.ebuild
+++ b/app-admin/localepurge/localepurge-0.5.3.3.ebuild
@@ -1,9 +1,11 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/localepurge/localepurge-0.5.3.3.ebuild,v 1.2 2008/01/26 10:20:17 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/localepurge/localepurge-0.5.3.3.ebuild,v 1.3 2012/03/21 12:04:26 pacho Exp $
+
+EAPI=4
 
 DESCRIPTION="Script to recover diskspace wasted for unneeded locale files and localized man pages."
-HOMEPAGE="http://www.josealberto.org/blog/index.php?s=localepurge"
+HOMEPAGE="http://gentoo.org"
 SRC_URI="mirror://gentoo/${P}.tbz2"
 
 LICENSE="GPL-2"
@@ -16,12 +18,16 @@ RDEPEND="app-shells/bash"
 
 S=${WORKDIR}/${PN}
 
+src_prepare() {
+	sed -i -e 's/0.5.3.2/0.5.3.3/' localepurge || die
+}
+
 src_install() {
 	insinto /var/cache/localepurge
 	doins defaultlist
 	dosym defaultlist /var/cache/localepurge/localelist
 	insinto /etc
 	doins locale.nopurge
-	dobin localepurge || die
+	dobin localepurge
 	doman localepurge.8
 }
diff --git a/app-admin/syslog-ng/syslog-ng-3.3.4.ebuild b/app-admin/syslog-ng/syslog-ng-3.3.4.ebuild
index 2ea80bf11460..456af73adfca 100644
--- a/app-admin/syslog-ng/syslog-ng-3.3.4.ebuild
+++ b/app-admin/syslog-ng/syslog-ng-3.3.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/syslog-ng-3.3.4.ebuild,v 1.2 2012/03/04 22:16:44 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/syslog-ng-3.3.4.ebuild,v 1.3 2012/03/21 20:54:04 mr_bones_ Exp $
 
 EAPI=2
 inherit autotools eutils multilib
@@ -20,8 +20,9 @@ LIBS_DEPEND="
 	spoof-source? ( net-libs/libnet )
 	ssl? ( dev-libs/openssl )
 	tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
-	!static? ( >=dev-libs/eventlog-0.2.12 )
-	>=dev-libs/glib-2.10.1:2
+	!static? (
+		>=dev-libs/eventlog-0.2.12
+		>=dev-libs/glib-2.10.1:2 )
 	json? ( >=dev-libs/json-glib-0.12 )
 	caps? ( sys-libs/libcap )
 	sql? ( >=dev-db/libdbi-0.8.3 )"
@@ -32,7 +33,9 @@ RDEPEND="
 	)"
 DEPEND="${RDEPEND}
 	${LIBS_DEPEND}
-	static? ( >=dev-libs/eventlog-0.2.12[static-libs] )
+	static? (
+		>=dev-libs/eventlog-0.2.12[static-libs]
+		>=dev-libs/glib-2.10.1:2[static-libs] )
 	dev-util/pkgconfig
 	sys-devel/flex"
 
diff --git a/app-arch/rpm/files/rpm-4.9.1.2-libdir.patch b/app-arch/rpm/files/rpm-4.9.1.2-libdir.patch
new file mode 100644
index 000000000000..2867de86e8e1
--- /dev/null
+++ b/app-arch/rpm/files/rpm-4.9.1.2-libdir.patch
@@ -0,0 +1,13 @@
+diff -urN rpm-4.9.1.2.old/rpm.am rpm-4.9.1.2/rpm.am
+--- rpm-4.9.1.2.old/rpm.am	2012-03-21 19:57:33.942448288 +0100
++++ rpm-4.9.1.2/rpm.am	2012-03-21 20:06:19.045419773 +0100
+@@ -1,7 +1,5 @@
+ # Internal binaries
+-## HACK: It probably should be $(libexecdir)/rpm or $(libdir)/rpm
+-rpmlibexecdir = $(prefix)/lib/rpm
++rpmlibexecdir = $(pkglibexecdir)
+ 
+ # Host independent config files
+-## HACK: it probably should be $(datadir)/rpm
+-rpmconfigdir = $(prefix)/lib/rpm
++rpmconfigdir = $(pkglibexecdir)
diff --git a/app-arch/rpm/rpm-4.9.1.2-r1.ebuild b/app-arch/rpm/rpm-4.9.1.2-r1.ebuild
new file mode 100644
index 000000000000..d8aa363d5294
--- /dev/null
+++ b/app-arch/rpm/rpm-4.9.1.2-r1.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/rpm/rpm-4.9.1.2-r1.ebuild,v 1.1 2012/03/21 19:19:35 scarabeus Exp $
+
+EAPI=4
+
+PYTHON_DEPEND="2"
+
+inherit eutils autotools flag-o-matic perl-module python
+
+DESCRIPTION="Red Hat Package Management Utils"
+HOMEPAGE="http://www.rpm.org"
+SRC_URI="http://rpm.org/releases/rpm-4.9.x/${P}.tar.bz2"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86"
+
+IUSE="nls python doc caps lua acl"
+
+RDEPEND=">=sys-libs/db-4.5
+	>=sys-libs/zlib-1.2.3-r1
+	>=app-arch/bzip2-1.0.1
+	>=dev-libs/popt-1.7
+	>=app-crypt/gnupg-1.2
+	dev-libs/elfutils
+	virtual/libintl
+	>=dev-lang/perl-5.8.8
+	dev-libs/nss
+	python? ( >=dev-lang/python-2.3 )
+	nls? ( virtual/libintl )
+	lua? ( >=dev-lang/lua-5.1.0[deprecated] )
+	acl? ( virtual/acl )
+	caps? ( >=sys-libs/libcap-2.0 )"
+
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )
+	doc? ( app-doc/doxygen )"
+
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-4.8.1-autotools.patch \
+		"${FILESDIR}"/${PN}-4.8.1-db-path.patch \
+		"${FILESDIR}"/${PN}-4.9.1.2-libdir.patch
+
+	# fix #356769
+	sed -i 's:%{_var}/tmp:/var/tmp:' macros.in || die "Fixing tmppath failed"
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--without-selinux \
+		--with-external-db \
+		$(use_enable python) \
+		$(use_with doc hackingdocs) \
+		$(use_enable nls) \
+		$(use_with lua) \
+		$(use_with caps cap) \
+		$(use_with acl)
+}
+
+src_compile() {
+	default
+}
+
+src_install() {
+	default
+
+	# remove la files
+	find "${ED}" -name '*.la' -exec rm -f {} +
+
+	mv "${ED}"/bin/rpm "${ED}"/usr/bin
+	rmdir "${ED}"/bin
+	# fix symlinks to /bin/rpm (#349840)
+	for binary in rpmquery rpmverify;do
+		ln -sf rpm "${ED}"/usr/bin/${binary}
+	done
+
+	use nls || rm -rf "${ED}"/usr/share/man/??
+
+	keepdir /usr/src/rpm/{SRPMS,SPECS,SOURCES,RPMS,BUILD}
+
+	dodoc CHANGES CREDITS GROUPS README*
+	if use doc; then
+		pushd doc/hacking/html
+		dohtml -p hacking -r .
+		popd
+		pushd doc/librpm/html
+		dohtml -p librpm -r .
+		popd
+	fi
+
+	# Fix perllocal.pod file collision
+	fixlocalpod
+}
+
+pkg_postinst() {
+	if [[ -f "${EROOT}"/var/lib/rpm/Packages ]] ; then
+		einfo "RPM database found... Rebuilding database (may take a while)..."
+		"${EROOT}"/usr/bin/rpmdb --rebuilddb --root="${EROOT}"
+	else
+		einfo "No RPM database found... Creating database..."
+		"${EROOT}"/usr/bin/rpmdb --initdb --root="${EROOT}"
+	fi
+
+	use python && python_mod_optimize rpm
+}
+
+pkg_postrm() {
+	use python && python_mod_cleanup rpm
+}
diff --git a/app-crypt/kstart/kstart-4.1.ebuild b/app-crypt/kstart/kstart-4.1.ebuild
index 6d49428ff67d..7cd44d75415c 100644
--- a/app-crypt/kstart/kstart-4.1.ebuild
+++ b/app-crypt/kstart/kstart-4.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/kstart/kstart-4.1.ebuild,v 1.1 2012/01/08 08:25:27 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/kstart/kstart-4.1.ebuild,v 1.2 2012/03/21 12:02:54 ago Exp $
 
 EAPI=4
 
@@ -13,7 +13,7 @@ SRC_URI="http://archives.eyrie.org/software/kerberos/${P}.tar.gz"
 
 LICENSE="|| ( MIT Stanford ISC )"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="afs"
 
 DEPEND="virtual/krb5
diff --git a/app-editors/leechcraft-popishu/Manifest b/app-editors/leechcraft-popishu/Manifest
index 82981786c7aa..4eb4c41f47fc 100644
--- a/app-editors/leechcraft-popishu/Manifest
+++ b/app-editors/leechcraft-popishu/Manifest
@@ -1,3 +1,3 @@
 DIST leechcraft-0.4.99.tar.xz 4601736 RMD160 343e64a430cd55f401989b1c89a74a9c2ddf1e33 SHA1 c8275ea635d7ea579b95a70e64372658928752f7 SHA256 967ca3a9b942d71da7f4818ba912f12b386b553fe4abded04c7d1956473e4e42
-DIST leechcraft-0.5.0.tar.xz 4691312 RMD160 4ea82848fe59fcd1159fa835dfb94ff81775f964 SHA1 0d01a9b38fd1ce136d678803a1270538fb8e3cc4 SHA256 ef0802442b803079dc491f73ff0294cb8560d86fbea44c8e57b3d54fdf3b88fa
-DIST leechcraft-0.5.60.tar.xz 2048000 RMD160 505a90f631779a1918ea814602288732b4f8af89 SHA1 b03ce9bb160c00c6be2f50af4e061c5d7777d630 SHA256 b7ee7aff4b07fa383da169346979701f4a428fc29d4e8b77a31f27561b025baf
+DIST leechcraft-0.5.0.tar.xz 7240 RMD160 41109d2b24cf188f31bafc9d65950ecb223f1fb7 SHA1 e32a08d9926a8351fcdbc13649e0fe83bbefb84a SHA256 762751d75d2bfa76656b8a88feae193af3c9467f74749ba182212bbe72eea1fc
+DIST leechcraft-0.5.60.tar.xz 4743936 RMD160 e845b9f9e7b0bdebd2c99822ffd3e15c019f6051 SHA1 2941679520e6871372eac31d1e683615a8dd64e6 SHA256 477d8fc54167798337e64324575d12cf1cace4d6502bb14d892edd2ed4b5a7f4
diff --git a/app-i18n/ibus-hangul/Manifest b/app-i18n/ibus-hangul/Manifest
index 2627559a3c28..3fc5ec50198b 100644
--- a/app-i18n/ibus-hangul/Manifest
+++ b/app-i18n/ibus-hangul/Manifest
@@ -1,2 +1 @@
-DIST ibus-hangul-1.3.1.tar.gz 431214 RMD160 996172fb00854ae2000b3197707269ebd8d6808e SHA1 e1fb0e0560d8987c3106992693638a298bd2ea1c SHA256 1e5530c1d7add8970f3a98a76a0a2feda06a08d65af56fbba5329a6645915afc
 DIST ibus-hangul-1.4.0.tar.gz 439462 RMD160 07ac966ba9f878ead7e17d31a653bd5514098305 SHA1 421d7164a27eeedfea49d54b61e2a5edd4f7d3a7 SHA256 a955ec0c9ea90ecd8e8d0fd2de1596a5ba1186463862c387d74a418d1707ca0a
diff --git a/app-i18n/ibus-hangul/files/ibus-hangul-ibus-1.4.patch b/app-i18n/ibus-hangul/files/ibus-hangul-ibus-1.4.patch
deleted file mode 100644
index 25a6f1238cac..000000000000
--- a/app-i18n/ibus-hangul/files/ibus-hangul-ibus-1.4.patch
+++ /dev/null
@@ -1,155 +0,0 @@
-From 6ce58d1d79e5b175865ee26794e9fc7ce576ce56 Mon Sep 17 00:00:00 2001
-From: Daiki Ueno <ueno@unixuser.org>
-Date: Mon, 8 Nov 2010 14:12:35 +0900
-Subject: [PATCH] Fix build with ibus-1.4.
-
-This patch adds compatibility code for the API changes of IBusConfig and
-IBusEngineDesc in ibus-1.3 -> ibus-1.4.
----
- src/engine.c |   75 ++++++++++++++++++++++++++++++++++++++++++++++++---------
- 1 files changed, 63 insertions(+), 12 deletions(-)
-
-diff --git a/src/engine.c b/src/engine.c
-index 79db70f..a297e4d 100644
---- a/src/engine.c
-+++ b/src/engine.c
-@@ -111,7 +111,11 @@ static void ibus_hangul_engine_update_lookup_table
- static void ibus_config_value_changed       (IBusConfig             *config,
-                                              const gchar            *section,
-                                              const gchar            *name,
-+#if IBUS_CHECK_VERSION(1,3,99)
-+                                             GVariant               *value,
-+#else
-                                              GValue                 *value,
-+#endif  /* !IBUS_CHECK_VERSION(1,3,99) */
-                                              gpointer                user_data);
- 
- static void        lookup_table_set_visible (IBusLookupTable        *table,
-@@ -136,6 +140,11 @@ static gboolean hanja_key_list_match        (HanjaKeyList           *list,
- static gboolean hanja_key_list_has_modifier (HanjaKeyList           *list,
-                                              guint                   keyval);
- 
-+static gboolean config_get_string           (IBusConfig             *config,
-+                                             const gchar            *section,
-+                                             const gchar            *name,
-+                                             gchar                 **result);
-+
- static IBusEngineClass *parent_class = NULL;
- static HanjaTable *hanja_table = NULL;
- static HanjaTable *symbol_table = NULL;
-@@ -176,7 +185,7 @@ void
- ibus_hangul_init (IBusBus *bus)
- {
-     gboolean res;
--    GValue value = { 0, };
-+    gchar *str;
- 
-     hanja_table = hanja_table_load (NULL);
- 
-@@ -187,22 +196,20 @@ ibus_hangul_init (IBusBus *bus)
-         g_object_ref_sink (config);
- 
-     hangul_keyboard = g_string_new_len ("2", 8);
--    res = ibus_config_get_value (config, "engine/Hangul",
--                                         "HangulKeyboard", &value);
-+    str = NULL;
-+    res = config_get_string (config, "engine/Hangul", "HangulKeyboard", &str);
-     if (res) {
--        const gchar* str = g_value_get_string (&value);
-         g_string_assign (hangul_keyboard, str);
--        g_value_unset(&value);
-+        g_free (str);
-     }
- 
-     hanja_key_list_init(&hanja_keys);
- 
--    res = ibus_config_get_value (config, "engine/Hangul",
--                                         "HanjaKeys", &value);
-+    str = NULL;
-+    res = config_get_string (config, "engine/Hangul", "HanjaKeys", &str);
-     if (res) {
--        const gchar* str = g_value_get_string (&value);
-         hanja_key_list_set_from_string(&hanja_keys, str);
--        g_value_unset(&value);
-+        g_free (str);
-     } else {
- 	hanja_key_list_append(&hanja_keys, IBUS_Hangul_Hanja, 0);
- 	hanja_key_list_append(&hanja_keys, IBUS_F9, 0);
-@@ -963,27 +970,71 @@ ibus_hangul_engine_property_activate (IBusEngine    *engine,
-     }
- }
- 
-+static gboolean
-+config_get_string (IBusConfig  *config,
-+                   const gchar *section,
-+                   const gchar *name,
-+                   gchar      **result)
-+{
-+#if IBUS_CHECK_VERSION(1,3,99)
-+    GVariant *value = NULL;
-+
-+    g_return_val_if_fail (result != NULL, FALSE);
-+
-+    value = ibus_config_get_value (config, section, name);
-+    if (value) {
-+        *result = g_strdup (g_variant_get_string (value, NULL));
-+        g_variant_unref (value);
-+        return TRUE;
-+    }
-+    return FALSE;
-+#else
-+    GValue value = { 0 };
-+
-+    g_return_val_if_fail (result != NULL, FALSE);
-+
-+    if (ibus_config_get_value (config, section, name, &value)) {
-+        *result = g_strdup (g_value_get_string (&value));
-+        g_value_unset (&value);
-+        return TRUE;
-+    }
-+    return FALSE;
-+#endif  /* !IBUS_CHECK_VERSION(1,3,99) */
-+}
-+
-+#if IBUS_CHECK_VERSION(1,3,99)
-+#define _g_variant_get_string g_variant_get_string
-+#define _g_variant_get_int32 g_variant_get_int32
-+#else
-+#define _g_variant_get_string(value, length) g_value_get_string(value)
-+#define _g_variant_get_int32 g_value_get_int
-+#endif  /* !IBUS_CHECK_VERSION(1,3,99) */
-+
- static void
- ibus_config_value_changed (IBusConfig   *config,
-                            const gchar  *section,
-                            const gchar  *name,
-+#if IBUS_CHECK_VERSION(1,3,99)
-+                           GVariant     *value,
-+#else
-                            GValue       *value,
-+#endif  /* !IBUS_CHECK_VERSION(1,3,99) */
-                            gpointer      user_data)
- {
-     IBusHangulEngine *hangul = (IBusHangulEngine *) user_data;
- 
-     if (strcmp(section, "engine/Hangul") == 0) {
-         if (strcmp(name, "HangulKeyboard") == 0) {
--            const gchar *str = g_value_get_string (value);
-+            const gchar *str = _g_variant_get_string (value, NULL);
-             g_string_assign (hangul_keyboard, str);
-             hangul_ic_select_keyboard (hangul->context, hangul_keyboard->str);
-         } else if (strcmp(name, "HanjaKeys") == 0) {
--            const gchar* str = g_value_get_string (value);
-+            const gchar* str = _g_variant_get_string (value, NULL);
- 	    hanja_key_list_set_from_string(&hanja_keys, str);
-         }
-     } else if (strcmp(section, "panel") == 0) {
-         if (strcmp(name, "lookup_table_orientation") == 0) {
--            lookup_table_orientation = g_value_get_int (value);
-+            lookup_table_orientation = _g_variant_get_int32 (value);
-         }
-     }
- }
--- 
-1.7.5.1
-
diff --git a/app-i18n/ibus-hangul/ibus-hangul-1.3.1-r1.ebuild b/app-i18n/ibus-hangul/ibus-hangul-1.3.1-r1.ebuild
deleted file mode 100644
index d974cd29a65a..000000000000
--- a/app-i18n/ibus-hangul/ibus-hangul-1.3.1-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus-hangul/ibus-hangul-1.3.1-r1.ebuild,v 1.3 2011/10/04 21:30:16 phajdan.jr Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2:2.5"
-inherit eutils python
-
-DESCRIPTION="The Hangul engine for IBus input platform"
-HOMEPAGE="http://code.google.com/p/ibus/"
-SRC_URI="http://ibus.googlecode.com/files/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="nls"
-
-RDEPEND=">=app-i18n/ibus-1.2.99
-	>=app-i18n/libhangul-0.0.12
-	nls? ( virtual/libintl )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	nls? ( >=sys-devel/gettext-0.17 )"
-
-src_prepare() {
-	# http://pkgs.fedoraproject.org/gitweb/?p=ibus-hangul.git
-	epatch "${FILESDIR}/${PN}-ibus-1.4.patch" || die
-	mv py-compile py-compile.orig || die
-	ln -s "$(type -P true)" py-compile || die
-}
-
-src_configure() {
-	econf $(use_enable nls) || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-
-	dodoc AUTHORS ChangeLog NEWS README || die
-}
diff --git a/app-i18n/ibus-hangul/ibus-hangul-1.4.0.ebuild b/app-i18n/ibus-hangul/ibus-hangul-1.4.0.ebuild
index de922784818b..4d4654bef9af 100644
--- a/app-i18n/ibus-hangul/ibus-hangul-1.4.0.ebuild
+++ b/app-i18n/ibus-hangul/ibus-hangul-1.4.0.ebuild
@@ -1,11 +1,12 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus-hangul/ibus-hangul-1.4.0.ebuild,v 1.2 2012/03/13 13:04:40 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/ibus-hangul/ibus-hangul-1.4.0.ebuild,v 1.4 2012/03/21 17:04:39 ssuominen Exp $
+
+EAPI=4
 
-EAPI="3"
 PYTHON_DEPEND="2:2.5"
 
-inherit eutils python
+inherit python
 
 DESCRIPTION="The Hangul engine for IBus input platform"
 HOMEPAGE="http://code.google.com/p/ibus/"
@@ -13,17 +14,22 @@ SRC_URI="http://ibus.googlecode.com/files/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="nls"
 
-RDEPEND=">=app-i18n/ibus-1.3.99
-	dev-python/pygobject
-	dev-python/pygtk
+RDEPEND=">=app-i18n/ibus-1.4
+	=dev-python/pygobject-2*
+	=dev-python/pygtk-2*
 	>=app-i18n/libhangul-0.1
 	nls? ( virtual/libintl )"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
-	nls? ( >=sys-devel/gettext-0.17 )"
+	nls? (
+		dev-util/intltool
+		>=sys-devel/gettext-0.17
+		)"
+
+DOCS="AUTHORS ChangeLog NEWS README"
 
 pkg_setup() {
 	python_set_active_version 2
@@ -31,19 +37,12 @@ pkg_setup() {
 }
 
 src_prepare() {
-	mv py-compile py-compile.orig || die
-	ln -s "$(type -P true)" py-compile || die
-	sed -i -e "s:python:$(PYTHON -2):" setup/ibus-setup-hangul.in || die
+	>py-compile
+	python_convert_shebangs 2 setup/ibus-setup-hangul.in
 }
 
 src_configure() {
-	econf $(use_enable nls) || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-
-	dodoc AUTHORS ChangeLog NEWS README || die
+	econf $(use_enable nls)
 }
 
 pkg_postinst() {
diff --git a/app-i18n/libhangul/libhangul-0.1.0.ebuild b/app-i18n/libhangul/libhangul-0.1.0.ebuild
index 0b96d41dc778..918e3eae92ab 100644
--- a/app-i18n/libhangul/libhangul-0.1.0.ebuild
+++ b/app-i18n/libhangul/libhangul-0.1.0.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/libhangul/libhangul-0.1.0.ebuild,v 1.2 2012/03/13 13:04:59 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/libhangul/libhangul-0.1.0.ebuild,v 1.4 2012/03/21 17:49:24 ssuominen Exp $
 
-EAPI="3"
+EAPI=4
 
 DESCRIPTION="libhangul is a generalized and portable library for processing hangul."
 HOMEPAGE="http://code.google.com/p/libhangul/"
@@ -10,22 +10,24 @@ SRC_URI="http://libhangul.googlecode.com/files/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="nls static-libs test"
 
 RDEPEND="nls? ( virtual/libintl )"
-DEPEND="nls? ( sys-devel/gettext )
+DEPEND="${RDEPEND}
 	dev-util/pkgconfig
+	nls? ( sys-devel/gettext )
 	test? ( dev-libs/check )"
 
+DOCS="AUTHORS ChangeLog NEWS README"
+
 src_configure() {
 	econf \
 		$(use_enable nls) \
-		$(use_enable static-libs static) || die
+		$(use_enable static-libs static)
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	dodoc AUTHORS ChangeLog NEWS README || die
+	default
+	rm -f "${ED}"/usr/lib*/libhangul.la
 }
diff --git a/app-laptop/radeontool/Manifest b/app-laptop/radeontool/Manifest
index fe91c68267f1..c225200fd6d2 100644
--- a/app-laptop/radeontool/Manifest
+++ b/app-laptop/radeontool/Manifest
@@ -1,3 +1,4 @@
 DIST radeontool-1.5.tar.gz 20869 RMD160 1cdeeb7ad379afa7bc03e1cd79adbb09f6a9cb85 SHA1 bd9096d5b18b31a1f1addbea80e6debfc707abf6 SHA256 598190677279001fd8d2724ac28aae11820d3c01f850bc167ec0030c21577361
 DIST radeontool-1.6.0.tar.bz2 334577 RMD160 cf1cdf5219a469d50e804382a99f5eec64ad0ef1 SHA1 3ed4678eede77e542251863417432f2d35e1878d SHA256 b23a1335379e028d7a3a1e5c5a9b53a891f31bcd54237a46580a4b996607534e
 DIST radeontool-1.6.1.tar.bz2 338446 RMD160 c4642b6fee4b4a6525178941490d3c8b5daabbee SHA1 afa2195aa7fa02605d56dc8ecd519e81f5754299 SHA256 6ebab96e2c3bc92c0e34507eb04e7bebdb3506c4bb3f7e2a3e9f84b4699ea46e
+DIST radeontool-1.6.3.tar.bz2 367487 RMD160 e291b54638d9ed87f285541e65269d15eb223a9a SHA1 f76fbef4f7e31711bc9ec0ab34fc31bf3f6db30a SHA256 f73d1ec1a962822e681c2eefa77d9843a02ee0c63196ba0c1181cc1da016a76c
diff --git a/app-laptop/radeontool/radeontool-1.6.3.ebuild b/app-laptop/radeontool/radeontool-1.6.3.ebuild
new file mode 100644
index 000000000000..0df7fb5ba786
--- /dev/null
+++ b/app-laptop/radeontool/radeontool-1.6.3.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/radeontool/radeontool-1.6.3.ebuild,v 1.1 2012/03/21 18:42:30 robbat2 Exp $
+
+EAPI=2
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Manage the backlight, external video output and registers of ATI Radeon graphics cards"
+
+HOMEPAGE="http://cgit.freedesktop.org/~airlied/radeontool/"
+SRC_URI="http://people.freedesktop.org/~airlied/${PN}/${P}.tar.bz2"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+IUSE=""
+
+RDEPEND="x11-libs/libpciaccess"
+DEPEND="${RDEPEND}"
+
+src_install() {
+	emake install DESTDIR="${D}"
+}
diff --git a/app-misc/datovka/Manifest b/app-misc/datovka/Manifest
index a87f003a8262..3e1a5e57c4bc 100644
--- a/app-misc/datovka/Manifest
+++ b/app-misc/datovka/Manifest
@@ -1,2 +1,2 @@
 DIST datovka-1.7.tar.gz 883670 RMD160 a46d8b052b9e87216888ca9cd13c00e2e5d5ef34 SHA1 108ff6c9b85af3b06a96ce2a3917b0dbb78b5e24 SHA256 23ad782f42c80958b423d0ea3e39320338a85a66d2d326ae3ed2752135389ef9
-DIST datovka-2.0.tar.gz 896205 RMD160 d4b17d5bb5b75a1b1c595802a9885255757e84d4 SHA1 e3a9d30dbb15af67bb55a7829f8d5b60544f1507 SHA256 cfdc21d6f572cca73501ad462a3f93de7171ca56e17c6e64dcaec76aa154a655
+DIST datovka-2.0.2.tar.gz 896658 RMD160 41bafa462096df716b9968769f9e3d17a10a825f SHA1 5e8fdce30b6ba339edd34c84ca085d38eb12d333 SHA256 688befa5cb52e563f55421889876c5c8915dc5642b8343b580277d6fa102e87e
diff --git a/app-misc/datovka/datovka-2.0.ebuild b/app-misc/datovka/datovka-2.0.2.ebuild
similarity index 92%
rename from app-misc/datovka/datovka-2.0.ebuild
rename to app-misc/datovka/datovka-2.0.2.ebuild
index 1089fad2fffc..ba8e2a2d0c25 100644
--- a/app-misc/datovka/datovka-2.0.ebuild
+++ b/app-misc/datovka/datovka-2.0.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/datovka/datovka-2.0.ebuild,v 1.1 2012/02/28 15:07:57 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/datovka/datovka-2.0.2.ebuild,v 1.1 2012/03/21 21:37:45 scarabeus Exp $
 
 EAPI=4
 
@@ -23,7 +23,7 @@ DEPEND="
 	dev-python/reportlab
 	dev-python/sqlalchemy
 	media-fonts/dejavu
-	>=net-libs/dslib-1.7
+	>=net-libs/dslib-2.0
 "
 RDEPEND="${DEPEND}"
 
diff --git a/app-misc/ytree/ytree-1.97.ebuild b/app-misc/ytree/ytree-1.97.ebuild
index faa435b8d1ae..b03bfb0a8825 100644
--- a/app-misc/ytree/ytree-1.97.ebuild
+++ b/app-misc/ytree/ytree-1.97.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/ytree/ytree-1.97.ebuild,v 1.1 2012/01/30 17:21:14 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/ytree/ytree-1.97.ebuild,v 1.2 2012/03/21 15:22:43 tomka Exp $
 
 EAPI=2
 
@@ -12,7 +12,7 @@ SRC_URI="http://www.han.de/~werner/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 IUSE=""
 
 DEPEND="sys-libs/readline
diff --git a/app-office/skrooge/Manifest b/app-office/skrooge/Manifest
index d405a58d443e..8994f26a059b 100644
--- a/app-office/skrooge/Manifest
+++ b/app-office/skrooge/Manifest
@@ -1,3 +1 @@
-DIST skrooge-0.8.0.tar.bz2 8262568 RMD160 094659591763bf757cf5bb050f191492163b072a SHA1 47182435735a9abbe733782814ff770ddb5f0ab6 SHA256 67cb3f557bbeb55afa77f7b306187cead45915d1cf0161bbd1206a942d2af66e
-DIST skrooge-1.1.1.tar.bz2 8559953 RMD160 030e9f16f9ec9a81a48c7610fc0df5b7d73442bf SHA1 063af1a04c2406babc59203e0d57912e834e46f1 SHA256 6553a61a74bb4f5d0272fff4844e47d983fa38cd6af0481658f4d1e3150c6d62
 DIST skrooge-1.2.0.tar.bz2 9709899 RMD160 9652414237b000a1ba206911876d6104423e642c SHA1 1587d493f6064637805e3601bdae08fd5258a633 SHA256 059d2e1dd6feb8e7fcf86b61c0932359b182c207f9dda21642a50253b7857f2a
diff --git a/app-office/skrooge/skrooge-0.8.0.ebuild b/app-office/skrooge/skrooge-0.8.0.ebuild
deleted file mode 100644
index 89e53b9dc895..000000000000
--- a/app-office/skrooge/skrooge-0.8.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/skrooge/skrooge-0.8.0.ebuild,v 1.4 2011/03/10 12:56:28 angelos Exp $
-
-EAPI=3
-KDE_LINGUAS="bg ca ca@valencia cs da de el en_GB eo es et fr ga gl hu it ja ko lt ms nb
-nds nl pl pt pt_BR ro ru sk sv tr uk zh_TW"
-KDE_DOC_DIRS="doc doc-translations/%lingua_${PN}"
-VIRTUALX_REQUIRED=test
-inherit kde4-base
-
-DESCRIPTION="personal finances manager for KDE4, aiming at being simple and intuitive"
-HOMEPAGE="http://skrooge.org/"
-SRC_URI="http://skrooge.org/files/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="4"
-KEYWORDS="amd64 x86"
-IUSE="debug +handbook test"
-
-DEPEND=">=dev-libs/libofx-0.9.1
-	app-crypt/qca:2
-	x11-libs/qt-sql:4[sqlite]"
-RDEPEND="${DEPEND}
-	$(add_kdebase_dep kdesdk-scripts)"
-
-# Tests hangs forever with Openbigtest
-# Quite few others fail (in all versions)
-RESTRICT="test"
-
-DOCS="AUTHORS CHANGELOG README TODO"
-
-src_configure() {
-	mycmakeargs+=( $(cmake-utils_use test SKG_BUILD_TEST) )
-	kde4-base_src_configure
-}
diff --git a/app-office/skrooge/skrooge-1.1.1.ebuild b/app-office/skrooge/skrooge-1.1.1.ebuild
deleted file mode 100644
index 0863cc1d64df..000000000000
--- a/app-office/skrooge/skrooge-1.1.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/skrooge/skrooge-1.1.1.ebuild,v 1.2 2012/01/18 14:46:30 johu Exp $
-
-EAPI=4
-KDE_LINGUAS="bg bs ca ca@valencia cs da de el en_GB eo es et fr ga gl hu it ja lt nb
-nl pl pt pt_BR ro ru sk sv tr ug zh_CN"
-KDE_DOC_DIRS="doc"
-KDE_HANDBOOK=optional
-inherit kde4-base
-
-DESCRIPTION="personal finances manager for KDE4, aiming at being simple and intuitive"
-HOMEPAGE="http://www.skrooge.org/"
-SRC_URI="http://www.skrooge.org/files/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="4"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug"
-
-DEPEND="
-	app-crypt/qca:2
-	dev-libs/grantlee
-	>=dev-libs/libofx-0.9.1
-	x11-libs/qt-sql:4[sqlite]
-"
-RDEPEND="${DEPEND}
-	$(add_kdebase_dep kdesdk-scripts)
-"
-
-DOCS="AUTHORS CHANGELOG README TODO"
-
-src_test() { :; }
-# tests are not included in tarball, bug 372315
diff --git a/app-office/skrooge/skrooge-1.2.0.ebuild b/app-office/skrooge/skrooge-1.2.0.ebuild
index f7464c216ebc..073fad5d4107 100644
--- a/app-office/skrooge/skrooge-1.2.0.ebuild
+++ b/app-office/skrooge/skrooge-1.2.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/skrooge/skrooge-1.2.0.ebuild,v 1.1 2012/01/18 14:46:30 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/skrooge/skrooge-1.2.0.ebuild,v 1.2 2012/03/21 19:49:26 scarabeus Exp $
 
 EAPI=4
 
@@ -16,7 +16,7 @@ SRC_URI="http://www.skrooge.org/files/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="4"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="debug"
 
 DEPEND="
diff --git a/app-text/gnome-doc-utils/Manifest b/app-text/gnome-doc-utils/Manifest
index 920663bf5683..f04d3fd42295 100644
--- a/app-text/gnome-doc-utils/Manifest
+++ b/app-text/gnome-doc-utils/Manifest
@@ -1 +1,2 @@
 DIST gnome-doc-utils-0.20.6.tar.bz2 716487 RMD160 d333cd84d1ae1404f3913caaf51be833f85696bb SHA1 c11dda3cff4248a6918cfaf0d7b892fc20bf329e SHA256 091486e370480bf45349ad09dac799211092a02938b26a0d68206172cb6cebbf
+DIST gnome-doc-utils-0.20.9.tar.xz 524480 RMD160 0bf48994ba1d91ae1a7f351e00dd254a4a70e1a4 SHA1 dd23ece0d1d5359d835e6adabdc60bf151087800 SHA256 60c4c1071071b97998fc80787870b9a0c07b5fd4cc1fde177e81f40f325d432a
diff --git a/app-text/gnome-doc-utils/gnome-doc-utils-0.20.9.ebuild b/app-text/gnome-doc-utils/gnome-doc-utils-0.20.9.ebuild
new file mode 100644
index 000000000000..438cbfd02f50
--- /dev/null
+++ b/app-text/gnome-doc-utils/gnome-doc-utils-0.20.9.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/gnome-doc-utils/gnome-doc-utils-0.20.9.ebuild,v 1.1 2012/03/22 05:13:48 tetromino Exp $
+
+EAPI="4"
+GCONF_DEBUG="no"
+PYTHON_DEPEND="2:2.5"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.* *-jython *-pypy-*"
+
+inherit gnome2 python
+
+DESCRIPTION="A collection of documentation utilities for the Gnome project"
+HOMEPAGE="http://live.gnome.org/GnomeDocUtils"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND=">=dev-libs/libxml2-2.6.12[python]
+	 >=dev-libs/libxslt-1.1.8
+"
+DEPEND="${RDEPEND}
+	>=sys-apps/gawk-3
+	sys-devel/gettext
+	>=dev-util/intltool-0.35
+	>=dev-util/pkgconfig-0.9
+	app-text/docbook-xml-dtd:4.4
+	app-text/scrollkeeper-dtd"
+# dev-libs/glib needed for eautofoo, bug #255114.
+
+# If there is a need to reintroduce eautomake or eautoreconf, make sure
+# to AT_M4DIR="tools m4", bug #224609 (m4 removes glib build time dep)
+
+pkg_setup() {
+	DOCS="AUTHORS ChangeLog NEWS README"
+	G2CONF="${G2CONF} --disable-scrollkeeper"
+	python_pkg_setup
+}
+
+src_prepare() {
+	gnome2_src_prepare
+
+	python_clean_py-compile_files
+
+	python_copy_sources
+}
+
+src_configure() {
+	python_execute_function -s gnome2_src_configure
+}
+
+src_compile() {
+	python_execute_function -d -s
+}
+
+src_test() {
+	python_execute_function -d -s
+}
+
+src_install() {
+	installation() {
+		gnome2_src_install
+		python_convert_shebangs $(python_get_version) "${ED}"usr/bin/xml2po
+		mv "${ED}"usr/bin/xml2po "${ED}"usr/bin/xml2po-$(python_get_version)
+	}
+	python_execute_function -s installation
+	python_clean_installation_image
+
+	python_generate_wrapper_scripts -E -f "${ED}"usr/bin/xml2po
+}
+
+pkg_postinst() {
+	python_mod_optimize xml2po
+	gnome2_pkg_postinst
+}
+
+pkg_postrm() {
+	python_mod_cleanup xml2po
+	gnome2_pkg_postrm
+}
diff --git a/app-text/texi2html/texi2html-5.0-r1.ebuild b/app-text/texi2html/texi2html-5.0-r1.ebuild
index 2681312a957f..87e885b09e16 100644
--- a/app-text/texi2html/texi2html-5.0-r1.ebuild
+++ b/app-text/texi2html/texi2html-5.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/texi2html/texi2html-5.0-r1.ebuild,v 1.1 2012/03/15 19:07:35 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/texi2html/texi2html-5.0-r1.ebuild,v 1.2 2012/03/21 20:40:04 jer Exp $
 
 EAPI=4
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://nongnu/${PN}/${P}.tar.bz2"
 
 LICENSE="CCPL-ShareAlike-1.0 FDL-1.3 GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~mips ~x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~amd64 ~hppa ~mips ~x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="unicode"
 
 RDEPEND=">=dev-lang/perl-5.10.1
diff --git a/app-text/texlive-core/texlive-core-2011-r6.ebuild b/app-text/texlive-core/texlive-core-2011-r6.ebuild
index f15df5aa5b46..75cf892623b6 100644
--- a/app-text/texlive-core/texlive-core-2011-r6.ebuild
+++ b/app-text/texlive-core/texlive-core-2011-r6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/texlive-core/texlive-core-2011-r6.ebuild,v 1.2 2012/03/20 10:41:24 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/texlive-core/texlive-core-2011-r6.ebuild,v 1.4 2012/03/21 16:21:08 tomka Exp $
 
 EAPI=3
 
@@ -61,7 +61,7 @@ for i in ${TL_CORE_EXTRA_SRC_MODULES}; do
 done
 SRC_URI="${SRC_URI} )"
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd"
 IUSE="cjk X doc source tk xetex"
 
 MODULAR_X_DEPEND="X? (
diff --git a/dev-lang/parrot/Manifest b/dev-lang/parrot/Manifest
index 4ad14090ae58..bccf7ab9b5ba 100644
--- a/dev-lang/parrot/Manifest
+++ b/dev-lang/parrot/Manifest
@@ -1,2 +1,3 @@
 DIST parrot-4.0.0.tar.bz2 4304293 RMD160 1c7693e0027c99efba7de2b91504db605053b844 SHA1 12c7bd48b5df4217547e8f913d989a7beafe6bd7 SHA256 a1e0bc3de509b247b2cea4863cc202cdceeaa329729416115d3c20a162a0dd88
 DIST parrot-4.1.0.tar.bz2 4302808 RMD160 a0cf550967a37f2273212ed8b401b24ce70329e4 SHA1 32e7bf38d307bc90d6fcf26f1016228bbee307d3 SHA256 826465f3b7045cf81768029b1f18a4fa05259b7268c98c9c0436bd77c74785ec
+DIST parrot-4.2.0.tar.bz2 4309388 RMD160 7e93362932cee529e15a2158be55565d45c8e41d SHA1 f439bc06d566b8e7e5e4ec703101bc6bca4dd383 SHA256 a960c89f94099c9643c5623263bdb7fa9e97effb889c975382bbf9c0251186b4
diff --git a/dev-lang/parrot/parrot-4.2.0.ebuild b/dev-lang/parrot/parrot-4.2.0.ebuild
new file mode 100644
index 000000000000..79b8f7257118
--- /dev/null
+++ b/dev-lang/parrot/parrot-4.2.0.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/parrot/parrot-4.2.0.ebuild,v 1.1 2012/03/21 15:06:36 patrick Exp $
+
+EAPI=3
+
+# There's multiple small issues at the moment, so ...
+RESTRICT="test"
+
+inherit eutils multilib
+
+DESCRIPTION="Virtual machine designed to efficiently compile and execute bytecode for dynamic languages"
+HOMEPAGE="http://www.parrot.org/"
+SRC_URI="ftp://ftp.parrot.org/pub/parrot/releases/devel/${PV}/${P}.tar.bz2"
+
+LICENSE="Artistic-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="opengl nls doc examples gdbm gmp ssl +unicode pcre"
+
+RDEPEND="sys-libs/readline
+	opengl? ( media-libs/freeglut )
+	nls? ( sys-devel/gettext )
+	unicode? ( >=dev-libs/icu-2.6 )
+	gdbm? ( >=sys-libs/gdbm-1.8.3-r1 )
+	gmp? ( >=dev-libs/gmp-4.1.4 )
+	ssl? ( dev-libs/openssl )
+	pcre? ( dev-libs/libpcre )"
+
+DEPEND="dev-lang/perl[doc?]
+	${RDEPEND}"
+
+src_prepare() {
+	# Fix for #404195 - pcre detection is wonky
+	sed -i 's:libpcre.so.0:libpcre.so.1:' runtime/parrot/library/pcre.pir || die "Couldn't fix pcre location"
+}
+
+src_configure() {
+	myconf="--disable-rpath"
+	use unicode || myconf+=" --without-icu"
+	use ssl     || myconf+=" --without-crypto"
+	use gdbm    || myconf+=" --without-gdbm"
+	use nls     || myconf+=" --without-gettext"
+	use gmp     || myconf+=" --without-gmp"
+	use opengl  || myconf+=" --without-opengl"
+	use pcre    || myconf+=" --without-pcre"
+
+	perl Configure.pl \
+		--ccflags="${CFLAGS}" \
+		--linkflags="${LDFLAGS}" \
+		--prefix="${EPREFIX}"/usr \
+		--libdir="${EPREFIX}"/usr/$(get_libdir) \
+		--mandir="${EPREFIX}"/usr/share/man \
+		--sysconfdir="${EPREFIX}"/etc \
+		--sharedstatedir="${EPREFIX}"/var/lib/parrot \
+		$myconf || die
+}
+
+src_compile() {
+	export LD_LIBRARY_PATH=${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}"${S}"/blib/lib
+	# occasionally dies in parallel make
+	emake -j1 || die
+	if use doc ; then
+		emake -j1 html || die
+	fi
+}
+
+src_test() {
+	emake -j1 test || die
+}
+
+src_install() {
+	emake -j1 install-dev DESTDIR="${D}" DOC_DIR="${EPREFIX}/usr/share/doc/${PF}" || die
+	dodoc CREDITS DONORS.pod PBC_COMPAT PLATFORMS RESPONSIBLE_PARTIES TODO || die
+	if use examples; then
+		insinto "/usr/share/doc/${PF}/examples"
+		doins -r examples/* || die
+	fi
+	if use doc; then
+		insinto "/usr/share/doc/${PF}/editor"
+		doins -r editor || die
+		cd docs/html
+		dohtml -r developer.html DONORS.pod.html index.html ops.html parrotbug.html pdds.html \
+			pmc.html tools.html docs src tools || die
+	fi
+}
diff --git a/dev-lang/python/files/python-3-distutils-egg-utf8.patch b/dev-lang/python/files/python-3-distutils-egg-utf8.patch
new file mode 100644
index 000000000000..d3213f39e9a5
--- /dev/null
+++ b/dev-lang/python/files/python-3-distutils-egg-utf8.patch
@@ -0,0 +1,43 @@
+
+# HG changeset patch
+# User Victor Stinner <victor.stinner@haypocalc.com>
+# Date 1315259096 -7200
+# Node ID fb4d2e6d393e96baac13c4efc216e361bf12c293
+# Parent  cb47cf5138a4567718a25d69a79d1c62d13f187c
+Issue #9561: distutils now reads and writes egg-info files using UTF-8
+
+instead of the locale encoding.
+
+diff --git a/Lib/distutils/command/install_egg_info.py b/Lib/distutils/command/install_egg_info.py
+--- a/Lib/distutils/command/install_egg_info.py
++++ b/Lib/distutils/command/install_egg_info.py
+@@ -40,9 +40,8 @@ class install_egg_info(Command):
+                          "Creating "+self.install_dir)
+         log.info("Writing %s", target)
+         if not self.dry_run:
+-            f = open(target, 'w')
+-            self.distribution.metadata.write_pkg_file(f)
+-            f.close()
++            with open(target, 'w', encoding='UTF-8') as f:
++                self.distribution.metadata.write_pkg_file(f)
+ 
+     def get_outputs(self):
+         return self.outputs
+diff --git a/Lib/distutils/dist.py b/Lib/distutils/dist.py
+--- a/Lib/distutils/dist.py
++++ b/Lib/distutils/dist.py
+@@ -1010,11 +1010,9 @@ class DistributionMetadata:
+     def write_pkg_info(self, base_dir):
+         """Write the PKG-INFO file into the release tree.
+         """
+-        pkg_info = open(os.path.join(base_dir, 'PKG-INFO'), 'w')
+-        try:
++        with open(os.path.join(base_dir, 'PKG-INFO'), 'w',
++                  encoding='UTF-8') as pkg_info:
+             self.write_pkg_file(pkg_info)
+-        finally:
+-            pkg_info.close()
+ 
+     def write_pkg_file(self, file):
+         """Write the PKG-INFO format data to a file object.
+
diff --git a/dev-lang/python/python-3.1.4-r4.ebuild b/dev-lang/python/python-3.1.4-r4.ebuild
new file mode 100644
index 000000000000..5f3649308cae
--- /dev/null
+++ b/dev-lang/python/python-3.1.4-r4.ebuild
@@ -0,0 +1,361 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-3.1.4-r4.ebuild,v 1.1 2012/03/21 16:27:07 floppym Exp $
+
+EAPI="3"
+WANT_AUTOMAKE="none"
+
+inherit autotools eutils flag-o-matic multilib python toolchain-funcs
+
+if [[ "${PV}" == *_pre* ]]; then
+	inherit mercurial
+
+	EHG_REPO_URI="http://hg.python.org/cpython"
+	EHG_REVISION=""
+else
+	MY_PV="${PV%_p*}"
+	MY_P="Python-${MY_PV}"
+fi
+
+PATCHSET_REVISION="0"
+
+DESCRIPTION="Python is an interpreted, interactive, object-oriented programming language."
+HOMEPAGE="http://www.python.org/"
+if [[ "${PV}" == *_pre* ]]; then
+	SRC_URI=""
+else
+	SRC_URI="http://www.python.org/ftp/python/${MY_PV}/${MY_P}.tar.xz
+		mirror://gentoo/python-gentoo-patches-${MY_PV}$([[ "${PATCHSET_REVISION}" != "0" ]] && echo "-r${PATCHSET_REVISION}").tar.bz2"
+fi
+
+LICENSE="PSF-2"
+SLOT="3.1"
+PYTHON_ABI="${SLOT}"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+IUSE="build doc elibc_uclibc examples gdbm ipv6 +ncurses +readline sqlite +ssl +threads tk +wide-unicode wininst +xml"
+
+RDEPEND=">=app-admin/eselect-python-20091230
+		app-arch/bzip2
+		>=sys-libs/zlib-1.1.3
+		virtual/libffi
+		virtual/libintl
+		!build? (
+			gdbm? ( sys-libs/gdbm )
+			ncurses? (
+				>=sys-libs/ncurses-5.2
+				readline? ( >=sys-libs/readline-4.1 )
+			)
+			sqlite? ( >=dev-db/sqlite-3.3.3:3 )
+			ssl? ( dev-libs/openssl )
+			tk? (
+				>=dev-lang/tk-8.0
+				dev-tcltk/blt
+			)
+			xml? ( >=dev-libs/expat-2 )
+		)"
+DEPEND="${RDEPEND}
+		$([[ "${PV}" == *_pre* ]] && echo "=${CATEGORY}/${PN}-${PV%%.*}*")
+		dev-util/pkgconfig
+		$([[ "${PV}" =~ ^[[:digit:]]+\.[[:digit:]]+_pre ]] && echo "doc? ( dev-python/sphinx )")
+		!sys-devel/gcc[libffi]"
+RDEPEND+=" !build? ( app-misc/mime-types )
+		$([[ "${PV}" =~ ^[[:digit:]]+\.[[:digit:]]+_pre ]] || echo "doc? ( dev-python/python-docs:${SLOT} )")"
+PDEPEND="app-admin/python-updater"
+
+if [[ "${PV}" != *_pre* ]]; then
+	S="${WORKDIR}/${MY_P}"
+fi
+
+pkg_setup() {
+	python_pkg_setup
+}
+
+src_prepare() {
+	# Ensure that internal copies of expat, libffi and zlib are not used.
+	rm -fr Modules/expat
+	rm -fr Modules/_ctypes/libffi*
+	rm -fr Modules/zlib
+
+	if [[ "${PV}" =~ ^[[:digit:]]+\.[[:digit:]]+_pre ]]; then
+		if [[ "$(hg branch)" != "default" ]]; then
+			die "Invalid EHG_REVISION"
+		fi
+	fi
+
+	if [[ "${PV}" =~ ^[[:digit:]]+\.[[:digit:]]+\.[[:digit:]]+_pre ]]; then
+		if [[ "$(hg branch)" != "${SLOT}" ]]; then
+			die "Invalid EHG_REVISION"
+		fi
+
+		if grep -Eq '#define PY_RELEASE_LEVEL[[:space:]]+PY_RELEASE_LEVEL_FINAL' Include/patchlevel.h; then
+			# Update micro version, release level and version string.
+			local micro_version="${PV%_pre*}"
+			micro_version="${micro_version##*.}"
+			local version_string="${PV%.*}.$((${micro_version} - 1))+"
+			sed \
+				-e "s/\(#define PY_MICRO_VERSION[[:space:]]\+\)[^[:space:]]\+/\1${micro_version}/" \
+				-e "s/\(#define PY_RELEASE_LEVEL[[:space:]]\+\)[^[:space:]]\+/\1PY_RELEASE_LEVEL_ALPHA/" \
+				-e "s/\(#define PY_VERSION[[:space:]]\+\"\)[^\"]\+\(\"\)/\1${version_string}\2/" \
+				-i Include/patchlevel.h || die "sed failed"
+		fi
+	fi
+
+	local excluded_patches
+	if ! tc-is-cross-compiler; then
+		excluded_patches="*_all_crosscompile.patch"
+	fi
+
+	local patchset_dir
+	if [[ "${PV}" == *_pre* ]]; then
+		patchset_dir="${FILESDIR}/${SLOT}-${PATCHSET_REVISION}"
+	else
+		patchset_dir="${WORKDIR}/${MY_PV}"
+	fi
+
+	EPATCH_EXCLUDE="${excluded_patches}" EPATCH_SUFFIX="patch" epatch "${patchset_dir}"
+	epatch "${FILESDIR}/linux2.patch"
+	# https://bugs.gentoo.org/show_bug.cgi?id=343721
+	epatch "${FILESDIR}"/python-3-distutils-egg-utf8.patch
+
+	# Linux-3 compat. Bug #374579 (upstream issue12571)
+	cp -r "${S}/Lib/plat-linux2" "${S}/Lib/plat-linux3" || die
+
+	sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \
+		Lib/distutils/command/install.py \
+		Lib/distutils/sysconfig.py \
+		Lib/site.py \
+		Makefile.pre.in \
+		Modules/Setup.dist \
+		Modules/getpath.c \
+		setup.py || die "sed failed to replace @@GENTOO_LIBDIR@@"
+
+	eautoconf
+	eautoheader
+}
+
+src_configure() {
+	if use build; then
+		# Disable extraneous modules with extra dependencies.
+		export PYTHON_DISABLE_MODULES="gdbm _curses _curses_panel readline _sqlite3 _tkinter _elementtree pyexpat"
+		export PYTHON_DISABLE_SSL="1"
+	else
+		local disable
+		use gdbm     || disable+=" gdbm"
+		use ncurses  || disable+=" _curses _curses_panel"
+		use readline || disable+=" readline"
+		use sqlite   || disable+=" _sqlite3"
+		use ssl      || export PYTHON_DISABLE_SSL="1"
+		use tk       || disable+=" _tkinter"
+		use xml      || disable+=" _elementtree pyexpat" # _elementtree uses pyexpat.
+		export PYTHON_DISABLE_MODULES="${disable}"
+
+		if ! use xml; then
+			ewarn "You have configured Python without XML support."
+			ewarn "This is NOT a recommended configuration as you"
+			ewarn "may face problems parsing any XML documents."
+		fi
+	fi
+
+	if [[ -n "${PYTHON_DISABLE_MODULES}" ]]; then
+		einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}"
+	fi
+
+	if [[ "$(gcc-major-version)" -ge 4 ]]; then
+		append-flags -fwrapv
+	fi
+
+	filter-flags -malign-double
+
+	[[ "${ARCH}" == "alpha" ]] && append-flags -fPIC
+
+	# https://bugs.gentoo.org/show_bug.cgi?id=50309
+	if is-flagq -O3; then
+		is-flagq -fstack-protector-all && replace-flags -O3 -O2
+		use hardened && replace-flags -O3 -O2
+	fi
+
+	if tc-is-cross-compiler; then
+		OPT="-O1" CFLAGS="" LDFLAGS="" CC="" \
+		./configure --{build,host}=${CBUILD} || die "cross-configure failed"
+		emake python Parser/pgen || die "cross-make failed"
+		mv python hostpython
+		mv Parser/pgen Parser/hostpgen
+		make distclean
+		sed -i \
+			-e "/^HOSTPYTHON/s:=.*:=./hostpython:" \
+			-e "/^HOSTPGEN/s:=.*:=./Parser/hostpgen:" \
+			Makefile.pre.in || die "sed failed"
+	fi
+
+	# Export CXX so it ends up in /usr/lib/python3.X/config/Makefile.
+	tc-export CXX
+
+	# Set LDFLAGS so we link modules with -lpython3.1 correctly.
+	# Needed on FreeBSD unless Python 3.1 is already installed.
+	# Please query BSD team before removing this!
+	append-ldflags "-L."
+
+	local dbmliborder
+	if use gdbm; then
+		dbmliborder+="${dbmliborder:+:}gdbm"
+	fi
+
+	OPT="" econf \
+		--with-fpectl \
+		--enable-shared \
+		$(use_enable ipv6) \
+		$(use_with threads) \
+		$(use_with wide-unicode) \
+		--infodir='${prefix}/share/info' \
+		--mandir='${prefix}/share/man' \
+		--with-computed-gotos \
+		--with-dbmliborder="${dbmliborder}" \
+		--with-libc="" \
+		--with-system-ffi
+}
+
+src_compile() {
+	emake EPYTHON="python${PV%%.*}" || die "emake failed"
+}
+
+src_test() {
+	# Tests will not work when cross compiling.
+	if tc-is-cross-compiler; then
+		elog "Disabling tests due to crosscompiling."
+		return
+	fi
+
+	if ! use threads; then
+		ewarn "Disabling tests due to USE=\"-threads\""
+		return
+	fi
+
+	# Byte compiling should be enabled here.
+	# Otherwise test_import fails.
+	python_enable_pyc
+
+	# Skip failing tests.
+	local skipped_tests="distutils"
+
+	for test in ${skipped_tests}; do
+		mv "${S}/Lib/test/test_${test}.py" "${T}"
+	done
+
+	# Rerun failed tests in verbose mode (regrtest -w).
+	emake test EXTRATESTOPTS="-w" < /dev/tty
+	local result="$?"
+
+	for test in ${skipped_tests}; do
+		mv "${T}/test_${test}.py" "${S}/Lib/test/test_${test}.py"
+	done
+
+	elog "The following tests have been skipped:"
+	for test in ${skipped_tests}; do
+		elog "test_${test}.py"
+	done
+
+	elog "If you would like to run them, you may:"
+	elog "cd '${EPREFIX}$(python_get_libdir)/test'"
+	elog "and run the tests separately."
+
+	python_disable_pyc
+
+	if [[ "${result}" -ne 0 ]]; then
+		die "emake test failed"
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" altinstall || die "emake altinstall failed"
+	python_clean_installation_image -q
+
+	mv "${ED}usr/bin/python${SLOT}-config" "${ED}usr/bin/python-config-${SLOT}"
+
+	# Fix collisions between different slots of Python.
+	mv "${ED}usr/bin/2to3" "${ED}usr/bin/2to3-${SLOT}"
+	mv "${ED}usr/bin/pydoc3" "${ED}usr/bin/pydoc${SLOT}"
+	mv "${ED}usr/bin/idle3" "${ED}usr/bin/idle${SLOT}"
+	rm -f "${ED}usr/bin/smtpd.py"
+
+	if use build; then
+		rm -fr "${ED}usr/bin/idle${SLOT}" "${ED}$(python_get_libdir)/"{idlelib,sqlite3,test,tkinter}
+	else
+		use elibc_uclibc && rm -fr "${ED}$(python_get_libdir)/test"
+		use sqlite || rm -fr "${ED}$(python_get_libdir)/"{sqlite3,test/test_sqlite*}
+		use tk || rm -fr "${ED}usr/bin/idle${SLOT}" "${ED}$(python_get_libdir)/"{idlelib,tkinter,test/test_tk*}
+	fi
+
+	use threads || rm -fr "${ED}$(python_get_libdir)/multiprocessing"
+	use wininst || rm -f "${ED}$(python_get_libdir)/distutils/command/"wininst-*.exe
+
+	dodoc Misc/{ACKS,HISTORY,NEWS} || die "dodoc failed"
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		doins -r "${S}/Tools" || die "doins failed"
+	fi
+
+	newconfd "${FILESDIR}/pydoc.conf" pydoc-${SLOT} || die "newconfd failed"
+	newinitd "${FILESDIR}/pydoc.init" pydoc-${SLOT} || die "newinitd failed"
+
+	if use kernel_linux; then
+		if [ -d "${ED}$(python_get_libdir)/plat-linux2" ];then
+			cp -r "${ED}$(python_get_libdir)/plat-linux2" \
+				"${ED}$(python_get_libdir)/plat-linux3" || die "copy plat-linux failed"
+		else
+			cp -r "${ED}$(python_get_libdir)/plat-linux3" \
+				"${ED}$(python_get_libdir)/plat-linux2" || die "copy plat-linux failed"
+		fi
+	fi
+
+	sed \
+		-e "s:@PYDOC_PORT_VARIABLE@:PYDOC${SLOT/./_}_PORT:" \
+		-e "s:@PYDOC@:pydoc${SLOT}:" \
+		-i "${ED}etc/conf.d/pydoc-${SLOT}" "${ED}etc/init.d/pydoc-${SLOT}" || die "sed failed"
+}
+
+pkg_preinst() {
+	if has_version "<${CATEGORY}/${PN}-${SLOT}" && ! has_version ">=${CATEGORY}/${PN}-${SLOT}_alpha"; then
+		python_updater_warning="1"
+	fi
+}
+
+eselect_python_update() {
+	if [[ -z "$(eselect python show)" || ! -f "${EROOT}usr/bin/$(eselect python show)" ]]; then
+		eselect python update
+	fi
+
+	if [[ -z "$(eselect python show --python${PV%%.*})" || ! -f "${EROOT}usr/bin/$(eselect python show --python${PV%%.*})" ]]; then
+		eselect python update --python${PV%%.*}
+	fi
+}
+
+pkg_postinst() {
+	eselect_python_update
+
+	python_mod_optimize -f -x "/(site-packages|test|tests)/" $(python_get_libdir)
+
+	if [[ "${python_updater_warning}" == "1" ]]; then
+		ewarn
+		ewarn "\e[1;31m************************************************************************\e[0m"
+		ewarn
+		ewarn "You have just upgraded from an older version of Python."
+		ewarn "You should switch active version of Python ${PV%%.*} and run"
+		ewarn "'python-updater \${options}' to rebuild Python modules."
+		ewarn
+		ewarn "\e[1;31m************************************************************************\e[0m"
+		ewarn
+
+		local n
+		for ((n = 0; n < 12; n++)); do
+			echo -ne "\a"
+			sleep 1
+		done
+	fi
+}
+
+pkg_postrm() {
+	eselect_python_update
+
+	python_mod_cleanup $(python_get_libdir)
+}
diff --git a/dev-lang/python/python-3.2.2-r1.ebuild b/dev-lang/python/python-3.2.2-r1.ebuild
new file mode 100644
index 000000000000..1a7c097281a5
--- /dev/null
+++ b/dev-lang/python/python-3.2.2-r1.ebuild
@@ -0,0 +1,365 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/python/python-3.2.2-r1.ebuild,v 1.1 2012/03/21 16:27:07 floppym Exp $
+
+EAPI="3"
+WANT_AUTOMAKE="none"
+
+inherit autotools eutils flag-o-matic multilib python toolchain-funcs
+
+if [[ "${PV}" == *_pre* ]]; then
+	inherit subversion
+
+	ESVN_PROJECT="python"
+	ESVN_REPO_URI="http://svn.python.org/projects/python/branches/release32-maint"
+	ESVN_REVISION=""
+else
+	MY_PV="${PV%_p*}"
+	MY_P="Python-${MY_PV}"
+fi
+
+PATCHSET_REVISION="0"
+
+DESCRIPTION="Python is an interpreted, interactive, object-oriented programming language."
+HOMEPAGE="http://www.python.org/"
+if [[ "${PV}" == *_pre* ]]; then
+	SRC_URI=""
+else
+	SRC_URI="http://www.python.org/ftp/python/${MY_PV}/${MY_P}.tar.xz
+		mirror://gentoo/python-gentoo-patches-${MY_PV}$([[ "${PATCHSET_REVISION}" != "0" ]] && echo "-r${PATCHSET_REVISION}").tar.bz2"
+fi
+
+LICENSE="PSF-2"
+SLOT="3.2"
+PYTHON_ABI="${SLOT}"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+IUSE="build doc elibc_uclibc examples gdbm ipv6 +ncurses +readline sqlite +ssl +threads tk +wide-unicode wininst +xml"
+
+RDEPEND=">=app-admin/eselect-python-20091230
+		>=sys-libs/zlib-1.1.3
+		virtual/libffi
+		virtual/libintl
+		!build? (
+			gdbm? ( sys-libs/gdbm )
+			ncurses? (
+				>=sys-libs/ncurses-5.2
+				readline? ( >=sys-libs/readline-4.1 )
+			)
+			sqlite? ( >=dev-db/sqlite-3.3.8:3[extensions] )
+			ssl? ( dev-libs/openssl )
+			tk? (
+				>=dev-lang/tk-8.0
+				dev-tcltk/blt
+			)
+			xml? ( >=dev-libs/expat-2 )
+		)"
+DEPEND=">=sys-devel/autoconf-2.65
+		${RDEPEND}
+		$([[ "${PV}" == *_pre* ]] && echo "=${CATEGORY}/${PN}-${PV%%.*}*")
+		$([[ "${PV}" != *_pre* ]] && echo "app-arch/xz-utils")
+		dev-util/pkgconfig
+		$([[ "${PV}" =~ ^[[:digit:]]+\.[[:digit:]]+_pre ]] && echo "doc? ( dev-python/sphinx )")
+		!sys-devel/gcc[libffi]"
+RDEPEND+=" !build? ( app-misc/mime-types )
+		$([[ "${PV}" =~ ^[[:digit:]]+\.[[:digit:]]+_pre ]] || echo "doc? ( dev-python/python-docs:${SLOT} )")"
+PDEPEND="app-admin/python-updater"
+
+if [[ "${PV}" != *_pre* ]]; then
+	S="${WORKDIR}/${MY_P}"
+fi
+
+pkg_setup() {
+	python_pkg_setup
+}
+
+src_prepare() {
+	# Ensure that internal copies of expat, libffi and zlib are not used.
+	rm -fr Modules/expat
+	rm -fr Modules/_ctypes/libffi*
+	rm -fr Modules/zlib
+
+	if [[ "${PV}" =~ ^[[:digit:]]+\.[[:digit:]]+\.[[:digit:]]+_pre ]]; then
+		if grep -Eq '#define PY_RELEASE_LEVEL[[:space:]]+PY_RELEASE_LEVEL_FINAL' Include/patchlevel.h; then
+			# Update micro version, release level and version string.
+			local micro_version="${PV%_pre*}"
+			micro_version="${micro_version##*.}"
+			local version_string="${PV%.*}.$((${micro_version} - 1))+"
+			sed \
+				-e "s/\(#define PY_MICRO_VERSION[[:space:]]\+\)[^[:space:]]\+/\1${micro_version}/" \
+				-e "s/\(#define PY_RELEASE_LEVEL[[:space:]]\+\)[^[:space:]]\+/\1PY_RELEASE_LEVEL_ALPHA/" \
+				-e "s/\(#define PY_VERSION[[:space:]]\+\"\)[^\"]\+\(\"\)/\1${version_string}\2/" \
+				-i Include/patchlevel.h || die "sed failed"
+		fi
+	fi
+
+	local excluded_patches
+	if ! tc-is-cross-compiler; then
+		excluded_patches="*_all_crosscompile.patch"
+	fi
+
+	local patchset_dir
+	if [[ "${PV}" == *_pre* ]]; then
+		patchset_dir="${FILESDIR}/${SLOT}-${PATCHSET_REVISION}"
+	else
+		patchset_dir="${WORKDIR}/${MY_PV}"
+	fi
+
+	EPATCH_EXCLUDE="${excluded_patches}" EPATCH_SUFFIX="patch" epatch "${patchset_dir}"
+	# https://bugs.gentoo.org/show_bug.cgi?id=343721
+	epatch "${FILESDIR}"/python-3-distutils-egg-utf8.patch
+
+	# Linux-3 compat. Bug #374579 (upstream issue12571)
+	cp -r "${S}/Lib/plat-linux2" "${S}/Lib/plat-linux3" || die
+
+	sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" \
+		Lib/distutils/command/install.py \
+		Lib/distutils/sysconfig.py \
+		Lib/site.py \
+		Lib/sysconfig.py \
+		Lib/test/test_site.py \
+		Makefile.pre.in \
+		Modules/Setup.dist \
+		Modules/getpath.c \
+		setup.py || die "sed failed to replace @@GENTOO_LIBDIR@@"
+	# The setup.py file hardcodes /usr/lib64!
+	sed -i -e "s:/lib64:/$(get_libdir):g" setup.py || die
+
+	if ! use wininst; then
+		# Remove Microsoft Windows executables.
+		rm Lib/distutils/command/wininst-*.exe
+	fi
+
+	# Support versions of Autoconf other than 2.65.
+	sed -e "/version_required(2\.65)/d" -i configure.in || die "sed failed"
+
+	# Disable ABI flags.
+	sed -e "s/ABIFLAGS=\"\${ABIFLAGS}.*\"/:/" -i configure.in || die "sed failed"
+
+	if [[ "${PV}" == *_pre* ]]; then
+		sed -e "s/\(-DSVNVERSION=\).*\( -o\)/\1\\\\\"${ESVN_REVISION}\\\\\"\2/" -i Makefile.pre.in || die "sed failed"
+	fi
+
+	eautoconf
+	eautoheader
+}
+
+src_configure() {
+	if use build; then
+		# Disable extraneous modules with extra dependencies.
+		export PYTHON_DISABLE_MODULES="gdbm _curses _curses_panel readline _sqlite3 _tkinter _elementtree pyexpat"
+		export PYTHON_DISABLE_SSL="1"
+	else
+		local disable
+		use gdbm     || disable+=" gdbm"
+		use ncurses  || disable+=" _curses _curses_panel"
+		use readline || disable+=" readline"
+		use sqlite   || disable+=" _sqlite3"
+		use ssl      || export PYTHON_DISABLE_SSL="1"
+		use tk       || disable+=" _tkinter"
+		use xml      || disable+=" _elementtree pyexpat" # _elementtree uses pyexpat.
+		export PYTHON_DISABLE_MODULES="${disable}"
+
+		if ! use xml; then
+			ewarn "You have configured Python without XML support."
+			ewarn "This is NOT a recommended configuration as you"
+			ewarn "may face problems parsing any XML documents."
+		fi
+	fi
+
+	if [[ -n "${PYTHON_DISABLE_MODULES}" ]]; then
+		einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}"
+	fi
+
+	if [[ "$(gcc-major-version)" -ge 4 ]]; then
+		append-flags -fwrapv
+	fi
+
+	filter-flags -malign-double
+
+	[[ "${ARCH}" == "alpha" ]] && append-flags -fPIC
+
+	# https://bugs.gentoo.org/show_bug.cgi?id=50309
+	if is-flagq -O3; then
+		is-flagq -fstack-protector-all && replace-flags -O3 -O2
+		use hardened && replace-flags -O3 -O2
+	fi
+
+	if tc-is-cross-compiler; then
+		OPT="-O1" CFLAGS="" LDFLAGS="" CC="" \
+		./configure --{build,host}=${CBUILD} || die "cross-configure failed"
+		emake python Parser/pgen || die "cross-make failed"
+		mv python hostpython
+		mv Parser/pgen Parser/hostpgen
+		make distclean
+		sed -i \
+			-e "/^HOSTPYTHON/s:=.*:=./hostpython:" \
+			-e "/^HOSTPGEN/s:=.*:=./Parser/hostpgen:" \
+			Makefile.pre.in || die "sed failed"
+	fi
+
+	# Export CXX so it ends up in /usr/lib/python3.X/config/Makefile.
+	tc-export CXX
+
+	# Set LDFLAGS so we link modules with -lpython3.2 correctly.
+	# Needed on FreeBSD unless Python 3.2 is already installed.
+	# Please query BSD team before removing this!
+	append-ldflags "-L."
+
+	local dbmliborder
+	if use gdbm; then
+		dbmliborder+="${dbmliborder:+:}gdbm"
+	fi
+
+	OPT="" econf \
+		--with-fpectl \
+		--enable-shared \
+		$(use_enable ipv6) \
+		$(use_with threads) \
+		$(use_with wide-unicode) \
+		--infodir='${prefix}/share/info' \
+		--mandir='${prefix}/share/man' \
+		--with-computed-gotos \
+		--with-dbmliborder="${dbmliborder}" \
+		--with-libc="" \
+		--enable-loadable-sqlite-extensions \
+		--with-system-expat \
+		--with-system-ffi
+}
+
+src_compile() {
+	emake EPYTHON="python${PV%%.*}" CPPFLAGS="" CFLAGS="" LDFLAGS="" || die "emake failed"
+}
+
+src_test() {
+	# Tests will not work when cross compiling.
+	if tc-is-cross-compiler; then
+		elog "Disabling tests due to crosscompiling."
+		return
+	fi
+
+	# Byte compiling should be enabled here.
+	# Otherwise test_import fails.
+	python_enable_pyc
+
+	# Skip failing tests.
+	local skip_tests="distutils gdb"
+
+	for test in ${skip_tests}; do
+		mv "${S}/Lib/test/test_${test}.py" "${T}"
+	done
+
+	# Rerun failed tests in verbose mode (regrtest -w).
+	emake test EXTRATESTOPTS="-w" CPPFLAGS="" CFLAGS="" LDFLAGS="" < /dev/tty
+	local result="$?"
+
+	for test in ${skip_tests}; do
+		mv "${T}/test_${test}.py" "${S}/Lib/test/test_${test}.py"
+	done
+
+	elog "The following tests have been skipped:"
+	for test in ${skip_tests}; do
+		elog "test_${test}.py"
+	done
+
+	elog "If you would like to run them, you may:"
+	elog "cd '${EPREFIX}$(python_get_libdir)/test'"
+	elog "and run the tests separately."
+
+	python_disable_pyc
+
+	if [[ "${result}" -ne 0 ]]; then
+		die "emake test failed"
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" altinstall || die "emake altinstall failed"
+	python_clean_installation_image -q
+
+	sed \
+		-e "s/\(CONFIGURE_LDFLAGS=\).*/\1/" \
+		-e "s/\(PY_LDFLAGS=\).*/\1/" \
+		-i "${ED}$(python_get_libdir)/config-${SLOT}/Makefile" || die "sed failed"
+
+	mv "${ED}usr/bin/python${SLOT}-config" "${ED}usr/bin/python-config-${SLOT}"
+
+	if use build; then
+		rm -fr "${ED}usr/bin/idle${SLOT}" "${ED}$(python_get_libdir)/"{idlelib,sqlite3,test,tkinter}
+	else
+		use elibc_uclibc && rm -fr "${ED}$(python_get_libdir)/test"
+		use sqlite || rm -fr "${ED}$(python_get_libdir)/"{sqlite3,test/test_sqlite*}
+		use tk || rm -fr "${ED}usr/bin/idle${SLOT}" "${ED}$(python_get_libdir)/"{idlelib,tkinter,test/test_tk*}
+	fi
+
+	use threads || rm -fr "${ED}$(python_get_libdir)/multiprocessing"
+
+	dodoc Misc/{ACKS,HISTORY,NEWS} || die "dodoc failed"
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		doins -r "${S}/Tools" || die "doins failed"
+	fi
+
+	newconfd "${FILESDIR}/pydoc.conf" pydoc-${SLOT} || die "newconfd failed"
+	newinitd "${FILESDIR}/pydoc.init" pydoc-${SLOT} || die "newinitd failed"
+
+	if use kernel_linux; then
+		if [ -d "${ED}$(python_get_libdir)/plat-linux2" ];then
+			cp -r "${ED}$(python_get_libdir)/plat-linux2" \
+				"${ED}$(python_get_libdir)/plat-linux3" || die "copy plat-linux failed"
+		else
+			cp -r "${ED}$(python_get_libdir)/plat-linux3" \
+				"${ED}$(python_get_libdir)/plat-linux2" || die "copy plat-linux failed"
+		fi
+	fi
+
+	sed \
+		-e "s:@PYDOC_PORT_VARIABLE@:PYDOC${SLOT/./_}_PORT:" \
+		-e "s:@PYDOC@:pydoc${SLOT}:" \
+		-i "${ED}etc/conf.d/pydoc-${SLOT}" "${ED}etc/init.d/pydoc-${SLOT}" || die "sed failed"
+}
+
+pkg_preinst() {
+	if has_version "<${CATEGORY}/${PN}-${SLOT}" && ! has_version ">=${CATEGORY}/${PN}-${SLOT}_alpha"; then
+		python_updater_warning="1"
+	fi
+}
+
+eselect_python_update() {
+	if [[ -z "$(eselect python show)" || ! -f "${EROOT}usr/bin/$(eselect python show)" ]]; then
+		eselect python update
+	fi
+
+	if [[ -z "$(eselect python show --python${PV%%.*})" || ! -f "${EROOT}usr/bin/$(eselect python show --python${PV%%.*})" ]]; then
+		eselect python update --python${PV%%.*}
+	fi
+}
+
+pkg_postinst() {
+	eselect_python_update
+
+	python_mod_optimize -f -x "/(site-packages|test|tests)/" $(python_get_libdir)
+
+	if [[ "${python_updater_warning}" == "1" ]]; then
+		ewarn
+		ewarn "\e[1;31m************************************************************************\e[0m"
+		ewarn
+		ewarn "You have just upgraded from an older version of Python."
+		ewarn "You should run 'python-updater \${options}' to rebuild Python modules."
+		ewarn
+		ewarn "\e[1;31m************************************************************************\e[0m"
+		ewarn
+
+		local n
+		for ((n = 0; n < 12; n++)); do
+			echo -ne "\a"
+			sleep 1
+		done
+	fi
+}
+
+pkg_postrm() {
+	eselect_python_update
+
+	python_mod_cleanup $(python_get_libdir)
+}
diff --git a/dev-libs/distorm64/distorm64-3.1.ebuild b/dev-libs/distorm64/distorm64-3.1.ebuild
index ca06cfe791c1..6b053798b06c 100644
--- a/dev-libs/distorm64/distorm64-3.1.ebuild
+++ b/dev-libs/distorm64/distorm64-3.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/distorm64/distorm64-3.1.ebuild,v 1.3 2012/02/24 11:50:39 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/distorm64/distorm64-3.1.ebuild,v 1.4 2012/03/21 22:17:29 ikelos Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2"
@@ -16,6 +16,9 @@ HOMEPAGE="http://www.ragestorm.net/distorm/"
 SRC_URI="http://distorm.googlecode.com/files/distorm3-1.0.zip"
 S="${WORKDIR}/distorm3-1.0"
 
+DEPEND="app-arch/unzip"
+RDEPEND=""
+
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
diff --git a/dev-libs/expat/expat-2.1.0_beta3.ebuild b/dev-libs/expat/expat-2.1.0_beta3.ebuild
index c7643e11d6d9..b7b72af06cf1 100644
--- a/dev-libs/expat/expat-2.1.0_beta3.ebuild
+++ b/dev-libs/expat/expat-2.1.0_beta3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/expat/expat-2.1.0_beta3.ebuild,v 1.2 2012/03/15 02:27:16 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/expat/expat-2.1.0_beta3.ebuild,v 1.3 2012/03/21 21:56:36 jer Exp $
 
 EAPI=4
 inherit eutils libtool toolchain-funcs
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/expat/${P/_/-}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
 IUSE="elibc_FreeBSD examples static-libs unicode"
 
 src_unpack() {
diff --git a/dev-libs/libgdata/libgdata-0.8.1-r2.ebuild b/dev-libs/libgdata/libgdata-0.8.1-r2.ebuild
index d4f5f6b8741f..7c4461d6428b 100644
--- a/dev-libs/libgdata/libgdata-0.8.1-r2.ebuild
+++ b/dev-libs/libgdata/libgdata-0.8.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgdata/libgdata-0.8.1-r2.ebuild,v 1.3 2012/03/16 18:14:46 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgdata/libgdata-0.8.1-r2.ebuild,v 1.4 2012/03/22 05:27:19 tetromino Exp $
 
 EAPI="3"
 GCONF_DEBUG="yes"
@@ -50,7 +50,7 @@ src_prepare() {
 	# Fix MITM attack, bug #408245
 	epatch "${FILESDIR}/${P}-validate-ssl.patch"
 
-	eautoreconf
+	AT_M4DIR=. eautoreconf
 	gnome2_src_prepare
 
 	# Disable tests requiring network access, bug #307725
diff --git a/dev-perl/JSON/JSON-2.530.0.ebuild b/dev-perl/JSON/JSON-2.530.0.ebuild
index 94e68c93b399..b363a2270981 100644
--- a/dev-perl/JSON/JSON-2.530.0.ebuild
+++ b/dev-perl/JSON/JSON-2.530.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/JSON/JSON-2.530.0.ebuild,v 1.6 2012/02/02 19:43:02 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/JSON/JSON-2.530.0.ebuild,v 1.7 2012/03/21 20:14:11 jer Exp $
 
 EAPI=4
 
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="parse and convert to JSON (JavaScript Object Notation)"
 
 SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc ~ppc64 sparc x86 ~x64-macos ~x86-solaris"
+KEYWORDS="alpha amd64 ~hppa ia64 ppc ~ppc64 sparc x86 ~x64-macos ~x86-solaris"
 IUSE=""
 
 SRC_TEST="do"
diff --git a/dev-perl/Module-Install/Module-Install-1.60.0.ebuild b/dev-perl/Module-Install/Module-Install-1.60.0.ebuild
index 52e9fdc6ea44..9d64c58b5fb4 100644
--- a/dev-perl/Module-Install/Module-Install-1.60.0.ebuild
+++ b/dev-perl/Module-Install/Module-Install-1.60.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Module-Install/Module-Install-1.60.0.ebuild,v 1.1 2012/03/04 14:06:26 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Module-Install/Module-Install-1.60.0.ebuild,v 1.2 2012/03/21 20:38:47 jer Exp $
 
 EAPI=4
 
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Standalone, extensible Perl module installer"
 
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~hppa ~x86"
 IUSE="test"
 
 RDEPEND=">=virtual/perl-File-Spec-3.28
diff --git a/dev-perl/Module-ScanDeps/Module-ScanDeps-1.80.0.ebuild b/dev-perl/Module-ScanDeps/Module-ScanDeps-1.80.0.ebuild
index 3321f772382d..010c269cbb6a 100644
--- a/dev-perl/Module-ScanDeps/Module-ScanDeps-1.80.0.ebuild
+++ b/dev-perl/Module-ScanDeps/Module-ScanDeps-1.80.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Module-ScanDeps/Module-ScanDeps-1.80.0.ebuild,v 1.1 2012/02/21 17:38:39 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Module-ScanDeps/Module-ScanDeps-1.80.0.ebuild,v 1.2 2012/03/21 20:33:06 jer Exp $
 
 EAPI=4
 
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="Recursively scan Perl code for dependencies"
 
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~hppa ~x86"
 IUSE="test"
 
 RDEPEND="virtual/perl-Module-Build
diff --git a/dev-perl/Unicode-EastAsianWidth/Unicode-EastAsianWidth-1.30.ebuild b/dev-perl/Unicode-EastAsianWidth/Unicode-EastAsianWidth-1.30.ebuild
index d3b232ae4ebe..24e4b983c261 100644
--- a/dev-perl/Unicode-EastAsianWidth/Unicode-EastAsianWidth-1.30.ebuild
+++ b/dev-perl/Unicode-EastAsianWidth/Unicode-EastAsianWidth-1.30.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-perl/Unicode-EastAsianWidth/Unicode-EastAsianWidth-1.30.ebuild,v 1.1 2012/03/15 18:58:55 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-perl/Unicode-EastAsianWidth/Unicode-EastAsianWidth-1.30.ebuild,v 1.2 2012/03/21 20:39:25 jer Exp $
 
 EAPI=4
 
@@ -11,7 +11,7 @@ DESCRIPTION="East Asian Width properties"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~hppa ~x86"
 IUSE=""
 
 RDEPEND="virtual/perl-File-Spec"
diff --git a/dev-php/PEAR-Benchmark/PEAR-Benchmark-1.2.9.ebuild b/dev-php/PEAR-Benchmark/PEAR-Benchmark-1.2.9.ebuild
index 46ac572c9e1d..514ea7d35bd7 100644
--- a/dev-php/PEAR-Benchmark/PEAR-Benchmark-1.2.9.ebuild
+++ b/dev-php/PEAR-Benchmark/PEAR-Benchmark-1.2.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-Benchmark/PEAR-Benchmark-1.2.9.ebuild,v 1.1 2012/01/18 18:03:46 mabi Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/PEAR-Benchmark/PEAR-Benchmark-1.2.9.ebuild,v 1.2 2012/03/21 18:57:08 mabi Exp $
 
 EAPI="4"
 
@@ -12,15 +12,8 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE=""
 
-src_unpack() {
-	unpack ${A}
-	cd "${WORKDIR}"
-	rm -f package.xml
-	cp package2.xml package.xml
-}
-
 pkg_postinst() {
-	if ! has_version "=dev-lang/php[bcmath]" ; then
+	if ! has_version "dev-lang/php[bcmath]" ; then
 		elog "${PN} can optionally use dev-lang/php bcmath features."
 		elog "If you want those, recompile dev-lang/php with these flags in USE."
 	fi
diff --git a/dev-php/awl/awl-0.51-r1.ebuild b/dev-php/awl/awl-0.51-r1.ebuild
new file mode 100644
index 000000000000..ba9346e354b3
--- /dev/null
+++ b/dev-php/awl/awl-0.51-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-php/awl/awl-0.51-r1.ebuild,v 1.1 2012/03/22 00:20:11 patrick Exp $
+
+EAPI=2
+
+inherit depend.php php-lib-r1
+
+DESCRIPTION="Andrew McMillan's web libraries: A collection of generic classes
+used by the davical calendar server"
+HOMEPAGE="http://andrew.mcmillan.net.nz/projects/awl"
+SRC_URI="http://debian.mcmillan.net.nz/packages/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+DEPEND="dev-lang/php[pdo,postgres,xml]
+	doc? ( dev-php/PEAR-PhpDocumentor )"
+RDEPEND="${DEPEND}"
+
+need_php5
+
+src_compile() {
+	if use doc ; then
+		ebegin "Generating documentation"
+		phpdoc -c "docs/api/phpdoc.ini" || die "Documentation failed to build"
+	fi
+}
+
+src_install() {
+	local docs="debian/README.Debian debian/changelog"
+	dodoc-php ${docs} || die "dodoc failed"
+
+	if use doc ; then
+		dohtml -r "docs/api/" || die "dohtml failed"
+	fi
+
+	php-lib-r1_src_install . dba/* inc/* scripts/*
+}
diff --git a/dev-python/simpy/simpy-2.3.ebuild b/dev-python/simpy/simpy-2.3.ebuild
index 0db8f0d3770d..de55d0b505f3 100644
--- a/dev-python/simpy/simpy-2.3.ebuild
+++ b/dev-python/simpy/simpy-2.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/simpy/simpy-2.3.ebuild,v 1.6 2012/02/28 21:26:00 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/simpy/simpy-2.3.ebuild,v 1.7 2012/03/21 17:55:26 jlec Exp $
 
 EAPI=4
 
@@ -26,7 +26,7 @@ IUSE="test doc"
 
 RDEPEND=""
 DEPEND="
-	doc? ( <=dev-python/sphinx-1.0.7 )
+	doc? ( dev-python/sphinx )
 	test? ( dev-python/pytest )"
 S="${WORKDIR}/${MY_P}"
 
diff --git a/dev-util/splint/splint-3.1.2.ebuild b/dev-util/splint/splint-3.1.2.ebuild
index 725033880af3..18302965baf1 100644
--- a/dev-util/splint/splint-3.1.2.ebuild
+++ b/dev-util/splint/splint-3.1.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/splint/splint-3.1.2.ebuild,v 1.10 2008/02/27 11:11:01 coldwind Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/splint/splint-3.1.2.ebuild,v 1.11 2012/03/21 16:54:18 jer Exp $
 
 DESCRIPTION="Check C programs for vulnerabilities and programming mistakes"
 HOMEPAGE="http://lclint.cs.virginia.edu/"
@@ -11,7 +11,11 @@ SLOT="0"
 KEYWORDS="amd64 hppa ppc ppc64 sparc x86"
 IUSE=""
 
-DEPEND=""
+DEPEND="
+	sys-devel/flex
+	virtual/yacc
+"
+RDEPEND=""
 
 src_compile() {
 	econf || die
diff --git a/eclass/autotools.eclass b/eclass/autotools.eclass
index e84474c07f28..b5b9f66c7d8b 100644
--- a/eclass/autotools.eclass
+++ b/eclass/autotools.eclass
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.126 2012/03/21 08:19:22 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/autotools.eclass,v 1.128 2012/03/21 21:51:32 vapier Exp $
 
 # @ECLASS: autotools.eclass
 # @MAINTAINER:
@@ -38,11 +38,11 @@ inherit eutils libtool
 # @DESCRIPTION:
 # CONSTANT!
 # The latest major version/slot of automake available on each arch.  #312315
-# If a newer version is stable on any arch, and is NOT reflected in this list,
+# If a newer slot is stable on any arch, and is NOT reflected in this list,
 # then circular dependencies may arise during emerge @system bootstraps.
+# Do NOT change this variable in your ebuilds!
 # If you want to force a newer minor version, you can specify the correct
 # WANT value by using a colon:  <PV>[:<WANT_AUTOMAKE>]
-# Do NOT change this variable in your ebuilds!
 _LATEST_AUTOMAKE=( 1.11.1:1.11 )
 
 _automake_atom="sys-devel/automake"
@@ -52,7 +52,14 @@ if [[ -n ${WANT_AUTOMAKE} ]]; then
 		none)   _automake_atom="" ;; # some packages don't require automake at all
 		# if you change the "latest" version here, change also autotools_run_tool
 		# this MUST reflect the latest stable major version for each arch!
-		latest) _automake_atom="|| ( `printf '>=sys-devel/automake-%s ' ${_LATEST_AUTOMAKE[@]/%:*}` )" ;;
+		latest)
+			# Use SLOT deps if we can.  For EAPI=0, we get pretty close.
+			if [[ ${EAPI:-0} != 0 ]] ; then
+				_automake_atom="|| ( `printf '>=sys-devel/automake-%s:%s ' ${_LATEST_AUTOMAKE[@]/:/ }` )"
+			else
+				_automake_atom="|| ( `printf '>=sys-devel/automake-%s ' ${_LATEST_AUTOMAKE[@]/%:*}` )"
+			fi
+			;;
 		*)      _automake_atom="=sys-devel/automake-${WANT_AUTOMAKE}*" ;;
 	esac
 	export WANT_AUTOMAKE
diff --git a/games-action/atanks/Manifest b/games-action/atanks/Manifest
index dfd1b8804352..9a7d4a0cf9a9 100644
--- a/games-action/atanks/Manifest
+++ b/games-action/atanks/Manifest
@@ -1,3 +1,2 @@
-DIST atanks-4.7.tar.gz 3114429 RMD160 027546c34d4fc4bcfac3e116fcf12ec16ee44ed2 SHA1 bcb731c2c84d16efa1930fde8756b62c28993b24 SHA256 300be923cd6f4b7eb19c5f39db1dc001da2ee6c52f544c768e059dc5ad42a94d
-DIST atanks-5.1.tar.gz 3125673 RMD160 542cc069a850eb2a28cc6df320da62c9d6461f94 SHA1 b5c692839015992e55bb9c9eb94d75739dcb4081 SHA256 39788e7139d553c628e2cba0c81b7e24659fb640b9bbf041619d4f94e0c7286c
 DIST atanks-5.2.tar.gz 3125456 RMD160 b4b1b0e2798f1474174539b14893cc9b97e7b6c9 SHA1 ad49d15ab8dcc0066fa88a6241e4454a5b37a444 SHA256 c086810db7661ba61e2b585c5d7fb3795924e978462b866fa05d5e6a00901a8e
+DIST atanks-5.3.tar.gz 3129896 RMD160 0bc985539331a8c6e6b8faf100fdbe4f0588456b SHA1 01ae12570496db7625ab2d72b837a0346b54c3bf SHA256 592f33f742c2017947896d1f3297727a724f191664ab8bae0fd3e9af11f8d530
diff --git a/games-action/atanks/atanks-4.7.ebuild b/games-action/atanks/atanks-4.7.ebuild
deleted file mode 100644
index 6a81577e1e35..000000000000
--- a/games-action/atanks/atanks-4.7.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/atanks/atanks-4.7.ebuild,v 1.6 2011/10/14 06:19:16 vapier Exp $
-
-EAPI=2
-inherit eutils games
-
-DESCRIPTION="Worms and Scorched Earth-like game"
-HOMEPAGE="http://atanks.sourceforge.net/"
-SRC_URI="mirror://sourceforge/atanks/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-DEPEND="media-libs/allegro:0[X]"
-
-src_prepare() {
-	find . -type f -name ".directory" -exec rm -vf '{}' +
-	epatch "${FILESDIR}"/${P}-build.patch
-}
-
-src_compile() {
-	emake \
-		BINDIR="${GAMES_BINDIR}" \
-		INSTALLDIR="${GAMES_DATADIR}/${PN}" \
-		|| die "emake failed"
-}
-
-src_install() {
-	dogamesbin ${PN} || die "dogamesbin failed"
-	insinto "${GAMES_DATADIR}"/${PN}
-	doins -r button misc missile sound stock tank tankgun text title \
-		unicode.dat *.txt \
-		|| die "doins failed"
-	doicon ${PN}.png
-	make_desktop_entry atanks "Atomic Tanks"
-	dodoc Changelog README TODO
-	prepgamesdirs
-}
diff --git a/games-action/atanks/atanks-5.1.ebuild b/games-action/atanks/atanks-5.3.ebuild
similarity index 88%
rename from games-action/atanks/atanks-5.1.ebuild
rename to games-action/atanks/atanks-5.3.ebuild
index 36e180cc995b..9eac0560929c 100644
--- a/games-action/atanks/atanks-5.1.ebuild
+++ b/games-action/atanks/atanks-5.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-action/atanks/atanks-5.1.ebuild,v 1.4 2011/10/14 06:19:16 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-action/atanks/atanks-5.3.ebuild,v 1.1 2012/03/21 20:12:48 mr_bones_ Exp $
 
 EAPI=2
 inherit eutils games
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/atanks/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
 DEPEND="media-libs/allegro:0[X]"
diff --git a/games-action/atanks/files/atanks-4.7-build.patch b/games-action/atanks/files/atanks-4.7-build.patch
deleted file mode 100644
index aca3f4467baa..000000000000
--- a/games-action/atanks/files/atanks-4.7-build.patch
+++ /dev/null
@@ -1,134 +0,0 @@
-diff -ru atanks-4.6.orig/src/Makefile atanks-4.6/src/Makefile
---- atanks-4.6.orig/src/Makefile	2010-05-24 12:30:23.000000000 -0400
-+++ atanks-4.6/src/Makefile	2010-06-02 03:22:25.112064819 -0400
-@@ -4,9 +4,6 @@
-           missile.o perlin.o physobj.o player.o satellite.o sky.o tank.o team.o teleport.o virtobj.o \
-           update.o network.o floattext.o land.o text.o client.o gameloop.o
- 
--CPP=g++
--CC=gcc
--LD=g++
- LIB=ar
- WINDRES=
- # FLAGS += -DDATA_DIR=\".\" -Wno-write-strings -DNETWORK -DTHREADS
-@@ -15,9 +12,9 @@
- WFLAGS = 
- OFLAGS = 
- LFLAGS +=
--LDFLAGS =  `allegro-config --libs`
-+LDFLAGS +=  `allegro-config --libs`
- 
--CFLAGS += -g -Wall -Iinclude # -fprofile-arcs -ftest-coverage 
-+CXXFLAGS += -Wall -Iinclude # -fprofile-arcs -ftest-coverage 
- 
- SRCS  = $(MODULES:.o=.cpp)
- GLOBALS	= main.h imagedefs.h externs.h
-@@ -33,82 +30,82 @@
- $(MODULES): Makefile
- 
- atanks.o: atanks.cpp globals.h main.h menucontent.h
--	$(CPP) -c atanks.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
-+	$(CXX) -c atanks.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
- 
- button.o: button.cpp button.h
--	$(CPP) -c button.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
-+	$(CXX) -c button.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
- 
- client.o: client.h client.cpp
--	$(CPP) -c client.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGSS) $(CFLAGS)
-+	$(CXX) -c client.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGSS) $(CXXFLAGS)
- 
- environment.o: environment.cpp environment.h
--	$(CPP) -c environment.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
-+	$(CXX) -c environment.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
- 
- explosion.o: explosion.cpp explosion.h
--	$(CPP) -c explosion.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
-+	$(CXX) -c explosion.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
- 
- files.o: files.cpp files.h text.h text.cpp
--	$(CPP) -c files.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
-+	$(CXX) -c files.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
- 
- floattext.o: floattext.cpp floattext.h
--	$(CPP) -c floattext.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
-+	$(CXX) -c floattext.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
- 
- gameloop.o: gameloop.cpp atanks.cpp main.h
--	$(CPP) -c gameloop.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
-+	$(CXX) -c gameloop.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
- 
- globaldata.o: globaldata.cpp globaldata.h
--	$(CPP) -c globaldata.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
-+	$(CXX) -c globaldata.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
- 
- land.o: land.cpp land.h globaldata.h environment.h
--	$(CPP) -c land.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
-+	$(CXX) -c land.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
- 
- missile.o: missile.cpp missile.h
--	$(CPP) -c missile.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
-+	$(CXX) -c missile.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
- 
- teleport.o: teleport.cpp teleport.h
--	$(CPP) -c teleport.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
-+	$(CXX) -c teleport.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
- 
- physobj.o: physobj.cpp physobj.h
--	$(CPP) -c physobj.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
-+	$(CXX) -c physobj.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
- 
- player.o: player.cpp player.h
--	$(CPP) -c player.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
-+	$(CXX) -c player.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
- 
- tank.o: tank.cpp tank.h
--	$(CPP) -c tank.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
-+	$(CXX) -c tank.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
- 
- team.o: team.cpp team.h
--	$(CPP) -c team.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
-+	$(CXX) -c team.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
- 
- virtobj.o: virtobj.cpp virtobj.h
--	$(CPP) -c virtobj.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
-+	$(CXX) -c virtobj.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
- 
- fade.o: fade.cpp
--	$(CPP) -c fade.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
-+	$(CXX) -c fade.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
- 
- perlin.o: perlin.cpp
--	$(CPP) -c perlin.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
-+	$(CXX) -c perlin.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
- 
- sky.o: sky.cpp sky.h
--	$(CPP) -c sky.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
-+	$(CXX) -c sky.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
- 
- satellite.o: satellite.cpp satellite.h
--	$(CPP) -c satellite.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
-+	$(CXX) -c satellite.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
- 
- text.o: text.cpp text.h
--	$(CPP) -c text.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
-+	$(CXX) -c text.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
- 
- update.o: update.cpp update.h
--	$(CPP) -c update.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
-+	$(CXX) -c update.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
- 
- network.o: network.cpp network.h
--	$(CPP) -c network.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
-+	$(CXX) -c network.cpp -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
- 
- %.o: %.cpp %.h
--	$(CPP) -c $< -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CFLAGS)
-+	$(CXX) -c $< -o $@ $(FLAGS) $(LFLAGS) $(OFLAGS) $(CXXFLAGS)
- 
- $(OUTPUT): $(OBJECTS) $(MODULES)
--	$(CPP) $(MODULES) -o $(OUTPUT) $(FLAGS) $(LFLAGS) $(LDFLAGS) $(SFLAGS) $(CFLAGS)
-+	$(CXX) $(MODULES) -o $(OUTPUT) $(FLAGS) $(LFLAGS) $(LDFLAGS) $(SFLAGS) $(CXXFLAGS)
- 	# strip $(OUTPUT)
- 
- # dependencies:
diff --git a/games-action/atanks/files/atanks-5.2-build.patch b/games-action/atanks/files/atanks-5.2-build.patch
index 4385a272dafd..5d4790d39aef 100644
--- a/games-action/atanks/files/atanks-5.2-build.patch
+++ b/games-action/atanks/files/atanks-5.2-build.patch
@@ -1,6 +1,5 @@
-diff -ru atanks-4.6.orig/src/Makefile atanks-4.6/src/Makefile
---- atanks-4.6.orig/src/Makefile	2010-05-24 12:30:23.000000000 -0400
-+++ atanks-4.6/src/Makefile	2010-06-02 03:22:25.112064819 -0400
+--- atanks-4.6.orig/src/Makefile
++++ atanks-4.6/src/Makefile
 @@ -4,9 +4,6 @@
            missile.o perlin.o physobj.o player.o satellite.o sky.o tank.o team.o teleport.o virtobj.o \
            update.o network.o floattext.o land.o text.o client.o gameloop.o
diff --git a/games-action/atanks/files/atanks-5.1-build.patch b/games-action/atanks/files/atanks-5.3-build.patch
similarity index 95%
rename from games-action/atanks/files/atanks-5.1-build.patch
rename to games-action/atanks/files/atanks-5.3-build.patch
index 4385a272dafd..e5c29f501427 100644
--- a/games-action/atanks/files/atanks-5.1-build.patch
+++ b/games-action/atanks/files/atanks-5.3-build.patch
@@ -1,6 +1,5 @@
-diff -ru atanks-4.6.orig/src/Makefile atanks-4.6/src/Makefile
---- atanks-4.6.orig/src/Makefile	2010-05-24 12:30:23.000000000 -0400
-+++ atanks-4.6/src/Makefile	2010-06-02 03:22:25.112064819 -0400
+--- atanks-5.3.orig/src/Makefile
++++ atanks-5.3/src/Makefile
 @@ -4,9 +4,6 @@
            missile.o perlin.o physobj.o player.o satellite.o sky.o tank.o team.o teleport.o virtobj.o \
            update.o network.o floattext.o land.o text.o client.o gameloop.o
@@ -18,7 +17,7 @@ diff -ru atanks-4.6.orig/src/Makefile atanks-4.6/src/Makefile
 -LDFLAGS =  `allegro-config --libs`
 +LDFLAGS +=  `allegro-config --libs` -lm -lpthread
  
--CFLAGS += -g -Wall -Iinclude # -fprofile-arcs -ftest-coverage 
+-CFLAGS += -Wall -Iinclude # -fprofile-arcs -ftest-coverage 
 +CXXFLAGS += -Wall -Iinclude # -fprofile-arcs -ftest-coverage 
  
  SRCS  = $(MODULES:.o=.cpp)
diff --git a/games-arcade/moleinvasion/moleinvasion-0.4-r1.ebuild b/games-arcade/moleinvasion/moleinvasion-0.4-r1.ebuild
index 33dcdcc7fbf7..13ef6a33f3f6 100644
--- a/games-arcade/moleinvasion/moleinvasion-0.4-r1.ebuild
+++ b/games-arcade/moleinvasion/moleinvasion-0.4-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-arcade/moleinvasion/moleinvasion-0.4-r1.ebuild,v 1.4 2011/06/14 20:18:03 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-arcade/moleinvasion/moleinvasion-0.4-r1.ebuild,v 1.5 2012/03/22 00:22:39 mr_bones_ Exp $
 
 EAPI=2
 inherit eutils games
@@ -15,7 +15,8 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE="music"
 
-DEPEND="media-libs/libsdl
+DEPEND="media-libs/libsdl[opengl,video]
+	virtual/opengl
 	media-libs/sdl-image[jpeg,png]
 	media-libs/sdl-mixer[vorbis]
 	media-libs/sdl-ttf"
diff --git a/games-engines/nazghul/Manifest b/games-engines/nazghul/Manifest
index 5943ffc69871..68f08417514f 100644
--- a/games-engines/nazghul/Manifest
+++ b/games-engines/nazghul/Manifest
@@ -1 +1,2 @@
 DIST nazghul-0.7.0.tar.gz 7819035 RMD160 406f1e98c4de628603de7e39288129e1c126db3e SHA1 1d67c3fb3b03b3f8b5170305f3d97428932e6c4f SHA256 023796490e6ba15be1d5ae40856efb27071b3a61cd2289c06d7bef124436425b
+DIST nazghul-0.7.1.tar.gz 7929363 RMD160 e339b122aac6d67262a42e1468ee41fe48826ce7 SHA1 eab4e5c49761373ad083ec606beb36af10fb8532 SHA256 f1b62810da52a116dfc1c407dbe683991b1b380ca611f57b5701cfbb803e9d2b
diff --git a/games-engines/nazghul/nazghul-0.7.1.ebuild b/games-engines/nazghul/nazghul-0.7.1.ebuild
new file mode 100644
index 000000000000..ff99d2bee5ba
--- /dev/null
+++ b/games-engines/nazghul/nazghul-0.7.1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-engines/nazghul/nazghul-0.7.1.ebuild,v 1.1 2012/03/22 01:50:37 mr_bones_ Exp $
+
+EAPI=2
+inherit eutils games
+
+DESCRIPTION="A computer role-playing game (CRPG) engine with game called HaximA"
+HOMEPAGE="http://myweb.cableone.net/gmcnutt/nazghul.html"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="media-libs/libpng
+	>=media-libs/libsdl-1.2.3[X,audio,video]
+	media-libs/sdl-image[png]
+	media-libs/sdl-mixer[midi,vorbis,wav]"
+
+src_prepare() {
+	ecvs_clean
+}
+
+src_configure() {
+	egamesconf \
+		--includedir=/usr/include
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+
+	dodoc AUTHORS ChangeLog NEWS README \
+		doc/{GAME_RULES,GHULSCRIPT,MAP_HACKERS_GUIDE,USERS_GUIDE}
+
+	dohtml -a html,gif -r doc/*
+
+	docinto engine_extension_and_design
+	dodoc doc/engine_extension_and_design/*
+
+	docinto world_building
+	dodoc doc/world_building/*
+
+	doicon icons/haxima.png
+	make_desktop_entry haxima.sh HaximA haxima
+
+	prepgamesdirs
+}
diff --git a/games-strategy/liquidwar/liquidwar-5.6.4.ebuild b/games-strategy/liquidwar/liquidwar-5.6.4.ebuild
index 6a7e10a90fe8..1e04ef3149c1 100644
--- a/games-strategy/liquidwar/liquidwar-5.6.4.ebuild
+++ b/games-strategy/liquidwar/liquidwar-5.6.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/liquidwar/liquidwar-5.6.4.ebuild,v 1.10 2011/10/14 06:15:38 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/liquidwar/liquidwar-5.6.4.ebuild,v 1.11 2012/03/22 01:20:56 mr_bones_ Exp $
 
 EAPI=2
 inherit eutils games
@@ -15,8 +15,7 @@ KEYWORDS="amd64 ~ppc ~ppc64 x86"
 IUSE="nls"
 RESTRICT="test"
 
-DEPEND=">=media-libs/allegro-4.2:0"
-RDEPEND="${DEPEND}"
+DEPEND=">=media-libs/allegro-4.2:0[X]"
 
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-exec-stack.patch \
diff --git a/games-strategy/wesnoth/Manifest b/games-strategy/wesnoth/Manifest
index 4ff518b0fa7f..a2fe362af7bc 100644
--- a/games-strategy/wesnoth/Manifest
+++ b/games-strategy/wesnoth/Manifest
@@ -1,3 +1,2 @@
+DIST wesnoth-1.10.1.tar.bz2 341899698 RMD160 7deb86d92ffae85d5c2bf7867fcf556bbe6cc621 SHA1 34a609ac1b2b7fc5f034db15e10fe99970a19c4f SHA256 0050494695af384ef1bd3b5d1d0ced4d1f41695bed9176ddb3d838b12242d387
 DIST wesnoth-1.10.tar.bz2 339946658 RMD160 39f0addc95ccc556c952f1172666a3d0b5756149 SHA1 6315c8e262fba86a98fcb8dd67d5d4d56b807c4d SHA256 4ba12b1e43761650579d563d4384c5e06674b0bff75cef2cb0abb439ecdc8ece
-DIST wesnoth-1.8.5.tar.bz2 301024033 RMD160 c2a6a9f094b862ef274838fd062c5d961f97c261 SHA1 22c6cc10dc7172daf636158dba0acac35f538597 SHA256 eca3bdce505480a0cf045d0189df7260c16af9f543a427e7de8690fff9c655fa
-DIST wesnoth-1.8.6.tar.bz2 302226547 RMD160 2190efe45d554df59052db1a58fcc3bdf766c47e SHA1 ade2f88287b5900485646f0ffe3414fa8b695afb SHA256 4fe603fa984ac76a384dc94ba28bd99fe2d1adf02ddf1706f2fa1b82b40f8081
diff --git a/games-strategy/wesnoth/wesnoth-1.8.6.ebuild b/games-strategy/wesnoth/wesnoth-1.10.1.ebuild
similarity index 86%
rename from games-strategy/wesnoth/wesnoth-1.8.6.ebuild
rename to games-strategy/wesnoth/wesnoth-1.10.1.ebuild
index c3f86e952d4e..7346df279298 100644
--- a/games-strategy/wesnoth/wesnoth-1.8.6.ebuild
+++ b/games-strategy/wesnoth/wesnoth-1.10.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/wesnoth/wesnoth-1.8.6.ebuild,v 1.4 2011/10/04 22:26:48 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-strategy/wesnoth/wesnoth-1.10.1.ebuild,v 1.1 2012/03/22 00:35:59 mr_bones_ Exp $
 
 EAPI=2
 inherit cmake-utils eutils multilib toolchain-funcs flag-o-matic games
@@ -11,8 +11,8 @@ SRC_URI="mirror://sourceforge/wesnoth/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd"
-IUSE="dbus dedicated doc nls server tinygui"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE="dbus dedicated doc nls server"
 
 RDEPEND=">=media-libs/libsdl-1.2.7[video,X]
 	media-libs/sdl-net
@@ -22,7 +22,7 @@ RDEPEND=">=media-libs/libsdl-1.2.7[video,X]
 	!dedicated? (
 		dbus? ( sys-apps/dbus )
 	)
-	>=dev-libs/boost-1.35
+	>=dev-libs/boost-1.36
 	sys-libs/zlib
 	x11-libs/pango
 	dev-lang/lua
@@ -30,14 +30,6 @@ RDEPEND=">=media-libs/libsdl-1.2.7[video,X]
 	virtual/libintl"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
-	!dedicated? (
-		tinygui? (
-			|| (
-				media-gfx/imagemagick[jpeg,png]
-				media-gfx/graphicsmagick[imagemagick,jpeg,png]
-			)
-		)
-	)
 	sys-devel/gettext"
 
 src_prepare() {
@@ -57,7 +49,7 @@ src_prepare() {
 			|| die "sed failed"
 	fi
 	# how do I hate boost? Let me count the ways...
-	local boost_ver=$(best_version ">=dev-libs/boost-1.35")
+	local boost_ver=$(best_version ">=dev-libs/boost-1.36")
 
 	boost_ver=${boost_ver/*boost-/}
 	boost_ver=${boost_ver%.*}
@@ -97,12 +89,10 @@ src_configure() {
 		$(cmake-utils_use_enable !dedicated ENABLE_DESKTOP_ENTRY)
 		$(cmake-utils_use_enable nls NLS)
 		$(cmake-utils_use_enable dbus NOTIFICATIONS)
-		"-DGUI=$(use tinygui && echo tiny || echo normal)"
 		"-DCMAKE_VERBOSE_MAKEFILE=TRUE"
 		"-DENABLE_FRIBIDI=FALSE"
 		"-DENABLE_STRICT_COMPILATION=FALSE"
 		"-DCMAKE_INSTALL_PREFIX=${GAMES_PREFIX}"
-		"-DPREFERENCES_DIR=.wesnoth"
 		"-DDATAROOTDIR=${GAMES_DATADIR}"
 		"-DBINDIR=${GAMES_BINDIR}"
 		"-DICONDIR=/usr/share/pixmaps"
diff --git a/games-strategy/wesnoth/wesnoth-1.8.5.ebuild b/games-strategy/wesnoth/wesnoth-1.8.5.ebuild
deleted file mode 100644
index 87b917de37cc..000000000000
--- a/games-strategy/wesnoth/wesnoth-1.8.5.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-strategy/wesnoth/wesnoth-1.8.5.ebuild,v 1.5 2011/10/04 01:27:59 josejx Exp $
-
-EAPI=2
-inherit cmake-utils eutils multilib toolchain-funcs flag-o-matic games
-
-DESCRIPTION="Battle for Wesnoth - A fantasy turn-based strategy game"
-HOMEPAGE="http://www.wesnoth.org/"
-SRC_URI="mirror://sourceforge/wesnoth/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd"
-IUSE="dbus dedicated doc nls server tinygui"
-
-RDEPEND=">=media-libs/libsdl-1.2.7[video,X]
-	media-libs/sdl-net
-	>=media-libs/sdl-ttf-2.0.8
-	>=media-libs/sdl-mixer-1.2[vorbis]
-	>=media-libs/sdl-image-1.2[jpeg,png]
-	!dedicated? (
-		dbus? ( sys-apps/dbus )
-	)
-	>=dev-libs/boost-1.35
-	sys-libs/zlib
-	x11-libs/pango
-	dev-lang/lua
-	media-libs/fontconfig
-	virtual/libintl"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	!dedicated? (
-		tinygui? (
-			|| (
-				media-gfx/imagemagick[jpeg,png]
-				media-gfx/graphicsmagick[imagemagick,jpeg,png]
-			)
-		)
-	)
-	sys-devel/gettext"
-
-src_prepare() {
-	if use dedicated || use server ; then
-		sed \
-			-e "s:GAMES_BINDIR:${GAMES_BINDIR}:" \
-			-e "s:GAMES_STATEDIR:${GAMES_STATEDIR}:" \
-			-e "s/GAMES_USER_DED/${GAMES_USER_DED}/" \
-			-e "s/GAMES_GROUP/${GAMES_GROUP}/" "${FILESDIR}"/wesnothd.rc \
-			> "${T}"/wesnothd \
-			|| die "sed failed"
-	fi
-	if ! use doc ; then
-		sed -i \
-			-e '/manual/d' \
-			doc/CMakeLists.txt \
-			|| die "sed failed"
-	fi
-	# how do I hate boost? Let me count the ways...
-	local boost_ver=$(best_version ">=dev-libs/boost-1.35")
-
-	boost_ver=${boost_ver/*boost-/}
-	boost_ver=${boost_ver%.*}
-	boost_ver=${boost_ver/./_}
-
-	einfo "Using boost version ${boost_ver}"
-	append-cxxflags \
-		-I/usr/include/boost-${boost_ver}
-	append-ldflags \
-		-L/usr/$(get_libdir)/boost-${boost_ver}
-	export BOOST_INCLUDEDIR="/usr/include/boost-${boost_ver}"
-	export BOOST_LIBRARYDIR="/usr/$(get_libdir)/boost-${boost_ver}"
-}
-
-src_configure() {
-	filter-flags -ftracer -fomit-frame-pointer
-	if [[ $(gcc-major-version) -eq 3 ]] ; then
-		filter-flags -fstack-protector
-		append-flags -fno-stack-protector
-	fi
-	if use dedicated || use server ; then
-		mycmakeargs=(
-			"-DENABLE_CAMPAIGN_SERVER=TRUE"
-			"-DENABLE_SERVER=TRUE"
-			"-DSERVER_UID=${GAMES_USER_DED}"
-			"-DSERVER_GID=${GAMES_GROUP}"
-			"-DFIFO_DIR=${GAMES_STATEDIR}/run/wesnothd"
-			)
-	else
-		mycmakeargs=(
-			"-DENABLE_CAMPAIGN_SERVER=FALSE"
-			"-DENABLE_SERVER=FALSE"
-			)
-	fi
-	mycmakeargs+=(
-		$(cmake-utils_use_enable !dedicated GAME)
-		$(cmake-utils_use_enable !dedicated ENABLE_DESKTOP_ENTRY)
-		$(cmake-utils_use_enable nls NLS)
-		$(cmake-utils_use_enable dbus NOTIFICATIONS)
-		"-DGUI=$(use tinygui && echo tiny || echo normal)"
-		"-DCMAKE_VERBOSE_MAKEFILE=TRUE"
-		"-DENABLE_FRIBIDI=FALSE"
-		"-DENABLE_STRICT_COMPILATION=FALSE"
-		"-DCMAKE_INSTALL_PREFIX=${GAMES_PREFIX}"
-		"-DPREFERENCES_DIR=.wesnoth"
-		"-DDATAROOTDIR=${GAMES_DATADIR}"
-		"-DBINDIR=${GAMES_BINDIR}"
-		"-DICONDIR=/usr/share/pixmaps"
-		"-DDESKTOPDIR=/usr/share/applications"
-		"-DMANDIR=/usr/share/man"
-		"-DDOCDIR=/usr/share/doc/${PF}"
-		)
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_install() {
-	DOCS="README changelog players_changelog" cmake-utils_src_install
-	if use dedicated || use server; then
-		keepdir "${GAMES_STATEDIR}/run/wesnothd"
-		doinitd "${T}"/wesnothd || die "doinitd failed"
-	fi
-	prepgamesdirs
-}
diff --git a/games-util/pyfa/Manifest b/games-util/pyfa/Manifest
index 35da44e375a9..7610078f69bf 100644
--- a/games-util/pyfa/Manifest
+++ b/games-util/pyfa/Manifest
@@ -1,2 +1 @@
-DIST pyfa-1.1.2-crucible-src.tar.bz2 4034641 RMD160 deb3467c6b23652005d18670e0b147d64e07da8a SHA1 4e25ec9b68ce8390f43a1548ad57939b0cf79688 SHA256 f0b976a0975a91217850a1b4549a00fbb4bfe5d2cd427d543adca8348e32210f
-DIST pyfa-1.1.3-crucible-src.tar.bz2 3918655 RMD160 768be5be520b4a4515a1944588b784ef2b45495b SHA1 1dcf5cab833e0b739cce8b58686f4b3209a85507 SHA256 ad0ab1589cdd5b2783781e27f789c119883cef59437234aeaabea1f71c84b5d8
+DIST pyfa-1.1.4-crucible-src.tar.bz2 3926243 RMD160 56a8b7a376a203b37bef393f376d8800c23113e5 SHA1 178fecb02b1ea6d6b83a03102cc3c8ad9cc2417f SHA256 e7ddd071d7f2c7b2794e0bece1964b4763ddcc8ba1d84f9f9736552897672674
diff --git a/games-util/pyfa/files/pyfa-1.1.4-wxversion.patch b/games-util/pyfa/files/pyfa-1.1.4-wxversion.patch
new file mode 100644
index 000000000000..624068b2bc9d
--- /dev/null
+++ b/games-util/pyfa/files/pyfa-1.1.4-wxversion.patch
@@ -0,0 +1,40 @@
+From 6971971729dbbea1db8c1006c99b1035f30214a2 Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Wed, 21 Mar 2012 18:24:26 -0400
+Subject: [PATCH] Use wxversion.select('2.8') to support systems that have
+ wxpython-2.9 installed
+
+Pyfa-1.x supports only wxpython-2.8, but multiple wxpython versions can
+be installed in parallel, and by default, 'import wx' pulls in the
+latest one.
+
+To support systems that have both wxpython-2.8 and 2.9 installed, pyfa
+needs to call wxversion.select.
+
+Note that wxversion.select can potentially fail with several exceptions
+internal to the wxversion module, so for simplicity, just check for all
+of them with an 'except:'.
+
+http://trac.evefit.org/ticket/475
+---
+ pyfa.py |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/pyfa.py b/pyfa.py
+index aedb718..6992aaf 100755
+--- a/pyfa.py
++++ b/pyfa.py
+@@ -29,8 +29,8 @@ if not hasattr(sys, 'frozen'):
+ 
+     try:
+         import wxversion
+-        wxversion.ensureMinimal('2.8')
+-    except ImportError:
++        wxversion.select('2.8')
++    except:
+         print "Cannot find wxPython or the installed wxPython version doesn't meet the min. requirements.\nYou can download wxPython (2.8) from http://www.wxpython.org/"
+         sys.exit(1)
+ 
+-- 
+1.7.8.5
+
diff --git a/games-util/pyfa/pyfa-1.1.3.ebuild b/games-util/pyfa/pyfa-1.1.3.ebuild
deleted file mode 100644
index 3f4180909d5d..000000000000
--- a/games-util/pyfa/pyfa-1.1.3.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-util/pyfa/pyfa-1.1.3.ebuild,v 1.1 2012/03/14 06:41:11 tetromino Exp $
-
-EAPI="4"
-PYTHON_DEPEND="2:2.6"
-PYTHON_USE_WITH="sqlite threads"
-
-inherit eutils gnome2-utils python
-
-if [[ ${PV/_rc*/} == ${PV} ]] ; then
-	MY_PV=${PV}-crucible-src
-	FOLDER=stable/${PV}
-else
-	MY_PV=${PV/_rc/-stable-RC}-src
-	FOLDER=stable/${PV/*_rc/RC}
-fi
-
-DESCRIPTION="Python Fitting Assistant - a ship fitting application for EVE Online"
-HOMEPAGE="http://www.evefit.org/Pyfa"
-SRC_URI="http://dl.evefit.org/${FOLDER}/${PN}-${MY_PV}.tar.bz2"
-
-LICENSE="GPL-3 LGPL-2.1 CCPL-Attribution-2.5 free-noncomm"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+graph"
-
-RDEPEND="dev-python/sqlalchemy
-	>=dev-python/wxpython-2.8
-	graph? ( dev-python/matplotlib[wxwidgets] dev-python/numpy )"
-DEPEND=""
-
-S=${WORKDIR}/${PN}
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	# make staticPath settable from configforced again
-	epatch "${FILESDIR}/${PN}-1.1-staticPath.patch"
-
-	python_convert_shebangs -r -x 2 .
-	sed -e "s:%%SITEDIR%%:$(python_get_sitedir):" \
-		-e "s:%%EPREFIX%%:${EPREFIX}:" \
-		"${FILESDIR}/configforced.py" > configforced.py
-}
-
-src_install() {
-	local packagedir=$(python_get_sitedir)/${PN}
-	insinto "${packagedir}"
-	doins -r eos gui icons service config*.py info.py gpl.txt
-	exeinto "${packagedir}"
-	doexe ${PN}.py
-	dosym "${packagedir}/${PN}.py" /usr/bin/${PN}
-	insinto /usr/share/${PN}
-	doins -r staticdata
-	dodoc readme.txt
-	insinto /usr/share/icons/hicolor/32x32/apps
-	doins icons/pyfa.png
-	insinto /usr/share/icons/hicolor/64x64/apps
-	newins icons/pyfa64.png pyfa.png
-	domenu "${FILESDIR}/${PN}.desktop"
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	python_mod_optimize ${PN}
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	python_mod_cleanup ${PN}
-}
diff --git a/games-util/pyfa/pyfa-1.1.2.ebuild b/games-util/pyfa/pyfa-1.1.4-r1.ebuild
similarity index 87%
rename from games-util/pyfa/pyfa-1.1.2.ebuild
rename to games-util/pyfa/pyfa-1.1.4-r1.ebuild
index 1a5ea3113a42..df5f6a4f60b2 100644
--- a/games-util/pyfa/pyfa-1.1.2.ebuild
+++ b/games-util/pyfa/pyfa-1.1.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-util/pyfa/pyfa-1.1.2.ebuild,v 1.1 2012/01/26 19:44:51 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-util/pyfa/pyfa-1.1.4-r1.ebuild,v 1.1 2012/03/21 22:45:57 tetromino Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2:2.6"
@@ -26,7 +26,7 @@ KEYWORDS="~amd64 ~x86"
 IUSE="+graph"
 
 RDEPEND="dev-python/sqlalchemy
-	>=dev-python/wxpython-2.8
+	dev-python/wxpython:2.8
 	graph? ( dev-python/matplotlib[wxwidgets] dev-python/numpy )"
 DEPEND=""
 
@@ -41,6 +41,9 @@ src_prepare() {
 	# make staticPath settable from configforced again
 	epatch "${FILESDIR}/${PN}-1.1-staticPath.patch"
 
+	# use correct slot of wxpython, http://trac.evefit.org/ticket/475
+	epatch "${FILESDIR}/${PN}-1.1.4-wxversion.patch"
+
 	python_convert_shebangs -r -x 2 .
 	sed -e "s:%%SITEDIR%%:$(python_get_sitedir):" \
 		-e "s:%%EPREFIX%%:${EPREFIX}:" \
diff --git a/mail-client/thunderbird-bin/Manifest b/mail-client/thunderbird-bin/Manifest
index c6f191fcf6eb..c0566dca49b9 100644
--- a/mail-client/thunderbird-bin/Manifest
+++ b/mail-client/thunderbird-bin/Manifest
@@ -50,6 +50,58 @@ DIST thunderbird-10.0.2-uk.xpi 463922 RMD160 a6d34f5da36ba5066c3a5505e8e4c99db8b
 DIST thunderbird-10.0.2-vi.xpi 435882 RMD160 f4b428533728b2dbf7affdd93d7af1fcabf431e1 SHA1 8b475d626396debbb01ab9484ddebc9227f8245f SHA256 1ee138ed4f805d21a9028b70e2d568c730be95564aeb82bb5fdc66a133543406
 DIST thunderbird-10.0.2-zh-CN.xpi 431231 RMD160 c6c19ecd67dd35edffc1563efb1b33fb585db144 SHA1 def9055acb5b574103e4f0f0eca5e15501430810 SHA256 e8ba5f21fe037530cae7832db4ed33c2ce58cc0fae605a8a0d25654b4a0e09cc
 DIST thunderbird-10.0.2-zh-TW.xpi 431824 RMD160 a65bc34ef02a67350f8107016ae1f8e971506ac5 SHA1 8cefe8df6cb805306b91faed5d99f7c0a21eb36e SHA256 a92886276ee1750f4bcd0fdf9100fc90783e9abf8aace55f5422eb1ac1dd22d8
+DIST thunderbird-10.0.3esr-ar.xpi 441462 RMD160 5c766a06764de46f12f047de4f1f25d291a0fd68 SHA1 5173b44d9e4af36fcb9c0fe37c0cdd907ecc7e56 SHA256 35cb4a50b24558d44a9473b0a247e7228e9e06c77ccd59398a09bd4e2aa4bcf2
+DIST thunderbird-10.0.3esr-ast.xpi 362706 RMD160 0a7df1c5dd8909448b4079116cc2892e0a2f65d1 SHA1 f48f456c2bf5df19f62b581fdbdb4ff4f3660469 SHA256 db64f4f9e7475ac97a0f080628a423bcd7a65b25c7cd5e5f2a4aa6ddd0b6e6c9
+DIST thunderbird-10.0.3esr-be.xpi 397804 RMD160 a8d3b420a96afc93213f242530e336f4b1b32f19 SHA1 964ded2493cf768eb693708dbcfec62470bf2b7e SHA256 45faed1033a3538ec7356e12e0b582b93aae781f30284e3200b3b0425e8cebc1
+DIST thunderbird-10.0.3esr-bg.xpi 460809 RMD160 fd4061d239a98f4ca0d864f13ea3299cf5b58e22 SHA1 9eb4dab0338d8f75349f26252d3c3955f13b20a7 SHA256 26e58d2f89d59cc7e65546acc436d610f04ccc3088524b4fcc414e0ae93e9691
+DIST thunderbird-10.0.3esr-bn-BD.xpi 478143 RMD160 df293cb84829807e6e51a30395f6f5cfdd8429c2 SHA1 0a6c05efa2358f6deebe82d533163e5c78636621 SHA256 1e9154a8a27cc2da50800b64119756aafcbf7613dcda26caa1389c30c5df7e49
+DIST thunderbird-10.0.3esr-br.xpi 415523 RMD160 c118cfaebbc95102e042d4bb0e1286be29da7823 SHA1 794529023fc6b37313601a9fee72b134a593d8cc SHA256 90986fed08d865c1228565b431a52a144c6ee691f9e84ef791f2a0e06435b4cc
+DIST thunderbird-10.0.3esr-ca.xpi 416065 RMD160 3e482f95c406d97c0f9ef136b27413e925ad2391 SHA1 b03b01dd57e8e19eaaea9e46664697ed77fa8757 SHA256 40dc4bf050f5f94f6f32a8bde6eec69525dbeca29c6c09803174a974018ddd8b
+DIST thunderbird-10.0.3esr-cs.xpi 419415 RMD160 21308e984ed636b861edbaee90c44eede3fe9c00 SHA1 f4417276bb32b6bdeea6e4b83b77e57a9919bb64 SHA256 38e3e5a0744e1d2af582742cdc78b0264db653f29285ed9c7357f7cefec80676
+DIST thunderbird-10.0.3esr-da.xpi 363372 RMD160 89f5a4fd469ed472359c69c9987e5db9a3944f6b SHA1 e1f0528add0e1ed17f2118febc7a6efd81bdb3f2 SHA256 dc9e5f1e9fb9c20cb2c0bd0688ad0338add337e787251e6f1303709d0df25b79
+DIST thunderbird-10.0.3esr-de.xpi 418263 RMD160 396885741b0230f817e46519b22cc38f1d0a4401 SHA1 db44c84e519f76dd9702ce6e324c640506519230 SHA256 c00b4dd2d236161a7c3d789b6950c6ae8981a3ca98c7aef02184f5d7be7d53a9
+DIST thunderbird-10.0.3esr-el.xpi 404863 RMD160 a65de47b384d874fd149362eabebe7e5f25dfd79 SHA1 beec71eea4eaa00f625218f4cd29259d31cc78ef SHA256 d1a8c7724db8b2afa25b0d1bae506c1cdbd79ebbb2f07eb1c67e99ead7471800
+DIST thunderbird-10.0.3esr-en-GB.xpi 391739 RMD160 50270f7d170718d8b94fa2da644824fa6700e405 SHA1 e3a94d4b06a327bfaed83b9d052eca2da3860727 SHA256 e005bc85a3dff4f7f49b948e05e316d593ab6bd2032b35ad53e62cb237aace97
+DIST thunderbird-10.0.3esr-es-AR.xpi 410723 RMD160 9bc1bc7bcf65e646203581694050e70fd7d376ca SHA1 2f0e4bbfe84cb50d37b114e226b7a1c73c698242 SHA256 e825057b315c26a6d3762acf7511408ca4adbbdae9c06b2b1f3f66b1e13cef0e
+DIST thunderbird-10.0.3esr-es-ES.xpi 355140 RMD160 73ca0164653e7d4c1e670924cd329d0cabe4283b SHA1 f42ab8c8d769140956428f37a30bf98f955a8bba SHA256 39c0057e14359acdd4355f44ca7d4a2fa5d1594a95f8b0367d3dfbeaedd51c03
+DIST thunderbird-10.0.3esr-et.xpi 410720 RMD160 282efdcf6f2d773e4cb0b6241b880ac8adc80edb SHA1 f95dc6a3eef35548392f9c219abf65de2f22ad91 SHA256 22081871d97c4e4017bd7633c8e99c87e89d478d828b8af7ab0fed262be39f65
+DIST thunderbird-10.0.3esr-eu.xpi 406383 RMD160 1aec69844a5dc77a389ff8ad0e62763b2c10f946 SHA1 571d9e896a42ee0871eb9150dc0fb9a0286dbae5 SHA256 d184c996c336ecc6ab93c821e8fbc5a69154210e8ee6a44a9824093cf1ec4d6e
+DIST thunderbird-10.0.3esr-fi.xpi 411925 RMD160 02753d79fb8d6caeea42a70bc0862706f6636a91 SHA1 9f4453a05a2374757795fce1735dfc094ed2b8e1 SHA256 b18c9ee4d136af05a7bc01c47522ba7bf2526859e0475c845d507d76e2f3c160
+DIST thunderbird-10.0.3esr-fr.xpi 414745 RMD160 c51bd4b55993f47bff4b90112f4d4c25fc974b93 SHA1 2a7507494bedf3a49e116be81b1d97772b9721bd SHA256 53b23cead071ee75fb9277280ace903a56739ea03ce51a6290f7c24d2c193bd9
+DIST thunderbird-10.0.3esr-fy-NL.xpi 413981 RMD160 25817216c0bcdbcce9b87c059d85ee95309b7e49 SHA1 6fcb73582bbc0869da7f150745c2772adae2cf03 SHA256 80e9b13ce9668f9973e3352c692c40175ae931960848a97f4895922d63e35f62
+DIST thunderbird-10.0.3esr-ga-IE.xpi 423257 RMD160 3b0c4c816fd920d88219be611e6d7f2d4e5fa5a4 SHA1 e4eab0f1b859ef21a4c4d44409722b215b5bc06a SHA256 efea50cfed12ec8d5fd744073479156af6b1a7faddd447dd892a052c270b4211
+DIST thunderbird-10.0.3esr-gd.xpi 425871 RMD160 77db9904061c72dc3095b1cd75f591997f6a72eb SHA1 9c20661e06ec9b384ff79b534405fd18f54b9d19 SHA256 47e67ad2c85b9f018b65d1d1d08f609fcef39d61a287f2e5a4cc8d9e49716c32
+DIST thunderbird-10.0.3esr-gl.xpi 409226 RMD160 0e60a2fd20b984f0640e6e3c1d54121cf86afa86 SHA1 79612ce375674e77d330c1d46c3c9c0e8cfcf716 SHA256 1851262d60689f70d272cafdaa75d6fa0a34e1c694c0d391f3b420ef232ddfa5
+DIST thunderbird-10.0.3esr-he.xpi 439203 RMD160 2285511a2f968aee32a9700fec62e3636a7a0aab SHA1 a1a014de3a9fd8cf619b60417f830479fcddd3f3 SHA256 de0f654e12f9576b614b0ed64117fa28f7b7c2f707870308036012683ffd1925
+DIST thunderbird-10.0.3esr-hu.xpi 426354 RMD160 86ed3ea80639bafd428ce3ff87d0155dba013f46 SHA1 bc57d9530f69daac63edfa7e40f472e071f8494a SHA256 572807030037168bba5f9d2ac857d303c683105f1fa2ccaf3487f3e4e8d5c950
+DIST thunderbird-10.0.3esr-id.xpi 400407 RMD160 460cd418f9c358a43cddbb824646bb5c3f9e0157 SHA1 c581ee59241cd44cda6cdd69a5651dc6367e612b SHA256 02c85622aae7f19bc7fd69e815f7cc4dfb3fe2fda8e437bbd101488d1a397d06
+DIST thunderbird-10.0.3esr-is.xpi 412631 RMD160 d9e3109fc4b29e37f5234dbe8f5a94bb5faf979f SHA1 4c0c800bf4c7b86742f8f046e384a4dd04657014 SHA256 f5137a07f033cdca54acc326020d2d372196cd79b147986081a09eef32645c82
+DIST thunderbird-10.0.3esr-it.xpi 347630 RMD160 3754a356746835cfe54c532fbc233b3e1b6a3dcb SHA1 f486a007a04cdc2a0374e07265cd1df24ff0273c SHA256 403b69429ad951529bc46d0beae23ef0724815f3c39290db59d128cd5dd47804
+DIST thunderbird-10.0.3esr-ja.xpi 459027 RMD160 6e122190a12062df22929673c55da8ce8535cb65 SHA1 e0ed5f05d64b8bdd57710e9feeb19338baf214b0 SHA256 f0300add69719084fdca5112068fbf208b1b570f366b7e22159aa8b3bea58926
+DIST thunderbird-10.0.3esr-ko.xpi 372009 RMD160 1a4db202fe07ca200601f4fb3986f619e60b5b37 SHA1 f0f2fd8ca9d7c458eaa04e391bbbc4b9826be332 SHA256 802fb0df904c074e436de03e0b1418feab512995b4310c8d8391f3c7257f1815
+DIST thunderbird-10.0.3esr-lt.xpi 531018 RMD160 72bec6a45094d092d12db638f12508f849b8b9c5 SHA1 cf7529a9a7bbea4d95ca49aefb82da1ae5326f23 SHA256 a76b1b20c92b22d0a8fa63f7ac8a890283d3861b17a75f910f58f91e9e71f93c
+DIST thunderbird-10.0.3esr-nb-NO.xpi 407726 RMD160 b3354040e92b4327d154fda444087f9328070f5d SHA1 14a27b79ea1b773fc46e7052bbd239c370953303 SHA256 98256461574f7aa06199500afd48a0700e5dd76072d0f175d5346f763dfd329b
+DIST thunderbird-10.0.3esr-nl.xpi 407981 RMD160 2b66573f164620b146f47fd37168c4f5b9c5b318 SHA1 366f067ed17b83e67559e58a8ba12f8093f8a9b2 SHA256 81cf4c679fda285400ba2ed8043a546132acd50b82863de15312a66eb72b2d6e
+DIST thunderbird-10.0.3esr-nn-NO.xpi 409455 RMD160 22e47f02ed42cf42fa1661190649cc1e75aaca72 SHA1 c786a22c96e9a54b95baac1b569912a3b1391225 SHA256 dd4ccb6e3a3660e9ef3e331a953ca2e96ff12ade94d7ddff024595b3a2702d2f
+DIST thunderbird-10.0.3esr-pa-IN.xpi 450327 RMD160 70b6ced9a7d99975788d5b436233818412d3ee22 SHA1 cc74f6884e4d6a8e38d5ca6ceeaa264e4b4eab2b SHA256 01500b2af03f93b03f790cb440506b8137974cd095dccd802b0a3f29114e008c
+DIST thunderbird-10.0.3esr-pl.xpi 393574 RMD160 b4c32a67fec29657306d533148b15e0cfc51eaee SHA1 d2cb7c1f0e09f947bb5c756bb40fa97e07d3d216 SHA256 07810903b8aa75d0378f8a3a790b6fe8097952a2b0e239b9033e58fccc2b68d3
+DIST thunderbird-10.0.3esr-pt-BR.xpi 417225 RMD160 e7b4b3b071a4ad2437ac3638c4cb2f6bfcad2295 SHA1 2b343b7a8c58ce77e60b00b80e9223a0ac5cf125 SHA256 781061abb5bb55ed5b49b6b659c560830d191f36eeb052420b91287d1cc77e64
+DIST thunderbird-10.0.3esr-pt-PT.xpi 414262 RMD160 f4be67df75769d3ff60d3198d39bf5e6e596cf93 SHA1 c558a9de2468ead21d13b1727f7017246105890b SHA256 aa0425c45464ecfc94c5912a5020760e37f235c5ff8657c0375087c6232054ce
+DIST thunderbird-10.0.3esr-rm.xpi 414704 RMD160 ac2e492c6c3805877fbd3790820e5e52e2763103 SHA1 71ccff387ecff4350fb74a76b07f5bb70a86f742 SHA256 1ba0594b7029d4c9b2b239cc52d6bc3b861cf5c20d02dd2d17046b924d647fee
+DIST thunderbird-10.0.3esr-ro.xpi 441291 RMD160 9e35baa05201237cc2c1cb5ac8e4b9f3cfda15ac SHA1 9516ce0f6dc1833a505cd64de24956d19e88bf3d SHA256 5099002ac5b2bd85461f770f5077ee48c3568d1c5bf2aa1be0d58cfba5e28f6d
+DIST thunderbird-10.0.3esr-ru.xpi 411631 RMD160 795f046262d66b9adb4410186b20f519473a5951 SHA1 1cb44cbc5ea23a82ad4c2e66c14007734c2a2923 SHA256 ec610eac0811a68b0dbc1014915ffe2f2eef6db1ac1680683c1e2a6b5127ac59
+DIST thunderbird-10.0.3esr-si.xpi 456604 RMD160 2b35fc0605d03483f06da5b2c63b6629a6200054 SHA1 b7edd6bd63036bab9c98e9325f1c25d66f307b45 SHA256 0e0bfa36032aefd3a391d0388e1f90eddc14957112189132045b476ec5dcb58d
+DIST thunderbird-10.0.3esr-sk.xpi 425026 RMD160 9b011b68a4840833de5aba2deaa8c00f3de70bdf SHA1 e7dd716f0fd6aaeebf652032587fd15aea502a0e SHA256 4ead646b5aead9d4478c7340c6daf49ffcf82a8b134dbf7286e131e9297a0cca
+DIST thunderbird-10.0.3esr-sl.xpi 410428 RMD160 f94b8586a08d836c81f30abca7c873b46b1bde24 SHA1 a40588e761cdee8b56d2a9969f5089733fed65d6 SHA256 a32141c4df379da4ba6f408d05e384590088f5d51e3bd5a092a246663a1aa0cd
+DIST thunderbird-10.0.3esr-sq.xpi 360476 RMD160 5ed0af642adc10c408a865cb68d55934c3551946 SHA1 25df1e106ee131f43e051b4b6bbb666d3512964e SHA256 a74763ebaf9572e8916ef4251540fc9626a9c29b4269b9cfa61e9b13fca02194
+DIST thunderbird-10.0.3esr-sr.xpi 460274 RMD160 081e2ad0678e3e36e60046f703b723a35beaef42 SHA1 3dc9aeaba7c22e35f7ada3f9940aba5fe48d0811 SHA256 86c59990e4abd1186768724176ad28516e623e70af8291f102c19670030a7ce0
+DIST thunderbird-10.0.3esr-sv-SE.xpi 478278 RMD160 2416ce0cc4cbb5a4d559dec1681017b645388ce7 SHA1 6088edd98ae1a55ea24f887d1372fffa5e765c86 SHA256 6665a49e1d1fce0676f1d9b68d13c2db10457c7e1b73fa8b9f2f729ddb9d175e
+DIST thunderbird-10.0.3esr-ta-LK.xpi 475715 RMD160 aed9401e1d7fa3a7db466f31b9f9643056bee7b0 SHA1 983f7e5228a4e55e0ed0a6429dca0fd894a6a447 SHA256 2ed073ee939f6f85fcccf064d7d71a4838b713dc5fe3b54254369e797c4e495d
+DIST thunderbird-10.0.3esr-tr.xpi 418206 RMD160 54faa3f326f08b1d6261b0713184e230bc69adc7 SHA1 6f1ea50a0faed292a4a81d6ec2e5b5d53a04e7c1 SHA256 96ed93aea3ea42ad1aeef8fc30f3b54a5b2efb4b219a35959864231e510e64cb
+DIST thunderbird-10.0.3esr-uk.xpi 463922 RMD160 d39ad39da90c06158b417be8f8806144971ed63b SHA1 9a493fb19e22b21dbb58cf757e0958585e76a7c4 SHA256 8ab1d49cc57f3f367e94852e4ef78fdb08471dad89bcc59e005a6ba1cba9dcaf
+DIST thunderbird-10.0.3esr-vi.xpi 435882 RMD160 2ea48f13c119dc4bf7310f8008a4a5e72d6fc5f1 SHA1 8f86e864381c08a56f47e7a74784305c9c8dc767 SHA256 a1e287e688ec2c8b6b715064f693c73c44f526654b2cfc2ff3ddcd7f4789e1eb
+DIST thunderbird-10.0.3esr-zh-CN.xpi 431232 RMD160 6617c84511d2753dbe00cd56181f2c5dbeb55227 SHA1 372ffe54885713e80a0080145b66434a9ab38a70 SHA256 b7c0077f9188f862866a4b36b7f9aa1e19a0350b86e9196908404f0206e79854
+DIST thunderbird-10.0.3esr-zh-TW.xpi 431824 RMD160 5649ecb95f2233b743b8b9c41b3cafc06097da03 SHA1 cde708d712327858cc077fcc075942e7a3a1d074 SHA256 bc6f06aa0bedf72f326a9f525f17c0828fb7569ccf45d891487f189c4d1d5a8e
 DIST thunderbird-11.0-ar.xpi 441216 RMD160 899f5287bfdfa5a6af02bbf27c7d915663d1342d SHA1 3e5a7c2649484787dd3002c3ebb25c3c3a81acdf SHA256 30fa17d2c6237d22670466dc21c7b1c01370fe98e9a48c385affc87c168110a6
 DIST thunderbird-11.0-ast.xpi 362423 RMD160 bc98f7985b8bc38dbe8afd8bff21113db9ecf106 SHA1 f194cf28af94485e8da91b727bf3f56c0f012729 SHA256 80e5ac8b08dbf8c14d1b0fe14cf015b1d72a10238772071d84b3a3c898a6d40b
 DIST thunderbird-11.0-be.xpi 397779 RMD160 09ecbf1bfd029851f4427ad50749387f39ff429d SHA1 95dd4746fc30e50a27e3ae9a423736bda6790ce0 SHA256 db3bdc8906061620016288667574338833b796ea8833565d24001b781383fe46
@@ -103,6 +155,8 @@ DIST thunderbird-11.0-vi.xpi 435640 RMD160 54b5466ca62e25e273d100774d0ed382dc4e0
 DIST thunderbird-11.0-zh-CN.xpi 430646 RMD160 f81ba574d57ce22140e1c7a197d3df7a5e837017 SHA1 261459cf085f6149cfeee62ff07213d06e0a8e88 SHA256 cd6a889da84b559acc37022b8bedef92f4ed8a0264a785596738094363b7ff1b
 DIST thunderbird-11.0-zh-TW.xpi 431214 RMD160 c2c31a828342cce399c008cb0128f7d476952846 SHA1 0be122d14cd4cdfb33d4564141b69772d37bccba SHA256 38341b2457744a81a6d31fb727e8d47bee58aca594e27a5d645fadddc76706af
 DIST thunderbird-bin_i686-10.0.2.tar.bz2 18549327 RMD160 81eccac4baf6344380360f450226ba1cc4c4d1fa SHA1 0e7cdf0e8b73029474ec6b0ce98a98997e42491d SHA256 06abdafed6e6a5f1bbb7de90ed7fb6498d9b2c0a4a9c1c84a6f326ea606f3d5a
+DIST thunderbird-bin_i686-10.0.3.tar.bz2 18549592 RMD160 9d411b1761db57f595e29e4a6b12320dddf41a26 SHA1 406255ae89cf60c462ea66c3285de5d2f6e5afb8 SHA256 6301c227be7ad5b767a0d29131fb0c45599f1020a0628162141262eccde9c3ed
 DIST thunderbird-bin_i686-11.0.tar.bz2 18761612 RMD160 a1e5767f33d82b577b2556d7849154d26b07c51c SHA1 a926e70af1633f3ded54e9ebed3862f0a2d51bf9 SHA256 7251edac496ac0a456c92c97c57e4e235c19b5cbbb489f78eb0c60b194188f47
 DIST thunderbird-bin_x86_64-10.0.2.tar.bz2 21461716 RMD160 fdaeea491e4d74d48d384fb98be2794e9dad6585 SHA1 d1661b63a2e6c4d774e004b823e4ed035b36ec11 SHA256 bf3fb051064bb66980e2e63b871f09cf12dcff99c0401b046dbbf03a0d0ea48a
+DIST thunderbird-bin_x86_64-10.0.3.tar.bz2 21406960 RMD160 5990edbd76d0aee01d729efb591fcf6b570bbd35 SHA1 50cbfc0cde73b694eb2974fde2f7d0595424b5da SHA256 8dd10a8f8e52e830d7b60b48364b5403516cd25b4e2f49154d508a78fc9129d7
 DIST thunderbird-bin_x86_64-11.0.tar.bz2 21730134 RMD160 fc2ad5e0abbe5d53f6461899d37161af58c3d2f4 SHA1 0688e1b04d0f59f7115b270a453ccaef5c16daa0 SHA256 1924bdd7ee812cbd4d4587c020a083c23f7182c045489627f99baa5140801f06
diff --git a/mail-client/thunderbird-bin/thunderbird-bin-10.0.3.ebuild b/mail-client/thunderbird-bin/thunderbird-bin-10.0.3.ebuild
new file mode 100644
index 000000000000..7712237ed4ea
--- /dev/null
+++ b/mail-client/thunderbird-bin/thunderbird-bin-10.0.3.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-client/thunderbird-bin/thunderbird-bin-10.0.3.ebuild,v 1.1 2012/03/21 18:26:29 jdhore Exp $
+
+EAPI="4"
+MOZ_ESR="1"
+
+# Can be updated using scripts/get_langs.sh from mozilla overlay
+MOZ_LANGS=(ar ast be bg bn-BD br ca cs da de el en en-GB en-US es-AR es-ES et eu
+fi fr fy-NL ga-IE gd gl he hu id is it ja ko lt nb-NO nl nn-NO pa-IN pl pt-BR
+pt-PT rm ro ru si sk sl sq sr sv-SE ta-LK tr uk vi zh-CN zh-TW)
+
+# Convert the ebuild version to the upstream mozilla version, used by
+MOZ_PN="${PN/-bin}"
+MOZ_PV="${PV/_beta/b}"
+MOZ_PV="${MOZ_PV/_rc/rc}"
+
+if [[ ${MOZ_ESR} == 1 ]]; then
+	# ESR releases have slightly version numbers
+	MOZ_PV="${MOZ_PV}esr"
+fi
+
+MOZ_P="${MOZ_PN}-${MOZ_PV}"
+
+# Upstream ftp release URI that's used by mozlinguas.eclass
+# We don't use the http mirror because it deletes old tarballs.
+MOZ_FTP_URI="ftp://ftp.mozilla.org/pub/mozilla.org/${MOZ_PN}/releases/"
+
+inherit eutils multilib pax-utils fdo-mime gnome2-utils mozlinguas nsplugins
+
+DESCRIPTION="Thunderbird Mail Client"
+SRC_URI="${SRC_URI}
+	amd64? ( ${MOZ_FTP_URI}/${MOZ_PV}/linux-x86_64/en-US/${MOZ_P}.tar.bz2 -> ${PN}_x86_64-${PV}.tar.bz2 )
+	x86? ( ${MOZ_FTP_URI}/${MOZ_PV}/linux-i686/en-US/${MOZ_P}.tar.bz2 -> ${PN}_i686-${PV}.tar.bz2 )"
+HOMEPAGE="http://www.mozilla.com/thunderbird"
+RESTRICT="strip mirror binchecks"
+
+KEYWORDS="-* ~amd64 ~x86"
+SLOT="0"
+LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
+IUSE="+crashreporter"
+
+DEPEND="app-arch/unzip"
+RDEPEND="virtual/freedesktop-icon-theme
+	x11-libs/libXrender
+	x11-libs/libXt
+	x11-libs/libXmu
+	>=x11-libs/gtk+-2.2:2
+	>=media-libs/alsa-lib-1.0.16
+	crashreporter? ( net-misc/curl ) "
+
+S="${WORKDIR}/${MOZ_PN}"
+
+src_unpack() {
+	unpack ${A}
+
+	# Unpack language packs
+	mozlinguas_src_unpack
+}
+
+src_install() {
+	declare MOZILLA_FIVE_HOME="/opt/${MOZ_PN}"
+
+	# Install thunderbird in /opt
+	dodir ${MOZILLA_FIVE_HOME%/*}
+	mv "${S}" "${D}"${MOZILLA_FIVE_HOME}
+
+	# Install language packs
+	mozlinguas_src_install
+
+	# Create /usr/bin/thunderbird-bin
+	dodir /usr/bin/
+	cat <<EOF >"${D}"/usr/bin/${PN}
+#!/bin/sh
+unset LD_PRELOAD
+LD_LIBRARY_PATH="${MOZILLA_FIVE_HOME}"
+exec ${MOZILLA_FIVE_HOME}/thunderbird "\$@"
+EOF
+	fperms 0755 /usr/bin/${PN}
+
+	# Install icon and .desktop for menu entry
+	doicon "${FILESDIR}"/icon/${PN}-icon.png
+	domenu "${FILESDIR}"/icon/${PN}.desktop
+
+	# revdep-rebuild entry
+	insinto /etc/revdep-rebuild
+	doins "${FILESDIR}"/10${PN}
+
+	# Enable very specific settings for thunderbird-3
+	cp "${FILESDIR}"/thunderbird-gentoo-default-prefs.js \
+		"${D}/${MOZILLA_FIVE_HOME}/defaults/pref/all-gentoo.js" || \
+		die "failed to cp thunderbird-gentoo-default-prefs.js"
+
+	# Plugins dir
+	share_plugins_dir
+
+	pax-mark mr "${ED}"/${MOZILLA_FIVE_HOME}/{thunderbird-bin,thunderbird,plugin-container}
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/mail-filter/opendkim/opendkim-2.4.3.ebuild b/mail-filter/opendkim/opendkim-2.4.3.ebuild
index 474609c6d6db..535c8a677f92 100644
--- a/mail-filter/opendkim/opendkim-2.4.3.ebuild
+++ b/mail-filter/opendkim/opendkim-2.4.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/opendkim/opendkim-2.4.3.ebuild,v 1.1 2011/12/26 12:39:37 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/opendkim/opendkim-2.4.3.ebuild,v 1.2 2012/03/21 12:04:29 ago Exp $
 
 EAPI=4
 
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/opendkim/${P}.tar.gz"
 
 LICENSE="Sendmail-Open-Source BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="asyncdns +berkdb ldap lua opendbx poll sasl +ssl static-libs unbound"
 
 # FUTURE: diffheaders (libtre error) - bug #296813
diff --git a/media-gfx/colorhug-client/colorhug-client-0.1.7-r1.ebuild b/media-gfx/colorhug-client/colorhug-client-0.1.7-r1.ebuild
new file mode 100644
index 000000000000..377db344d365
--- /dev/null
+++ b/media-gfx/colorhug-client/colorhug-client-0.1.7-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/colorhug-client/colorhug-client-0.1.7-r1.ebuild,v 1.1 2012/03/21 15:26:29 gregkh Exp $
+
+EAPI=4
+
+inherit gnome2-utils
+
+DESCRIPTION="Client tools for the ColorHug display colorimeter"
+HOMEPAGE="http://www.hughsie.com/"
+SRC_URI="http://people.freedesktop.org/~hughsient/releases/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-db/sqlite:3
+		>=dev-libs/glib-2.28.0
+		dev-libs/libgusb
+		media-libs/lcms:2
+		net-libs/libsoup:2.4
+		x11-libs/gtk+:3
+		>=x11-misc/colord-0.1.15"
+RDEPEND="${DEPEND}"
+
+pkg_postinst() {
+	gnome2_schemas_update
+}
+pkg_postrm() {
+	gnome2_schemas_update
+}
diff --git a/media-libs/fidlib/fidlib-0.9.10.ebuild b/media-libs/fidlib/fidlib-0.9.10.ebuild
index 0d895793f814..577c16bf357c 100644
--- a/media-libs/fidlib/fidlib-0.9.10.ebuild
+++ b/media-libs/fidlib/fidlib-0.9.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/fidlib/fidlib-0.9.10.ebuild,v 1.1 2012/03/20 21:27:25 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/fidlib/fidlib-0.9.10.ebuild,v 1.3 2012/03/21 16:47:26 radhermit Exp $
 
 EAPI=4
 
@@ -35,7 +35,7 @@ src_compile() {
 		-fPIC -shared fidlib.c -lm -o libfidlib.so.${PV:0:1}
 
 	# build command-line tool
-	doecho $(tc-getCC) ${CFLAGS} ${LDFLAGS} -L. firun.c -lm -lfidlib -o firun
+	doecho $(tc-getCC) ${CFLAGS} ${LDFLAGS} firun.c -lm ./libfidlib.so.${PV:0:1} -o firun
 }
 
 src_install() {
diff --git a/media-libs/libcdr/Manifest b/media-libs/libcdr/Manifest
index c2f43ce2da2d..3c5b13d845f0 100644
--- a/media-libs/libcdr/Manifest
+++ b/media-libs/libcdr/Manifest
@@ -1 +1 @@
-DIST libcdr-0.0.4.tar.xz 469428 RMD160 50c99a13c266a4555a778937722c01c34966c099 SHA1 f3cbada2925800a7a55548ca87454b8765615429 SHA256 b0f1ded08bbdf09ed0b5f9b277661811e22388b26e847c4a43b02ce635cbe7c9
+DIST libcdr-0.0.5.tar.xz 460504 RMD160 47b7d659e96af54fb42faf1522632fd261c64714 SHA1 725bf06b6b8000fd472408befb1a0b0e80a8fdbd SHA256 83b84cc2ffa5444b3d9a07026a064c3a0c2744c8dc8f2fcd1888bdba92b1e244
diff --git a/media-libs/libcdr/libcdr-0.0.4.ebuild b/media-libs/libcdr/libcdr-0.0.5.ebuild
similarity index 95%
rename from media-libs/libcdr/libcdr-0.0.4.ebuild
rename to media-libs/libcdr/libcdr-0.0.5.ebuild
index c08e40efde88..11eefb223dc6 100644
--- a/media-libs/libcdr/libcdr-0.0.4.ebuild
+++ b/media-libs/libcdr/libcdr-0.0.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libcdr/libcdr-0.0.4.ebuild,v 1.1 2012/03/09 15:11:59 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libcdr/libcdr-0.0.5.ebuild,v 1.1 2012/03/21 21:40:31 scarabeus Exp $
 
 EAPI=4
 
diff --git a/media-libs/libvpx/libvpx-1.0.0.ebuild b/media-libs/libvpx/libvpx-1.0.0.ebuild
index 6688d3001524..f9e463d47190 100644
--- a/media-libs/libvpx/libvpx-1.0.0.ebuild
+++ b/media-libs/libvpx/libvpx-1.0.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libvpx/libvpx-1.0.0.ebuild,v 1.7 2012/03/21 11:28:26 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libvpx/libvpx-1.0.0.ebuild,v 1.8 2012/03/21 11:56:31 ssuominen Exp $
 
 EAPI=4
 inherit multilib toolchain-funcs eutils
@@ -49,9 +49,10 @@ src_configure() {
 	# http://bugs.gentoo.org/show_bug.cgi?id=384585
 	addpredict /usr/share/snmp/mibs/.index
 
-	tc-export CC
 	# http://bugs.gentoo.org/379659 http://gerrit.chromium.org/gerrit/#change,18142
-	LC_ALL=C \
+	export LC_ALL=C
+
+	tc-export CC
 	./configure \
 		--prefix="${EPREFIX}"/usr \
 		--libdir="${EPREFIX}"/usr/$(get_libdir) \
diff --git a/media-libs/openjpeg/Manifest b/media-libs/openjpeg/Manifest
index ce60c9165633..100516da0f6b 100644
--- a/media-libs/openjpeg/Manifest
+++ b/media-libs/openjpeg/Manifest
@@ -1 +1,2 @@
+DIST openjpeg-1.5.0.tar.gz 2117572 RMD160 ffa85dbb0a3ba1545bc6974f4950f466789c04ef SHA1 dce705ae45f137e4698a8cf39d1fbf22bc434fa8 SHA256 c9908fab44432a2ed2550c457cb7e736da6d7c326f1203d23d1082d992364ace
 DIST openjpeg_v1_4_sources_r697.tgz 2365447 RMD160 c0d88c4a312651bac17d50bd6917e1b678fcf8f7 SHA1 9ef6a08ecf5944962b4e2cd7569ac01a8eaa66d0 SHA256 493e4db087bf5c5485618a1e1cfd827c4fb2ad421a4342903b166b76cf094b73
diff --git a/media-libs/openjpeg/files/openjpeg-1.5.0-build.patch b/media-libs/openjpeg/files/openjpeg-1.5.0-build.patch
new file mode 100644
index 000000000000..b335b9eeeccf
--- /dev/null
+++ b/media-libs/openjpeg/files/openjpeg-1.5.0-build.patch
@@ -0,0 +1,72 @@
+Some bits have been loaned from http://pkgs.fedoraproject.org/gitweb/?p=openjpeg.git;a=tree
+
+--- CMake/OpenJPEGConfig.cmake.in
++++ CMake/OpenJPEGConfig.cmake.in
+@@ -11,13 +11,13 @@
+ SET(OPENJPEG_BUILD_VERSION "@OPENJPEG_VERSION_BUILD@")
+ 
+ # The libraries.
+-SET(OPENJPEG_LIBRARIES "@OPENJPEG_LIBRARIES@")
++SET(OPENJPEG_LIBRARIES "@OPENJPEG_LIBRARY_NAME@")
+ 
+ # The CMake macros dir.
+-SET(OPENJPEG_CMAKE_DIR "@OPENJPEG_CMAKE_DIR_CONFIG@")
++SET(OPENJPEG_CMAKE_DIR "@OPENJPEG_INSTALL_PACKAGE_DIR@")
+ 
+ # The configuration options.
+-SET(OPENJPEG_BUILD_SHARED_LIBS "@OPENJPEG_BUILD_SHARED_LIBS@")
++SET(OPENJPEG_BUILD_SHARED_LIBS "@BUILD_SHARED_LIBS@")
+ 
+ # The "use" file.
+ SET(OPENJPEG_USE_FILE "@OPENJPEG_USE_FILE_CONFIG@")
+--- CMakeLists.txt
++++ CMakeLists.txt
+@@ -146,7 +146,7 @@
+   CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/libopenjpeg1.pc.cmake
+     ${CMAKE_CURRENT_BINARY_DIR}/libopenjpeg1.pc @ONLY)
+   INSTALL( FILES  ${CMAKE_CURRENT_BINARY_DIR}/libopenjpeg1.pc DESTINATION
+-    ${OPENJPEG_INSTALL_SHARE_DIR}/pkgconfig )
++    ${OPENJPEG_INSTALL_LIB_DIR}/pkgconfig )
+   INSTALL( CODE "EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E create_symlink
+   \"libopenjpeg1.pc\"
+   \"\$ENV{DESTDIR}${OPENJPEG_INSTALL_LIB_DIR}/pkgconfig/libopenjpeg.pc\")")
+@@ -252,11 +252,4 @@
+   DESTINATION ${OPENJPEG_INSTALL_PACKAGE_DIR}
+ )
+ 
+-#-----------------------------------------------------------------------------
+-# install CHANGES and LICENSE
+-INSTALL(
+-  FILES       CHANGES 
+-              LICENSE
+-  DESTINATION ${OPENJPEG_INSTALL_DOC_DIR})
+-
+ INCLUDE (CMake/OpenJPEGCPack.cmake)
+--- libopenjpeg/CMakeLists.txt
++++ libopenjpeg/CMakeLists.txt
+@@ -57,6 +57,10 @@
+ INSTALL(FILES openjpeg.h
+   DESTINATION ${OPENJPEG_INSTALL_INCLUDE_DIR}/${OPENJPEG_INSTALL_SUBDIR} COMPONENT Headers
+ )
++INSTALL( CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink
++  \"${OPENJPEG_INSTALL_SUBDIR}/openjpeg.h\"
++  \"\$ENV{DESTDIR}${OPENJPEG_INSTALL_INCLUDE_DIR}/openjpeg.h\")"
++)
+ 
+ # install man page of the library
+ INSTALL(
+--- libopenjpeg1.pc.cmake
++++ libopenjpeg1.pc.cmake
+@@ -1,8 +1,8 @@
+ prefix=@CMAKE_INSTALL_PREFIX@
+-bindir=@OPENJPEG_INSTALL_BIN_DIR@
+-datadir=@OPENJPEG_INSTALL_DATA_DIR@
+-libdir=@OPENJPEG_INSTALL_LIB_DIR@
+-includedir=@OPENJPEG_INSTALL_INCLUDE_DIR@
++bindir=${prefix}/@OPENJPEG_INSTALL_BIN_DIR@
++datadir=${prefix}/@OPENJPEG_INSTALL_DATA_DIR@
++libdir=${prefix}/@OPENJPEG_INSTALL_LIB_DIR@
++includedir=${prefix}/@OPENJPEG_INSTALL_INCLUDE_DIR@/@OPENJPEG_INSTALL_SUBDIR@
+ 
+ Name: openjpeg
+ Description: JPEG2000 files library
diff --git a/media-libs/openjpeg/openjpeg-1.5.0.ebuild b/media-libs/openjpeg/openjpeg-1.5.0.ebuild
new file mode 100644
index 000000000000..54217bb7613c
--- /dev/null
+++ b/media-libs/openjpeg/openjpeg-1.5.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/openjpeg/openjpeg-1.5.0.ebuild,v 1.2 2012/03/22 04:37:50 ssuominen Exp $
+
+EAPI=4
+inherit cmake-utils multilib
+
+DESCRIPTION="An open-source JPEG 2000 library"
+HOMEPAGE="http://code.google.com/p/openjpeg/"
+SRC_URI="http://${PN}.googlecode.com/files/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+IUSE="doc test"
+
+RDEPEND="media-libs/lcms:2
+	media-libs/libpng:0
+	media-libs/tiff:0
+	sys-libs/zlib"
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )"
+
+DOCS=( AUTHORS CHANGES NEWS README THANKS )
+
+PATCHES=( "${FILESDIR}"/${P}-build.patch )
+
+RESTRICT="test" #409263
+
+src_configure() {
+	local mycmakeargs=(
+		-DOPENJPEG_INSTALL_LIB_DIR="$(get_libdir)"
+		$(cmake-utils_use_build doc)
+		$(cmake-utils_use_build test TESTING)
+		)
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	# See broken -E create_symlink(s) in the -build.patch!
+	dosym openjpeg-1.5/openjpeg.h /usr/include/openjpeg.h
+	dosym libopenjpeg1.pc /usr/$(get_libdir)/pkgconfig/libopenjpeg.pc
+}
diff --git a/media-plugins/live/Manifest b/media-plugins/live/Manifest
index ba66cd83f8fe..6144683182c3 100644
--- a/media-plugins/live/Manifest
+++ b/media-plugins/live/Manifest
@@ -1,3 +1,2 @@
 DIST live.2009.06.02.tar.gz 469471 RMD160 ddbe057ac4f47d66ee7c99ec3c4886fe97f06565 SHA1 a03ac47dc1b2a5e4745e30fc304af61675036782 SHA256 66c54241bfcc7ea42fe40e1c93739be79a3c065390c4163c0f2647ac45c24758
 DIST live.2012.01.07.tar.gz 534076 RMD160 1bfbbbe4b0ee7f627aa2551657bf9f0937603147 SHA1 a89bc86d179d17c57ed98c0bb8fdaf5f101fdb70 SHA256 8f3d167959b355c571caab2ee12cf70c89f09e93484f150080a59367b35c8131
-DIST live.2012.02.29.tar.gz 538874 RMD160 949dc8b1ac8314e2d21cd99d5266898c50acb796 SHA1 a2eb6ecf88e64475ac0d936c50939859311539a4 SHA256 cedf54750639a98acade344cf7888b67b04544f2964e6300b897454fd9d8fe01
diff --git a/media-plugins/live/live-2012.01.07.ebuild b/media-plugins/live/live-2012.01.07.ebuild
index 1e0bd65011b2..9bbe657798c5 100644
--- a/media-plugins/live/live-2012.01.07.ebuild
+++ b/media-plugins/live/live-2012.01.07.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/live/live-2012.01.07.ebuild,v 1.1 2012/01/09 16:41:26 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/live/live-2012.01.07.ebuild,v 1.2 2012/03/21 12:01:58 ago Exp $
 
 EAPI=3
 inherit flag-o-matic eutils toolchain-funcs multilib
@@ -11,7 +11,7 @@ SRC_URI="http://www.live555.com/liveMedia/public/${P/-/.}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 S="${WORKDIR}"
diff --git a/media-plugins/live/live-2012.02.29.ebuild b/media-plugins/live/live-2012.02.29.ebuild
deleted file mode 100644
index 95dd35196c0c..000000000000
--- a/media-plugins/live/live-2012.02.29.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/live/live-2012.02.29.ebuild,v 1.1 2012/03/20 10:05:44 aballier Exp $
-
-EAPI=3
-inherit flag-o-matic eutils toolchain-funcs multilib
-
-DESCRIPTION="Source-code libraries for standards-based RTP/RTCP/RTSP multimedia streaming, suitable for embedded and/or low-cost streaming applications"
-HOMEPAGE="http://www.live555.com/"
-SRC_URI="http://www.live555.com/liveMedia/public/${P/-/.}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE=""
-
-S="${WORKDIR}"
-
-# Alexis Ballier <aballier@gentoo.org>
-# Be careful, bump this everytime you bump the package and the ABI has changed.
-# If you don't know, ask someone.
-LIVE_ABI_VERSION=4
-
-src_prepare() {
-	cd "${WORKDIR}"
-	epatch "${FILESDIR}/${PN}-recursive.patch"
-
-	cp -pPR live live-shared
-	mv live live-static
-
-	cp "${FILESDIR}/config.gentoo" live-static
-	cp "${FILESDIR}/config.gentoo-so-r1" live-shared
-
-	case ${CHOST} in
-		*-solaris*)
-			sed -i \
-				-e '/^COMPILE_OPTS /s/$/ -DSOLARIS/' \
-				-e '/^LIBS_FOR_CONSOLE_APPLICATION /s/$/ -lsocket -lnsl/' \
-				live-static/config.gentoo \
-				live-shared/config.gentoo-so-r1 \
-				|| die
-		;;
-		*-darwin*)
-			sed -i \
-				-e '/^COMPILE_OPTS /s/$/ -DBSD=1 -DHAVE_SOCKADDR_LEN=1/' \
-				-e '/^LINK /s/$/ /' \
-				-e '/^LIBRARY_LINK /s/$/ /' \
-				-e '/^LIBRARY_LINK_OPTS /s/-Bstatic//' \
-				live-static/config.gentoo \
-				|| die static
-			sed -i \
-				-e '/^COMPILE_OPTS /s/$/ -DBSD=1 -DHAVE_SOCKADDR_LEN=1/' \
-				-e '/^LINK /s/$/ /' \
-				-e '/^LIBRARY_LINK /s/=.*$/= $(CXX) -o /' \
-				-e '/^LIBRARY_LINK_OPTS /s:-shared.*$:-undefined suppress -flat_namespace -dynamiclib -install_name '"${EPREFIX}/usr/$(get_libdir)/"'$@:' \
-				live-shared/config.gentoo-so-r1 \
-				|| die shared
-		;;
-	esac
-}
-
-src_configure() { :; }
-
-src_compile() {
-	tc-export CC CXX LD
-
-	cd "${WORKDIR}/live-static"
-
-	einfo "Beginning static library build"
-	./genMakefiles gentoo
-	emake -j1 LINK_OPTS="-L. $(raw-ldflags)" || die "failed to build static libraries"
-
-	einfo "Beginning programs build"
-	cd "${WORKDIR}/live-static/testProgs"
-	emake LINK_OPTS="-L. ${LDFLAGS}" || die "failed to build test programs"
-	cd "${WORKDIR}/live-static/mediaServer"
-	emake LINK_OPTS="-L. ${LDFLAGS}" || die "failed to build the mediaserver"
-
-	cd "${WORKDIR}/live-shared"
-	einfo "Beginning shared library build"
-	./genMakefiles gentoo-so-r1
-	local suffix=$(get_libname ${LIVE_ABI_VERSION})
-	emake -j1 LINK_OPTS="-L. ${LDFLAGS}" LIB_SUFFIX="${suffix#.}" || die "failed to build shared libraries"
-}
-
-src_install() {
-	for library in UsageEnvironment liveMedia BasicUsageEnvironment groupsock; do
-		dolib.a live-static/${library}/lib${library}.a
-		dolib.so live-shared/${library}/lib${library}$(get_libname ${LIVE_ABI_VERSION})
-		dosym lib${library}$(get_libname ${LIVE_ABI_VERSION}) /usr/$(get_libdir)/lib${library}$(get_libname)
-
-		insinto /usr/include/${library}
-		doins live-shared/${library}/include/*h
-	done
-
-	# Should we really install these?
-	find live-static/testProgs -type f -perm +111 -print0 | \
-		xargs -0 dobin
-
-	#install included live555MediaServer aplication
-	dobin live-static/mediaServer/live555MediaServer
-
-	# install docs
-	dodoc live-static/README
-}
-
-pkg_postinst() {
-	ewarn "If you are upgrading from a version prior to live-2008.02.08"
-	ewarn "Please make sure to rebuild applications built against ${PN}"
-	ewarn "like vlc or mplayer. ${PN} may have had ABI changes and ${PN}"
-	ewarn "support might be broken."
-}
diff --git a/media-sound/csound/Manifest b/media-sound/csound/Manifest
index 81ddfac60d49..c438648770df 100644
--- a/media-sound/csound/Manifest
+++ b/media-sound/csound/Manifest
@@ -3,3 +3,8 @@ DIST Csound5.16_manual-fr_html.zip 9711044 RMD160 951a5e6872c888b49917e172f1b5a2
 DIST Csound5.16_manual-fr_pdf.zip 5969838 RMD160 8710496e4909ac80df2a2fb48c124d811f3cffe7 SHA1 68a7dc63bf08b04aee8635d0cf13c44214fe743d SHA256 a30f30554529d891018534dc1de06cb7c7499d80f1b618f9977cf457194e8091
 DIST Csound5.16_manual_html.zip 9451986 RMD160 262888c476044827f872764ba3a5ffab3717d42f SHA1 4dbe80c06a6573066269ce1ee0ac466a03414a65 SHA256 572b1b3825fd5203d00e3db6db7a190a17212b28de425cc0373e705d44aa2c8b
 DIST Csound5.16_manual_pdf.zip 5661273 RMD160 a63c6806366e0b7bb702096d10d956194d2c9378 SHA1 91ee66b4c4aa93757165a391a19e8039ef9a6982 SHA256 66550eb53a77b942ad073be63c12dca66b6960d5995a6a241dde255d2d0be85b
+DIST Csound5.17.2.tar.gz 8777963 RMD160 79bb854e722c049afd4a2e048b2332223c2a0f97 SHA1 717233f40fe516a955b9caf2ddad3b5c85634b36 SHA256 b46c7efc23831b2c611b0f77d2222a8d0055eee094d92ac3fb7eb1aa969003bb
+DIST Csound5.17_manual-fr_html.zip 9881142 RMD160 089a4fa7bbcd194494f9a20f10166b4f05c8af59 SHA1 a170cf2f3009ac6055bcc91e9104d33146c286c2 SHA256 9c2a6639ee733329269f1474a60e0233aded2b9f11d1f183fd9602fc38d301f5
+DIST Csound5.17_manual-fr_pdf.zip 6044660 RMD160 44a188bcaf70afba2e9e884460348aa6a6e50fad SHA1 2ef4ee6ce503d40ddc9f6afb9104fce66d28cc47 SHA256 03033ef48e570c89b6a2b4c70c1c29e379f5d09d0f5d98a24fe5bf1ee559164a
+DIST Csound5.17_manual_html.zip 9621312 RMD160 fbd6d343dbbe6787e10b3abbc35011713db27cea SHA1 20c22f73abc5b4a72956881d5cbde1587d853a31 SHA256 cad3ee307c801c972d9d5f626a79c88dddda6872d8a4af64dd4f3edfe7c0f626
+DIST Csound5.17_manual_pdf.zip 5736239 RMD160 469f7a1df1ef33b17bc3de169123c4842e30994a SHA1 e27d16ed45e7a9b40d129d8b32411775faff5e29 SHA256 72d3e416b1e2fa7d60d67f803083f86ec12a09a4af427713a5a6a10472f95ee8
diff --git a/media-sound/csound/csound-5.16.6-r1.ebuild b/media-sound/csound/csound-5.17.2.ebuild
similarity index 92%
rename from media-sound/csound/csound-5.16.6-r1.ebuild
rename to media-sound/csound/csound-5.17.2.ebuild
index c9f08b884071..2f802fce9d77 100644
--- a/media-sound/csound/csound-5.16.6-r1.ebuild
+++ b/media-sound/csound/csound-5.17.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/csound/csound-5.16.6-r1.ebuild,v 1.4 2012/02/28 21:28:40 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/csound/csound-5.17.2.ebuild,v 1.1 2012/03/22 01:08:57 radhermit Exp $
 
 EAPI="4"
 PYTHON_DEPEND="python? 2"
@@ -26,8 +26,8 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="+alsa beats chua csoundac +cxx debug double-precision dssi examples fltk +fluidsynth
-html +image jack java keyboard linear lua nls osc openmp doc portaudio portmidi pulseaudio
+IUSE="+alsa beats chua csoundac +cxx debug doc double-precision dssi examples fltk +fluidsynth
+html +image jack java keyboard linear lua luajit nls osc openmp portaudio portmidi pulseaudio
 python samples static-libs stk tcl test +threads +utils vim-syntax vst"
 
 LANGS=" de en_GB en_US es_CO fr it ro ru"
@@ -47,7 +47,10 @@ RDEPEND=">=media-libs/libsndfile-1.0.16
 	java? ( >=virtual/jdk-1.5 )
 	keyboard? ( x11-libs/fltk:1[threads?] )
 	linear? ( sci-mathematics/gmm )
-	lua? ( dev-lang/luajit:2 )
+	lua? (
+		luajit? ( dev-lang/luajit:2 )
+		!luajit? ( dev-lang/lua )
+	)
 	osc? ( media-libs/liblo )
 	portaudio? ( media-libs/portaudio )
 	portmidi? ( media-libs/portmidi )
@@ -89,8 +92,8 @@ pkg_setup() {
 
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-scons.patch
-	epatch "${FILESDIR}"/${P}-tests.patch
-	epatch "${FILESDIR}"/${P}-install.patch
+	epatch "${FILESDIR}"/${PN}-5.16.6-tests.patch
+	epatch "${FILESDIR}"/${PN}-5.16.6-install.patch
 
 	cat > custom.py <<-EOF
 		platform = 'linux'
@@ -135,6 +138,7 @@ src_compile() {
 		$(use_scons linear buildLinearOpcodes) \
 		$(use_scons lua buildLuaOpcodes) \
 		$(use_scons lua buildLuaWrapper) \
+		$(use_scons luajit useLuaJIT) \
 		$(use_scons nls useGettext) \
 		$(use_scons osc useOSC) \
 		$(use_scons openmp useOpenMP) \
diff --git a/media-sound/csound/files/csound-5.17.2-scons.patch b/media-sound/csound/files/csound-5.17.2-scons.patch
new file mode 100644
index 000000000000..3ae0e3d5689f
--- /dev/null
+++ b/media-sound/csound/files/csound-5.17.2-scons.patch
@@ -0,0 +1,277 @@
+--- Csound5.17.2/SConstruct
++++ Csound5.17.2/SConstruct
+@@ -89,6 +89,9 @@
+ commandOptions.Add('usePortMIDI',
+     'Build PortMidi plugin for real time MIDI input and output.',
+     '1')
++commandOptions.Add('usePulseAudio',
++    'Set to 1 to use PulseAudio for real-time audio and MIDI input and output.',
++    '1')
+ commandOptions.Add('useALSA',
+     'Set to 1 to use ALSA for real-time audio and MIDI input and output.',
+     '1')
+@@ -101,6 +104,9 @@
+ commandOptions.Add('noFLTKThreads',
+     'Set to 1 to disable use of a separate thread for FLTK widgets.',
+     '1')
++commandOptions.Add('useLuaJIT',
++    'Set to 1 to use the Just-In-Time Compiler for Lua',
++    '1')
+ commandOptions.Add('pythonVersion',
+     'Set to the Python version to be used.',
+     '%d.%d' % (int(sys.hexversion) >> 24, (int(sys.hexversion) >> 16) & 255))
+@@ -180,6 +186,15 @@
+     commandOptions.Add('dynamicCsoundLibrary',
+         'Build dynamic Csound library instead of libcsound.a',
+         '0')
++commandOptions.Add('buildChuaOpcodes',
++    'Set to 1 to build chua opcodes.',
++    '1')
++commandOptions.Add('buildLinearOpcodes',
++    'Set to 1 to build linear algebra opcodes.',
++    '1')
++commandOptions.Add('buildFluidOpcodes',
++    'Set to 1 to build Fluidsynth opcodes.',
++    '1')
+ commandOptions.Add('buildStkOpcodes',
+     "Build opcodes encapsulating Perry Cook's Synthesis Toolkit in C++ instruments and effects",
+     '0')
+@@ -352,6 +367,7 @@
+ fileOptions.Add('customCXXFLAGS')
+ fileOptions.Add('customLIBS')
+ fileOptions.Add('customLIBPATH')
++fileOptions.Add('customLINKFLAGS')
+ fileOptions.Add('customSHLINKFLAGS')
+ fileOptions.Add('customSWIGFLAGS')
+ fileOptions.Update(commonEnvironment)
+@@ -366,6 +382,8 @@
+ commonEnvironment.Prepend(LIBS = customLIBS)
+ customLIBPATH = commonEnvironment['customLIBPATH']
+ commonEnvironment.Prepend(LIBPATH = customLIBPATH)
++customLINKFLAGS = commonEnvironment['customLINKFLAGS']
++commonEnvironment.Prepend(LINKFLAGS = customLINKFLAGS)
+ customSHLINKFLAGS = commonEnvironment['customSHLINKFLAGS']
+ commonEnvironment.Prepend(SHLINKFLAGS = customSHLINKFLAGS)
+ customSWIGFLAGS = commonEnvironment['customSWIGFLAGS']
+@@ -469,14 +487,6 @@
+ if commonEnvironment['buildRelease'] == '0':
+     commonEnvironment.Prepend(CPPFLAGS = ['-DBETA'])
+ 
+-if commonEnvironment['Lib64'] == '1':
+-    if getPlatform() == 'sunos':
+-        commonEnvironment.Prepend(LIBPATH = ['.', '#.', '/lib/64', '/usr/lib/64'])
+-    else:
+-        commonEnvironment.Prepend(LIBPATH = ['.', '#.', '/usr/local/lib64'])
+-else:
+-    commonEnvironment.Prepend(LIBPATH = ['.', '#.', '/usr/local/lib'])
+-
+ if commonEnvironment['Word64'] == '1':
+     if compilerSun():
+         commonEnvironment.Append(CCFLAGS = ['-xcode=pic32'])
+@@ -494,10 +504,7 @@
+ if getPlatform() == 'linux':
+     commonEnvironment.Append(CCFLAGS = ["-DLINUX"])
+     commonEnvironment.Append(CPPFLAGS = ['-DHAVE_SOCKETS'])
+-    commonEnvironment.Append(CPPPATH = ['/usr/local/include'])
+-    commonEnvironment.Append(CPPPATH = ['/usr/include'])
+     commonEnvironment.Append(CPPPATH = ['/usr/include'])
+-    commonEnvironment.Append(CPPPATH = ['/usr/X11R6/include'])
+     commonEnvironment.Append(CCFLAGS = ["-DPIPES"])
+     commonEnvironment.Append(LINKFLAGS = ['-Wl,-Bdynamic'])
+ elif getPlatform() == 'sunos':
+@@ -559,18 +566,17 @@
+ 
+ if getPlatform() == 'linux':
+     path1 = '/usr/include/python%s' % commonEnvironment['pythonVersion']
+-    path2 = '/usr/local/include/python%s' % commonEnvironment['pythonVersion']
+-    pythonIncludePath = [path1, path2]
++    pythonIncludePath = [path1]
+     path1 = '/usr/include/tcl%s' % commonEnvironment['tclversion']
+     path2 = '/usr/include/tk%s' % commonEnvironment['tclversion']
+     tclIncludePath = [path1, path2]
+     pythonLinkFlags = []
+     if commonEnvironment['Lib64'] == '1':
+         tmp = '/usr/lib64/python%s/config' % commonEnvironment['pythonVersion']
+-        pythonLibraryPath = ['/usr/local/lib64', '/usr/lib64', tmp]
++        pythonLibraryPath = ['/usr/lib64', tmp]
+     else:
+         tmp = '/usr/lib/python%s/config' % commonEnvironment['pythonVersion']
+-        pythonLibraryPath = ['/usr/local/lib', '/usr/lib', tmp]
++        pythonLibraryPath = ['/usr/lib', tmp]
+     pythonLibs = ['python%s' % commonEnvironment['pythonVersion']]
+ elif getPlatform() == 'sunos':
+     path1 = '/usr/include/python%s' % commonEnvironment['pythonVersion']
+@@ -777,6 +783,7 @@
+ zlibhfound = configure.CheckHeader("zlib.h", language = "C")
+ midiPluginSdkFound = configure.CheckHeader("funknown.h", language = "C++")
+ luaFound = configure.CheckHeader("lua.h", language = "C")
++luajitFound = configure.CheckLibWithHeader("luajit-5.1", "luajit-2.0/lua.h", language = "C")
+ #print 'LUA: %s' % (['no', 'yes'][int(luaFound)])
+ swigFound = 'swig' in commonEnvironment['TOOLS']
+ print 'Checking for SWIG... %s' % (['no', 'yes'][int(swigFound)])
+@@ -1452,25 +1459,31 @@
+     swigflags = csoundWrapperEnvironment['SWIGFLAGS']
+     print 'swigflags:', swigflags
+     luaWrapper = None
+-    if not (luaFound and commonEnvironment['buildLuaWrapper'] != '0'):
++    if not ((luaFound or luajitFound) and commonEnvironment['buildLuaWrapper'] != '0'):
+         print 'CONFIGURATION DECISION: Not building Lua wrapper to Csound C++ interface library.'
+     else:
+         print 'CONFIGURATION DECISION: Building Lua wrapper to Csound C++ interface library.'
+ 	luaWrapperEnvironment = csoundWrapperEnvironment.Clone()
+         if getPlatform() != 'win32':
+-            csoundWrapperEnvironment.Append(CPPPATH=['/usr/include/lua5.1'])
++            if luajitFound and commonEnvironment['useLuaJIT'] == '1':
++                csoundWrapperEnvironment.Append(CPPPATH=['/usr/include/luajit-2.0'])
++            else:
++                csoundWrapperEnvironment.Append(CPPPATH=['/usr/include/lua5.1'])
+         if getPlatform() == 'win32':
+             csoundLuaInterface = luaWrapperEnvironment.SharedObject(
+ 		    'interfaces/lua_interface.i',
+ 		    SWIGFLAGS = [swigflags, '-lua', '-module', 'luaCsnd', '-outdir', '.'])
+ 	    luaWrapperEnvironment.Prepend(LIBS = ['csnd','lua51'])
+-	else:
+-	    csoundLuaInterface = luaWrapperEnvironment.SharedObject(
+-			'interfaces/lua_interface.i',
+-			SWIGFLAGS = [swigflags, '-lua', '-module', 'luaCsnd', '-outdir', '.'])
+-            luaWrapperEnvironment.Prepend(LIBS = ['csnd','luajit-5.1'])
+-       	luaWrapper = makeLuaModule(luaWrapperEnvironment, 'luaCsnd', [csoundLuaInterface])
+-	Depends(luaWrapper, csoundLuaInterface)
++        else:
++            csoundLuaInterface = luaWrapperEnvironment.SharedObject(
++            'interfaces/lua_interface.i',
++            SWIGFLAGS = [swigflags, '-lua', '-module', 'luaCsnd', '-outdir', '.'])
++            if luajitFound and commonEnvironment['useLuaJIT'] == '1':
++                luaWrapperEnvironment.Prepend(LIBS = ['csnd','luajit-5.1'])
++            else:
++                luaWrapperEnvironment.Prepend(LIBS = ['csnd','lua'])
++        luaWrapper = makeLuaModule(luaWrapperEnvironment, 'luaCsnd', [csoundLuaInterface])
++        Depends(luaWrapper, csoundLuaInterface)
+ 
+     if not (javaFound and commonEnvironment['buildJavaWrapper'] != '0'):
+         print 'CONFIGURATION DECISION: Not building Java wrapper to Csound C++ interface library.'
+@@ -1510,6 +1523,9 @@
+             javaWrapper = javaWrapperEnvironment.Program(
+                 'lib_jcsound.jnilib', javaWrapperSources)
+         else:
++            soname = 'lib_jcsound.so'
++            soflag = [ '-Wl,-soname=%s' % soname ]
++            javaWrapperEnvironment.Prepend(LINKFLAGS = [soflag])
+             javaWrapper = javaWrapperEnvironment.SharedLibrary(
+                 '_jcsound', javaWrapperSources)
+         #Depends(javaWrapper, csoundLibrary)
+@@ -1759,9 +1775,12 @@
+ 	jpluginEnvironment.Append(LINKFLAGS = ['-framework', 'Jackmp'])
+     makePlugin(jpluginEnvironment, 'jackTransport', 'Opcodes/jackTransport.c')
+     makePlugin(jpluginEnvironment, 'jacko', 'Opcodes/jacko.cpp')
+-if boostFound:
++if commonEnvironment['buildChuaOpcodes'] == '1' and boostFound:
++    print 'CONFIGURATION DECISION: Building chua opcodes.'
+     makePlugin(pluginEnvironment, 'chua', 'Opcodes/chua/ChuaOscillator.cpp')
+-if gmmFound and commonEnvironment['useDouble'] != '0':
++else:
++    print 'CONFIGURATION DECISION: Not building chua opcodes.'
++if commonEnvironment['buildLinearOpcodes'] == '1' and gmmFound and commonEnvironment['useDouble'] != '0':
+     makePlugin(pluginEnvironment, 'linear_algebra', 'Opcodes/linear_algebra.cpp')
+     print 'CONFIGURATION DECISION: Building linear algebra opcodes.'
+ else:
+@@ -1893,11 +1912,13 @@
+     alsaEnvironment.Append(LIBS = ['asound', 'pthread'])
+     makePlugin(alsaEnvironment, 'rtalsa', ['InOut/rtalsa.c'])
+ 
+-if pulseaudioFound and (getPlatform() == 'linux' or getPlatform() == 'sunos'):
++if commonEnvironment['usePulseAudio'] == '1' and pulseaudioFound and (getPlatform() == 'linux' or getPlatform() == 'sunos'):
+    print "CONFIGURATION DECISION: Building PulseAudio plugin"
+    pulseaudioEnv = pluginEnvironment.Clone()
+    pulseaudioEnv.Append(LIBS = ['pulse-simple'])
+    makePlugin(pulseaudioEnv, 'rtpulse', ['InOut/rtpulse.c'])
++else:
++   print "CONFIGURATION DECISION: Not building PulseAudio plugin."
+ 
+ if getPlatform() == 'win32':
+     winmmEnvironment = pluginEnvironment.Clone()
+@@ -1963,9 +1984,7 @@
+ 
+ # FLUIDSYNTH OPCODES
+ 
+-if not configure.CheckHeader("fluidsynth.h", language = "C"):
+-    print "CONFIGURATION DECISION: Not building fluid opcodes."
+-else:
++if commonEnvironment['buildFluidOpcodes'] == '1' and configure.CheckHeader("fluidsynth.h", language = "C"):
+ 	print "CONFIGURATION DECISION: Building fluid opcodes."
+ 	fluidEnvironment = pluginEnvironment.Clone()
+ 	if getPlatform() == 'win32':
+@@ -1981,6 +2000,8 @@
+ 		fluidEnvironment.Append(LIBS = ['pthread'])
+ 	makePlugin(fluidEnvironment, 'fluidOpcodes',
+ 			   ['Opcodes/fluidOpcodes/fluidOpcodes.cpp'])
++else:
++    print "CONFIGURATION DECISION: Not building fluid opcodes."
+ 
+ # VST HOST OPCODES
+ 
+@@ -2174,7 +2195,7 @@
+     if getPlatform() == 'win32' and pythonLibs[0] < 'python24':
+         Depends(pythonOpcodes, pythonImportLibrary)
+ 
+-# Python opcodes
++# Lua opcodes
+ 
+ if not (commonEnvironment['buildLuaOpcodes'] != '0'):
+     print "CONFIGURATION DECISION: Not building Lua opcodes."
+@@ -2183,10 +2204,13 @@
+     luaEnvironment = pluginEnvironment.Clone()
+     
+     if getPlatform() == 'linux':
+-       if(luaFound == 1):
++       if(luajitFound == 1 and commonEnvironment['useLuaJIT'] == '1'):
+          luaEnvironment.Append(LIBS = ['luajit-5.1'])
+          luaEnvironment.Append(LIBS = ['util', 'dl', 'm'])
+-         luaEnvironment.Append(CPPPATH = '/usr/local/include/luajit-2.0')
++         luaEnvironment.Append(CPPPATH = '/usr/include/luajit-2.0')
++       elif(luaFound == 1):
++         luaEnvironment.Append(LIBS = ['lua'])
++         luaEnvironment.Append(LIBS = ['util', 'dl', 'm'])
+     elif getPlatform() == 'win32':
+        if(luaFound == 1):
+         luaEnvironment.Append(LIBS = ['lua51'])
+@@ -2538,21 +2562,24 @@
+     Depends(csoundAcPythonModule, pythonWrapper)
+     Depends(csoundAcPythonModule, csoundac)
+     Depends(csoundAcPythonModule, csnd)
+-    if luaFound and commonEnvironment['buildLuaWrapper'] != '0':
+-       luaCsoundACWrapperEnvironment = acWrapperEnvironment.Clone()
+-       if getPlatform() == 'win32':
+-       	  luaCsoundACWrapperEnvironment.Prepend(LIBS = Split('luaCsnd lua51 CsoundAC csnd fltk_images'))
+-       else:
+-       	  luaCsoundACWrapperEnvironment.Prepend(LIBS = [luaWrapper])
+-       	  luaCsoundACWrapperEnvironment.Prepend(LIBS = Split('luajit-5.1 CsoundAC csnd fltk_images'))
+-       luaCsoundACWrapper = luaCsoundACWrapperEnvironment.SharedObject(
+-       	 'frontends/CsoundAC/luaCsoundAC.i', SWIGFLAGS = [swigflags, Split('-lua ')])
+-       luaCsoundACWrapperEnvironment.Clean('.', 'frontends/CsoundAC/luaCsoundAC_wrap.h')
+-       CsoundAclModule = makeLuaModule(luaCsoundACWrapperEnvironment, 'luaCsoundAC', [luaCsoundACWrapper])
+-       Depends(CsoundAclModule, luaCsoundACWrapper)
+-       Depends(CsoundAclModule, luaWrapper)
+-       Depends(CsoundAclModule, csoundac)
+-       Depends(CsoundAclModule, csnd)
++    if (luajitFound or luaFound) and commonEnvironment['buildLuaWrapper'] != '0':
++        luaCsoundACWrapperEnvironment = acWrapperEnvironment.Clone()
++        if getPlatform() == 'win32':
++            luaCsoundACWrapperEnvironment.Prepend(LIBS = Split('luaCsnd lua51 CsoundAC csnd fltk_images'))
++        else:
++            luaCsoundACWrapperEnvironment.Prepend(LIBS = [luaWrapper])
++            if commonEnvironment['useLuaJIT'] == '1':
++                luaCsoundACWrapperEnvironment.Prepend(LIBS = Split('luajit-5.1 CsoundAC csnd fltk_images'))
++            else:
++                luaCsoundACWrapperEnvironment.Prepend(LIBS = Split('lua CsoundAC csnd fltk_images'))
++        luaCsoundACWrapper = luaCsoundACWrapperEnvironment.SharedObject(
++            'frontends/CsoundAC/luaCsoundAC.i', SWIGFLAGS = [swigflags, Split('-lua ')])
++        luaCsoundACWrapperEnvironment.Clean('.', 'frontends/CsoundAC/luaCsoundAC_wrap.h')
++        CsoundAclModule = makeLuaModule(luaCsoundACWrapperEnvironment, 'luaCsoundAC', [luaCsoundACWrapper])
++        Depends(CsoundAclModule, luaCsoundACWrapper)
++        Depends(CsoundAclModule, luaWrapper)
++        Depends(CsoundAclModule, csoundac)
++        Depends(CsoundAclModule, csnd)
+ 
+ 
+ # Build CsoundVST
diff --git a/media-video/leechcraft-laure/Manifest b/media-video/leechcraft-laure/Manifest
index f2e9e42534d8..aa8502e2b992 100644
--- a/media-video/leechcraft-laure/Manifest
+++ b/media-video/leechcraft-laure/Manifest
@@ -1 +1 @@
-DIST leechcraft-0.5.60.tar.xz 2048000 RMD160 505a90f631779a1918ea814602288732b4f8af89 SHA1 b03ce9bb160c00c6be2f50af4e061c5d7777d630 SHA256 b7ee7aff4b07fa383da169346979701f4a428fc29d4e8b77a31f27561b025baf
+DIST leechcraft-0.5.60.tar.xz 4743936 RMD160 e845b9f9e7b0bdebd2c99822ffd3e15c019f6051 SHA1 2941679520e6871372eac31d1e683615a8dd64e6 SHA256 477d8fc54167798337e64324575d12cf1cace4d6502bb14d892edd2ed4b5a7f4
diff --git a/media-video/leechcraft-lmp/Manifest b/media-video/leechcraft-lmp/Manifest
index 82981786c7aa..4eb4c41f47fc 100644
--- a/media-video/leechcraft-lmp/Manifest
+++ b/media-video/leechcraft-lmp/Manifest
@@ -1,3 +1,3 @@
 DIST leechcraft-0.4.99.tar.xz 4601736 RMD160 343e64a430cd55f401989b1c89a74a9c2ddf1e33 SHA1 c8275ea635d7ea579b95a70e64372658928752f7 SHA256 967ca3a9b942d71da7f4818ba912f12b386b553fe4abded04c7d1956473e4e42
-DIST leechcraft-0.5.0.tar.xz 4691312 RMD160 4ea82848fe59fcd1159fa835dfb94ff81775f964 SHA1 0d01a9b38fd1ce136d678803a1270538fb8e3cc4 SHA256 ef0802442b803079dc491f73ff0294cb8560d86fbea44c8e57b3d54fdf3b88fa
-DIST leechcraft-0.5.60.tar.xz 2048000 RMD160 505a90f631779a1918ea814602288732b4f8af89 SHA1 b03ce9bb160c00c6be2f50af4e061c5d7777d630 SHA256 b7ee7aff4b07fa383da169346979701f4a428fc29d4e8b77a31f27561b025baf
+DIST leechcraft-0.5.0.tar.xz 7240 RMD160 41109d2b24cf188f31bafc9d65950ecb223f1fb7 SHA1 e32a08d9926a8351fcdbc13649e0fe83bbefb84a SHA256 762751d75d2bfa76656b8a88feae193af3c9467f74749ba182212bbe72eea1fc
+DIST leechcraft-0.5.60.tar.xz 4743936 RMD160 e845b9f9e7b0bdebd2c99822ffd3e15c019f6051 SHA1 2941679520e6871372eac31d1e683615a8dd64e6 SHA256 477d8fc54167798337e64324575d12cf1cace4d6502bb14d892edd2ed4b5a7f4
diff --git a/media-video/libav/libav-0.6.5.ebuild b/media-video/libav/libav-0.6.5.ebuild
index 1dbe3dceb578..e52b50b5bf7f 100644
--- a/media-video/libav/libav-0.6.5.ebuild
+++ b/media-video/libav/libav-0.6.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-0.6.5.ebuild,v 1.3 2012/02/09 12:01:20 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-0.6.5.ebuild,v 1.4 2012/03/22 01:32:51 flameeyes Exp $
 
 EAPI=4
 
@@ -87,7 +87,7 @@ src_prepare() {
 }
 
 src_configure() {
-	local myconf="${EXTRA_FFMPEG_CONF}"
+	local myconf="${EXTRA_LIBAV_CONF}"
 	local uses i
 
 	# enabled by default
diff --git a/media-video/libav/libav-0.7.4.ebuild b/media-video/libav/libav-0.7.4.ebuild
index b1c33b7793e5..db563f869cca 100644
--- a/media-video/libav/libav-0.7.4.ebuild
+++ b/media-video/libav/libav-0.7.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-0.7.4.ebuild,v 1.2 2012/03/20 22:58:59 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-0.7.4.ebuild,v 1.4 2012/03/22 01:32:51 flameeyes Exp $
 
 EAPI=4
 
@@ -94,10 +94,10 @@ src_prepare() {
 }
 
 src_configure() {
-	local myconf="${EXTRA_FFMPEG_CONF}"
+	local myconf="${EXTRA_LIBAV_CONF}"
 	local uses i
 
-	myconf="
+	myconf+="
 		$(use_enable gpl)
 		$(use_enable gpl version3)
 		--enable-postproc
diff --git a/media-video/libav/libav-0.7.9999.ebuild b/media-video/libav/libav-0.7.9999.ebuild
index ffdc554b7303..0180e21ea31d 100644
--- a/media-video/libav/libav-0.7.9999.ebuild
+++ b/media-video/libav/libav-0.7.9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-0.7.9999.ebuild,v 1.6 2012/03/20 22:58:59 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-0.7.9999.ebuild,v 1.7 2012/03/22 01:08:51 flameeyes Exp $
 
 EAPI=4
 
@@ -94,10 +94,10 @@ src_prepare() {
 }
 
 src_configure() {
-	local myconf="${EXTRA_FFMPEG_CONF}"
+	local myconf="${EXTRA_LIBAV_CONF}"
 	local uses i
 
-	myconf="
+	myconf+="
 		$(use_enable gpl)
 		$(use_enable gpl version3)
 		--enable-postproc
diff --git a/media-video/libav/libav-0.8.1.ebuild b/media-video/libav/libav-0.8.1.ebuild
index 0f010371dc30..7801fe4ea025 100644
--- a/media-video/libav/libav-0.8.1.ebuild
+++ b/media-video/libav/libav-0.8.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-0.8.1.ebuild,v 1.2 2012/03/20 22:58:59 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-0.8.1.ebuild,v 1.4 2012/03/22 01:32:51 flameeyes Exp $
 
 EAPI=4
 
@@ -106,10 +106,10 @@ src_prepare() {
 }
 
 src_configure() {
-	local myconf="${EXTRA_FFMPEG_CONF}"
+	local myconf="${EXTRA_LIBAV_CONF}"
 	local uses i
 
-	myconf="
+	myconf+="
 		$(use_enable gpl)
 		$(use_enable gpl version3)
 		--enable-postproc
diff --git a/media-video/libav/libav-0.8.9999.ebuild b/media-video/libav/libav-0.8.9999.ebuild
index 60d4bd2f9ed9..4d3ce528606d 100644
--- a/media-video/libav/libav-0.8.9999.ebuild
+++ b/media-video/libav/libav-0.8.9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-0.8.9999.ebuild,v 1.7 2012/03/20 22:58:59 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-0.8.9999.ebuild,v 1.8 2012/03/22 01:08:51 flameeyes Exp $
 
 EAPI=4
 
@@ -106,10 +106,10 @@ src_prepare() {
 }
 
 src_configure() {
-	local myconf="${EXTRA_FFMPEG_CONF}"
+	local myconf="${EXTRA_LIBAV_CONF}"
 	local uses i
 
-	myconf="
+	myconf+="
 		$(use_enable gpl)
 		$(use_enable gpl version3)
 		--enable-postproc
diff --git a/media-video/libav/libav-0.8.ebuild b/media-video/libav/libav-0.8.ebuild
index 099c878817b9..bb2dfefbfed0 100644
--- a/media-video/libav/libav-0.8.ebuild
+++ b/media-video/libav/libav-0.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-0.8.ebuild,v 1.9 2012/03/20 22:58:59 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-0.8.ebuild,v 1.11 2012/03/22 01:32:51 flameeyes Exp $
 
 EAPI=4
 
@@ -106,10 +106,10 @@ src_prepare() {
 }
 
 src_configure() {
-	local myconf="${EXTRA_FFMPEG_CONF}"
+	local myconf="${EXTRA_LIBAV_CONF}"
 	local uses i
 
-	myconf="
+	myconf+="
 		$(use_enable gpl)
 		$(use_enable gpl version3)
 		--enable-postproc
diff --git a/media-video/libav/libav-9999.ebuild b/media-video/libav/libav-9999.ebuild
index bf135c06a239..71ff1076020a 100644
--- a/media-video/libav/libav-9999.ebuild
+++ b/media-video/libav/libav-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-9999.ebuild,v 1.35 2012/03/20 22:58:59 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-9999.ebuild,v 1.37 2012/03/22 01:08:51 flameeyes Exp $
 
 EAPI=4
 
@@ -107,10 +107,10 @@ src_prepare() {
 TOOLS="aviocat graph2dot ismindex qt-faststart"
 
 src_configure() {
-	local myconf="${EXTRA_FFMPEG_CONF}"
+	local myconf="${EXTRA_LIBAV_CONF}"
 	local uses i
 
-	myconf="
+	myconf+="
 		$(use_enable gpl)
 		$(use_enable gpl version3)
 		--enable-avfilter
diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index 8ebf86c08a07..7a02e7823af9 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -3,4 +3,4 @@ DIST vlc-2.0.0.tar.xz 17144876 RMD160 6c4d1401a7cc5b1c66dde7eb896347a728961d2b S
 DIST vlc-2.0.1.tar.xz 17210552 RMD160 9d932e1be72b65cf47057191d9e84deeedea282c SHA1 40d0ed360dd3fa7dc3ff4fbc9c319553ebb22538 SHA256 7f485725c17487a77d70844cbd9acf528360d65cd6ff79d206657920f4fcbf4b
 DIST vlc-patches-101.tar.bz2 3011 RMD160 785ba728c04f025ca8377061e82c6c865d50a736 SHA1 e9be6b192bb3d69e4bd2387a9854543e0f8b3132 SHA256 abd3af99b9c2fa76b67a2e9c72e2d81982f1bca93cb5e3b2f33d29de9e395dae
 DIST vlc-patches-105.tar.bz2 4325 RMD160 1fc8f5edc1f136c7074a5a00aabec583aec1cc58 SHA1 9f70e4a7ac7749da58b0134f4de79227a6b66c69 SHA256 e28047c097de2b1daa26b32227f11bb06d09a060b93c6ae2fe564094373f0778
-DIST vlc-patches-106.tar.bz2 3662 RMD160 1f3365ec69bad76ac31f3c12b762fdfb81389eaf SHA1 cc9ada821c58aa6b1d5ef881f1ac1c2f871cddf1 SHA256 ea02e3428bd72b0f9b58723c1773e6eafaf8518e83a2eeb2dc3a95ecfd0b59bb
+DIST vlc-patches-107.tar.bz2 4694 RMD160 341138714b59572bb4aaa7af96cfbebcfdd76d28 SHA1 60217caa88a35487a28eaab4f95e2dc6bae6ec98 SHA256 b371af609bd3d8ed11769b72b9bdb82bc231a8e2058c8965567ab4fa9363b4ca
diff --git a/media-video/vlc/vlc-2.0.1.ebuild b/media-video/vlc/vlc-2.0.1.ebuild
index 1923bba5b3a2..e269fc8a108f 100644
--- a/media-video/vlc/vlc-2.0.1.ebuild
+++ b/media-video/vlc/vlc-2.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.0.1.ebuild,v 1.2 2012/03/20 10:43:13 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.0.1.ebuild,v 1.3 2012/03/22 01:53:28 aballier Exp $
 
 EAPI="4"
 
@@ -21,7 +21,7 @@ MY_PV="${PV/_/-}"
 MY_PV="${MY_PV/-beta/-test}"
 MY_P="${PN}-${MY_PV}"
 
-PATCHLEVEL="106"
+PATCHLEVEL="107"
 DESCRIPTION="VLC media player - Video player and streamer"
 HOMEPAGE="http://www.videolan.org/vlc/"
 if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
diff --git a/metadata/cache/app-accessibility/brltty-4.2 b/metadata/cache/app-accessibility/brltty-4.2
index aa36cc2f19d8..25327f978124 100644
--- a/metadata/cache/app-accessibility/brltty-4.2
+++ b/metadata/cache/app-accessibility/brltty-4.2
@@ -1,4 +1,4 @@
-java? ( >=virtual/jdk-1.4 ) bluetooth? ( net-wireless/bluez ) gpm? ( >=sys-libs/gpm-1.20 ) iconv? ( virtual/libiconv ) icu? ( dev-libs/icu ) nls? ( virtual/libintl ) python? ( >=dev-python/pyrex-0.9.4.1 ) tcl? ( >=dev-lang/tcl-8.4.15 ) usb? ( virtual/libusb:0 ) X? ( x11-libs/libXaw ) ocaml? ( >=dev-ml/findlib-1.0.4-r1 ) java? ( >=dev-java/java-config-2.1.9-r1 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+java? ( >=virtual/jdk-1.4 ) bluetooth? ( net-wireless/bluez ) gpm? ( >=sys-libs/gpm-1.20 ) iconv? ( virtual/libiconv ) icu? ( dev-libs/icu ) nls? ( virtual/libintl ) python? ( >=dev-python/pyrex-0.9.4.1 ) tcl? ( >=dev-lang/tcl-8.4.15 ) usb? ( virtual/libusb:0 ) X? ( x11-libs/libXaw ) ocaml? ( >=dev-ml/findlib-1.0.4-r1 ) java? ( >=dev-java/java-config-2.1.9-r1 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 java? ( >=virtual/jre-1.4 ) bluetooth? ( net-wireless/bluez ) gpm? ( >=sys-libs/gpm-1.20 ) iconv? ( virtual/libiconv ) icu? ( dev-libs/icu ) nls? ( virtual/libintl ) python? ( >=dev-python/pyrex-0.9.4.1 ) tcl? ( >=dev-lang/tcl-8.4.15 ) usb? ( virtual/libusb:0 ) X? ( x11-libs/libXaw ) java? ( >=dev-java/java-config-2.1.9-r1 )
 0
 http://mielke.cc/brltty/releases/brltty-4.2.tar.gz
diff --git a/metadata/cache/app-accessibility/java-access-bridge-1.24.2 b/metadata/cache/app-accessibility/java-access-bridge-1.24.2
index c8dc93e2f5ca..6adefb9c88c7 100644
--- a/metadata/cache/app-accessibility/java-access-bridge-1.24.2
+++ b/metadata/cache/app-accessibility/java-access-bridge-1.24.2
@@ -1,4 +1,4 @@
->=gnome-base/libbonobo-2 >=gnome-extra/at-spi-1.7.10:1 >=virtual/jdk-1.4 >=dev-util/pkgconfig-0.9 >=dev-java/java-config-2.1.9-r1 >=sys-apps/sed-4 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=gnome-base/libbonobo-2 >=gnome-extra/at-spi-1.7.10:1 >=virtual/jdk-1.4 >=dev-util/pkgconfig-0.9 >=dev-java/java-config-2.1.9-r1 >=sys-apps/sed-4 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=gnome-base/libbonobo-2 >=gnome-extra/at-spi-1.7.10:1 >=virtual/jre-1.4 >=dev-java/java-config-2.1.9-r1
 0
 mirror://gnome/sources/java-access-bridge/1.24/java-access-bridge-1.24.2.tar.bz2
diff --git a/metadata/cache/app-accessibility/java-access-bridge-1.26.0 b/metadata/cache/app-accessibility/java-access-bridge-1.26.0
index e914cd06a51d..11194633a0a0 100644
--- a/metadata/cache/app-accessibility/java-access-bridge-1.26.0
+++ b/metadata/cache/app-accessibility/java-access-bridge-1.26.0
@@ -1,4 +1,4 @@
->=gnome-base/libbonobo-2 >=gnome-extra/at-spi-1.7.10:1 x11-apps/xprop >=virtual/jdk-1.4 >=dev-util/pkgconfig-0.9 >=dev-java/java-config-2.1.9-r1 >=sys-apps/sed-4 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=gnome-base/libbonobo-2 >=gnome-extra/at-spi-1.7.10:1 x11-apps/xprop >=virtual/jdk-1.4 >=dev-util/pkgconfig-0.9 >=dev-java/java-config-2.1.9-r1 >=sys-apps/sed-4 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=gnome-base/libbonobo-2 >=gnome-extra/at-spi-1.7.10:1 x11-apps/xprop >=virtual/jre-1.4 >=dev-java/java-config-2.1.9-r1
 0
 mirror://gnome/sources/java-access-bridge/1.26/java-access-bridge-1.26.0.tar.bz2
diff --git a/metadata/cache/app-accessibility/java-access-bridge-1.6.0-r2 b/metadata/cache/app-accessibility/java-access-bridge-1.6.0-r2
index ca0967b5545a..e930561c0e53 100644
--- a/metadata/cache/app-accessibility/java-access-bridge-1.6.0-r2
+++ b/metadata/cache/app-accessibility/java-access-bridge-1.6.0-r2
@@ -1,4 +1,4 @@
->=gnome-base/libbonobo-2 >=gnome-extra/at-spi-1.7.10:1 >=virtual/jdk-1.4 >=dev-util/pkgconfig-0.9 >=dev-java/java-config-2.1.9-r1 >=sys-apps/sed-4 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=gnome-base/libbonobo-2 >=gnome-extra/at-spi-1.7.10:1 >=virtual/jdk-1.4 >=dev-util/pkgconfig-0.9 >=dev-java/java-config-2.1.9-r1 >=sys-apps/sed-4 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=gnome-base/libbonobo-2 >=gnome-extra/at-spi-1.7.10:1 >=virtual/jre-1.4 >=dev-java/java-config-2.1.9-r1
 0
 mirror://gnome/sources/java-access-bridge/1.6/java-access-bridge-1.6.0.tar.bz2
diff --git a/metadata/cache/app-accessibility/speech-dispatcher-0.7.1-r1 b/metadata/cache/app-accessibility/speech-dispatcher-0.7.1-r1
index 64bc0206be07..5929e594a410 100644
--- a/metadata/cache/app-accessibility/speech-dispatcher-0.7.1-r1
+++ b/metadata/cache/app-accessibility/speech-dispatcher-0.7.1-r1
@@ -1,4 +1,4 @@
-dev-libs/dotconf >=dev-libs/glib-2 alsa? ( media-libs/alsa-lib ) ao? ( media-libs/libao ) espeak? ( app-accessibility/espeak ) flite? ( app-accessibility/flite ) nas? ( media-libs/nas ) pulseaudio? ( media-sound/pulseaudio ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( =dev-lang/python-2* )
+dev-libs/dotconf >=dev-libs/glib-2 alsa? ( media-libs/alsa-lib ) ao? ( media-libs/libao ) espeak? ( app-accessibility/espeak ) flite? ( app-accessibility/flite ) nas? ( media-libs/nas ) pulseaudio? ( media-sound/pulseaudio ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( =dev-lang/python-2* )
 dev-libs/dotconf >=dev-libs/glib-2 alsa? ( media-libs/alsa-lib ) ao? ( media-libs/libao ) espeak? ( app-accessibility/espeak ) flite? ( app-accessibility/flite ) nas? ( media-libs/nas ) pulseaudio? ( media-sound/pulseaudio ) python? ( =dev-lang/python-2* )
 0
 http://www.freebsoft.org/pub/projects/speechd/speech-dispatcher-0.7.1.tar.gz
diff --git a/metadata/cache/app-accessibility/sphinx2-0.6 b/metadata/cache/app-accessibility/sphinx2-0.6
index dd95d5cd16fb..ce8463a51fed 100644
--- a/metadata/cache/app-accessibility/sphinx2-0.6
+++ b/metadata/cache/app-accessibility/sphinx2-0.6
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 mirror://sourceforge/cmusphinx/sphinx2-0.6.tar.gz
diff --git a/metadata/cache/app-accessibility/yasr-0.6.9-r1 b/metadata/cache/app-accessibility/yasr-0.6.9-r1
index cba25fdd9122..db1d379fb01c 100644
--- a/metadata/cache/app-accessibility/yasr-0.6.9-r1
+++ b/metadata/cache/app-accessibility/yasr-0.6.9-r1
@@ -1,4 +1,4 @@
-nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 mirror://sourceforge/yasr/yasr-0.6.9.tar.gz
diff --git a/metadata/cache/app-admin/abrt-2.0.6 b/metadata/cache/app-admin/abrt-2.0.6
index 65b9cddc2ae3..d86bc82b728f 100644
--- a/metadata/cache/app-admin/abrt-2.0.6
+++ b/metadata/cache/app-admin/abrt-2.0.6
@@ -1,4 +1,4 @@
-dev-libs/btparser >=dev-libs/glib-2.21:2 dev-libs/libreport dev-libs/libxml2 dev-libs/nss sys-apps/dbus sys-fs/inotify-tools x11-libs/gtk+:2 x11-libs/libnotify app-text/asciidoc app-text/xmlto >=dev-util/intltool-0.35.0 >=dev-util/pkgconfig-0.9.0 >=sys-devel/gettext-0.17 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) !<sys-apps/systemd-29-r4 !=sys-apps/systemd-37-r1
+dev-libs/btparser >=dev-libs/glib-2.21:2 dev-libs/libreport dev-libs/libxml2 dev-libs/nss sys-apps/dbus sys-fs/inotify-tools x11-libs/gtk+:2 x11-libs/libnotify app-text/asciidoc app-text/xmlto >=dev-util/intltool-0.35.0 >=dev-util/pkgconfig-0.9.0 >=sys-devel/gettext-0.17 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) !<sys-apps/systemd-29-r4 !=sys-apps/systemd-37-r1
 dev-libs/btparser >=dev-libs/glib-2.21:2 dev-libs/libreport dev-libs/libxml2 dev-libs/nss sys-apps/dbus sys-fs/inotify-tools x11-libs/gtk+:2 x11-libs/libnotify app-arch/cpio dev-libs/elfutils sys-devel/gdb || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
 0
 https://fedorahosted.org/released/abrt/abrt-2.0.6.tar.gz
diff --git a/metadata/cache/app-admin/abrt-2.0.8 b/metadata/cache/app-admin/abrt-2.0.8
index 56315065425e..a3f254fcb3ad 100644
--- a/metadata/cache/app-admin/abrt-2.0.8
+++ b/metadata/cache/app-admin/abrt-2.0.8
@@ -1,4 +1,4 @@
->=dev-libs/btparser-0.16 >=dev-libs/glib-2.21:2 >=dev-libs/libreport-2.0.9 dev-libs/libxml2 dev-libs/nss sys-apps/dbus sys-fs/inotify-tools x11-libs/gtk+:2 x11-libs/libnotify app-text/asciidoc app-text/xmlto >=dev-util/intltool-0.35.0 >=dev-util/pkgconfig-0.9.0 >=sys-devel/gettext-0.17 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) !<sys-apps/systemd-29-r4 !=sys-apps/systemd-37-r1
+>=dev-libs/btparser-0.16 >=dev-libs/glib-2.21:2 >=dev-libs/libreport-2.0.9 dev-libs/libxml2 dev-libs/nss sys-apps/dbus sys-fs/inotify-tools x11-libs/gtk+:2 x11-libs/libnotify app-text/asciidoc app-text/xmlto >=dev-util/intltool-0.35.0 >=dev-util/pkgconfig-0.9.0 >=sys-devel/gettext-0.17 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) !<sys-apps/systemd-29-r4 !=sys-apps/systemd-37-r1
 >=dev-libs/btparser-0.16 >=dev-libs/glib-2.21:2 >=dev-libs/libreport-2.0.9 dev-libs/libxml2 dev-libs/nss sys-apps/dbus sys-fs/inotify-tools x11-libs/gtk+:2 x11-libs/libnotify app-arch/cpio dev-libs/elfutils >=sys-devel/gdb-7 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
 0
 https://fedorahosted.org/released/abrt/abrt-2.0.8.tar.gz
diff --git a/metadata/cache/app-admin/apachetop-0.12.6-r1 b/metadata/cache/app-admin/apachetop-0.12.6-r1
index 1ff162439d2b..5c282fd0b281 100644
--- a/metadata/cache/app-admin/apachetop-0.12.6-r1
+++ b/metadata/cache/app-admin/apachetop-0.12.6-r1
@@ -1,4 +1,4 @@
-fam? ( virtual/fam ) pcre? ( dev-libs/libpcre ) adns? ( net-libs/adns ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+fam? ( virtual/fam ) pcre? ( dev-libs/libpcre ) adns? ( net-libs/adns ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 fam? ( virtual/fam ) pcre? ( dev-libs/libpcre ) adns? ( net-libs/adns )
 0
 http://www.webta.org/apachetop/apachetop-0.12.6.tar.gz
diff --git a/metadata/cache/app-admin/ccze-0.2.1-r3 b/metadata/cache/app-admin/ccze-0.2.1-r3
index 582d03fed1e8..0703d2a67742 100644
--- a/metadata/cache/app-admin/ccze-0.2.1-r3
+++ b/metadata/cache/app-admin/ccze-0.2.1-r3
@@ -1,4 +1,4 @@
-dev-libs/libpcre sys-libs/ncurses >=sys-apps/sed-4 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-libs/libpcre sys-libs/ncurses >=sys-apps/sed-4 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-libs/libpcre sys-libs/ncurses
 0
 mirror://gentoo/ccze-0.2.1.tar.gz
diff --git a/metadata/cache/app-admin/chrpath-0.13-r2 b/metadata/cache/app-admin/chrpath-0.13-r2
index eba860a40e4c..b889b7dd7bfd 100644
--- a/metadata/cache/app-admin/chrpath-0.13-r2
+++ b/metadata/cache/app-admin/chrpath-0.13-r2
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 http://ftp.tux.org/pub/X-Windows/ftp.hungry.com/chrpath/chrpath-0.13.tar.gz
diff --git a/metadata/cache/app-admin/collectd-5.0.2 b/metadata/cache/app-admin/collectd-5.0.2
index 2ae6d9cb8b31..700c467b0b4e 100644
--- a/metadata/cache/app-admin/collectd-5.0.2
+++ b/metadata/cache/app-admin/collectd-5.0.2
@@ -1,4 +1,4 @@
-dev-libs/libgcrypt sys-devel/libtool perl? ( dev-lang/perl[ithreads] ( || ( sys-devel/libperl[ithreads] >=sys-devel/libperl-5.10 ) ) ) collectd_plugins_apache? ( net-misc/curl ) collectd_plugins_ascent? ( net-misc/curl dev-libs/libxml2 ) collectd_plugins_bind? ( dev-libs/libxml2 ) collectd_plugins_curl? ( net-misc/curl ) collectd_plugins_curl_json? ( net-misc/curl dev-libs/yajl ) collectd_plugins_curl_xml? ( net-misc/curl dev-libs/libxml2 ) collectd_plugins_dbi? ( dev-db/libdbi ) collectd_plugins_dns? ( net-libs/libpcap ) collectd_plugins_gmond? ( sys-cluster/ganglia ) collectd_plugins_ipmi? ( >=sys-libs/openipmi-2.0.16-r1 ) collectd_plugins_iptables? ( >=net-firewall/iptables-1.4.9.1-r2 ) collectd_plugins_java? ( virtual/jre dev-java/java-config-wrapper ) collectd_plugins_libvirt? ( app-emulation/libvirt dev-libs/libxml2 ) collectd_plugins_memcachec? ( dev-libs/libmemcached ) collectd_plugins_mysql? ( >=virtual/mysql-5.0 ) collectd_plugins_netlink? ( >=sys-apps/iproute2-2.6.34 ) collectd_plugins_nginx? ( net-misc/curl ) collectd_plugins_notify_desktop? ( x11-libs/libnotify ) collectd_plugins_notify_email? ( >=net-libs/libesmtp-1.0.4 dev-libs/openssl ) collectd_plugins_nut? ( sys-power/nut ) collectd_plugins_onewire? ( sys-fs/owfs ) collectd_plugins_oracle? ( >=dev-db/oracle-instantclient-basic-11.2.0.1.0 ) collectd_plugins_perl? ( dev-lang/perl[ithreads] ( || ( sys-devel/libperl[ithreads] >=sys-devel/libperl-5.10 ) ) ) collectd_plugins_ping? ( net-libs/liboping ) collectd_plugins_postgresql? ( >=dev-db/postgresql-base-8.2 ) collectd_plugins_python? ( =dev-lang/python-2* ) collectd_plugins_routeros? ( net-libs/librouteros ) collectd_plugins_rrdcached? ( >=net-analyzer/rrdtool-1.4 ) collectd_plugins_rrdtool? ( >=net-analyzer/rrdtool-1.2.27 ) collectd_plugins_sensors? ( sys-apps/lm_sensors ) collectd_plugins_snmp? ( net-analyzer/net-snmp ) collectd_plugins_tokyotyrant? ( net-misc/tokyotyrant ) collectd_plugins_varnish? ( www-servers/varnish ) collectd_plugins_write_http? ( net-misc/curl ) kernel_FreeBSD? ( collectd_plugins_disk? ( >=sys-libs/libstatgrab-0.16 ) collectd_plugins_interface? ( >=sys-libs/libstatgrab-0.16 ) collectd_plugins_load? ( >=sys-libs/libstatgrab-0.16 ) collectd_plugins_memory? ( >=sys-libs/libstatgrab-0.16 ) collectd_plugins_swap? ( >=sys-libs/libstatgrab-0.16 ) collectd_plugins_users? ( >=sys-libs/libstatgrab-0.16 ) ) dev-util/pkgconfig kernel_linux? ( collectd_plugins_vserver? ( sys-kernel/vserver-sources ) ) dev-lang/perl[-build] || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-libs/libgcrypt sys-devel/libtool perl? ( dev-lang/perl[ithreads] ( || ( sys-devel/libperl[ithreads] >=sys-devel/libperl-5.10 ) ) ) collectd_plugins_apache? ( net-misc/curl ) collectd_plugins_ascent? ( net-misc/curl dev-libs/libxml2 ) collectd_plugins_bind? ( dev-libs/libxml2 ) collectd_plugins_curl? ( net-misc/curl ) collectd_plugins_curl_json? ( net-misc/curl dev-libs/yajl ) collectd_plugins_curl_xml? ( net-misc/curl dev-libs/libxml2 ) collectd_plugins_dbi? ( dev-db/libdbi ) collectd_plugins_dns? ( net-libs/libpcap ) collectd_plugins_gmond? ( sys-cluster/ganglia ) collectd_plugins_ipmi? ( >=sys-libs/openipmi-2.0.16-r1 ) collectd_plugins_iptables? ( >=net-firewall/iptables-1.4.9.1-r2 ) collectd_plugins_java? ( virtual/jre dev-java/java-config-wrapper ) collectd_plugins_libvirt? ( app-emulation/libvirt dev-libs/libxml2 ) collectd_plugins_memcachec? ( dev-libs/libmemcached ) collectd_plugins_mysql? ( >=virtual/mysql-5.0 ) collectd_plugins_netlink? ( >=sys-apps/iproute2-2.6.34 ) collectd_plugins_nginx? ( net-misc/curl ) collectd_plugins_notify_desktop? ( x11-libs/libnotify ) collectd_plugins_notify_email? ( >=net-libs/libesmtp-1.0.4 dev-libs/openssl ) collectd_plugins_nut? ( sys-power/nut ) collectd_plugins_onewire? ( sys-fs/owfs ) collectd_plugins_oracle? ( >=dev-db/oracle-instantclient-basic-11.2.0.1.0 ) collectd_plugins_perl? ( dev-lang/perl[ithreads] ( || ( sys-devel/libperl[ithreads] >=sys-devel/libperl-5.10 ) ) ) collectd_plugins_ping? ( net-libs/liboping ) collectd_plugins_postgresql? ( >=dev-db/postgresql-base-8.2 ) collectd_plugins_python? ( =dev-lang/python-2* ) collectd_plugins_routeros? ( net-libs/librouteros ) collectd_plugins_rrdcached? ( >=net-analyzer/rrdtool-1.4 ) collectd_plugins_rrdtool? ( >=net-analyzer/rrdtool-1.2.27 ) collectd_plugins_sensors? ( sys-apps/lm_sensors ) collectd_plugins_snmp? ( net-analyzer/net-snmp ) collectd_plugins_tokyotyrant? ( net-misc/tokyotyrant ) collectd_plugins_varnish? ( www-servers/varnish ) collectd_plugins_write_http? ( net-misc/curl ) kernel_FreeBSD? ( collectd_plugins_disk? ( >=sys-libs/libstatgrab-0.16 ) collectd_plugins_interface? ( >=sys-libs/libstatgrab-0.16 ) collectd_plugins_load? ( >=sys-libs/libstatgrab-0.16 ) collectd_plugins_memory? ( >=sys-libs/libstatgrab-0.16 ) collectd_plugins_swap? ( >=sys-libs/libstatgrab-0.16 ) collectd_plugins_users? ( >=sys-libs/libstatgrab-0.16 ) ) dev-util/pkgconfig kernel_linux? ( collectd_plugins_vserver? ( sys-kernel/vserver-sources ) ) dev-lang/perl[-build] || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-libs/libgcrypt sys-devel/libtool perl? ( dev-lang/perl[ithreads] ( || ( sys-devel/libperl[ithreads] >=sys-devel/libperl-5.10 ) ) ) collectd_plugins_apache? ( net-misc/curl ) collectd_plugins_ascent? ( net-misc/curl dev-libs/libxml2 ) collectd_plugins_bind? ( dev-libs/libxml2 ) collectd_plugins_curl? ( net-misc/curl ) collectd_plugins_curl_json? ( net-misc/curl dev-libs/yajl ) collectd_plugins_curl_xml? ( net-misc/curl dev-libs/libxml2 ) collectd_plugins_dbi? ( dev-db/libdbi ) collectd_plugins_dns? ( net-libs/libpcap ) collectd_plugins_gmond? ( sys-cluster/ganglia ) collectd_plugins_ipmi? ( >=sys-libs/openipmi-2.0.16-r1 ) collectd_plugins_iptables? ( >=net-firewall/iptables-1.4.9.1-r2 ) collectd_plugins_java? ( virtual/jre dev-java/java-config-wrapper ) collectd_plugins_libvirt? ( app-emulation/libvirt dev-libs/libxml2 ) collectd_plugins_memcachec? ( dev-libs/libmemcached ) collectd_plugins_mysql? ( >=virtual/mysql-5.0 ) collectd_plugins_netlink? ( >=sys-apps/iproute2-2.6.34 ) collectd_plugins_nginx? ( net-misc/curl ) collectd_plugins_notify_desktop? ( x11-libs/libnotify ) collectd_plugins_notify_email? ( >=net-libs/libesmtp-1.0.4 dev-libs/openssl ) collectd_plugins_nut? ( sys-power/nut ) collectd_plugins_onewire? ( sys-fs/owfs ) collectd_plugins_oracle? ( >=dev-db/oracle-instantclient-basic-11.2.0.1.0 ) collectd_plugins_perl? ( dev-lang/perl[ithreads] ( || ( sys-devel/libperl[ithreads] >=sys-devel/libperl-5.10 ) ) ) collectd_plugins_ping? ( net-libs/liboping ) collectd_plugins_postgresql? ( >=dev-db/postgresql-base-8.2 ) collectd_plugins_python? ( =dev-lang/python-2* ) collectd_plugins_routeros? ( net-libs/librouteros ) collectd_plugins_rrdcached? ( >=net-analyzer/rrdtool-1.4 ) collectd_plugins_rrdtool? ( >=net-analyzer/rrdtool-1.2.27 ) collectd_plugins_sensors? ( sys-apps/lm_sensors ) collectd_plugins_snmp? ( net-analyzer/net-snmp ) collectd_plugins_tokyotyrant? ( net-misc/tokyotyrant ) collectd_plugins_varnish? ( www-servers/varnish ) collectd_plugins_write_http? ( net-misc/curl ) kernel_FreeBSD? ( collectd_plugins_disk? ( >=sys-libs/libstatgrab-0.16 ) collectd_plugins_interface? ( >=sys-libs/libstatgrab-0.16 ) collectd_plugins_load? ( >=sys-libs/libstatgrab-0.16 ) collectd_plugins_memory? ( >=sys-libs/libstatgrab-0.16 ) collectd_plugins_swap? ( >=sys-libs/libstatgrab-0.16 ) collectd_plugins_users? ( >=sys-libs/libstatgrab-0.16 ) ) collectd_plugins_syslog? ( virtual/logger ) dev-lang/perl[-build]
 0
 http://collectd.org/files/collectd-5.0.2.tar.bz2
diff --git a/metadata/cache/app-admin/collectd-5.0.2-r1 b/metadata/cache/app-admin/collectd-5.0.2-r1
index 2ae6d9cb8b31..700c467b0b4e 100644
--- a/metadata/cache/app-admin/collectd-5.0.2-r1
+++ b/metadata/cache/app-admin/collectd-5.0.2-r1
@@ -1,4 +1,4 @@
-dev-libs/libgcrypt sys-devel/libtool perl? ( dev-lang/perl[ithreads] ( || ( sys-devel/libperl[ithreads] >=sys-devel/libperl-5.10 ) ) ) collectd_plugins_apache? ( net-misc/curl ) collectd_plugins_ascent? ( net-misc/curl dev-libs/libxml2 ) collectd_plugins_bind? ( dev-libs/libxml2 ) collectd_plugins_curl? ( net-misc/curl ) collectd_plugins_curl_json? ( net-misc/curl dev-libs/yajl ) collectd_plugins_curl_xml? ( net-misc/curl dev-libs/libxml2 ) collectd_plugins_dbi? ( dev-db/libdbi ) collectd_plugins_dns? ( net-libs/libpcap ) collectd_plugins_gmond? ( sys-cluster/ganglia ) collectd_plugins_ipmi? ( >=sys-libs/openipmi-2.0.16-r1 ) collectd_plugins_iptables? ( >=net-firewall/iptables-1.4.9.1-r2 ) collectd_plugins_java? ( virtual/jre dev-java/java-config-wrapper ) collectd_plugins_libvirt? ( app-emulation/libvirt dev-libs/libxml2 ) collectd_plugins_memcachec? ( dev-libs/libmemcached ) collectd_plugins_mysql? ( >=virtual/mysql-5.0 ) collectd_plugins_netlink? ( >=sys-apps/iproute2-2.6.34 ) collectd_plugins_nginx? ( net-misc/curl ) collectd_plugins_notify_desktop? ( x11-libs/libnotify ) collectd_plugins_notify_email? ( >=net-libs/libesmtp-1.0.4 dev-libs/openssl ) collectd_plugins_nut? ( sys-power/nut ) collectd_plugins_onewire? ( sys-fs/owfs ) collectd_plugins_oracle? ( >=dev-db/oracle-instantclient-basic-11.2.0.1.0 ) collectd_plugins_perl? ( dev-lang/perl[ithreads] ( || ( sys-devel/libperl[ithreads] >=sys-devel/libperl-5.10 ) ) ) collectd_plugins_ping? ( net-libs/liboping ) collectd_plugins_postgresql? ( >=dev-db/postgresql-base-8.2 ) collectd_plugins_python? ( =dev-lang/python-2* ) collectd_plugins_routeros? ( net-libs/librouteros ) collectd_plugins_rrdcached? ( >=net-analyzer/rrdtool-1.4 ) collectd_plugins_rrdtool? ( >=net-analyzer/rrdtool-1.2.27 ) collectd_plugins_sensors? ( sys-apps/lm_sensors ) collectd_plugins_snmp? ( net-analyzer/net-snmp ) collectd_plugins_tokyotyrant? ( net-misc/tokyotyrant ) collectd_plugins_varnish? ( www-servers/varnish ) collectd_plugins_write_http? ( net-misc/curl ) kernel_FreeBSD? ( collectd_plugins_disk? ( >=sys-libs/libstatgrab-0.16 ) collectd_plugins_interface? ( >=sys-libs/libstatgrab-0.16 ) collectd_plugins_load? ( >=sys-libs/libstatgrab-0.16 ) collectd_plugins_memory? ( >=sys-libs/libstatgrab-0.16 ) collectd_plugins_swap? ( >=sys-libs/libstatgrab-0.16 ) collectd_plugins_users? ( >=sys-libs/libstatgrab-0.16 ) ) dev-util/pkgconfig kernel_linux? ( collectd_plugins_vserver? ( sys-kernel/vserver-sources ) ) dev-lang/perl[-build] || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-libs/libgcrypt sys-devel/libtool perl? ( dev-lang/perl[ithreads] ( || ( sys-devel/libperl[ithreads] >=sys-devel/libperl-5.10 ) ) ) collectd_plugins_apache? ( net-misc/curl ) collectd_plugins_ascent? ( net-misc/curl dev-libs/libxml2 ) collectd_plugins_bind? ( dev-libs/libxml2 ) collectd_plugins_curl? ( net-misc/curl ) collectd_plugins_curl_json? ( net-misc/curl dev-libs/yajl ) collectd_plugins_curl_xml? ( net-misc/curl dev-libs/libxml2 ) collectd_plugins_dbi? ( dev-db/libdbi ) collectd_plugins_dns? ( net-libs/libpcap ) collectd_plugins_gmond? ( sys-cluster/ganglia ) collectd_plugins_ipmi? ( >=sys-libs/openipmi-2.0.16-r1 ) collectd_plugins_iptables? ( >=net-firewall/iptables-1.4.9.1-r2 ) collectd_plugins_java? ( virtual/jre dev-java/java-config-wrapper ) collectd_plugins_libvirt? ( app-emulation/libvirt dev-libs/libxml2 ) collectd_plugins_memcachec? ( dev-libs/libmemcached ) collectd_plugins_mysql? ( >=virtual/mysql-5.0 ) collectd_plugins_netlink? ( >=sys-apps/iproute2-2.6.34 ) collectd_plugins_nginx? ( net-misc/curl ) collectd_plugins_notify_desktop? ( x11-libs/libnotify ) collectd_plugins_notify_email? ( >=net-libs/libesmtp-1.0.4 dev-libs/openssl ) collectd_plugins_nut? ( sys-power/nut ) collectd_plugins_onewire? ( sys-fs/owfs ) collectd_plugins_oracle? ( >=dev-db/oracle-instantclient-basic-11.2.0.1.0 ) collectd_plugins_perl? ( dev-lang/perl[ithreads] ( || ( sys-devel/libperl[ithreads] >=sys-devel/libperl-5.10 ) ) ) collectd_plugins_ping? ( net-libs/liboping ) collectd_plugins_postgresql? ( >=dev-db/postgresql-base-8.2 ) collectd_plugins_python? ( =dev-lang/python-2* ) collectd_plugins_routeros? ( net-libs/librouteros ) collectd_plugins_rrdcached? ( >=net-analyzer/rrdtool-1.4 ) collectd_plugins_rrdtool? ( >=net-analyzer/rrdtool-1.2.27 ) collectd_plugins_sensors? ( sys-apps/lm_sensors ) collectd_plugins_snmp? ( net-analyzer/net-snmp ) collectd_plugins_tokyotyrant? ( net-misc/tokyotyrant ) collectd_plugins_varnish? ( www-servers/varnish ) collectd_plugins_write_http? ( net-misc/curl ) kernel_FreeBSD? ( collectd_plugins_disk? ( >=sys-libs/libstatgrab-0.16 ) collectd_plugins_interface? ( >=sys-libs/libstatgrab-0.16 ) collectd_plugins_load? ( >=sys-libs/libstatgrab-0.16 ) collectd_plugins_memory? ( >=sys-libs/libstatgrab-0.16 ) collectd_plugins_swap? ( >=sys-libs/libstatgrab-0.16 ) collectd_plugins_users? ( >=sys-libs/libstatgrab-0.16 ) ) dev-util/pkgconfig kernel_linux? ( collectd_plugins_vserver? ( sys-kernel/vserver-sources ) ) dev-lang/perl[-build] || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-libs/libgcrypt sys-devel/libtool perl? ( dev-lang/perl[ithreads] ( || ( sys-devel/libperl[ithreads] >=sys-devel/libperl-5.10 ) ) ) collectd_plugins_apache? ( net-misc/curl ) collectd_plugins_ascent? ( net-misc/curl dev-libs/libxml2 ) collectd_plugins_bind? ( dev-libs/libxml2 ) collectd_plugins_curl? ( net-misc/curl ) collectd_plugins_curl_json? ( net-misc/curl dev-libs/yajl ) collectd_plugins_curl_xml? ( net-misc/curl dev-libs/libxml2 ) collectd_plugins_dbi? ( dev-db/libdbi ) collectd_plugins_dns? ( net-libs/libpcap ) collectd_plugins_gmond? ( sys-cluster/ganglia ) collectd_plugins_ipmi? ( >=sys-libs/openipmi-2.0.16-r1 ) collectd_plugins_iptables? ( >=net-firewall/iptables-1.4.9.1-r2 ) collectd_plugins_java? ( virtual/jre dev-java/java-config-wrapper ) collectd_plugins_libvirt? ( app-emulation/libvirt dev-libs/libxml2 ) collectd_plugins_memcachec? ( dev-libs/libmemcached ) collectd_plugins_mysql? ( >=virtual/mysql-5.0 ) collectd_plugins_netlink? ( >=sys-apps/iproute2-2.6.34 ) collectd_plugins_nginx? ( net-misc/curl ) collectd_plugins_notify_desktop? ( x11-libs/libnotify ) collectd_plugins_notify_email? ( >=net-libs/libesmtp-1.0.4 dev-libs/openssl ) collectd_plugins_nut? ( sys-power/nut ) collectd_plugins_onewire? ( sys-fs/owfs ) collectd_plugins_oracle? ( >=dev-db/oracle-instantclient-basic-11.2.0.1.0 ) collectd_plugins_perl? ( dev-lang/perl[ithreads] ( || ( sys-devel/libperl[ithreads] >=sys-devel/libperl-5.10 ) ) ) collectd_plugins_ping? ( net-libs/liboping ) collectd_plugins_postgresql? ( >=dev-db/postgresql-base-8.2 ) collectd_plugins_python? ( =dev-lang/python-2* ) collectd_plugins_routeros? ( net-libs/librouteros ) collectd_plugins_rrdcached? ( >=net-analyzer/rrdtool-1.4 ) collectd_plugins_rrdtool? ( >=net-analyzer/rrdtool-1.2.27 ) collectd_plugins_sensors? ( sys-apps/lm_sensors ) collectd_plugins_snmp? ( net-analyzer/net-snmp ) collectd_plugins_tokyotyrant? ( net-misc/tokyotyrant ) collectd_plugins_varnish? ( www-servers/varnish ) collectd_plugins_write_http? ( net-misc/curl ) kernel_FreeBSD? ( collectd_plugins_disk? ( >=sys-libs/libstatgrab-0.16 ) collectd_plugins_interface? ( >=sys-libs/libstatgrab-0.16 ) collectd_plugins_load? ( >=sys-libs/libstatgrab-0.16 ) collectd_plugins_memory? ( >=sys-libs/libstatgrab-0.16 ) collectd_plugins_swap? ( >=sys-libs/libstatgrab-0.16 ) collectd_plugins_users? ( >=sys-libs/libstatgrab-0.16 ) ) collectd_plugins_syslog? ( virtual/logger ) dev-lang/perl[-build]
 0
 http://collectd.org/files/collectd-5.0.2.tar.bz2
diff --git a/metadata/cache/app-admin/conky-1.8.1-r4 b/metadata/cache/app-admin/conky-1.8.1-r4
index 9f9531aab5b0..b0ace61de843 100644
--- a/metadata/cache/app-admin/conky-1.8.1-r4
+++ b/metadata/cache/app-admin/conky-1.8.1-r4
@@ -1,4 +1,4 @@
-X? ( imlib? ( media-libs/imlib2 ) lua-cairo? ( >=dev-lua/toluapp-1.0.93 x11-libs/cairo[X] ) lua-imlib? ( >=dev-lua/toluapp-1.0.93 media-libs/imlib2 ) nvidia? ( media-video/nvidia-settings ) truetype? ( x11-libs/libXft >=media-libs/freetype-2 ) x11-libs/libX11 x11-libs/libXdamage x11-libs/libXext audacious? ( >=media-sound/audacious-1.5 dev-libs/glib ) xmms2? ( media-sound/xmms2 ) ) curl? ( net-misc/curl ) eve? ( net-misc/curl dev-libs/libxml2 ) portmon? ( dev-libs/glib ) lua? ( >=dev-lang/lua-5.1 ) ncurses? ( sys-libs/ncurses ) rss? ( dev-libs/libxml2 net-misc/curl dev-libs/glib ) wifi? ( net-wireless/wireless-tools ) weather-metar? ( net-misc/curl ) weather-xoap? ( dev-libs/libxml2 net-misc/curl ) virtual/libiconv dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+X? ( imlib? ( media-libs/imlib2 ) lua-cairo? ( >=dev-lua/toluapp-1.0.93 x11-libs/cairo[X] ) lua-imlib? ( >=dev-lua/toluapp-1.0.93 media-libs/imlib2 ) nvidia? ( media-video/nvidia-settings ) truetype? ( x11-libs/libXft >=media-libs/freetype-2 ) x11-libs/libX11 x11-libs/libXdamage x11-libs/libXext audacious? ( >=media-sound/audacious-1.5 dev-libs/glib ) xmms2? ( media-sound/xmms2 ) ) curl? ( net-misc/curl ) eve? ( net-misc/curl dev-libs/libxml2 ) portmon? ( dev-libs/glib ) lua? ( >=dev-lang/lua-5.1 ) ncurses? ( sys-libs/ncurses ) rss? ( dev-libs/libxml2 net-misc/curl dev-libs/glib ) wifi? ( net-wireless/wireless-tools ) weather-metar? ( net-misc/curl ) weather-xoap? ( dev-libs/libxml2 net-misc/curl ) virtual/libiconv dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 X? ( imlib? ( media-libs/imlib2 ) lua-cairo? ( >=dev-lua/toluapp-1.0.93 x11-libs/cairo[X] ) lua-imlib? ( >=dev-lua/toluapp-1.0.93 media-libs/imlib2 ) nvidia? ( media-video/nvidia-settings ) truetype? ( x11-libs/libXft >=media-libs/freetype-2 ) x11-libs/libX11 x11-libs/libXdamage x11-libs/libXext audacious? ( >=media-sound/audacious-1.5 dev-libs/glib ) xmms2? ( media-sound/xmms2 ) ) curl? ( net-misc/curl ) eve? ( net-misc/curl dev-libs/libxml2 ) portmon? ( dev-libs/glib ) lua? ( >=dev-lang/lua-5.1 ) ncurses? ( sys-libs/ncurses ) rss? ( dev-libs/libxml2 net-misc/curl dev-libs/glib ) wifi? ( net-wireless/wireless-tools ) weather-metar? ( net-misc/curl ) weather-xoap? ( dev-libs/libxml2 net-misc/curl ) virtual/libiconv apcupsd? ( sys-power/apcupsd ) hddtemp? ( app-admin/hddtemp ) moc? ( media-sound/moc ) nano-syntax? ( app-editors/nano ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
 0
 mirror://sourceforge/conky/conky-1.8.1.tar.bz2
diff --git a/metadata/cache/app-admin/conky-1.8.1-r6 b/metadata/cache/app-admin/conky-1.8.1-r6
index 9f9531aab5b0..b0ace61de843 100644
--- a/metadata/cache/app-admin/conky-1.8.1-r6
+++ b/metadata/cache/app-admin/conky-1.8.1-r6
@@ -1,4 +1,4 @@
-X? ( imlib? ( media-libs/imlib2 ) lua-cairo? ( >=dev-lua/toluapp-1.0.93 x11-libs/cairo[X] ) lua-imlib? ( >=dev-lua/toluapp-1.0.93 media-libs/imlib2 ) nvidia? ( media-video/nvidia-settings ) truetype? ( x11-libs/libXft >=media-libs/freetype-2 ) x11-libs/libX11 x11-libs/libXdamage x11-libs/libXext audacious? ( >=media-sound/audacious-1.5 dev-libs/glib ) xmms2? ( media-sound/xmms2 ) ) curl? ( net-misc/curl ) eve? ( net-misc/curl dev-libs/libxml2 ) portmon? ( dev-libs/glib ) lua? ( >=dev-lang/lua-5.1 ) ncurses? ( sys-libs/ncurses ) rss? ( dev-libs/libxml2 net-misc/curl dev-libs/glib ) wifi? ( net-wireless/wireless-tools ) weather-metar? ( net-misc/curl ) weather-xoap? ( dev-libs/libxml2 net-misc/curl ) virtual/libiconv dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+X? ( imlib? ( media-libs/imlib2 ) lua-cairo? ( >=dev-lua/toluapp-1.0.93 x11-libs/cairo[X] ) lua-imlib? ( >=dev-lua/toluapp-1.0.93 media-libs/imlib2 ) nvidia? ( media-video/nvidia-settings ) truetype? ( x11-libs/libXft >=media-libs/freetype-2 ) x11-libs/libX11 x11-libs/libXdamage x11-libs/libXext audacious? ( >=media-sound/audacious-1.5 dev-libs/glib ) xmms2? ( media-sound/xmms2 ) ) curl? ( net-misc/curl ) eve? ( net-misc/curl dev-libs/libxml2 ) portmon? ( dev-libs/glib ) lua? ( >=dev-lang/lua-5.1 ) ncurses? ( sys-libs/ncurses ) rss? ( dev-libs/libxml2 net-misc/curl dev-libs/glib ) wifi? ( net-wireless/wireless-tools ) weather-metar? ( net-misc/curl ) weather-xoap? ( dev-libs/libxml2 net-misc/curl ) virtual/libiconv dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 X? ( imlib? ( media-libs/imlib2 ) lua-cairo? ( >=dev-lua/toluapp-1.0.93 x11-libs/cairo[X] ) lua-imlib? ( >=dev-lua/toluapp-1.0.93 media-libs/imlib2 ) nvidia? ( media-video/nvidia-settings ) truetype? ( x11-libs/libXft >=media-libs/freetype-2 ) x11-libs/libX11 x11-libs/libXdamage x11-libs/libXext audacious? ( >=media-sound/audacious-1.5 dev-libs/glib ) xmms2? ( media-sound/xmms2 ) ) curl? ( net-misc/curl ) eve? ( net-misc/curl dev-libs/libxml2 ) portmon? ( dev-libs/glib ) lua? ( >=dev-lang/lua-5.1 ) ncurses? ( sys-libs/ncurses ) rss? ( dev-libs/libxml2 net-misc/curl dev-libs/glib ) wifi? ( net-wireless/wireless-tools ) weather-metar? ( net-misc/curl ) weather-xoap? ( dev-libs/libxml2 net-misc/curl ) virtual/libiconv apcupsd? ( sys-power/apcupsd ) hddtemp? ( app-admin/hddtemp ) moc? ( media-sound/moc ) nano-syntax? ( app-editors/nano ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
 0
 mirror://sourceforge/conky/conky-1.8.1.tar.bz2
diff --git a/metadata/cache/app-admin/conserver-8.1.18 b/metadata/cache/app-admin/conserver-8.1.18
index 6429bd63f011..d3a278007b0f 100644
--- a/metadata/cache/app-admin/conserver-8.1.18
+++ b/metadata/cache/app-admin/conserver-8.1.18
@@ -1,4 +1,4 @@
-ssl? ( >=dev-libs/openssl-0.9.6g ) pam? ( virtual/pam ) tcpd? ( sys-apps/tcp-wrappers ) debug? ( dev-libs/dmalloc ) kerberos? ( virtual/krb5 net-libs/libgssglue ) ssl? ( dev-libs/openssl ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+ssl? ( >=dev-libs/openssl-0.9.6g ) pam? ( virtual/pam ) tcpd? ( sys-apps/tcp-wrappers ) debug? ( dev-libs/dmalloc ) kerberos? ( virtual/krb5 net-libs/libgssglue ) ssl? ( dev-libs/openssl ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 ssl? ( >=dev-libs/openssl-0.9.6g ) pam? ( virtual/pam ) tcpd? ( sys-apps/tcp-wrappers ) debug? ( dev-libs/dmalloc ) kerberos? ( virtual/krb5 net-libs/libgssglue ) pam? ( >=sys-auth/pambase-20080219.1 )
 0
 http://www.conserver.com/conserver-8.1.18.tar.gz
diff --git a/metadata/cache/app-admin/elektra-0.7.1 b/metadata/cache/app-admin/elektra-0.7.1
index 31f910a22ea0..de45932e72a2 100644
--- a/metadata/cache/app-admin/elektra-0.7.1
+++ b/metadata/cache/app-admin/elektra-0.7.1
@@ -1,4 +1,4 @@
-dev-libs/libxml2 sys-devel/libtool iconv? ( virtual/libiconv ) test? ( dev-libs/libxml2[static-libs] ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-libs/libxml2 sys-devel/libtool iconv? ( virtual/libiconv ) test? ( dev-libs/libxml2[static-libs] ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-libs/libxml2
 0
 ftp://ftp.markus-raab.org/elektra/elektra-0.7.1.tar.gz
diff --git a/metadata/cache/app-admin/fam-2.7.0-r6 b/metadata/cache/app-admin/fam-2.7.0-r6
index 2cb1ea6a21eb..227af94de01c 100644
--- a/metadata/cache/app-admin/fam-2.7.0-r6
+++ b/metadata/cache/app-admin/fam-2.7.0-r6
@@ -1,4 +1,4 @@
-|| ( net-nds/rpcbind >=net-nds/portmap-5b-r6 ) !app-admin/gamin || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+|| ( net-nds/rpcbind >=net-nds/portmap-5b-r6 ) !app-admin/gamin || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 || ( net-nds/rpcbind >=net-nds/portmap-5b-r6 ) !app-admin/gamin
 0
 ftp://oss.sgi.com/projects/fam/download/stable/fam-2.7.0.tar.gz mirror://debian/pool/main/f/fam/fam_2.7.0-17.diff.gz
diff --git a/metadata/cache/app-admin/gam-server-0.1.10 b/metadata/cache/app-admin/gam-server-0.1.10
index d47c8147c351..0fec8e6ce5e1 100644
--- a/metadata/cache/app-admin/gam-server-0.1.10
+++ b/metadata/cache/app-admin/gam-server-0.1.10
@@ -1,4 +1,4 @@
->=dev-libs/glib-2:2 >=dev-libs/libgamin-0.1.10 !app-admin/fam !<app-admin/gamin-0.1.10 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-libs/glib-2:2 >=dev-libs/libgamin-0.1.10 !app-admin/fam !<app-admin/gamin-0.1.10 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=dev-libs/glib-2:2 >=dev-libs/libgamin-0.1.10 !app-admin/fam !<app-admin/gamin-0.1.10
 0
 mirror://gnome/sources/gamin/0.1/gamin-0.1.10.tar.bz2 mirror://gentoo/gamin-0.1.9-freebsd.patch.bz2 http://pkgconfig.freedesktop.org/releases/pkg-config-0.26.tar.gz
diff --git a/metadata/cache/app-admin/geolizer-2.01.10_p20070115 b/metadata/cache/app-admin/geolizer-2.01.10_p20070115
index 09ec327c7cc4..30f936e0105d 100644
--- a/metadata/cache/app-admin/geolizer-2.01.10_p20070115
+++ b/metadata/cache/app-admin/geolizer-2.01.10_p20070115
@@ -1,4 +1,4 @@
->=sys-libs/db-4.2 >=sys-libs/zlib-1.1.4 >=media-libs/libpng-1.2 >=media-libs/gd-1.8.3 dev-libs/geoip >=app-admin/webapp-config-1.50.15 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=sys-libs/db-4.2 >=sys-libs/zlib-1.1.4 >=media-libs/libpng-1.2 >=media-libs/gd-1.8.3 dev-libs/geoip >=app-admin/webapp-config-1.50.15 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=sys-libs/db-4.2 >=sys-libs/zlib-1.1.4 >=media-libs/libpng-1.2 >=media-libs/gd-1.8.3 dev-libs/geoip >=app-admin/webapp-config-1.50.15
 0
 ftp://ftp.mrunix.net/pub/webalizer/old/webalizer-2.01-10-src.tar.bz2 http://sysd.org/stas/files/active/0/geolizer_2.01-10-patch.20070115.tar.gz mirror://gentoo/webalizer.conf.gz
diff --git a/metadata/cache/app-admin/geolizer-2.01.10_p20070115-r1 b/metadata/cache/app-admin/geolizer-2.01.10_p20070115-r1
index 09ec327c7cc4..30f936e0105d 100644
--- a/metadata/cache/app-admin/geolizer-2.01.10_p20070115-r1
+++ b/metadata/cache/app-admin/geolizer-2.01.10_p20070115-r1
@@ -1,4 +1,4 @@
->=sys-libs/db-4.2 >=sys-libs/zlib-1.1.4 >=media-libs/libpng-1.2 >=media-libs/gd-1.8.3 dev-libs/geoip >=app-admin/webapp-config-1.50.15 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=sys-libs/db-4.2 >=sys-libs/zlib-1.1.4 >=media-libs/libpng-1.2 >=media-libs/gd-1.8.3 dev-libs/geoip >=app-admin/webapp-config-1.50.15 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=sys-libs/db-4.2 >=sys-libs/zlib-1.1.4 >=media-libs/libpng-1.2 >=media-libs/gd-1.8.3 dev-libs/geoip >=app-admin/webapp-config-1.50.15
 0
 ftp://ftp.mrunix.net/pub/webalizer/old/webalizer-2.01-10-src.tar.bz2 http://sysd.org/stas/files/active/0/geolizer_2.01-10-patch.20070115.tar.gz mirror://gentoo/webalizer.conf.gz
diff --git a/metadata/cache/app-admin/gnome-system-tools-2.32.0-r3 b/metadata/cache/app-admin/gnome-system-tools-2.32.0-r3
index eb67efeb6868..acd90d9374f0 100644
--- a/metadata/cache/app-admin/gnome-system-tools-2.32.0-r3
+++ b/metadata/cache/app-admin/gnome-system-tools-2.32.0-r3
@@ -1,4 +1,4 @@
->=app-admin/system-tools-backends-2.10.1 >=dev-libs/liboobs-2.31.91 >=x11-libs/gtk+-2.19.7:2 >=dev-libs/glib-2.25.3:2 dev-libs/dbus-glib >=gnome-base/nautilus-2.9.90 sys-libs/cracklib nfs? ( net-fs/nfs-utils ) samba? ( >=net-fs/samba-3 ) policykit? ( >=sys-auth/polkit-0.92 || ( gnome-extra/polkit-gnome:obsolete <gnome-extra/polkit-gnome-0.102 ) ) app-text/docbook-xml-dtd:4.1.2 app-text/scrollkeeper >=app-text/gnome-doc-utils-0.3.2 dev-util/pkgconfig >=dev-util/intltool-0.35.0 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+>=app-admin/system-tools-backends-2.10.1 >=dev-libs/liboobs-2.31.91 >=x11-libs/gtk+-2.19.7:2 >=dev-libs/glib-2.25.3:2 dev-libs/dbus-glib >=gnome-base/nautilus-2.9.90 sys-libs/cracklib nfs? ( net-fs/nfs-utils ) samba? ( >=net-fs/samba-3 ) policykit? ( >=sys-auth/polkit-0.92 || ( gnome-extra/polkit-gnome:obsolete <gnome-extra/polkit-gnome-0.102 ) ) app-text/docbook-xml-dtd:4.1.2 app-text/scrollkeeper >=app-text/gnome-doc-utils-0.3.2 dev-util/pkgconfig >=dev-util/intltool-0.35.0 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 >=app-admin/system-tools-backends-2.10.1 >=dev-libs/liboobs-2.31.91 >=x11-libs/gtk+-2.19.7:2 >=dev-libs/glib-2.25.3:2 dev-libs/dbus-glib >=gnome-base/nautilus-2.9.90 sys-libs/cracklib nfs? ( net-fs/nfs-utils ) samba? ( >=net-fs/samba-3 ) policykit? ( >=sys-auth/polkit-0.92 || ( gnome-extra/polkit-gnome:obsolete <gnome-extra/polkit-gnome-0.102 ) )
 0
 mirror://gnome/sources/gnome-system-tools/2.32/gnome-system-tools-2.32.0.tar.bz2
diff --git a/metadata/cache/app-admin/hddtemp-0.3_beta15-r4 b/metadata/cache/app-admin/hddtemp-0.3_beta15-r4
index f991ac255bd5..50794f86237d 100644
--- a/metadata/cache/app-admin/hddtemp-0.3_beta15-r4
+++ b/metadata/cache/app-admin/hddtemp-0.3_beta15-r4
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 http://download.savannah.gnu.org/releases/hddtemp/hddtemp-0.3-beta15.tar.bz2 mirror://gentoo/hddtemp-20080531.db.bz2
diff --git a/metadata/cache/app-admin/localepurge-0.5.3.3 b/metadata/cache/app-admin/localepurge-0.5.3.3
index 37fdd03709ae..eb875870f114 100644
--- a/metadata/cache/app-admin/localepurge-0.5.3.3
+++ b/metadata/cache/app-admin/localepurge-0.5.3.3
@@ -3,7 +3,7 @@ app-shells/bash
 0
 mirror://gentoo/localepurge-0.5.3.3.tbz2
 
-http://www.josealberto.org/blog/index.php?s=localepurge
+http://gentoo.org
 GPL-2
 Script to recover diskspace wasted for unneeded locale files and localized man pages.
 ~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
@@ -12,9 +12,9 @@ Script to recover diskspace wasted for unneeded locale files and localized man p
 
 
 
+4
 
-
-install
+install prepare
 
 
 
diff --git a/metadata/cache/app-admin/lsyncd-2.0.4-r1 b/metadata/cache/app-admin/lsyncd-2.0.4-r1
index 82c6129f9730..d1e0b382ab1a 100644
--- a/metadata/cache/app-admin/lsyncd-2.0.4-r1
+++ b/metadata/cache/app-admin/lsyncd-2.0.4-r1
@@ -1,4 +1,4 @@
-dev-lang/lua || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-lang/lua || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-lang/lua net-misc/rsync
 0
 http://lsyncd.googlecode.com/files/lsyncd-2.0.4.tar.gz
diff --git a/metadata/cache/app-admin/procinfo-ng-2.0.304 b/metadata/cache/app-admin/procinfo-ng-2.0.304
index f1ff330a2c20..c3a9d1515c1d 100644
--- a/metadata/cache/app-admin/procinfo-ng-2.0.304
+++ b/metadata/cache/app-admin/procinfo-ng-2.0.304
@@ -1,4 +1,4 @@
-sys-libs/ncurses || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+sys-libs/ncurses || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 sys-libs/ncurses !app-admin/procinfo
 0
 mirror://sourceforge/procinfo-ng/procinfo-ng-2.0.304.tar.bz2
diff --git a/metadata/cache/app-admin/setools-3.3.7-r1 b/metadata/cache/app-admin/setools-3.3.7-r1
index d106b2efa0da..3984fb5db640 100644
--- a/metadata/cache/app-admin/setools-3.3.7-r1
+++ b/metadata/cache/app-admin/setools-3.3.7-r1
@@ -1,4 +1,4 @@
->=sys-libs/libsepol-2.1.0 sys-libs/libselinux sys-devel/bison sys-devel/flex >=dev-db/sqlite-3.2:3 dev-libs/libxml2:2 dev-util/pkgconfig java? ( >=dev-lang/swig-1.3.28 >=virtual/jdk-1.4 ) python? ( >=dev-lang/swig-1.3.28 ) X? ( >=dev-lang/tk-8.4.9 >=gnome-base/libglade-2.0 >=x11-libs/gtk+-2.8:2 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool java? ( >=dev-java/java-config-2.1.9-r1 ) python? ( =dev-lang/python-2* )
+>=sys-libs/libsepol-2.1.0 sys-libs/libselinux sys-devel/bison sys-devel/flex >=dev-db/sqlite-3.2:3 dev-libs/libxml2:2 dev-util/pkgconfig java? ( >=dev-lang/swig-1.3.28 >=virtual/jdk-1.4 ) python? ( >=dev-lang/swig-1.3.28 ) X? ( >=dev-lang/tk-8.4.9 >=gnome-base/libglade-2.0 >=x11-libs/gtk+-2.8:2 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool java? ( >=dev-java/java-config-2.1.9-r1 ) python? ( =dev-lang/python-2* )
 >=sys-libs/libsepol-2.1.0 sys-libs/libselinux >=dev-db/sqlite-3.2:3 dev-libs/libxml2:2 java? ( >=virtual/jre-1.4 ) X? ( >=dev-lang/tk-8.4.9 >=dev-tcltk/bwidget-1.8 >=gnome-base/libglade-2.0 >=x11-libs/gtk+-2.8:2 ) java? ( >=dev-java/java-config-2.1.9-r1 ) python? ( =dev-lang/python-2* )
 0
 http://oss.tresys.com/projects/setools/chrome/site/dists/setools-3.3.7/setools-3.3.7.tar.bz2
diff --git a/metadata/cache/app-admin/syslog-ng-3.2.4 b/metadata/cache/app-admin/syslog-ng-3.2.4
index d1a16bae6716..4196ef598dee 100644
--- a/metadata/cache/app-admin/syslog-ng-3.2.4
+++ b/metadata/cache/app-admin/syslog-ng-3.2.4
@@ -1,4 +1,4 @@
-!static? ( pcre? ( dev-libs/libpcre ) spoof-source? ( net-libs/libnet ) ssl? ( dev-libs/openssl ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) !static? ( >=dev-libs/eventlog-0.2.12 ) >=dev-libs/glib-2.10.1:2 caps? ( sys-libs/libcap ) sql? ( >=dev-db/libdbi-0.8.3 ) ) spoof-source? ( net-libs/libnet ) ssl? ( dev-libs/openssl ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) !static? ( >=dev-libs/eventlog-0.2.12 ) >=dev-libs/glib-2.10.1:2 caps? ( sys-libs/libcap ) sql? ( >=dev-db/libdbi-0.8.3 ) static? ( >=dev-libs/eventlog-0.2.12[static-libs] ) dev-util/pkgconfig sys-devel/flex || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+!static? ( pcre? ( dev-libs/libpcre ) spoof-source? ( net-libs/libnet ) ssl? ( dev-libs/openssl ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) !static? ( >=dev-libs/eventlog-0.2.12 ) >=dev-libs/glib-2.10.1:2 caps? ( sys-libs/libcap ) sql? ( >=dev-db/libdbi-0.8.3 ) ) spoof-source? ( net-libs/libnet ) ssl? ( dev-libs/openssl ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) !static? ( >=dev-libs/eventlog-0.2.12 ) >=dev-libs/glib-2.10.1:2 caps? ( sys-libs/libcap ) sql? ( >=dev-db/libdbi-0.8.3 ) static? ( >=dev-libs/eventlog-0.2.12[static-libs] ) dev-util/pkgconfig sys-devel/flex || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 !static? ( pcre? ( dev-libs/libpcre ) spoof-source? ( net-libs/libnet ) ssl? ( dev-libs/openssl ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) !static? ( >=dev-libs/eventlog-0.2.12 ) >=dev-libs/glib-2.10.1:2 caps? ( sys-libs/libcap ) sql? ( >=dev-db/libdbi-0.8.3 ) )
 0
 http://www.balabit.com/downloads/files/syslog-ng/sources/3.2.4/source/syslog-ng_3.2.4.tar.gz
diff --git a/metadata/cache/app-admin/syslog-ng-3.2.5 b/metadata/cache/app-admin/syslog-ng-3.2.5
index ec3207b3a456..9b3ada55fe5c 100644
--- a/metadata/cache/app-admin/syslog-ng-3.2.5
+++ b/metadata/cache/app-admin/syslog-ng-3.2.5
@@ -1,4 +1,4 @@
-pcre? ( dev-libs/libpcre ) spoof-source? ( net-libs/libnet ) ssl? ( dev-libs/openssl ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) >=dev-libs/eventlog-0.2.12 >=dev-libs/glib-2.10.1:2 caps? ( sys-libs/libcap ) sql? ( >=dev-db/libdbi-0.8.3 ) dev-util/pkgconfig sys-devel/flex || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+pcre? ( dev-libs/libpcre ) spoof-source? ( net-libs/libnet ) ssl? ( dev-libs/openssl ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) >=dev-libs/eventlog-0.2.12 >=dev-libs/glib-2.10.1:2 caps? ( sys-libs/libcap ) sql? ( >=dev-db/libdbi-0.8.3 ) dev-util/pkgconfig sys-devel/flex || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 pcre? ( dev-libs/libpcre ) spoof-source? ( net-libs/libnet ) ssl? ( dev-libs/openssl ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) >=dev-libs/eventlog-0.2.12 >=dev-libs/glib-2.10.1:2 caps? ( sys-libs/libcap ) sql? ( >=dev-db/libdbi-0.8.3 )
 0
 http://www.balabit.com/downloads/files/syslog-ng/sources/3.2.5/source/syslog-ng_3.2.5.tar.gz
diff --git a/metadata/cache/app-admin/syslog-ng-3.3.4 b/metadata/cache/app-admin/syslog-ng-3.3.4
index 0bdcfa2c5f02..342ace19278b 100644
--- a/metadata/cache/app-admin/syslog-ng-3.3.4
+++ b/metadata/cache/app-admin/syslog-ng-3.3.4
@@ -1,5 +1,5 @@
-!static? ( pcre? ( dev-libs/libpcre ) spoof-source? ( net-libs/libnet ) ssl? ( dev-libs/openssl ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) !static? ( >=dev-libs/eventlog-0.2.12 ) >=dev-libs/glib-2.10.1:2 json? ( >=dev-libs/json-glib-0.12 ) caps? ( sys-libs/libcap ) sql? ( >=dev-db/libdbi-0.8.3 ) ) spoof-source? ( net-libs/libnet ) ssl? ( dev-libs/openssl ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) !static? ( >=dev-libs/eventlog-0.2.12 ) >=dev-libs/glib-2.10.1:2 json? ( >=dev-libs/json-glib-0.12 ) caps? ( sys-libs/libcap ) sql? ( >=dev-db/libdbi-0.8.3 ) static? ( >=dev-libs/eventlog-0.2.12[static-libs] ) dev-util/pkgconfig sys-devel/flex || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
-!static? ( pcre? ( dev-libs/libpcre ) spoof-source? ( net-libs/libnet ) ssl? ( dev-libs/openssl ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) !static? ( >=dev-libs/eventlog-0.2.12 ) >=dev-libs/glib-2.10.1:2 json? ( >=dev-libs/json-glib-0.12 ) caps? ( sys-libs/libcap ) sql? ( >=dev-db/libdbi-0.8.3 ) )
+!static? ( pcre? ( dev-libs/libpcre ) spoof-source? ( net-libs/libnet ) ssl? ( dev-libs/openssl ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) !static? ( >=dev-libs/eventlog-0.2.12 >=dev-libs/glib-2.10.1:2 ) json? ( >=dev-libs/json-glib-0.12 ) caps? ( sys-libs/libcap ) sql? ( >=dev-db/libdbi-0.8.3 ) ) spoof-source? ( net-libs/libnet ) ssl? ( dev-libs/openssl ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) !static? ( >=dev-libs/eventlog-0.2.12 >=dev-libs/glib-2.10.1:2 ) json? ( >=dev-libs/json-glib-0.12 ) caps? ( sys-libs/libcap ) sql? ( >=dev-db/libdbi-0.8.3 ) static? ( >=dev-libs/eventlog-0.2.12[static-libs] >=dev-libs/glib-2.10.1:2[static-libs] ) dev-util/pkgconfig sys-devel/flex || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+!static? ( pcre? ( dev-libs/libpcre ) spoof-source? ( net-libs/libnet ) ssl? ( dev-libs/openssl ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) !static? ( >=dev-libs/eventlog-0.2.12 >=dev-libs/glib-2.10.1:2 ) json? ( >=dev-libs/json-glib-0.12 ) caps? ( sys-libs/libcap ) sql? ( >=dev-db/libdbi-0.8.3 ) )
 0
 http://www.balabit.com/downloads/files/syslog-ng/sources/3.3.4/source/syslog-ng_3.3.4.tar.gz
 test
diff --git a/metadata/cache/app-admin/tripwire-2.4.2 b/metadata/cache/app-admin/tripwire-2.4.2
index e2f08612933d..619cf5d36c2f 100644
--- a/metadata/cache/app-admin/tripwire-2.4.2
+++ b/metadata/cache/app-admin/tripwire-2.4.2
@@ -1,4 +1,4 @@
-sys-devel/automake sys-devel/autoconf dev-util/patchutils ssl? ( dev-libs/openssl ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+sys-devel/automake sys-devel/autoconf dev-util/patchutils ssl? ( dev-libs/openssl ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 virtual/cron virtual/mta ssl? ( dev-libs/openssl )
 0
 mirror://sourceforge/tripwire/tripwire-2.4.2-src.tar.bz2 mirror://gentoo/twpol.txt.gz mirror://gentoo/tripwire.gif
diff --git a/metadata/cache/app-admin/tripwire-2.4.2-r1 b/metadata/cache/app-admin/tripwire-2.4.2-r1
index e2f08612933d..619cf5d36c2f 100644
--- a/metadata/cache/app-admin/tripwire-2.4.2-r1
+++ b/metadata/cache/app-admin/tripwire-2.4.2-r1
@@ -1,4 +1,4 @@
-sys-devel/automake sys-devel/autoconf dev-util/patchutils ssl? ( dev-libs/openssl ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+sys-devel/automake sys-devel/autoconf dev-util/patchutils ssl? ( dev-libs/openssl ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 virtual/cron virtual/mta ssl? ( dev-libs/openssl )
 0
 mirror://sourceforge/tripwire/tripwire-2.4.2-src.tar.bz2 mirror://gentoo/twpol.txt.gz mirror://gentoo/tripwire.gif
diff --git a/metadata/cache/app-admin/ulogd-1.24-r2 b/metadata/cache/app-admin/ulogd-1.24-r2
index a3ab81629ea0..45fcd15a0eea 100644
--- a/metadata/cache/app-admin/ulogd-1.24-r2
+++ b/metadata/cache/app-admin/ulogd-1.24-r2
@@ -1,4 +1,4 @@
-net-firewall/iptables mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-base ) sqlite? ( dev-db/sqlite:3 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+net-firewall/iptables mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-base ) sqlite? ( dev-db/sqlite:3 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 net-firewall/iptables mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-base ) sqlite? ( dev-db/sqlite:3 ) net-libs/libpcap
 0
 http://ftp.netfilter.org/pub/ulogd/ulogd-1.24.tar.bz2 mirror://gentoo/ulogd-glsa-200805.patch.bz2
diff --git a/metadata/cache/app-admin/webalizer-2.01.10-r15 b/metadata/cache/app-admin/webalizer-2.01.10-r15
index ef37387e6853..d980c61d26fd 100644
--- a/metadata/cache/app-admin/webalizer-2.01.10-r15
+++ b/metadata/cache/app-admin/webalizer-2.01.10-r15
@@ -1,4 +1,4 @@
->=sys-libs/db-4.2 >=sys-libs/zlib-1.1.4 >=media-libs/libpng-1.2 >=media-libs/gd-1.8.3[png] geoip? ( dev-libs/geoip ) >=app-admin/webapp-config-1.50.15 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=sys-libs/db-4.2 >=sys-libs/zlib-1.1.4 >=media-libs/libpng-1.2 >=media-libs/gd-1.8.3[png] geoip? ( dev-libs/geoip ) >=app-admin/webapp-config-1.50.15 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=sys-libs/db-4.2 >=sys-libs/zlib-1.1.4 >=media-libs/libpng-1.2 >=media-libs/gd-1.8.3[png] geoip? ( dev-libs/geoip ) >=app-admin/webapp-config-1.50.15
 0
 ftp://ftp.mrunix.net/pub/webalizer/old/webalizer-2.01-10-src.tar.bz2 geoip? ( http://sysd.org/proj/geolizer_2.01-10-patch.20050520.tar.bz2 ) xtended? ( http://www.irc.unizh.ch/users/pfrei/webalizer/rb17/webalizer-2.01-10-RB17-patch.tar.gz ) mirror://gentoo/webalizer.conf.gz
diff --git a/metadata/cache/app-admin/webalizer-2.01.10-r16 b/metadata/cache/app-admin/webalizer-2.01.10-r16
index 77f3779d6bcf..bcea7a80369c 100644
--- a/metadata/cache/app-admin/webalizer-2.01.10-r16
+++ b/metadata/cache/app-admin/webalizer-2.01.10-r16
@@ -1,4 +1,4 @@
->=sys-libs/db-4.2 >=sys-libs/zlib-1.1.4 >=media-libs/libpng-1.2 >=media-libs/gd-1.8.3 geoip? ( dev-libs/geoip ) >=app-admin/webapp-config-1.50.15 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=sys-libs/db-4.2 >=sys-libs/zlib-1.1.4 >=media-libs/libpng-1.2 >=media-libs/gd-1.8.3 geoip? ( dev-libs/geoip ) >=app-admin/webapp-config-1.50.15 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=sys-libs/db-4.2 >=sys-libs/zlib-1.1.4 >=media-libs/libpng-1.2 >=media-libs/gd-1.8.3 geoip? ( dev-libs/geoip ) >=app-admin/webapp-config-1.50.15
 0
 ftp://ftp.mrunix.net/pub/webalizer/old/webalizer-2.01-10-src.tar.bz2 geoip? ( http://sysd.org/stas/files/active/0/geolizer_2.01-10-patch.20070115.tar.gz ) xtended? ( http://patrickfrei.ch/webalizer/rb21/webalizer-2.01-10-RB21-patch.tar.gz ) mirror://gentoo/webalizer.conf.gz
diff --git a/metadata/cache/app-admin/webalizer-2.01.10-r17 b/metadata/cache/app-admin/webalizer-2.01.10-r17
index 77f3779d6bcf..bcea7a80369c 100644
--- a/metadata/cache/app-admin/webalizer-2.01.10-r17
+++ b/metadata/cache/app-admin/webalizer-2.01.10-r17
@@ -1,4 +1,4 @@
->=sys-libs/db-4.2 >=sys-libs/zlib-1.1.4 >=media-libs/libpng-1.2 >=media-libs/gd-1.8.3 geoip? ( dev-libs/geoip ) >=app-admin/webapp-config-1.50.15 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=sys-libs/db-4.2 >=sys-libs/zlib-1.1.4 >=media-libs/libpng-1.2 >=media-libs/gd-1.8.3 geoip? ( dev-libs/geoip ) >=app-admin/webapp-config-1.50.15 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=sys-libs/db-4.2 >=sys-libs/zlib-1.1.4 >=media-libs/libpng-1.2 >=media-libs/gd-1.8.3 geoip? ( dev-libs/geoip ) >=app-admin/webapp-config-1.50.15
 0
 ftp://ftp.mrunix.net/pub/webalizer/old/webalizer-2.01-10-src.tar.bz2 geoip? ( http://sysd.org/stas/files/active/0/geolizer_2.01-10-patch.20070115.tar.gz ) xtended? ( http://patrickfrei.ch/webalizer/rb21/webalizer-2.01-10-RB21-patch.tar.gz ) mirror://gentoo/webalizer.conf.gz
diff --git a/metadata/cache/app-admin/webalizer-xtended-2.01.10_p21 b/metadata/cache/app-admin/webalizer-xtended-2.01.10_p21
index 946f335c6917..9f1963681090 100644
--- a/metadata/cache/app-admin/webalizer-xtended-2.01.10_p21
+++ b/metadata/cache/app-admin/webalizer-xtended-2.01.10_p21
@@ -1,4 +1,4 @@
->=sys-libs/db-4.2 >=sys-libs/zlib-1.1.4 >=media-libs/libpng-1.2 >=media-libs/gd-1.8.3 geoip? ( dev-libs/geoip ) >=app-admin/webapp-config-1.50.15 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=sys-libs/db-4.2 >=sys-libs/zlib-1.1.4 >=media-libs/libpng-1.2 >=media-libs/gd-1.8.3 geoip? ( dev-libs/geoip ) >=app-admin/webapp-config-1.50.15 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=sys-libs/db-4.2 >=sys-libs/zlib-1.1.4 >=media-libs/libpng-1.2 >=media-libs/gd-1.8.3 geoip? ( dev-libs/geoip ) >=app-admin/webapp-config-1.50.15
 0
 ftp://ftp.mrunix.net/pub/webalizer/old/webalizer-2.01-10-src.tar.bz2 http://patrickfrei.ch/webalizer/rb21/webalizer-2.01-10-RB21-patch.tar.gz mirror://gentoo/webalizer.conf.gz
diff --git a/metadata/cache/app-admin/webalizer-xtended-2.01.10_p21-r1 b/metadata/cache/app-admin/webalizer-xtended-2.01.10_p21-r1
index 404c4cb3a586..b8640bf74fb2 100644
--- a/metadata/cache/app-admin/webalizer-xtended-2.01.10_p21-r1
+++ b/metadata/cache/app-admin/webalizer-xtended-2.01.10_p21-r1
@@ -1,4 +1,4 @@
->=sys-libs/db-4.2 >=sys-libs/zlib-1.1.4 >=media-libs/libpng-1.2 >=media-libs/gd-1.8.3 geoip? ( dev-libs/geoip ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=app-admin/webapp-config-1.50.15
+>=sys-libs/db-4.2 >=sys-libs/zlib-1.1.4 >=media-libs/libpng-1.2 >=media-libs/gd-1.8.3 geoip? ( dev-libs/geoip ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=app-admin/webapp-config-1.50.15
 >=sys-libs/db-4.2 >=sys-libs/zlib-1.1.4 >=media-libs/libpng-1.2 >=media-libs/gd-1.8.3 geoip? ( dev-libs/geoip ) >=app-admin/webapp-config-1.50.15
 0
 ftp://ftp.mrunix.net/pub/webalizer/old/webalizer-2.01-10-src.tar.bz2 http://patrickfrei.ch/webalizer/rb21/webalizer-2.01-10-RB21-patch.tar.gz mirror://gentoo/webalizer.conf.gz
diff --git a/metadata/cache/app-arch/arj-3.10.22-r3 b/metadata/cache/app-arch/arj-3.10.22-r3
index 9425770e445b..d83a5f8d7c3f 100644
--- a/metadata/cache/app-arch/arj-3.10.22-r3
+++ b/metadata/cache/app-arch/arj-3.10.22-r3
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 mirror://debian/pool/main/a/arj/arj_3.10.22.orig.tar.gz mirror://debian/pool/main/a/arj/arj_3.10.22-9.debian.tar.gz
diff --git a/metadata/cache/app-arch/arj-3.10.22-r4 b/metadata/cache/app-arch/arj-3.10.22-r4
index 211a46a0b29f..7f7cf1755617 100644
--- a/metadata/cache/app-arch/arj-3.10.22-r4
+++ b/metadata/cache/app-arch/arj-3.10.22-r4
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 mirror://debian/pool/main/a/arj/arj_3.10.22.orig.tar.gz mirror://debian/pool/main/a/arj/arj_3.10.22-10.debian.tar.gz
diff --git a/metadata/cache/app-arch/dpkg-1.16.0.3 b/metadata/cache/app-arch/dpkg-1.16.0.3
index 3cb88d3fd1c1..335b2862aa97 100644
--- a/metadata/cache/app-arch/dpkg-1.16.0.3
+++ b/metadata/cache/app-arch/dpkg-1.16.0.3
@@ -1,4 +1,4 @@
->=dev-lang/perl-5.6.0 dev-perl/TimeDate >=sys-libs/ncurses-5.2-r7 zlib? ( >=sys-libs/zlib-1.1.4 ) bzip2? ( app-arch/bzip2 ) dev-util/pkgconfig sys-devel/flex nls? ( app-text/po4a ) test? ( dev-perl/DateTime-Format-DateParse dev-perl/IO-String dev-perl/Test-Pod ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-lang/perl-5.6.0 dev-perl/TimeDate >=sys-libs/ncurses-5.2-r7 zlib? ( >=sys-libs/zlib-1.1.4 ) bzip2? ( app-arch/bzip2 ) dev-util/pkgconfig sys-devel/flex nls? ( app-text/po4a ) test? ( dev-perl/DateTime-Format-DateParse dev-perl/IO-String dev-perl/Test-Pod ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=dev-lang/perl-5.6.0 dev-perl/TimeDate >=sys-libs/ncurses-5.2-r7 zlib? ( >=sys-libs/zlib-1.1.4 ) bzip2? ( app-arch/bzip2 )
 0
 mirror://debian/pool/main/d/dpkg/dpkg_1.16.0.3.tar.bz2
diff --git a/metadata/cache/app-arch/dpkg-1.16.1 b/metadata/cache/app-arch/dpkg-1.16.1
index 52258d47a50a..f3bb0f1fe3c0 100644
--- a/metadata/cache/app-arch/dpkg-1.16.1
+++ b/metadata/cache/app-arch/dpkg-1.16.1
@@ -1,4 +1,4 @@
->=dev-lang/perl-5.6.0 dev-perl/TimeDate >=sys-libs/ncurses-5.2-r7 zlib? ( >=sys-libs/zlib-1.1.4 ) bzip2? ( app-arch/bzip2 ) dev-util/pkgconfig sys-devel/flex nls? ( app-text/po4a ) test? ( dev-perl/DateTime-Format-DateParse dev-perl/IO-String dev-perl/Test-Pod ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-lang/perl-5.6.0 dev-perl/TimeDate >=sys-libs/ncurses-5.2-r7 zlib? ( >=sys-libs/zlib-1.1.4 ) bzip2? ( app-arch/bzip2 ) dev-util/pkgconfig sys-devel/flex nls? ( app-text/po4a ) test? ( dev-perl/DateTime-Format-DateParse dev-perl/IO-String dev-perl/Test-Pod ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=dev-lang/perl-5.6.0 dev-perl/TimeDate >=sys-libs/ncurses-5.2-r7 zlib? ( >=sys-libs/zlib-1.1.4 ) bzip2? ( app-arch/bzip2 )
 0
 mirror://debian/pool/main/d/dpkg/dpkg_1.16.1.tar.bz2
diff --git a/metadata/cache/app-arch/dpkg-1.16.1.1 b/metadata/cache/app-arch/dpkg-1.16.1.1
index 28c7b1bcfbab..4def50b8456f 100644
--- a/metadata/cache/app-arch/dpkg-1.16.1.1
+++ b/metadata/cache/app-arch/dpkg-1.16.1.1
@@ -1,4 +1,4 @@
->=dev-lang/perl-5.6.0 dev-perl/TimeDate >=sys-libs/ncurses-5.2-r7 zlib? ( >=sys-libs/zlib-1.1.4 ) bzip2? ( app-arch/bzip2 ) sys-devel/flex dev-util/pkgconfig nls? ( app-text/po4a ) test? ( dev-perl/DateTime-Format-DateParse dev-perl/IO-String dev-perl/Test-Pod ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-lang/perl-5.6.0 dev-perl/TimeDate >=sys-libs/ncurses-5.2-r7 zlib? ( >=sys-libs/zlib-1.1.4 ) bzip2? ( app-arch/bzip2 ) sys-devel/flex dev-util/pkgconfig nls? ( app-text/po4a ) test? ( dev-perl/DateTime-Format-DateParse dev-perl/IO-String dev-perl/Test-Pod ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=dev-lang/perl-5.6.0 dev-perl/TimeDate >=sys-libs/ncurses-5.2-r7 zlib? ( >=sys-libs/zlib-1.1.4 ) bzip2? ( app-arch/bzip2 )
 0
 mirror://debian/pool/main/d/dpkg/dpkg_1.16.1.1.tar.bz2
diff --git a/metadata/cache/app-arch/dpkg-1.16.1.2 b/metadata/cache/app-arch/dpkg-1.16.1.2
index 5c6508143ff5..cb8e537c1272 100644
--- a/metadata/cache/app-arch/dpkg-1.16.1.2
+++ b/metadata/cache/app-arch/dpkg-1.16.1.2
@@ -1,4 +1,4 @@
->=dev-lang/perl-5.6.0 dev-perl/TimeDate >=sys-libs/ncurses-5.2-r7 zlib? ( >=sys-libs/zlib-1.1.4 ) bzip2? ( app-arch/bzip2 ) sys-devel/flex dev-util/pkgconfig nls? ( app-text/po4a ) test? ( dev-perl/DateTime-Format-DateParse dev-perl/IO-String dev-perl/Test-Pod ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-lang/perl-5.6.0 dev-perl/TimeDate >=sys-libs/ncurses-5.2-r7 zlib? ( >=sys-libs/zlib-1.1.4 ) bzip2? ( app-arch/bzip2 ) sys-devel/flex dev-util/pkgconfig nls? ( app-text/po4a ) test? ( dev-perl/DateTime-Format-DateParse dev-perl/IO-String dev-perl/Test-Pod ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=dev-lang/perl-5.6.0 dev-perl/TimeDate >=sys-libs/ncurses-5.2-r7 zlib? ( >=sys-libs/zlib-1.1.4 ) bzip2? ( app-arch/bzip2 )
 0
 mirror://debian/pool/main/d/dpkg/dpkg_1.16.1.2.tar.bz2
diff --git a/metadata/cache/app-arch/dpkg-1.16.2 b/metadata/cache/app-arch/dpkg-1.16.2
index 4a541fb457c6..a44e2905eae3 100644
--- a/metadata/cache/app-arch/dpkg-1.16.2
+++ b/metadata/cache/app-arch/dpkg-1.16.2
@@ -1,4 +1,4 @@
->=dev-lang/perl-5.6.0 dev-perl/TimeDate >=sys-libs/ncurses-5.2-r7 zlib? ( >=sys-libs/zlib-1.1.4 ) bzip2? ( app-arch/bzip2 ) sys-devel/flex dev-util/pkgconfig nls? ( app-text/po4a ) test? ( dev-perl/DateTime-Format-DateParse dev-perl/IO-String dev-perl/Test-Pod ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-lang/perl-5.6.0 dev-perl/TimeDate >=sys-libs/ncurses-5.2-r7 zlib? ( >=sys-libs/zlib-1.1.4 ) bzip2? ( app-arch/bzip2 ) sys-devel/flex dev-util/pkgconfig nls? ( app-text/po4a ) test? ( dev-perl/DateTime-Format-DateParse dev-perl/IO-String dev-perl/Test-Pod ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=dev-lang/perl-5.6.0 dev-perl/TimeDate >=sys-libs/ncurses-5.2-r7 zlib? ( >=sys-libs/zlib-1.1.4 ) bzip2? ( app-arch/bzip2 )
 0
 mirror://debian/pool/main/d/dpkg/dpkg_1.16.2.tar.bz2
diff --git a/metadata/cache/app-arch/dump-0.4.44-r1 b/metadata/cache/app-arch/dump-0.4.44-r1
index 2f60f7f300d1..437a17965eab 100644
--- a/metadata/cache/app-arch/dump-0.4.44-r1
+++ b/metadata/cache/app-arch/dump-0.4.44-r1
@@ -1,4 +1,4 @@
->=sys-fs/e2fsprogs-1.27 >=app-arch/bzip2-1.0.2 >=sys-libs/zlib-1.1.4 ermt? ( dev-libs/openssl ) readline? ( sys-libs/readline sys-libs/ncurses static? ( sys-libs/ncurses[static-libs] ) ) dev-util/pkgconfig virtual/os-headers || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=sys-fs/e2fsprogs-1.27 >=app-arch/bzip2-1.0.2 >=sys-libs/zlib-1.1.4 ermt? ( dev-libs/openssl ) readline? ( sys-libs/readline sys-libs/ncurses static? ( sys-libs/ncurses[static-libs] ) ) dev-util/pkgconfig virtual/os-headers || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=sys-fs/e2fsprogs-1.27 >=app-arch/bzip2-1.0.2 >=sys-libs/zlib-1.1.4 ermt? ( dev-libs/openssl ) readline? ( sys-libs/readline sys-libs/ncurses static? ( sys-libs/ncurses[static-libs] ) )
 0
 mirror://sourceforge/dump/dump-0.4b44.tar.gz
diff --git a/metadata/cache/app-arch/lha-114i-r7 b/metadata/cache/app-arch/lha-114i-r7
index 52698780e7d8..7a7a17aa422d 100644
--- a/metadata/cache/app-arch/lha-114i-r7
+++ b/metadata/cache/app-arch/lha-114i-r7
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 mirror://sourceforge.jp/lha/22231/lha-1.14i-ac20050924p1.tar.gz
diff --git a/metadata/cache/app-arch/libzpaq-2.02a-r1 b/metadata/cache/app-arch/libzpaq-2.02a-r1
index 7617a0cfc5a5..3169d52f6d35 100644
--- a/metadata/cache/app-arch/libzpaq-2.02a-r1
+++ b/metadata/cache/app-arch/libzpaq-2.02a-r1
@@ -1,4 +1,4 @@
-app-arch/unzip || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+app-arch/unzip || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 !=app-arch/zpaq-2.04
 0
 http://mattmahoney.net/dc/libzpaq.202a.zip
diff --git a/metadata/cache/app-arch/libzpaq-3.00 b/metadata/cache/app-arch/libzpaq-3.00
index e593b2188a11..53d53ceda9a8 100644
--- a/metadata/cache/app-arch/libzpaq-3.00
+++ b/metadata/cache/app-arch/libzpaq-3.00
@@ -1,4 +1,4 @@
-app-arch/unzip || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+app-arch/unzip || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 http://mattmahoney.net/dc/libzpaq300.zip
diff --git a/metadata/cache/app-arch/pax-3.4.12.16 b/metadata/cache/app-arch/pax-3.4.12.16
index d8d28d87cae1..676cf91a615f 100644
--- a/metadata/cache/app-arch/pax-3.4.12.16
+++ b/metadata/cache/app-arch/pax-3.4.12.16
@@ -1,4 +1,4 @@
->=app-arch/rpm2targz-9.0.0.3g || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=app-arch/rpm2targz-9.0.0.3g || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 mirror://fedora-dev/releases/16/Everything/source/SRPMS/pax-3.4-12.fc16.src.rpm
diff --git a/metadata/cache/app-arch/pdv-1.5.1-r2 b/metadata/cache/app-arch/pdv-1.5.1-r2
index e295f61384a4..a26a08732f44 100644
--- a/metadata/cache/app-arch/pdv-1.5.1-r2
+++ b/metadata/cache/app-arch/pdv-1.5.1-r2
@@ -1,4 +1,4 @@
-X? ( >=x11-libs/openmotif-2.3:0 >=x11-libs/libX11-1.0.0 >=x11-libs/libXt-1.0.0 >=x11-libs/libXext-1.0.0 >=x11-libs/libXp-1.0.0 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+X? ( >=x11-libs/openmotif-2.3:0 >=x11-libs/libX11-1.0.0 >=x11-libs/libXt-1.0.0 >=x11-libs/libXext-1.0.0 >=x11-libs/libXp-1.0.0 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 X? ( >=x11-libs/openmotif-2.3:0 >=x11-libs/libX11-1.0.0 >=x11-libs/libXt-1.0.0 >=x11-libs/libXext-1.0.0 >=x11-libs/libXp-1.0.0 )
 0
 mirror://sourceforge/pdv/pdv-1.5.1.tar.gz
diff --git a/metadata/cache/app-arch/rpm-4.4.6-r7 b/metadata/cache/app-arch/rpm-4.4.6-r7
index 2b86c90f6cd9..4eaeab7ddd3a 100644
--- a/metadata/cache/app-arch/rpm-4.4.6-r7
+++ b/metadata/cache/app-arch/rpm-4.4.6-r7
@@ -1,4 +1,4 @@
->=sys-libs/db-4 >=sys-libs/zlib-1.1.3 >=app-arch/bzip2-1.0.1 >=dev-libs/popt-1.7 >=app-crypt/gnupg-1.2 dev-libs/elfutils virtual/libintl >=dev-libs/beecrypt-3.1.0-r1 python? ( >=dev-lang/python-2.2 ) perl? ( >=dev-lang/perl-5.8.8 ) nls? ( virtual/libintl ) sqlite? ( >=dev-db/sqlite-3.3.5 ) >=net-libs/neon-0.28 nls? ( sys-devel/gettext ) doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-lang/perl[-build]
+>=sys-libs/db-4 >=sys-libs/zlib-1.1.3 >=app-arch/bzip2-1.0.1 >=dev-libs/popt-1.7 >=app-crypt/gnupg-1.2 dev-libs/elfutils virtual/libintl >=dev-libs/beecrypt-3.1.0-r1 python? ( >=dev-lang/python-2.2 ) perl? ( >=dev-lang/perl-5.8.8 ) nls? ( virtual/libintl ) sqlite? ( >=dev-db/sqlite-3.3.5 ) >=net-libs/neon-0.28 nls? ( sys-devel/gettext ) doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-lang/perl[-build]
 >=sys-libs/db-4 >=sys-libs/zlib-1.1.3 >=app-arch/bzip2-1.0.1 >=dev-libs/popt-1.7 >=app-crypt/gnupg-1.2 dev-libs/elfutils virtual/libintl >=dev-libs/beecrypt-3.1.0-r1 python? ( >=dev-lang/python-2.2 ) perl? ( >=dev-lang/perl-5.8.8 ) nls? ( virtual/libintl ) sqlite? ( >=dev-db/sqlite-3.3.5 ) >=net-libs/neon-0.28 dev-lang/perl[-build]
 0
 http://rpm5.org/files/rpm/rpm-4.4/rpm-4.4.6.tar.gz
diff --git a/metadata/cache/app-arch/rpm-4.4.7-r6 b/metadata/cache/app-arch/rpm-4.4.7-r6
index 0f70feff6f31..62a48defb717 100644
--- a/metadata/cache/app-arch/rpm-4.4.7-r6
+++ b/metadata/cache/app-arch/rpm-4.4.7-r6
@@ -1,4 +1,4 @@
->=sys-libs/db-4 >=sys-libs/zlib-1.2.3-r1 >=app-arch/bzip2-1.0.1 >=dev-libs/popt-1.7 >=app-crypt/gnupg-1.2 dev-libs/elfutils virtual/libintl >=dev-libs/beecrypt-3.1.0-r1 python? ( >=dev-lang/python-2.2 ) perl? ( >=dev-lang/perl-5.8.8 ) nls? ( virtual/libintl ) sqlite? ( >=dev-db/sqlite-3.3.5 ) >=net-libs/neon-0.28 nls? ( sys-devel/gettext ) doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-lang/perl[-build]
+>=sys-libs/db-4 >=sys-libs/zlib-1.2.3-r1 >=app-arch/bzip2-1.0.1 >=dev-libs/popt-1.7 >=app-crypt/gnupg-1.2 dev-libs/elfutils virtual/libintl >=dev-libs/beecrypt-3.1.0-r1 python? ( >=dev-lang/python-2.2 ) perl? ( >=dev-lang/perl-5.8.8 ) nls? ( virtual/libintl ) sqlite? ( >=dev-db/sqlite-3.3.5 ) >=net-libs/neon-0.28 nls? ( sys-devel/gettext ) doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-lang/perl[-build]
 >=sys-libs/db-4 >=sys-libs/zlib-1.2.3-r1 >=app-arch/bzip2-1.0.1 >=dev-libs/popt-1.7 >=app-crypt/gnupg-1.2 dev-libs/elfutils virtual/libintl >=dev-libs/beecrypt-3.1.0-r1 python? ( >=dev-lang/python-2.2 ) perl? ( >=dev-lang/perl-5.8.8 ) nls? ( virtual/libintl ) sqlite? ( >=dev-db/sqlite-3.3.5 ) >=net-libs/neon-0.28 dev-lang/perl[-build]
 0
 http://rpm5.org/files/rpm/rpm-4.4/rpm-4.4.7.tar.gz
diff --git a/metadata/cache/app-arch/rpm-4.9.1.2 b/metadata/cache/app-arch/rpm-4.9.1.2
index 1e94f0a7fa81..81323761c093 100644
--- a/metadata/cache/app-arch/rpm-4.9.1.2
+++ b/metadata/cache/app-arch/rpm-4.9.1.2
@@ -1,4 +1,4 @@
->=sys-libs/db-4.5 >=sys-libs/zlib-1.2.3-r1 >=app-arch/bzip2-1.0.1 >=dev-libs/popt-1.7 >=app-crypt/gnupg-1.2 dev-libs/elfutils virtual/libintl >=dev-lang/perl-5.8.8 dev-libs/nss python? ( >=dev-lang/python-2.3 ) nls? ( virtual/libintl ) lua? ( >=dev-lang/lua-5.1.0[deprecated] ) acl? ( virtual/acl ) caps? ( >=sys-libs/libcap-2.0 ) nls? ( sys-devel/gettext ) doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-lang/perl[-build] =dev-lang/python-2*
+>=sys-libs/db-4.5 >=sys-libs/zlib-1.2.3-r1 >=app-arch/bzip2-1.0.1 >=dev-libs/popt-1.7 >=app-crypt/gnupg-1.2 dev-libs/elfutils virtual/libintl >=dev-lang/perl-5.8.8 dev-libs/nss python? ( >=dev-lang/python-2.3 ) nls? ( virtual/libintl ) lua? ( >=dev-lang/lua-5.1.0[deprecated] ) acl? ( virtual/acl ) caps? ( >=sys-libs/libcap-2.0 ) nls? ( sys-devel/gettext ) doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-lang/perl[-build] =dev-lang/python-2*
 >=sys-libs/db-4.5 >=sys-libs/zlib-1.2.3-r1 >=app-arch/bzip2-1.0.1 >=dev-libs/popt-1.7 >=app-crypt/gnupg-1.2 dev-libs/elfutils virtual/libintl >=dev-lang/perl-5.8.8 dev-libs/nss python? ( >=dev-lang/python-2.3 ) nls? ( virtual/libintl ) lua? ( >=dev-lang/lua-5.1.0[deprecated] ) acl? ( virtual/acl ) caps? ( >=sys-libs/libcap-2.0 ) dev-lang/perl[-build] =dev-lang/python-2*
 0
 http://rpm.org/releases/rpm-4.9.x/rpm-4.9.1.2.tar.bz2
diff --git a/metadata/cache/app-arch/rpm-4.9.1.2-r1 b/metadata/cache/app-arch/rpm-4.9.1.2-r1
new file mode 100644
index 000000000000..e751efc46743
--- /dev/null
+++ b/metadata/cache/app-arch/rpm-4.9.1.2-r1
@@ -0,0 +1,22 @@
+>=sys-libs/db-4.5 >=sys-libs/zlib-1.2.3-r1 >=app-arch/bzip2-1.0.1 >=dev-libs/popt-1.7 >=app-crypt/gnupg-1.2 dev-libs/elfutils virtual/libintl >=dev-lang/perl-5.8.8 dev-libs/nss python? ( >=dev-lang/python-2.3 ) nls? ( virtual/libintl ) lua? ( >=dev-lang/lua-5.1.0[deprecated] ) acl? ( virtual/acl ) caps? ( >=sys-libs/libcap-2.0 ) nls? ( sys-devel/gettext ) doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-lang/perl[-build] =dev-lang/python-2*
+>=sys-libs/db-4.5 >=sys-libs/zlib-1.2.3-r1 >=app-arch/bzip2-1.0.1 >=dev-libs/popt-1.7 >=app-crypt/gnupg-1.2 dev-libs/elfutils virtual/libintl >=dev-lang/perl-5.8.8 dev-libs/nss python? ( >=dev-lang/python-2.3 ) nls? ( virtual/libintl ) lua? ( >=dev-lang/lua-5.1.0[deprecated] ) acl? ( virtual/acl ) caps? ( >=sys-libs/libcap-2.0 ) dev-lang/perl[-build] =dev-lang/python-2*
+0
+http://rpm.org/releases/rpm-4.9.x/rpm-4.9.1.2.tar.bz2
+
+http://www.rpm.org
+GPL-2 LGPL-2
+Red Hat Package Management Utils
+~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86
+autotools base eutils flag-o-matic libtool multilib perl-module python toolchain-funcs user
+nls python doc caps lua acl
+
+
+
+4
+
+compile configure install postinst postrm prepare setup test unpack
+
+
+
+
+
diff --git a/metadata/cache/app-arch/rzip-2.1-r1 b/metadata/cache/app-arch/rzip-2.1-r1
index 3f21481697fc..f0c021b08d2d 100644
--- a/metadata/cache/app-arch/rzip-2.1-r1
+++ b/metadata/cache/app-arch/rzip-2.1-r1
@@ -1,4 +1,4 @@
-app-arch/bzip2 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+app-arch/bzip2 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 app-arch/bzip2
 0
 http://rzip.samba.org/ftp/rzip/rzip-2.1.tar.gz
diff --git a/metadata/cache/app-arch/rzip-2.1-r2 b/metadata/cache/app-arch/rzip-2.1-r2
index 02375c56f3b2..738d01d8fb07 100644
--- a/metadata/cache/app-arch/rzip-2.1-r2
+++ b/metadata/cache/app-arch/rzip-2.1-r2
@@ -1,4 +1,4 @@
-app-arch/bzip2 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+app-arch/bzip2 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 app-arch/bzip2
 0
 http://rzip.samba.org/ftp/rzip/rzip-2.1.tar.gz
diff --git a/metadata/cache/app-arch/tar-1.26-r1 b/metadata/cache/app-arch/tar-1.26-r1
index 4e510446d38c..569ade3dffc0 100644
--- a/metadata/cache/app-arch/tar-1.26-r1
+++ b/metadata/cache/app-arch/tar-1.26-r1
@@ -1,4 +1,4 @@
-xattr? ( sys-apps/attr ) nls? ( >=sys-devel/gettext-0.10.35 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+xattr? ( sys-apps/attr ) nls? ( >=sys-devel/gettext-0.10.35 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 xattr? ( sys-apps/attr )
 0
 http://ftp.gnu.org/gnu/tar/tar-1.26.tar.bz2 mirror://gnu-alpha/tar/tar-1.26.tar.bz2 mirror://gnu/tar/tar-1.26.tar.bz2
diff --git a/metadata/cache/app-arch/unrar-gpl-0.0.1_p20080417-r1 b/metadata/cache/app-arch/unrar-gpl-0.0.1_p20080417-r1
index c1171bf86960..734a43d55706 100644
--- a/metadata/cache/app-arch/unrar-gpl-0.0.1_p20080417-r1
+++ b/metadata/cache/app-arch/unrar-gpl-0.0.1_p20080417-r1
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 mirror://gentoo/unrar-gpl-0.0.1_p20080417.tar.bz2
diff --git a/metadata/cache/app-arch/unshield-0.6_p20120308 b/metadata/cache/app-arch/unshield-0.6_p20120308
index 139084d6c800..298d6ae4d715 100644
--- a/metadata/cache/app-arch/unshield-0.6_p20120308
+++ b/metadata/cache/app-arch/unshield-0.6_p20120308
@@ -1,4 +1,4 @@
-dev-libs/openssl:0 sys-libs/zlib || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-libs/openssl:0 sys-libs/zlib || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-libs/openssl:0 sys-libs/zlib
 0
 mirror://gentoo/unshield-0.6_p20120308.tar.xz
diff --git a/metadata/cache/app-arch/xar-1.5.2 b/metadata/cache/app-arch/xar-1.5.2
index 45634da7607c..d393d7f3b84b 100644
--- a/metadata/cache/app-arch/xar-1.5.2
+++ b/metadata/cache/app-arch/xar-1.5.2
@@ -1,4 +1,4 @@
-dev-libs/openssl dev-libs/libxml2 sys-libs/zlib acl? ( sys-apps/acl ) bzip2? ( app-arch/bzip2 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-libs/openssl dev-libs/libxml2 sys-libs/zlib acl? ( sys-apps/acl ) bzip2? ( app-arch/bzip2 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-libs/openssl dev-libs/libxml2 sys-libs/zlib acl? ( sys-apps/acl ) bzip2? ( app-arch/bzip2 )
 0
 http://xar.googlecode.com/files/xar-1.5.2.tar.gz
diff --git a/metadata/cache/app-arch/xar-1.5.2-r1 b/metadata/cache/app-arch/xar-1.5.2-r1
index 8581dcb768e5..11f959e59a19 100644
--- a/metadata/cache/app-arch/xar-1.5.2-r1
+++ b/metadata/cache/app-arch/xar-1.5.2-r1
@@ -1,4 +1,4 @@
-dev-libs/openssl dev-libs/libxml2 sys-libs/zlib acl? ( sys-apps/acl ) bzip2? ( app-arch/bzip2 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-libs/openssl dev-libs/libxml2 sys-libs/zlib acl? ( sys-apps/acl ) bzip2? ( app-arch/bzip2 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-libs/openssl dev-libs/libxml2 sys-libs/zlib acl? ( sys-apps/acl ) bzip2? ( app-arch/bzip2 )
 0
 http://xar.googlecode.com/files/xar-1.5.2.tar.gz
diff --git a/metadata/cache/app-arch/xz-utils-9999 b/metadata/cache/app-arch/xz-utils-9999
index e204f3750944..b41ddd1e1426 100644
--- a/metadata/cache/app-arch/xz-utils-9999
+++ b/metadata/cache/app-arch/xz-utils-9999
@@ -1,4 +1,4 @@
-!<app-arch/lzma-4.63 !app-arch/lzma-utils !<app-arch/p7zip-4.57 sys-devel/gettext dev-vcs/cvs >=sys-devel/libtool-2 dev-vcs/git || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+!<app-arch/lzma-4.63 !app-arch/lzma-utils !<app-arch/p7zip-4.57 sys-devel/gettext dev-vcs/cvs >=sys-devel/libtool-2 dev-vcs/git || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 !<app-arch/lzma-4.63 !app-arch/lzma-utils !<app-arch/p7zip-4.57
 0
 
diff --git a/metadata/cache/app-arch/zpaq-2.05 b/metadata/cache/app-arch/zpaq-2.05
index f47d8a3ec96f..cd1c75163eda 100644
--- a/metadata/cache/app-arch/zpaq-2.05
+++ b/metadata/cache/app-arch/zpaq-2.05
@@ -1,4 +1,4 @@
-=app-arch/libzpaq-2* app-arch/unzip || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+=app-arch/libzpaq-2* app-arch/unzip || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 =app-arch/libzpaq-2*
 0
 http://mattmahoney.net/dc/zpaq.205.zip
diff --git a/metadata/cache/app-arch/zpaq-3.01 b/metadata/cache/app-arch/zpaq-3.01
index 5e8ae369b4e6..26a66bee58ac 100644
--- a/metadata/cache/app-arch/zpaq-3.01
+++ b/metadata/cache/app-arch/zpaq-3.01
@@ -1,4 +1,4 @@
-=app-arch/libzpaq-3* app-arch/unzip || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+=app-arch/libzpaq-3* app-arch/unzip || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 =app-arch/libzpaq-3*
 0
 http://mattmahoney.net/dc/zpaq301.zip
diff --git a/metadata/cache/app-backup/amanda-3.2.1 b/metadata/cache/app-backup/amanda-3.2.1
index dc55e6b4c1a5..8e77044308f2 100644
--- a/metadata/cache/app-backup/amanda-3.2.1
+++ b/metadata/cache/app-backup/amanda-3.2.1
@@ -1,4 +1,4 @@
-sys-libs/readline virtual/inetd sys-apps/gawk app-arch/tar >=dev-lang/perl-5.6 app-arch/dump net-misc/openssh >=dev-libs/glib-2.26.0 nls? ( virtual/libintl ) s3? ( >=net-misc/curl-7.10.0 ) !s3? ( curl? ( >=net-misc/curl-7.10.0 ) ) samba? ( net-fs/samba ) kerberos? ( app-crypt/mit-krb5 ) xfs? ( sys-fs/xfsdump ) readline? ( sys-libs/readline ) !minimal? ( virtual/mailx app-arch/mt-st sys-block/mtx gnuplot? ( sci-visualization/gnuplot ) app-crypt/aespipe app-crypt/gnupg ) dev-util/pkgconfig nls? ( sys-devel/gettext ) >=app-text/docbook-xsl-stylesheets-1.72.0 app-text/docbook-xml-dtd || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-lang/perl[-build]
+sys-libs/readline virtual/inetd sys-apps/gawk app-arch/tar >=dev-lang/perl-5.6 app-arch/dump net-misc/openssh >=dev-libs/glib-2.26.0 nls? ( virtual/libintl ) s3? ( >=net-misc/curl-7.10.0 ) !s3? ( curl? ( >=net-misc/curl-7.10.0 ) ) samba? ( net-fs/samba ) kerberos? ( app-crypt/mit-krb5 ) xfs? ( sys-fs/xfsdump ) readline? ( sys-libs/readline ) !minimal? ( virtual/mailx app-arch/mt-st sys-block/mtx gnuplot? ( sci-visualization/gnuplot ) app-crypt/aespipe app-crypt/gnupg ) dev-util/pkgconfig nls? ( sys-devel/gettext ) >=app-text/docbook-xsl-stylesheets-1.72.0 app-text/docbook-xml-dtd || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-lang/perl[-build]
 sys-libs/readline virtual/inetd sys-apps/gawk app-arch/tar >=dev-lang/perl-5.6 app-arch/dump net-misc/openssh >=dev-libs/glib-2.26.0 nls? ( virtual/libintl ) s3? ( >=net-misc/curl-7.10.0 ) !s3? ( curl? ( >=net-misc/curl-7.10.0 ) ) samba? ( net-fs/samba ) kerberos? ( app-crypt/mit-krb5 ) xfs? ( sys-fs/xfsdump ) readline? ( sys-libs/readline ) !minimal? ( virtual/mailx app-arch/mt-st sys-block/mtx gnuplot? ( sci-visualization/gnuplot ) app-crypt/aespipe app-crypt/gnupg ) dev-lang/perl[-build]
 0
 mirror://sourceforge/amanda/amanda-3.2.1.tar.gz
diff --git a/metadata/cache/app-backup/amanda-3.2.2 b/metadata/cache/app-backup/amanda-3.2.2
index 697e7651dd1d..14c642ae94be 100644
--- a/metadata/cache/app-backup/amanda-3.2.2
+++ b/metadata/cache/app-backup/amanda-3.2.2
@@ -1,4 +1,4 @@
-sys-libs/readline virtual/inetd sys-apps/gawk app-arch/tar >=dev-lang/perl-5.6 app-arch/dump net-misc/openssh >=dev-libs/glib-2.26.0 nls? ( virtual/libintl ) s3? ( >=net-misc/curl-7.10.0 ) !s3? ( curl? ( >=net-misc/curl-7.10.0 ) ) samba? ( net-fs/samba ) kerberos? ( app-crypt/mit-krb5 ) xfs? ( sys-fs/xfsdump ) readline? ( sys-libs/readline ) !minimal? ( virtual/mailx app-arch/mt-st sys-block/mtx gnuplot? ( sci-visualization/gnuplot ) app-crypt/aespipe app-crypt/gnupg ) dev-util/pkgconfig nls? ( sys-devel/gettext ) >=app-text/docbook-xsl-stylesheets-1.72.0 app-text/docbook-xml-dtd || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-lang/perl[-build]
+sys-libs/readline virtual/inetd sys-apps/gawk app-arch/tar >=dev-lang/perl-5.6 app-arch/dump net-misc/openssh >=dev-libs/glib-2.26.0 nls? ( virtual/libintl ) s3? ( >=net-misc/curl-7.10.0 ) !s3? ( curl? ( >=net-misc/curl-7.10.0 ) ) samba? ( net-fs/samba ) kerberos? ( app-crypt/mit-krb5 ) xfs? ( sys-fs/xfsdump ) readline? ( sys-libs/readline ) !minimal? ( virtual/mailx app-arch/mt-st sys-block/mtx gnuplot? ( sci-visualization/gnuplot ) app-crypt/aespipe app-crypt/gnupg ) dev-util/pkgconfig nls? ( sys-devel/gettext ) >=app-text/docbook-xsl-stylesheets-1.72.0 app-text/docbook-xml-dtd || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-lang/perl[-build]
 sys-libs/readline virtual/inetd sys-apps/gawk app-arch/tar >=dev-lang/perl-5.6 app-arch/dump net-misc/openssh >=dev-libs/glib-2.26.0 nls? ( virtual/libintl ) s3? ( >=net-misc/curl-7.10.0 ) !s3? ( curl? ( >=net-misc/curl-7.10.0 ) ) samba? ( net-fs/samba ) kerberos? ( app-crypt/mit-krb5 ) xfs? ( sys-fs/xfsdump ) readline? ( sys-libs/readline ) !minimal? ( virtual/mailx app-arch/mt-st sys-block/mtx gnuplot? ( sci-visualization/gnuplot ) app-crypt/aespipe app-crypt/gnupg ) dev-lang/perl[-build]
 0
 mirror://sourceforge/amanda/amanda-3.2.2.tar.gz
diff --git a/metadata/cache/app-backup/amanda-3.3.0 b/metadata/cache/app-backup/amanda-3.3.0
index ee0685d701e0..b8cbf7791d89 100644
--- a/metadata/cache/app-backup/amanda-3.3.0
+++ b/metadata/cache/app-backup/amanda-3.3.0
@@ -1,4 +1,4 @@
-sys-libs/readline virtual/inetd sys-apps/gawk app-arch/tar >=dev-lang/perl-5.6 app-arch/dump net-misc/openssh >=dev-libs/glib-2.26.0 nls? ( virtual/libintl ) s3? ( >=net-misc/curl-7.10.0 ) !s3? ( curl? ( >=net-misc/curl-7.10.0 ) ) samba? ( net-fs/samba ) kerberos? ( app-crypt/mit-krb5 ) xfs? ( sys-fs/xfsdump ) readline? ( sys-libs/readline ) !minimal? ( virtual/mailx app-arch/mt-st sys-block/mtx gnuplot? ( sci-visualization/gnuplot ) app-crypt/aespipe app-crypt/gnupg ) dev-util/pkgconfig nls? ( sys-devel/gettext ) >=app-text/docbook-xsl-stylesheets-1.72.0 app-text/docbook-xml-dtd dev-libs/libxslt || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-lang/perl[-build]
+sys-libs/readline virtual/inetd sys-apps/gawk app-arch/tar >=dev-lang/perl-5.6 app-arch/dump net-misc/openssh >=dev-libs/glib-2.26.0 nls? ( virtual/libintl ) s3? ( >=net-misc/curl-7.10.0 ) !s3? ( curl? ( >=net-misc/curl-7.10.0 ) ) samba? ( net-fs/samba ) kerberos? ( app-crypt/mit-krb5 ) xfs? ( sys-fs/xfsdump ) readline? ( sys-libs/readline ) !minimal? ( virtual/mailx app-arch/mt-st sys-block/mtx gnuplot? ( sci-visualization/gnuplot ) app-crypt/aespipe app-crypt/gnupg ) dev-util/pkgconfig nls? ( sys-devel/gettext ) >=app-text/docbook-xsl-stylesheets-1.72.0 app-text/docbook-xml-dtd dev-libs/libxslt || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-lang/perl[-build]
 sys-libs/readline virtual/inetd sys-apps/gawk app-arch/tar >=dev-lang/perl-5.6 app-arch/dump net-misc/openssh >=dev-libs/glib-2.26.0 nls? ( virtual/libintl ) s3? ( >=net-misc/curl-7.10.0 ) !s3? ( curl? ( >=net-misc/curl-7.10.0 ) ) samba? ( net-fs/samba ) kerberos? ( app-crypt/mit-krb5 ) xfs? ( sys-fs/xfsdump ) readline? ( sys-libs/readline ) !minimal? ( virtual/mailx app-arch/mt-st sys-block/mtx gnuplot? ( sci-visualization/gnuplot ) app-crypt/aespipe app-crypt/gnupg ) dev-lang/perl[-build]
 0
 mirror://sourceforge/amanda/amanda-3.3.0.tar.gz
diff --git a/metadata/cache/app-backup/backupninja-0.9.10 b/metadata/cache/app-backup/backupninja-0.9.10
index 8608634cc1c2..870573653cb4 100644
--- a/metadata/cache/app-backup/backupninja-0.9.10
+++ b/metadata/cache/app-backup/backupninja-0.9.10
@@ -1,4 +1,4 @@
-dev-util/dialog || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-util/dialog || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-util/dialog
 0
 https://labs.riseup.net/code/attachments/download/242/backupninja-0.9.10.tar.gz
diff --git a/metadata/cache/app-backup/backupninja-0.9.9 b/metadata/cache/app-backup/backupninja-0.9.9
index dab89ddafa03..8f2cd6db6281 100644
--- a/metadata/cache/app-backup/backupninja-0.9.9
+++ b/metadata/cache/app-backup/backupninja-0.9.9
@@ -1,4 +1,4 @@
-dev-util/dialog || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-util/dialog || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-util/dialog
 0
 https://labs.riseup.net/code/attachments/download/230/backupninja-0.9.9.tar.gz
diff --git a/metadata/cache/app-backup/deja-dup-21.2 b/metadata/cache/app-backup/deja-dup-21.2
index 68438f3b1e25..c696e0081dd6 100644
--- a/metadata/cache/app-backup/deja-dup-21.2
+++ b/metadata/cache/app-backup/deja-dup-21.2
@@ -1,4 +1,4 @@
->=dev-libs/glib-2.26:2 x11-libs/gtk+:3 >=x11-libs/libnotify-0.7.1 app-backup/duplicity dev-libs/dbus-glib gnome-base/gnome-keyring nautilus? ( gnome-base/nautilus ) app-text/yelp-tools dev-lang/vala:0.14 dev-perl/Locale-gettext dev-util/pkgconfig >=dev-util/intltool-0.40 >=sys-devel/gettext-0.17 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
+>=dev-libs/glib-2.26:2 x11-libs/gtk+:3 >=x11-libs/libnotify-0.7.1 app-backup/duplicity dev-libs/dbus-glib gnome-base/gnome-keyring nautilus? ( gnome-base/nautilus ) app-text/yelp-tools dev-lang/vala:0.14 dev-perl/Locale-gettext dev-util/pkgconfig >=dev-util/intltool-0.40 >=sys-devel/gettext-0.17 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
 >=dev-libs/glib-2.26:2 x11-libs/gtk+:3 >=x11-libs/libnotify-0.7.1 app-backup/duplicity dev-libs/dbus-glib gnome-base/gnome-keyring nautilus? ( gnome-base/nautilus ) gnome-base/gvfs[fuse]
 0
 http://launchpad.net/deja-dup/22/21.2/+download/deja-dup-21.2.tar.xz
diff --git a/metadata/cache/app-backup/deja-dup-21.2-r1 b/metadata/cache/app-backup/deja-dup-21.2-r1
index 6d235e60faff..f7475c960566 100644
--- a/metadata/cache/app-backup/deja-dup-21.2-r1
+++ b/metadata/cache/app-backup/deja-dup-21.2-r1
@@ -1,4 +1,4 @@
->=dev-libs/glib-2.26:2 x11-libs/gtk+:3 >=x11-libs/libnotify-0.7.1 app-backup/duplicity dev-libs/dbus-glib gnome-base/gnome-keyring nautilus? ( gnome-base/nautilus ) app-text/yelp-tools dev-lang/vala:0.14 dev-perl/Locale-gettext dev-util/pkgconfig >=dev-util/intltool-0.40 >=sys-devel/gettext-0.17 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
+>=dev-libs/glib-2.26:2 x11-libs/gtk+:3 >=x11-libs/libnotify-0.7.1 app-backup/duplicity dev-libs/dbus-glib gnome-base/gnome-keyring nautilus? ( gnome-base/nautilus ) app-text/yelp-tools dev-lang/vala:0.14 dev-perl/Locale-gettext dev-util/pkgconfig >=dev-util/intltool-0.40 >=sys-devel/gettext-0.17 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
 >=dev-libs/glib-2.26:2 x11-libs/gtk+:3 >=x11-libs/libnotify-0.7.1 app-backup/duplicity dev-libs/dbus-glib gnome-base/gnome-keyring nautilus? ( gnome-base/nautilus ) gnome-base/gvfs[fuse]
 0
 http://launchpad.net/deja-dup/22/21.2/+download/deja-dup-21.2.tar.xz
diff --git a/metadata/cache/app-backup/fsarchiver-0.6.12 b/metadata/cache/app-backup/fsarchiver-0.6.12
index 21a44e6458ea..7be54655009f 100644
--- a/metadata/cache/app-backup/fsarchiver-0.6.12
+++ b/metadata/cache/app-backup/fsarchiver-0.6.12
@@ -1,4 +1,4 @@
-dev-libs/libgcrypt >=sys-fs/e2fsprogs-1.41.4 lzma? ( >=app-arch/xz-utils-4.999.9_beta ) lzo? ( >=dev-libs/lzo-2.02 ) static? ( lzma? ( app-arch/xz-utils[static-libs] ) ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-libs/libgcrypt >=sys-fs/e2fsprogs-1.41.4 lzma? ( >=app-arch/xz-utils-4.999.9_beta ) lzo? ( >=dev-libs/lzo-2.02 ) static? ( lzma? ( app-arch/xz-utils[static-libs] ) ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-libs/libgcrypt >=sys-fs/e2fsprogs-1.41.4 lzma? ( >=app-arch/xz-utils-4.999.9_beta ) lzo? ( >=dev-libs/lzo-2.02 ) static? ( lzma? ( app-arch/xz-utils[static-libs] ) )
 0
 mirror://sourceforge/fsarchiver/fsarchiver-0.6.12.tar.gz
diff --git a/metadata/cache/app-backup/fsarchiver-0.6.13 b/metadata/cache/app-backup/fsarchiver-0.6.13
index 0a2e436051cf..59cc5fa7c67b 100644
--- a/metadata/cache/app-backup/fsarchiver-0.6.13
+++ b/metadata/cache/app-backup/fsarchiver-0.6.13
@@ -1,4 +1,4 @@
-dev-libs/libgcrypt >=sys-fs/e2fsprogs-1.41.4 lzma? ( >=app-arch/xz-utils-4.999.9_beta ) lzo? ( >=dev-libs/lzo-2.02 ) static? ( lzma? ( app-arch/xz-utils[static-libs] ) ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-libs/libgcrypt >=sys-fs/e2fsprogs-1.41.4 lzma? ( >=app-arch/xz-utils-4.999.9_beta ) lzo? ( >=dev-libs/lzo-2.02 ) static? ( lzma? ( app-arch/xz-utils[static-libs] ) ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-libs/libgcrypt >=sys-fs/e2fsprogs-1.41.4 lzma? ( >=app-arch/xz-utils-4.999.9_beta ) lzo? ( >=dev-libs/lzo-2.02 ) static? ( lzma? ( app-arch/xz-utils[static-libs] ) )
 0
 mirror://sourceforge/fsarchiver/fsarchiver-0.6.13.tar.gz
diff --git a/metadata/cache/app-benchmarks/httperf-0.9.0-r1 b/metadata/cache/app-benchmarks/httperf-0.9.0-r1
index 8dfa373c1958..8e4ff6d88645 100644
--- a/metadata/cache/app-benchmarks/httperf-0.9.0-r1
+++ b/metadata/cache/app-benchmarks/httperf-0.9.0-r1
@@ -1,4 +1,4 @@
-dev-libs/openssl || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-libs/openssl || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-libs/openssl
 0
 http://httperf.googlecode.com/files/httperf-0.9.0.tar.gz
diff --git a/metadata/cache/app-benchmarks/os-autoinst-9999 b/metadata/cache/app-benchmarks/os-autoinst-9999
index 0b687a42ff6a..7e73fae1b159 100644
--- a/metadata/cache/app-benchmarks/os-autoinst-9999
+++ b/metadata/cache/app-benchmarks/os-autoinst-9999
@@ -1,4 +1,4 @@
-dev-vcs/git || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-vcs/git || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 app-emulation/qemu-kvm app-text/gocr media-gfx/imagemagick media-video/ffmpeg2theora
 0
 
diff --git a/metadata/cache/app-benchmarks/spew-1.0.8 b/metadata/cache/app-benchmarks/spew-1.0.8
index 644a6aee5b05..2ceb53a0c536 100644
--- a/metadata/cache/app-benchmarks/spew-1.0.8
+++ b/metadata/cache/app-benchmarks/spew-1.0.8
@@ -1,4 +1,4 @@
-static? ( sys-libs/ncurses[-gpm] dev-libs/popt[static-libs] ) !static? ( sys-libs/ncurses dev-libs/popt ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+static? ( sys-libs/ncurses[-gpm] dev-libs/popt[static-libs] ) !static? ( sys-libs/ncurses dev-libs/popt ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 static? ( sys-libs/ncurses[-gpm] dev-libs/popt[static-libs] ) !static? ( sys-libs/ncurses dev-libs/popt )
 0
 ftp://ftp.berlios.de/pub/spew/1.0.8/spew-1.0.8.tgz
diff --git a/metadata/cache/app-benchmarks/sysbench-0.4.12-r1 b/metadata/cache/app-benchmarks/sysbench-0.4.12-r1
index a3eb510682f6..e29d0f389228 100644
--- a/metadata/cache/app-benchmarks/sysbench-0.4.12-r1
+++ b/metadata/cache/app-benchmarks/sysbench-0.4.12-r1
@@ -1,4 +1,4 @@
-mysql? ( virtual/mysql ) aio? ( dev-libs/libaio ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+mysql? ( virtual/mysql ) aio? ( dev-libs/libaio ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 mysql? ( virtual/mysql ) aio? ( dev-libs/libaio )
 0
 mirror://sourceforge/sysbench/sysbench-0.4.12.tar.gz
diff --git a/metadata/cache/app-cdr/brasero-2.32.1-r1 b/metadata/cache/app-cdr/brasero-2.32.1-r1
index 14a4fc7bd9cc..7c7a44b83055 100644
--- a/metadata/cache/app-cdr/brasero-2.32.1-r1
+++ b/metadata/cache/app-cdr/brasero-2.32.1-r1
@@ -1,4 +1,4 @@
->=dev-libs/glib-2.25.10:2 media-libs/libcanberra[gtk] >=x11-libs/gtk+-2.21.9:2[introspection?] >=gnome-base/gconf-2.31.1:2 >=media-libs/gstreamer-0.10.15:0.10 >=media-libs/gst-plugins-base-0.10:0.10 >=dev-libs/libxml2-2.6:2 >=dev-libs/libunique-1:1 x11-libs/libSM introspection? ( >=dev-libs/gobject-introspection-0.6.3 ) libburn? ( >=dev-libs/libburn-0.4 >=dev-libs/libisofs-0.6.4 ) nautilus? ( >=gnome-base/nautilus-2.31.3 <gnome-base/nautilus-3 ) playlist? ( >=dev-libs/totem-pl-parser-2.29.1 ) app-text/gnome-doc-utils dev-util/pkgconfig sys-devel/gettext dev-util/intltool gnome-base/gnome-common:3 >=dev-util/gtk-doc-am-1.12 doc? ( >=dev-util/gtk-doc-1.12 ) test? ( app-text/docbook-xml-dtd:4.3 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+>=dev-libs/glib-2.25.10:2 media-libs/libcanberra[gtk] >=x11-libs/gtk+-2.21.9:2[introspection?] >=gnome-base/gconf-2.31.1:2 >=media-libs/gstreamer-0.10.15:0.10 >=media-libs/gst-plugins-base-0.10:0.10 >=dev-libs/libxml2-2.6:2 >=dev-libs/libunique-1:1 x11-libs/libSM introspection? ( >=dev-libs/gobject-introspection-0.6.3 ) libburn? ( >=dev-libs/libburn-0.4 >=dev-libs/libisofs-0.6.4 ) nautilus? ( >=gnome-base/nautilus-2.31.3 <gnome-base/nautilus-3 ) playlist? ( >=dev-libs/totem-pl-parser-2.29.1 ) app-text/gnome-doc-utils dev-util/pkgconfig sys-devel/gettext dev-util/intltool gnome-base/gnome-common:3 >=dev-util/gtk-doc-am-1.12 doc? ( >=dev-util/gtk-doc-1.12 ) test? ( app-text/docbook-xml-dtd:4.3 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 >=dev-libs/glib-2.25.10:2 media-libs/libcanberra[gtk] >=x11-libs/gtk+-2.21.9:2[introspection?] >=gnome-base/gconf-2.31.1:2 >=media-libs/gstreamer-0.10.15:0.10 >=media-libs/gst-plugins-base-0.10:0.10 >=dev-libs/libxml2-2.6:2 >=dev-libs/libunique-1:1 x11-libs/libSM introspection? ( >=dev-libs/gobject-introspection-0.6.3 ) libburn? ( >=dev-libs/libburn-0.4 >=dev-libs/libisofs-0.6.4 ) nautilus? ( >=gnome-base/nautilus-2.31.3 <gnome-base/nautilus-3 ) playlist? ( >=dev-libs/totem-pl-parser-2.29.1 ) app-cdr/cdrdao app-cdr/dvd+rw-tools >=media-plugins/gst-plugins-meta-0.10-r6:0.10[dvd?,vcd?] x11-themes/hicolor-icon-theme css? ( media-libs/libdvdcss:1.2 ) cdr? ( virtual/cdrtools ) dvd? ( media-video/dvdauthor ) vcd? ( media-video/vcdimager ) !libburn? ( virtual/cdrtools )
 0
 mirror://gnome/sources/brasero/2.32/brasero-2.32.1.tar.bz2
diff --git a/metadata/cache/app-cdr/brasero-3.2.0-r1 b/metadata/cache/app-cdr/brasero-3.2.0-r1
index 041b9543522c..f488cd0d3341 100644
--- a/metadata/cache/app-cdr/brasero-3.2.0-r1
+++ b/metadata/cache/app-cdr/brasero-3.2.0-r1
@@ -1,4 +1,4 @@
->=dev-libs/glib-2.29.14:2 >=x11-libs/gtk+-3.0.0:3[introspection?] >=media-libs/gstreamer-0.10.15:0.10 >=media-libs/gst-plugins-base-0.10:0.10 >=dev-libs/libxml2-2.6:2 >=x11-libs/libnotify-0.6.1 media-libs/libcanberra[gtk3] x11-libs/libICE x11-libs/libSM introspection? ( >=dev-libs/gobject-introspection-0.6.3 ) libburn? ( >=dev-libs/libburn-0.4 >=dev-libs/libisofs-0.6.4 ) nautilus? ( >=gnome-base/nautilus-2.91.90 ) playlist? ( >=dev-libs/totem-pl-parser-2.29.1 ) tracker? ( >=app-misc/tracker-0.12 ) app-text/gnome-doc-utils dev-util/pkgconfig sys-devel/gettext dev-util/intltool gnome-base/gnome-common:3 >=dev-util/gtk-doc-am-1.12 doc? ( >=dev-util/gtk-doc-1.12 ) test? ( app-text/docbook-xml-dtd:4.3 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
+>=dev-libs/glib-2.29.14:2 >=x11-libs/gtk+-3.0.0:3[introspection?] >=media-libs/gstreamer-0.10.15:0.10 >=media-libs/gst-plugins-base-0.10:0.10 >=dev-libs/libxml2-2.6:2 >=x11-libs/libnotify-0.6.1 media-libs/libcanberra[gtk3] x11-libs/libICE x11-libs/libSM introspection? ( >=dev-libs/gobject-introspection-0.6.3 ) libburn? ( >=dev-libs/libburn-0.4 >=dev-libs/libisofs-0.6.4 ) nautilus? ( >=gnome-base/nautilus-2.91.90 ) playlist? ( >=dev-libs/totem-pl-parser-2.29.1 ) tracker? ( >=app-misc/tracker-0.12 ) app-text/gnome-doc-utils dev-util/pkgconfig sys-devel/gettext dev-util/intltool gnome-base/gnome-common:3 >=dev-util/gtk-doc-am-1.12 doc? ( >=dev-util/gtk-doc-1.12 ) test? ( app-text/docbook-xml-dtd:4.3 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
 >=dev-libs/glib-2.29.14:2 >=x11-libs/gtk+-3.0.0:3[introspection?] >=media-libs/gstreamer-0.10.15:0.10 >=media-libs/gst-plugins-base-0.10:0.10 >=dev-libs/libxml2-2.6:2 >=x11-libs/libnotify-0.6.1 media-libs/libcanberra[gtk3] x11-libs/libICE x11-libs/libSM introspection? ( >=dev-libs/gobject-introspection-0.6.3 ) libburn? ( >=dev-libs/libburn-0.4 >=dev-libs/libisofs-0.6.4 ) nautilus? ( >=gnome-base/nautilus-2.91.90 ) playlist? ( >=dev-libs/totem-pl-parser-2.29.1 ) tracker? ( >=app-misc/tracker-0.12 ) media-libs/gst-plugins-good:0.10 media-plugins/gst-plugins-gconf:0.10 media-plugins/gst-plugins-meta:0.10[mp3?] x11-themes/hicolor-icon-theme css? ( media-libs/libdvdcss:1.2 ) !libburn? ( app-cdr/cdrdao app-cdr/dvd+rw-tools virtual/cdrtools ) mp3? ( media-libs/gst-plugins-ugly:0.10 ) packagekit? ( app-admin/packagekit-base )
 0
 mirror://gnome/sources/brasero/3.2/brasero-3.2.0.tar.xz
diff --git a/metadata/cache/app-cdr/cdw-0.6.0 b/metadata/cache/app-cdr/cdw-0.6.0
index c819860a3cbf..8ca65d15bc8c 100644
--- a/metadata/cache/app-cdr/cdw-0.6.0
+++ b/metadata/cache/app-cdr/cdw-0.6.0
@@ -1,4 +1,4 @@
-virtual/cdrtools app-cdr/dvd+rw-tools dev-libs/libcdio[-minimal] sys-libs/ncurses[unicode] || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+virtual/cdrtools app-cdr/dvd+rw-tools dev-libs/libcdio[-minimal] sys-libs/ncurses[unicode] || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 virtual/cdrtools app-cdr/dvd+rw-tools dev-libs/libcdio[-minimal] sys-libs/ncurses[unicode]
 0
 mirror://sourceforge/cdw/cdw-0.6.0.tar.gz
diff --git a/metadata/cache/app-cdr/cdw-0.7.0 b/metadata/cache/app-cdr/cdw-0.7.0
index d63ac6abd855..cee5c38d9374 100644
--- a/metadata/cache/app-cdr/cdw-0.7.0
+++ b/metadata/cache/app-cdr/cdw-0.7.0
@@ -1,4 +1,4 @@
-virtual/cdrtools app-cdr/dvd+rw-tools dev-libs/libburn dev-libs/libcdio[-minimal] sys-libs/ncurses[unicode] || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+virtual/cdrtools app-cdr/dvd+rw-tools dev-libs/libburn dev-libs/libcdio[-minimal] sys-libs/ncurses[unicode] || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 virtual/cdrtools app-cdr/dvd+rw-tools dev-libs/libburn dev-libs/libcdio[-minimal] sys-libs/ncurses[unicode]
 0
 mirror://sourceforge/cdw/cdw-0.7.0.tar.gz
diff --git a/metadata/cache/app-cdr/cdw-9999 b/metadata/cache/app-cdr/cdw-9999
index 56a21171217a..dfd2b2c49a02 100644
--- a/metadata/cache/app-cdr/cdw-9999
+++ b/metadata/cache/app-cdr/cdw-9999
@@ -1,4 +1,4 @@
-virtual/cdrtools app-cdr/dvd+rw-tools dev-libs/libburn dev-libs/libcdio[-minimal] sys-libs/ncurses[unicode] || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/cvs
+virtual/cdrtools app-cdr/dvd+rw-tools dev-libs/libburn dev-libs/libcdio[-minimal] sys-libs/ncurses[unicode] || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/cvs
 virtual/cdrtools app-cdr/dvd+rw-tools dev-libs/libburn dev-libs/libcdio[-minimal] sys-libs/ncurses[unicode]
 0
 
diff --git a/metadata/cache/app-cdr/xfburn-0.4.3-r3 b/metadata/cache/app-cdr/xfburn-0.4.3-r3
index ceccea09c9a3..3d12960ca125 100644
--- a/metadata/cache/app-cdr/xfburn-0.4.3-r3
+++ b/metadata/cache/app-cdr/xfburn-0.4.3-r3
@@ -1,4 +1,4 @@
->=dev-libs/glib-2.22 >=dev-libs/libburn-0.4.2 >=dev-libs/libisofs-0.6.2 >=x11-libs/gtk+-2.10:2 >=xfce-base/exo-0.6 >=xfce-base/libxfce4ui-4.8 gstreamer? ( >=media-libs/gst-plugins-base-0.10.20:0.10 ) udev? ( || ( >=sys-fs/udev-171-r1[gudev] <sys-fs/udev-171-r1[extras] ) ) dev-util/pkgconfig dev-util/intltool sys-devel/gettext >=sys-apps/sed-4 >=dev-util/xfce4-dev-tools-4.9.1 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-libs/glib-2.22 >=dev-libs/libburn-0.4.2 >=dev-libs/libisofs-0.6.2 >=x11-libs/gtk+-2.10:2 >=xfce-base/exo-0.6 >=xfce-base/libxfce4ui-4.8 gstreamer? ( >=media-libs/gst-plugins-base-0.10.20:0.10 ) udev? ( || ( >=sys-fs/udev-171-r1[gudev] <sys-fs/udev-171-r1[extras] ) ) dev-util/pkgconfig dev-util/intltool sys-devel/gettext >=sys-apps/sed-4 >=dev-util/xfce4-dev-tools-4.9.1 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=dev-libs/glib-2.22 >=dev-libs/libburn-0.4.2 >=dev-libs/libisofs-0.6.2 >=x11-libs/gtk+-2.10:2 >=xfce-base/exo-0.6 >=xfce-base/libxfce4ui-4.8 gstreamer? ( >=media-libs/gst-plugins-base-0.10.20:0.10 ) udev? ( || ( >=sys-fs/udev-171-r1[gudev] <sys-fs/udev-171-r1[extras] ) )
 0
 mirror://xfce/src/apps/xfburn/0.4/xfburn-0.4.3.tar.bz2 mirror://debian/pool/main/x/xfburn/xfburn_0.4.3-4.debian.tar.gz
diff --git a/metadata/cache/app-crypt/acr38u-1.7.10-r1 b/metadata/cache/app-crypt/acr38u-1.7.10-r1
index cff9aa115ee3..cd1e8a0d5a5f 100644
--- a/metadata/cache/app-crypt/acr38u-1.7.10-r1
+++ b/metadata/cache/app-crypt/acr38u-1.7.10-r1
@@ -1,4 +1,4 @@
->=sys-apps/pcsc-lite-1.6.4 dev-libs/libusb-compat dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=sys-apps/pcsc-lite-1.6.4 dev-libs/libusb-compat dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=sys-apps/pcsc-lite-1.6.4 dev-libs/libusb-compat
 0
 http://www.acs.com.hk/drivers/eng/ACR38U_driver_Lnx_1710_P.tar.gz
diff --git a/metadata/cache/app-crypt/acr38u-1.7.11 b/metadata/cache/app-crypt/acr38u-1.7.11
index 011078eb24c2..0116b865f109 100644
--- a/metadata/cache/app-crypt/acr38u-1.7.11
+++ b/metadata/cache/app-crypt/acr38u-1.7.11
@@ -1,4 +1,4 @@
->=sys-apps/pcsc-lite-1.6.4 dev-libs/libusb-compat dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=sys-apps/pcsc-lite-1.6.4 dev-libs/libusb-compat dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=sys-apps/pcsc-lite-1.6.4 dev-libs/libusb-compat
 0
 http://www.linuxunderground.be/ACR38_LINUX_100711_P.tar.bz2
diff --git a/metadata/cache/app-crypt/bsign-0.4.5 b/metadata/cache/app-crypt/bsign-0.4.5
index 106e058ae821..b37211e8d3e0 100644
--- a/metadata/cache/app-crypt/bsign-0.4.5
+++ b/metadata/cache/app-crypt/bsign-0.4.5
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 mirror://debian/pool/main/b/bsign/bsign_0.4.5.tar.gz
diff --git a/metadata/cache/app-crypt/dieharder-2.28.1 b/metadata/cache/app-crypt/dieharder-2.28.1
index 94cd05804441..9605d11d14ad 100644
--- a/metadata/cache/app-crypt/dieharder-2.28.1
+++ b/metadata/cache/app-crypt/dieharder-2.28.1
@@ -1,4 +1,4 @@
-sci-libs/gsl || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+sci-libs/gsl || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 sci-libs/gsl
 0
 http://www.phy.duke.edu/~rgb/General/dieharder/dieharder-2.28.1.tgz
diff --git a/metadata/cache/app-crypt/gpa-0.9.1_pre20100416 b/metadata/cache/app-crypt/gpa-0.9.1_pre20100416
index 8e1af797647e..4d52d40ffbb1 100644
--- a/metadata/cache/app-crypt/gpa-0.9.1_pre20100416
+++ b/metadata/cache/app-crypt/gpa-0.9.1_pre20100416
@@ -1,4 +1,4 @@
->=x11-libs/gtk+-2.10.0:2 >=dev-libs/libgpg-error-1.4 >=dev-libs/libassuan-1.1.0 >=app-crypt/gnupg-2 >=app-crypt/gpgme-1.2.0 >=dev-util/pkgconfig-0.7 nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=x11-libs/gtk+-2.10.0:2 >=dev-libs/libgpg-error-1.4 >=dev-libs/libassuan-1.1.0 >=app-crypt/gnupg-2 >=app-crypt/gpgme-1.2.0 >=dev-util/pkgconfig-0.7 nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=x11-libs/gtk+-2.10.0:2 >=dev-libs/libgpg-error-1.4 >=dev-libs/libassuan-1.1.0 >=app-crypt/gnupg-2 >=app-crypt/gpgme-1.2.0
 0
 mirror://gentoo/gpa-0.9.1_pre20100416.tar.bz2
diff --git a/metadata/cache/app-crypt/gpa-0.9.1_pre20100416-r1 b/metadata/cache/app-crypt/gpa-0.9.1_pre20100416-r1
index 7d2f4a286ef0..b4b9a8dff069 100644
--- a/metadata/cache/app-crypt/gpa-0.9.1_pre20100416-r1
+++ b/metadata/cache/app-crypt/gpa-0.9.1_pre20100416-r1
@@ -1,4 +1,4 @@
->=x11-libs/gtk+-2.10.0:2 >=dev-libs/libgpg-error-1.4 >=dev-libs/libassuan-1.1.0 >=app-crypt/gnupg-2 >=app-crypt/gpgme-1.2.0 >=dev-util/pkgconfig-0.7 nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=x11-libs/gtk+-2.10.0:2 >=dev-libs/libgpg-error-1.4 >=dev-libs/libassuan-1.1.0 >=app-crypt/gnupg-2 >=app-crypt/gpgme-1.2.0 >=dev-util/pkgconfig-0.7 nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=x11-libs/gtk+-2.10.0:2 >=dev-libs/libgpg-error-1.4 >=dev-libs/libassuan-1.1.0 >=app-crypt/gnupg-2 >=app-crypt/gpgme-1.2.0
 0
 mirror://gentoo/gpa-0.9.1_pre20100416.tar.bz2
diff --git a/metadata/cache/app-crypt/gpgme-1.3.0-r1 b/metadata/cache/app-crypt/gpgme-1.3.0-r1
index a47650ebda5a..2c24f343c05d 100644
--- a/metadata/cache/app-crypt/gpgme-1.3.0-r1
+++ b/metadata/cache/app-crypt/gpgme-1.3.0-r1
@@ -1,4 +1,4 @@
-app-crypt/gnupg >=dev-libs/libassuan-1.1.0 >=dev-libs/libgpg-error-1.4 pth? ( >=dev-libs/pth-1.2 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+app-crypt/gnupg >=dev-libs/libassuan-1.1.0 >=dev-libs/libgpg-error-1.4 pth? ( >=dev-libs/pth-1.2 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 app-crypt/gnupg >=dev-libs/libassuan-1.1.0 >=dev-libs/libgpg-error-1.4 pth? ( >=dev-libs/pth-1.2 )
 1
 mirror://gnupg/gpgme/gpgme-1.3.0.tar.bz2
diff --git a/metadata/cache/app-crypt/gpgme-1.3.1 b/metadata/cache/app-crypt/gpgme-1.3.1
index 92d0341ba111..97aeceeed9d2 100644
--- a/metadata/cache/app-crypt/gpgme-1.3.1
+++ b/metadata/cache/app-crypt/gpgme-1.3.1
@@ -1,4 +1,4 @@
-app-crypt/gnupg >=dev-libs/libassuan-2.0.2 >=dev-libs/libgpg-error-1.4 pth? ( >=dev-libs/pth-1.2 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+app-crypt/gnupg >=dev-libs/libassuan-2.0.2 >=dev-libs/libgpg-error-1.4 pth? ( >=dev-libs/pth-1.2 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 app-crypt/gnupg >=dev-libs/libassuan-2.0.2 >=dev-libs/libgpg-error-1.4 pth? ( >=dev-libs/pth-1.2 )
 1
 mirror://gnupg/gpgme/gpgme-1.3.1.tar.bz2
diff --git a/metadata/cache/app-crypt/heimdal-1.5.1-r1 b/metadata/cache/app-crypt/heimdal-1.5.1-r1
index fffa0bc76d72..03bfa0494603 100644
--- a/metadata/cache/app-crypt/heimdal-1.5.1-r1
+++ b/metadata/cache/app-crypt/heimdal-1.5.1-r1
@@ -1,4 +1,4 @@
-ssl? ( dev-libs/openssl ) berkdb? ( sys-libs/db ) !berkdb? ( sys-libs/gdbm ) caps? ( sys-libs/libcap-ng ) >=dev-db/sqlite-3.5.7 >=sys-libs/e2fsprogs-libs-1.41.11 sys-libs/ncurses sys-libs/readline afs? ( net-fs/openafs ) hdb-ldap? ( >=net-nds/openldap-2.3.0 ) X? ( x11-libs/libX11 x11-libs/libXau x11-libs/libXt ) !!app-crypt/mit-krb5 !!app-crypt/mit-krb5-appl =dev-lang/python-2* dev-util/pkgconfig >=sys-devel/autoconf-2.62 test? ( X? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+ssl? ( dev-libs/openssl ) berkdb? ( sys-libs/db ) !berkdb? ( sys-libs/gdbm ) caps? ( sys-libs/libcap-ng ) >=dev-db/sqlite-3.5.7 >=sys-libs/e2fsprogs-libs-1.41.11 sys-libs/ncurses sys-libs/readline afs? ( net-fs/openafs ) hdb-ldap? ( >=net-nds/openldap-2.3.0 ) X? ( x11-libs/libX11 x11-libs/libXau x11-libs/libXt ) !!app-crypt/mit-krb5 !!app-crypt/mit-krb5-appl =dev-lang/python-2* dev-util/pkgconfig >=sys-devel/autoconf-2.62 test? ( X? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 ssl? ( dev-libs/openssl ) berkdb? ( sys-libs/db ) !berkdb? ( sys-libs/gdbm ) caps? ( sys-libs/libcap-ng ) >=dev-db/sqlite-3.5.7 >=sys-libs/e2fsprogs-libs-1.41.11 sys-libs/ncurses sys-libs/readline afs? ( net-fs/openafs ) hdb-ldap? ( >=net-nds/openldap-2.3.0 ) X? ( x11-libs/libX11 x11-libs/libXau x11-libs/libXt ) !!app-crypt/mit-krb5 !!app-crypt/mit-krb5-appl
 0
 http://www.h5l.org/dist/src/heimdal-1.5.1.tar.gz
diff --git a/metadata/cache/app-crypt/heimdal-1.5.2 b/metadata/cache/app-crypt/heimdal-1.5.2
index 013eaec4ea73..3d8552a15992 100644
--- a/metadata/cache/app-crypt/heimdal-1.5.2
+++ b/metadata/cache/app-crypt/heimdal-1.5.2
@@ -1,4 +1,4 @@
-ssl? ( dev-libs/openssl ) berkdb? ( sys-libs/db ) !berkdb? ( sys-libs/gdbm ) caps? ( sys-libs/libcap-ng ) >=dev-db/sqlite-3.5.7 >=sys-libs/e2fsprogs-libs-1.41.11 sys-libs/ncurses sys-libs/readline afs? ( net-fs/openafs ) hdb-ldap? ( >=net-nds/openldap-2.3.0 ) X? ( x11-libs/libX11 x11-libs/libXau x11-libs/libXt ) !!app-crypt/mit-krb5 !!app-crypt/mit-krb5-appl =dev-lang/python-2* dev-util/pkgconfig >=sys-devel/autoconf-2.62 test? ( X? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+ssl? ( dev-libs/openssl ) berkdb? ( sys-libs/db ) !berkdb? ( sys-libs/gdbm ) caps? ( sys-libs/libcap-ng ) >=dev-db/sqlite-3.5.7 >=sys-libs/e2fsprogs-libs-1.41.11 sys-libs/ncurses sys-libs/readline afs? ( net-fs/openafs ) hdb-ldap? ( >=net-nds/openldap-2.3.0 ) X? ( x11-libs/libX11 x11-libs/libXau x11-libs/libXt ) !!app-crypt/mit-krb5 !!app-crypt/mit-krb5-appl =dev-lang/python-2* dev-util/pkgconfig >=sys-devel/autoconf-2.62 test? ( X? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 ssl? ( dev-libs/openssl ) berkdb? ( sys-libs/db ) !berkdb? ( sys-libs/gdbm ) caps? ( sys-libs/libcap-ng ) >=dev-db/sqlite-3.5.7 >=sys-libs/e2fsprogs-libs-1.41.11 sys-libs/ncurses sys-libs/readline afs? ( net-fs/openafs ) hdb-ldap? ( >=net-nds/openldap-2.3.0 ) X? ( x11-libs/libX11 x11-libs/libXau x11-libs/libXt ) !!app-crypt/mit-krb5 !!app-crypt/mit-krb5-appl
 0
 http://www.h5l.org/dist/src/heimdal-1.5.2.tar.gz
diff --git a/metadata/cache/app-crypt/kstart-4.1 b/metadata/cache/app-crypt/kstart-4.1
index 731861f22164..6810fee022aa 100644
--- a/metadata/cache/app-crypt/kstart-4.1
+++ b/metadata/cache/app-crypt/kstart-4.1
@@ -6,7 +6,7 @@ http://archives.eyrie.org/software/kerberos/kstart-4.1.tar.gz
 http://www.eyrie.org/~eagle/software/kstart
 || ( MIT Stanford ISC )
 Modified versions of kinit for refreshing kerberos tickets automatically
-~amd64 ~x86
+amd64 ~x86
 eutils multilib toolchain-funcs user
 afs
 
diff --git a/metadata/cache/app-crypt/onak-0.3.7 b/metadata/cache/app-crypt/onak-0.3.7
index 9e544813d78c..964b247de07c 100644
--- a/metadata/cache/app-crypt/onak-0.3.7
+++ b/metadata/cache/app-crypt/onak-0.3.7
@@ -1,4 +1,4 @@
-berkdb? ( >=sys-libs/db-4 ) postgres? ( dev-db/postgresql-server ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+berkdb? ( >=sys-libs/db-4 ) postgres? ( dev-db/postgresql-server ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 berkdb? ( >=sys-libs/db-4 ) postgres? ( dev-db/postgresql-server )
 0
 http://www.earth.li/projectpurple/files/onak-0.3.7.tar.gz
diff --git a/metadata/cache/app-crypt/onak-0.4.0 b/metadata/cache/app-crypt/onak-0.4.0
index 446f69f9c8d6..d0c7dcc5f696 100644
--- a/metadata/cache/app-crypt/onak-0.4.0
+++ b/metadata/cache/app-crypt/onak-0.4.0
@@ -1,4 +1,4 @@
-berkdb? ( >=sys-libs/db-4 ) postgres? ( dev-db/postgresql-server ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+berkdb? ( >=sys-libs/db-4 ) postgres? ( dev-db/postgresql-server ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 berkdb? ( >=sys-libs/db-4 ) postgres? ( dev-db/postgresql-server )
 0
 http://www.earth.li/projectpurple/files/onak-0.4.0.tar.gz
diff --git a/metadata/cache/app-crypt/scute-1.4.0 b/metadata/cache/app-crypt/scute-1.4.0
index 231a5ef0ccb3..e49e2fc2b731 100644
--- a/metadata/cache/app-crypt/scute-1.4.0
+++ b/metadata/cache/app-crypt/scute-1.4.0
@@ -1,4 +1,4 @@
->=dev-libs/libgpg-error-1.4 >=dev-libs/libassuan-2.0.0 >=app-crypt/pinentry-0.7.0 >=app-crypt/gnupg-2.0.17-r1[smartcard] || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-libs/libgpg-error-1.4 >=dev-libs/libassuan-2.0.0 >=app-crypt/pinentry-0.7.0 >=app-crypt/gnupg-2.0.17-r1[smartcard] || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=dev-libs/libgpg-error-1.4 >=dev-libs/libassuan-2.0.0 >=app-crypt/pinentry-0.7.0 >=app-crypt/gnupg-2.0.17-r1[smartcard]
 0
 ftp://ftp.gnupg.org/gcrypt/scute/scute-1.4.0.tar.bz2
diff --git a/metadata/cache/app-crypt/shishi-1.0.1 b/metadata/cache/app-crypt/shishi-1.0.1
index b9df117c7c1b..21cbd8f7e93e 100644
--- a/metadata/cache/app-crypt/shishi-1.0.1
+++ b/metadata/cache/app-crypt/shishi-1.0.1
@@ -1,4 +1,4 @@
-gnutls? ( net-libs/gnutls ) idn? ( net-dns/libidn ) dev-libs/libtasn1 dev-libs/libgcrypt dev-libs/libgpg-error virtual/libiconv virtual/libintl || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+gnutls? ( net-libs/gnutls ) idn? ( net-dns/libidn ) dev-libs/libtasn1 dev-libs/libgcrypt dev-libs/libgpg-error virtual/libiconv virtual/libintl || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 gnutls? ( net-libs/gnutls ) idn? ( net-dns/libidn ) dev-libs/libtasn1 dev-libs/libgcrypt dev-libs/libgpg-error virtual/libiconv virtual/libintl
 0
 http://ftp.gnu.org/gnu/shishi/shishi-1.0.1.tar.gz
diff --git a/metadata/cache/app-crypt/stan-0.4.1 b/metadata/cache/app-crypt/stan-0.4.1
index 1b5a65b9d09c..3773b6acc29c 100644
--- a/metadata/cache/app-crypt/stan-0.4.1
+++ b/metadata/cache/app-crypt/stan-0.4.1
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 http://www.roqe.org/stan/stan-0.4.1.tar.gz
diff --git a/metadata/cache/app-crypt/tpm-tools-1.3.5 b/metadata/cache/app-crypt/tpm-tools-1.3.5
index 0757122a559c..8fa8e8ada550 100644
--- a/metadata/cache/app-crypt/tpm-tools-1.3.5
+++ b/metadata/cache/app-crypt/tpm-tools-1.3.5
@@ -1,4 +1,4 @@
->=app-crypt/trousers-0.3.0 nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=app-crypt/trousers-0.3.0 nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=app-crypt/trousers-0.3.0 nls? ( virtual/libintl )
 0
 mirror://sourceforge/trousers/tpm-tools-1.3.5.tar.gz
diff --git a/metadata/cache/app-crypt/tpm-tools-1.3.5-r1 b/metadata/cache/app-crypt/tpm-tools-1.3.5-r1
index 760cce16d7da..012cb405a2c3 100644
--- a/metadata/cache/app-crypt/tpm-tools-1.3.5-r1
+++ b/metadata/cache/app-crypt/tpm-tools-1.3.5-r1
@@ -1,4 +1,4 @@
->=app-crypt/trousers-0.3.0 dev-libs/openssl pkcs11? ( dev-libs/opencryptoki ) nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=app-crypt/trousers-0.3.0 dev-libs/openssl pkcs11? ( dev-libs/opencryptoki ) nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=app-crypt/trousers-0.3.0 dev-libs/openssl pkcs11? ( dev-libs/opencryptoki ) nls? ( virtual/libintl )
 0
 mirror://sourceforge/trousers/tpm-tools-1.3.5.tar.gz
diff --git a/metadata/cache/app-crypt/trousers-0.3.6 b/metadata/cache/app-crypt/trousers-0.3.6
index 6a4de780a781..18b433ac3496 100644
--- a/metadata/cache/app-crypt/trousers-0.3.6
+++ b/metadata/cache/app-crypt/trousers-0.3.6
@@ -1,4 +1,4 @@
->=dev-libs/glib-2 >=dev-libs/openssl-0.9.7 dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-libs/glib-2 >=dev-libs/openssl-0.9.7 dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=dev-libs/glib-2 >=dev-libs/openssl-0.9.7
 0
 mirror://sourceforge/trousers/trousers-0.3.6.tar.gz
diff --git a/metadata/cache/app-dicts/gjiten-2.6-r1 b/metadata/cache/app-dicts/gjiten-2.6-r1
index 8861a3ee55e0..831a94a31d6f 100644
--- a/metadata/cache/app-dicts/gjiten-2.6-r1
+++ b/metadata/cache/app-dicts/gjiten-2.6-r1
@@ -1,4 +1,4 @@
->=gnome-base/libgnome-2.2 >=gnome-base/libgnomeui-2.2 >=gnome-base/libglade-2 app-text/rarian dev-util/intltool app-text/xmlto app-text/docbook-xml-dtd:4.1.2 dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+>=gnome-base/libgnome-2.2 >=gnome-base/libgnomeui-2.2 >=gnome-base/libglade-2 app-text/rarian dev-util/intltool app-text/xmlto app-text/docbook-xml-dtd:4.1.2 dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 >=gnome-base/libgnome-2.2 >=gnome-base/libgnomeui-2.2 >=gnome-base/libglade-2
 0
 http://gjiten.sourceforge.net/gjiten-2.6.tar.gz
diff --git a/metadata/cache/app-dicts/ipadic-2.7.0-r1 b/metadata/cache/app-dicts/ipadic-2.7.0-r1
index a7195e7de6d9..491c257e702a 100644
--- a/metadata/cache/app-dicts/ipadic-2.7.0-r1
+++ b/metadata/cache/app-dicts/ipadic-2.7.0-r1
@@ -1,4 +1,4 @@
->=app-text/chasen-2.3.1 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=app-text/chasen-2.3.1 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 http://chasen.aist-nara.ac.jp/stable/ipadic/ipadic-2.7.0.tar.gz
diff --git a/metadata/cache/app-dicts/ipadic-2.7.0-r2 b/metadata/cache/app-dicts/ipadic-2.7.0-r2
index 0940391da664..9d4e809152b4 100644
--- a/metadata/cache/app-dicts/ipadic-2.7.0-r2
+++ b/metadata/cache/app-dicts/ipadic-2.7.0-r2
@@ -1,4 +1,4 @@
->=app-text/chasen-2.3.1 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=app-text/chasen-2.3.1 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 http://chasen.aist-nara.ac.jp/stable/ipadic/ipadic-2.7.0.tar.gz
diff --git a/metadata/cache/app-dicts/wordnet-3.0-r3 b/metadata/cache/app-dicts/wordnet-3.0-r3
index f974a00a4b3d..faebd7b72c9e 100644
--- a/metadata/cache/app-dicts/wordnet-3.0-r3
+++ b/metadata/cache/app-dicts/wordnet-3.0-r3
@@ -1,4 +1,4 @@
-dev-lang/tcl dev-lang/tk || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-lang/tcl dev-lang/tk || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-lang/tcl dev-lang/tk
 0
 ftp://ftp.cogsci.princeton.edu/pub/wordnet/3.0/WordNet-3.0.tar.gz mirror://gentoo/wordnet-3.0-patchset-1.tar.bz2
diff --git a/metadata/cache/app-editors/adie-1.6.36 b/metadata/cache/app-editors/adie-1.6.36
index efe16ae55a85..1909849e4cb5 100644
--- a/metadata/cache/app-editors/adie-1.6.36
+++ b/metadata/cache/app-editors/adie-1.6.36
@@ -1,4 +1,4 @@
-x11-libs/fox:1.6 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-util/reswrap >=sys-apps/sed-4
+x11-libs/fox:1.6 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-util/reswrap >=sys-apps/sed-4
 x11-libs/fox:1.6
 0
 ftp://ftp.fox-toolkit.org/pub/fox-1.6.36.tar.gz
diff --git a/metadata/cache/app-editors/adie-1.7.32 b/metadata/cache/app-editors/adie-1.7.32
index 5a426fe07a95..e361ead7481e 100644
--- a/metadata/cache/app-editors/adie-1.7.32
+++ b/metadata/cache/app-editors/adie-1.7.32
@@ -1,4 +1,4 @@
-~x11-libs/fox-1.7.32 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-util/reswrap >=sys-apps/sed-4
+~x11-libs/fox-1.7.32 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-util/reswrap >=sys-apps/sed-4
 ~x11-libs/fox-1.7.32
 0
 ftp://ftp.fox-toolkit.org/pub/fox-1.7.32.tar.gz
diff --git a/metadata/cache/app-editors/amyedit-1.0-r2 b/metadata/cache/app-editors/amyedit-1.0-r2
index 6a036e022833..fc721da5386d 100644
--- a/metadata/cache/app-editors/amyedit-1.0-r2
+++ b/metadata/cache/app-editors/amyedit-1.0-r2
@@ -1,4 +1,4 @@
->=dev-cpp/gtkmm-2.6:2.4 >=dev-cpp/glibmm-2.14:2 >=dev-libs/libsigc++-2.2 x11-libs/gtksourceview:2.0 dev-cpp/gtksourceviewmm:2.0 app-text/aspell dev-util/intltool dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-cpp/gtkmm-2.6:2.4 >=dev-cpp/glibmm-2.14:2 >=dev-libs/libsigc++-2.2 x11-libs/gtksourceview:2.0 dev-cpp/gtksourceviewmm:2.0 app-text/aspell dev-util/intltool dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=dev-cpp/gtkmm-2.6:2.4 >=dev-cpp/glibmm-2.14:2 >=dev-libs/libsigc++-2.2 x11-libs/gtksourceview:2.0 dev-cpp/gtksourceviewmm:2.0 app-text/aspell
 0
 mirror://sourceforge/amyedit/amyedit-1.0.tar.bz2
diff --git a/metadata/cache/app-editors/bluefish-2.2.1 b/metadata/cache/app-editors/bluefish-2.2.1
index 10ca4bc3d6e0..01e38ae7b73e 100644
--- a/metadata/cache/app-editors/bluefish-2.2.1
+++ b/metadata/cache/app-editors/bluefish-2.2.1
@@ -1,4 +1,4 @@
-x11-libs/gtk+:3 gnome-extra/gucharmap:2.90 spell? ( app-text/enchant ) >=dev-libs/glib-2.16:2 dev-libs/libxml2:2 dev-util/pkgconfig x11-libs/pango nls? ( sys-devel/gettext dev-util/intltool ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( =dev-lang/python-2* )
+x11-libs/gtk+:3 gnome-extra/gucharmap:2.90 spell? ( app-text/enchant ) >=dev-libs/glib-2.16:2 dev-libs/libxml2:2 dev-util/pkgconfig x11-libs/pango nls? ( sys-devel/gettext dev-util/intltool ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( =dev-lang/python-2* )
 x11-libs/gtk+:3 gnome-extra/gucharmap:2.90 spell? ( app-text/enchant ) python? ( =dev-lang/python-2* )
 0
 http://www.bennewitz.com/bluefish/stable/source/bluefish-2.2.1.tar.bz2
diff --git a/metadata/cache/app-editors/cssed-0.4.0-r1 b/metadata/cache/app-editors/cssed-0.4.0-r1
index 3e7cd4969ada..6ba6d4a82703 100644
--- a/metadata/cache/app-editors/cssed-0.4.0-r1
+++ b/metadata/cache/app-editors/cssed-0.4.0-r1
@@ -1,4 +1,4 @@
-x11-libs/gtk+:2 >=dev-libs/atk-1.4.0 >=dev-libs/glib-2.2.3 >=media-libs/fontconfig-2.2.0-r2 >=x11-libs/pango-1.2.1-r1 dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+x11-libs/gtk+:2 >=dev-libs/atk-1.4.0 >=dev-libs/glib-2.2.3 >=media-libs/fontconfig-2.2.0-r2 >=x11-libs/pango-1.2.1-r1 dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 x11-libs/gtk+:2 >=dev-libs/atk-1.4.0 >=dev-libs/glib-2.2.3 >=media-libs/fontconfig-2.2.0-r2 >=x11-libs/pango-1.2.1-r1
 0
 mirror://sourceforge/cssed/cssed-0.4.0.tar.gz
diff --git a/metadata/cache/app-editors/emacs-vcs-24.0.93 b/metadata/cache/app-editors/emacs-vcs-24.0.93
index 4388cba447b0..a70b9b6d820c 100644
--- a/metadata/cache/app-editors/emacs-vcs-24.0.93
+++ b/metadata/cache/app-editors/emacs-vcs-24.0.93
@@ -1,4 +1,4 @@
-sys-libs/ncurses >=app-admin/eselect-emacs-1.2 net-libs/liblockfile hesiod? ( net-dns/hesiod ) kerberos? ( virtual/krb5 ) alsa? ( media-libs/alsa-lib ) gpm? ( sys-libs/gpm ) dbus? ( sys-apps/dbus ) gnutls? ( net-libs/gnutls ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) selinux? ( sys-libs/libselinux ) X? ( x11-libs/libXmu x11-libs/libXt x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib ) jpeg? ( virtual/jpeg ) png? ( >=media-libs/libpng-1.4:0 ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2 ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) ) !gtk? ( Xaw3d? ( x11-libs/libXaw3d ) !Xaw3d? ( athena? ( x11-libs/libXaw ) !athena? ( motif? ( >=x11-libs/openmotif-2.3:0 ) ) ) ) ) alsa? ( dev-util/pkgconfig ) dbus? ( dev-util/pkgconfig ) gnutls? ( dev-util/pkgconfig ) libxml2? ( dev-util/pkgconfig ) X? ( dev-util/pkgconfig ) gzip-el? ( app-arch/gzip ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+sys-libs/ncurses >=app-admin/eselect-emacs-1.2 net-libs/liblockfile hesiod? ( net-dns/hesiod ) kerberos? ( virtual/krb5 ) alsa? ( media-libs/alsa-lib ) gpm? ( sys-libs/gpm ) dbus? ( sys-apps/dbus ) gnutls? ( net-libs/gnutls ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) selinux? ( sys-libs/libselinux ) X? ( x11-libs/libXmu x11-libs/libXt x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib ) jpeg? ( virtual/jpeg ) png? ( >=media-libs/libpng-1.4:0 ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2 ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) ) !gtk? ( Xaw3d? ( x11-libs/libXaw3d ) !Xaw3d? ( athena? ( x11-libs/libXaw ) !athena? ( motif? ( >=x11-libs/openmotif-2.3:0 ) ) ) ) ) alsa? ( dev-util/pkgconfig ) dbus? ( dev-util/pkgconfig ) gnutls? ( dev-util/pkgconfig ) libxml2? ( dev-util/pkgconfig ) X? ( dev-util/pkgconfig ) gzip-el? ( app-arch/gzip ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 sys-libs/ncurses >=app-admin/eselect-emacs-1.2 net-libs/liblockfile hesiod? ( net-dns/hesiod ) kerberos? ( virtual/krb5 ) alsa? ( media-libs/alsa-lib ) gpm? ( sys-libs/gpm ) dbus? ( sys-apps/dbus ) gnutls? ( net-libs/gnutls ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) selinux? ( sys-libs/libselinux ) X? ( x11-libs/libXmu x11-libs/libXt x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib ) jpeg? ( virtual/jpeg ) png? ( >=media-libs/libpng-1.4:0 ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2 ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) ) !gtk? ( Xaw3d? ( x11-libs/libXaw3d ) !Xaw3d? ( athena? ( x11-libs/libXaw ) !athena? ( motif? ( >=x11-libs/openmotif-2.3:0 ) ) ) ) ) >=app-emacs/emacs-common-gentoo-1.3[X?]
 24
 mirror://gentoo/emacs-24.0.93.tar.gz ftp://alpha.gnu.org/gnu/emacs/pretest/emacs-24.0.93.tar.gz
diff --git a/metadata/cache/app-editors/emacs-vcs-24.0.94 b/metadata/cache/app-editors/emacs-vcs-24.0.94
index 746e7626ee40..52966f145906 100644
--- a/metadata/cache/app-editors/emacs-vcs-24.0.94
+++ b/metadata/cache/app-editors/emacs-vcs-24.0.94
@@ -1,4 +1,4 @@
-sys-libs/ncurses >=app-admin/eselect-emacs-1.2 net-libs/liblockfile hesiod? ( net-dns/hesiod ) kerberos? ( virtual/krb5 ) alsa? ( media-libs/alsa-lib ) gpm? ( sys-libs/gpm ) dbus? ( sys-apps/dbus ) gnutls? ( net-libs/gnutls ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) selinux? ( sys-libs/libselinux ) X? ( x11-libs/libXmu x11-libs/libXt x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib ) jpeg? ( virtual/jpeg ) png? ( >=media-libs/libpng-1.4:0 ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2 ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) ) !gtk? ( Xaw3d? ( x11-libs/libXaw3d ) !Xaw3d? ( athena? ( x11-libs/libXaw ) !athena? ( motif? ( >=x11-libs/openmotif-2.3:0 ) ) ) ) ) alsa? ( dev-util/pkgconfig ) dbus? ( dev-util/pkgconfig ) gnutls? ( dev-util/pkgconfig ) libxml2? ( dev-util/pkgconfig ) X? ( dev-util/pkgconfig ) gzip-el? ( app-arch/gzip ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+sys-libs/ncurses >=app-admin/eselect-emacs-1.2 net-libs/liblockfile hesiod? ( net-dns/hesiod ) kerberos? ( virtual/krb5 ) alsa? ( media-libs/alsa-lib ) gpm? ( sys-libs/gpm ) dbus? ( sys-apps/dbus ) gnutls? ( net-libs/gnutls ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) selinux? ( sys-libs/libselinux ) X? ( x11-libs/libXmu x11-libs/libXt x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib ) jpeg? ( virtual/jpeg ) png? ( >=media-libs/libpng-1.4:0 ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2 ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) ) !gtk? ( Xaw3d? ( x11-libs/libXaw3d ) !Xaw3d? ( athena? ( x11-libs/libXaw ) !athena? ( motif? ( >=x11-libs/openmotif-2.3:0 ) ) ) ) ) alsa? ( dev-util/pkgconfig ) dbus? ( dev-util/pkgconfig ) gnutls? ( dev-util/pkgconfig ) libxml2? ( dev-util/pkgconfig ) X? ( dev-util/pkgconfig ) gzip-el? ( app-arch/gzip ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 sys-libs/ncurses >=app-admin/eselect-emacs-1.2 net-libs/liblockfile hesiod? ( net-dns/hesiod ) kerberos? ( virtual/krb5 ) alsa? ( media-libs/alsa-lib ) gpm? ( sys-libs/gpm ) dbus? ( sys-apps/dbus ) gnutls? ( net-libs/gnutls ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) selinux? ( sys-libs/libselinux ) X? ( x11-libs/libXmu x11-libs/libXt x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib ) jpeg? ( virtual/jpeg ) png? ( >=media-libs/libpng-1.4:0 ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2 ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) ) !gtk? ( Xaw3d? ( x11-libs/libXaw3d ) !Xaw3d? ( athena? ( x11-libs/libXaw ) !athena? ( motif? ( >=x11-libs/openmotif-2.3:0 ) ) ) ) ) >=app-emacs/emacs-common-gentoo-1.3[X?]
 24
 mirror://gentoo/emacs-24.0.94.tar.gz ftp://alpha.gnu.org/gnu/emacs/pretest/emacs-24.0.94.tar.gz
diff --git a/metadata/cache/app-editors/emacs-vcs-24.0.9999-r3 b/metadata/cache/app-editors/emacs-vcs-24.0.9999-r3
index fa2a3a982204..88caf854f0e0 100644
--- a/metadata/cache/app-editors/emacs-vcs-24.0.9999-r3
+++ b/metadata/cache/app-editors/emacs-vcs-24.0.9999-r3
@@ -1,4 +1,4 @@
-sys-libs/ncurses >=app-admin/eselect-emacs-1.2 net-libs/liblockfile hesiod? ( net-dns/hesiod ) kerberos? ( virtual/krb5 ) alsa? ( media-libs/alsa-lib ) gpm? ( sys-libs/gpm ) dbus? ( sys-apps/dbus ) gnutls? ( net-libs/gnutls ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) selinux? ( sys-libs/libselinux ) X? ( x11-libs/libXmu x11-libs/libXt x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib ) jpeg? ( virtual/jpeg ) png? ( >=media-libs/libpng-1.4:0 ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2 ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) ) !gtk? ( Xaw3d? ( x11-libs/libXaw3d ) !Xaw3d? ( athena? ( x11-libs/libXaw ) !athena? ( motif? ( >=x11-libs/openmotif-2.3:0 ) ) ) ) ) alsa? ( dev-util/pkgconfig ) dbus? ( dev-util/pkgconfig ) gnutls? ( dev-util/pkgconfig ) libxml2? ( dev-util/pkgconfig ) X? ( dev-util/pkgconfig ) gzip-el? ( app-arch/gzip ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=dev-vcs/bzr-2.0.1
+sys-libs/ncurses >=app-admin/eselect-emacs-1.2 net-libs/liblockfile hesiod? ( net-dns/hesiod ) kerberos? ( virtual/krb5 ) alsa? ( media-libs/alsa-lib ) gpm? ( sys-libs/gpm ) dbus? ( sys-apps/dbus ) gnutls? ( net-libs/gnutls ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) selinux? ( sys-libs/libselinux ) X? ( x11-libs/libXmu x11-libs/libXt x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib ) jpeg? ( virtual/jpeg ) png? ( >=media-libs/libpng-1.4:0 ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2 ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) ) !gtk? ( Xaw3d? ( x11-libs/libXaw3d ) !Xaw3d? ( athena? ( x11-libs/libXaw ) !athena? ( motif? ( >=x11-libs/openmotif-2.3:0 ) ) ) ) ) alsa? ( dev-util/pkgconfig ) dbus? ( dev-util/pkgconfig ) gnutls? ( dev-util/pkgconfig ) libxml2? ( dev-util/pkgconfig ) X? ( dev-util/pkgconfig ) gzip-el? ( app-arch/gzip ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=dev-vcs/bzr-2.0.1
 sys-libs/ncurses >=app-admin/eselect-emacs-1.2 net-libs/liblockfile hesiod? ( net-dns/hesiod ) kerberos? ( virtual/krb5 ) alsa? ( media-libs/alsa-lib ) gpm? ( sys-libs/gpm ) dbus? ( sys-apps/dbus ) gnutls? ( net-libs/gnutls ) libxml2? ( >=dev-libs/libxml2-2.2.0 ) selinux? ( sys-libs/libselinux ) X? ( x11-libs/libXmu x11-libs/libXt x11-misc/xbitmaps gconf? ( >=gnome-base/gconf-2.26.2 ) gsettings? ( >=dev-libs/glib-2.28.6 ) gif? ( media-libs/giflib ) jpeg? ( virtual/jpeg ) png? ( >=media-libs/libpng-1.4:0 ) svg? ( >=gnome-base/librsvg-2.0 ) tiff? ( media-libs/tiff ) xpm? ( x11-libs/libXpm ) imagemagick? ( >=media-gfx/imagemagick-6.6.2 ) xft? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft m17n-lib? ( >=dev-libs/libotf-0.9.4 >=dev-libs/m17n-lib-1.5.1 ) ) gtk? ( gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) ) !gtk? ( Xaw3d? ( x11-libs/libXaw3d ) !Xaw3d? ( athena? ( x11-libs/libXaw ) !athena? ( motif? ( >=x11-libs/openmotif-2.3:0 ) ) ) ) ) >=app-emacs/emacs-common-gentoo-1.3[X?]
 24
 
diff --git a/metadata/cache/app-editors/mlview-0.9.0-r1 b/metadata/cache/app-editors/mlview-0.9.0-r1
index 4b189a6fbab1..a378905a44ab 100644
--- a/metadata/cache/app-editors/mlview-0.9.0-r1
+++ b/metadata/cache/app-editors/mlview-0.9.0-r1
@@ -1,4 +1,4 @@
->=dev-libs/libxml2-2.6.11:2 >=dev-libs/libxslt-1.1.8 >=dev-libs/glib-2.6:2 >=x11-libs/gtk+-2.6:2 >=dev-cpp/gtkmm-2.4:2.4 >=gnome-base/libglade-2.4:2.0 >=dev-cpp/libglademm-2.6:2.4 >=gnome-base/libgnome-2.8.1 >=gnome-base/gnome-vfs-2.6:2 >=gnome-base/libgnomeui-2.2 >=gnome-base/gconf-2.6.2:2 x11-libs/gtksourceview:2.0 >=x11-libs/vte-0.11.12:0 sys-libs/zlib dev-util/pkgconfig dev-util/intltool sys-devel/gettext || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+>=dev-libs/libxml2-2.6.11:2 >=dev-libs/libxslt-1.1.8 >=dev-libs/glib-2.6:2 >=x11-libs/gtk+-2.6:2 >=dev-cpp/gtkmm-2.4:2.4 >=gnome-base/libglade-2.4:2.0 >=dev-cpp/libglademm-2.6:2.4 >=gnome-base/libgnome-2.8.1 >=gnome-base/gnome-vfs-2.6:2 >=gnome-base/libgnomeui-2.2 >=gnome-base/gconf-2.6.2:2 x11-libs/gtksourceview:2.0 >=x11-libs/vte-0.11.12:0 sys-libs/zlib dev-util/pkgconfig dev-util/intltool sys-devel/gettext || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 >=dev-libs/libxml2-2.6.11:2 >=dev-libs/libxslt-1.1.8 >=dev-libs/glib-2.6:2 >=x11-libs/gtk+-2.6:2 >=dev-cpp/gtkmm-2.4:2.4 >=gnome-base/libglade-2.4:2.0 >=dev-cpp/libglademm-2.6:2.4 >=gnome-base/libgnome-2.8.1 >=gnome-base/gnome-vfs-2.6:2 >=gnome-base/libgnomeui-2.2 >=gnome-base/gconf-2.6.2:2 x11-libs/gtksourceview:2.0 >=x11-libs/vte-0.11.12:0 sys-libs/zlib
 0
 mirror://gnome/sources/mlview/0.9/mlview-0.9.0.tar.bz2
diff --git a/metadata/cache/app-editors/nano-2.3.1-r1 b/metadata/cache/app-editors/nano-2.3.1-r1
index 31fe5f59c225..67bf9f8b85f9 100644
--- a/metadata/cache/app-editors/nano-2.3.1-r1
+++ b/metadata/cache/app-editors/nano-2.3.1-r1
@@ -1,4 +1,4 @@
->=sys-libs/ncurses-5.9-r1[unicode?] nls? ( sys-devel/gettext ) !ncurses? ( slang? ( sys-libs/slang ) ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=sys-libs/ncurses-5.9-r1[unicode?] nls? ( sys-devel/gettext ) !ncurses? ( slang? ( sys-libs/slang ) ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=sys-libs/ncurses-5.9-r1[unicode?] nls? ( sys-devel/gettext ) !ncurses? ( slang? ( sys-libs/slang ) )
 0
 http://www.nano-editor.org/dist/v2.3/nano-2.3.1.tar.gz
diff --git a/metadata/cache/app-editors/nvi-1.81.6-r3 b/metadata/cache/app-editors/nvi-1.81.6-r3
index 8fcefc4d3dac..557ae14f72f8 100644
--- a/metadata/cache/app-editors/nvi-1.81.6-r3
+++ b/metadata/cache/app-editors/nvi-1.81.6-r3
@@ -1,4 +1,4 @@
-|| ( >=sys-libs/db-4.8.30:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 sys-libs/db:4.4 sys-libs/db:4.3 sys-libs/db:4.2 ) >=sys-libs/ncurses-5.6-r2 perl? ( dev-lang/perl ) tcl? ( !unicode? ( >=dev-lang/tcl-8.5 ) ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+|| ( >=sys-libs/db-4.8.30:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 sys-libs/db:4.4 sys-libs/db:4.3 sys-libs/db:4.2 ) >=sys-libs/ncurses-5.6-r2 perl? ( dev-lang/perl ) tcl? ( !unicode? ( >=dev-lang/tcl-8.5 ) ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 || ( >=sys-libs/db-4.8.30:4.8 sys-libs/db:4.7 sys-libs/db:4.6 sys-libs/db:4.5 sys-libs/db:4.4 sys-libs/db:4.3 sys-libs/db:4.2 ) >=sys-libs/ncurses-5.6-r2 perl? ( dev-lang/perl ) tcl? ( !unicode? ( >=dev-lang/tcl-8.5 ) ) app-admin/eselect-vi
 0
 http://www.kotnet.org/~skimo/nvi/devel/nvi-1.81.6.tar.bz2
diff --git a/metadata/cache/app-editors/xemacs-21.4.22-r2 b/metadata/cache/app-editors/xemacs-21.4.22-r2
index 7ff215c3c852..0cd3d77c29e4 100644
--- a/metadata/cache/app-editors/xemacs-21.4.22-r2
+++ b/metadata/cache/app-editors/xemacs-21.4.22-r2
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/automake-1.11.1 ) =sys-devel/autoconf-2.1* sys-devel/libtool
+|| ( >=sys-devel/automake-1.11.1:1.11 ) =sys-devel/autoconf-2.1* sys-devel/libtool
 berkdb? ( sys-libs/db ) gdbm? ( >=sys-libs/gdbm-1.8.3 ) >=sys-libs/zlib-1.1.4 >=dev-libs/openssl-0.9.6 >=media-libs/audiofile-0.2.3 gpm? ( >=sys-libs/gpm-1.19.6 ) postgres? ( dev-db/postgresql-base ) ldap? ( net-nds/openldap ) nas? ( media-libs/nas ) X? ( x11-libs/libXt x11-libs/libXmu x11-libs/libXext x11-misc/xbitmaps !Xaw3d? ( !neXt? ( x11-libs/libXaw ) ) ) dnd? ( x11-libs/dnd ) motif? ( >=x11-libs/openmotif-2.3:0 ) athena? ( x11-libs/libXaw ) Xaw3d? ( x11-libs/libXaw3d ) neXt? ( x11-libs/neXtaw ) xface? ( media-libs/compface ) tiff? ( media-libs/tiff ) png? ( >=media-libs/libpng-1.2 ) jpeg? ( virtual/jpeg ) canna? ( app-i18n/canna ) !amd64? ( freewnn? ( app-i18n/freewnn ) ) >=sys-libs/ncurses-5.2 >=app-admin/eselect-emacs-1.2
 0
 http://ftp.xemacs.org/xemacs-21.4/xemacs-21.4.22.tar.gz http://www.malfunction.de/afterstep/files/NeXT_XEmacs.tar.gz
diff --git a/metadata/cache/app-emacs/emacs-w3m-1.4.417_pre20101104 b/metadata/cache/app-emacs/emacs-w3m-1.4.417_pre20101104
index 1e8bbb2a07d7..6eee2ed8586c 100644
--- a/metadata/cache/app-emacs/emacs-w3m-1.4.417_pre20101104
+++ b/metadata/cache/app-emacs/emacs-w3m-1.4.417_pre20101104
@@ -1,4 +1,4 @@
-virtual/w3m >=virtual/emacs-21 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+virtual/w3m >=virtual/emacs-21 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 virtual/w3m >=virtual/emacs-21
 0
 mirror://gentoo/emacs-w3m-1.4.417_pre20101104.tar.bz2
diff --git a/metadata/cache/app-emacs/emacs-w3m-1.4.437_pre20110310 b/metadata/cache/app-emacs/emacs-w3m-1.4.437_pre20110310
index 9faf0a19d8f0..f796d1a3c809 100644
--- a/metadata/cache/app-emacs/emacs-w3m-1.4.437_pre20110310
+++ b/metadata/cache/app-emacs/emacs-w3m-1.4.437_pre20110310
@@ -1,4 +1,4 @@
-virtual/w3m >=virtual/emacs-21 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+virtual/w3m >=virtual/emacs-21 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 virtual/w3m >=virtual/emacs-21
 0
 mirror://gentoo/emacs-w3m-1.4.437_pre20110310.tar.bz2
diff --git a/metadata/cache/app-emacs/mailcrypt-3.5.9 b/metadata/cache/app-emacs/mailcrypt-3.5.9
index 8d2e88a7cd96..46623e31ab5b 100644
--- a/metadata/cache/app-emacs/mailcrypt-3.5.9
+++ b/metadata/cache/app-emacs/mailcrypt-3.5.9
@@ -1,4 +1,4 @@
->=virtual/emacs-21 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=virtual/emacs-21 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 app-crypt/gnupg >=virtual/emacs-21
 0
 mirror://sourceforge/mailcrypt/mailcrypt-3.5.9.tar.gz
diff --git a/metadata/cache/app-emulation/fuse-utils-1.0.0 b/metadata/cache/app-emulation/fuse-utils-1.0.0
index 72bf4f6732d5..97f194b33dd9 100644
--- a/metadata/cache/app-emulation/fuse-utils-1.0.0
+++ b/metadata/cache/app-emulation/fuse-utils-1.0.0
@@ -1,4 +1,4 @@
-~app-emulation/libspectrum-1.0.0[gcrypt?] audiofile? ( >=media-libs/audiofile-0.2.3 ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+~app-emulation/libspectrum-1.0.0[gcrypt?] audiofile? ( >=media-libs/audiofile-0.2.3 ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 ~app-emulation/libspectrum-1.0.0[gcrypt?] audiofile? ( >=media-libs/audiofile-0.2.3 )
 0
 mirror://sourceforge/fuse-emulator/fuse-utils-1.0.0.tar.gz
diff --git a/metadata/cache/app-emulation/libguestfs-1.16.10 b/metadata/cache/app-emulation/libguestfs-1.16.10
index 838ca50aaef3..0f720982902d 100644
--- a/metadata/cache/app-emulation/libguestfs-1.16.10
+++ b/metadata/cache/app-emulation/libguestfs-1.16.10
@@ -1,4 +1,4 @@
->=app-misc/hivex-1.3.1 dev-libs/libpcre app-arch/cpio dev-lang/perl app-cdr/cdrkit >=app-emulation/qemu-kvm-1.0[qemu_user_targets_x86_64,qemu_softmmu_targets_x86_64] sys-apps/fakeroot sys-apps/file app-emulation/libvirt dev-libs/libxml2:2 >=sys-apps/fakechroot-2.8 >=app-admin/augeas-0.7.1 sys-fs/squashfs-tools dev-libs/libconfig dev-libs/libpcre sys-libs/readline >=sys-libs/db-4.6 perl? ( virtual/perl-ExtUtils-MakeMaker >=dev-perl/Sys-Virt-0.2.4 virtual/perl-Getopt-Long virtual/perl-Data-Dumper dev-perl/libintl-perl >=app-misc/hivex-1.3.1[perl?] dev-perl/String-ShellQuote ) fuse? ( sys-fs/fuse ) introspection? ( >=dev-libs/gobject-introspection-1.30.0 dev-libs/gjs ) selinux? ( sys-libs/libselinux sys-libs/libsemanage ) systemtap? ( dev-util/systemtap ) ocaml? ( dev-lang/ocaml[ocamlopt] dev-ml/findlib[ocamlopt] ) erlang? ( dev-lang/erlang ) dev-util/gperf doc? ( app-text/po4a ) ruby? ( dev-lang/ruby virtual/rubygems dev-ruby/rake ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-lang/perl[-build]
+>=app-misc/hivex-1.3.1 dev-libs/libpcre app-arch/cpio dev-lang/perl app-cdr/cdrkit >=app-emulation/qemu-kvm-1.0[qemu_user_targets_x86_64,qemu_softmmu_targets_x86_64] sys-apps/fakeroot sys-apps/file app-emulation/libvirt dev-libs/libxml2:2 >=sys-apps/fakechroot-2.8 >=app-admin/augeas-0.7.1 sys-fs/squashfs-tools dev-libs/libconfig dev-libs/libpcre sys-libs/readline >=sys-libs/db-4.6 perl? ( virtual/perl-ExtUtils-MakeMaker >=dev-perl/Sys-Virt-0.2.4 virtual/perl-Getopt-Long virtual/perl-Data-Dumper dev-perl/libintl-perl >=app-misc/hivex-1.3.1[perl?] dev-perl/String-ShellQuote ) fuse? ( sys-fs/fuse ) introspection? ( >=dev-libs/gobject-introspection-1.30.0 dev-libs/gjs ) selinux? ( sys-libs/libselinux sys-libs/libsemanage ) systemtap? ( dev-util/systemtap ) ocaml? ( dev-lang/ocaml[ocamlopt] dev-ml/findlib[ocamlopt] ) erlang? ( dev-lang/erlang ) dev-util/gperf doc? ( app-text/po4a ) ruby? ( dev-lang/ruby virtual/rubygems dev-ruby/rake ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-lang/perl[-build]
 >=app-misc/hivex-1.3.1 dev-libs/libpcre app-arch/cpio dev-lang/perl app-cdr/cdrkit >=app-emulation/qemu-kvm-1.0[qemu_user_targets_x86_64,qemu_softmmu_targets_x86_64] sys-apps/fakeroot sys-apps/file app-emulation/libvirt dev-libs/libxml2:2 >=sys-apps/fakechroot-2.8 >=app-admin/augeas-0.7.1 sys-fs/squashfs-tools dev-libs/libconfig dev-libs/libpcre sys-libs/readline >=sys-libs/db-4.6 perl? ( virtual/perl-ExtUtils-MakeMaker >=dev-perl/Sys-Virt-0.2.4 virtual/perl-Getopt-Long virtual/perl-Data-Dumper dev-perl/libintl-perl >=app-misc/hivex-1.3.1[perl?] dev-perl/String-ShellQuote ) fuse? ( sys-fs/fuse ) introspection? ( >=dev-libs/gobject-introspection-1.30.0 dev-libs/gjs ) selinux? ( sys-libs/libselinux sys-libs/libsemanage ) systemtap? ( dev-util/systemtap ) ocaml? ( dev-lang/ocaml[ocamlopt] dev-ml/findlib[ocamlopt] ) erlang? ( dev-lang/erlang ) dev-lang/perl[-build]
 0
 http://libguestfs.org/download/1.16-stable/libguestfs-1.16.10.tar.gz http://rion-overlay.googlecode.com/files/appliance-1.17.14.tar.xz
diff --git a/metadata/cache/app-emulation/libguestfs-1.17.14 b/metadata/cache/app-emulation/libguestfs-1.17.14
index 21294f14975b..a8ad237116ae 100644
--- a/metadata/cache/app-emulation/libguestfs-1.17.14
+++ b/metadata/cache/app-emulation/libguestfs-1.17.14
@@ -1,4 +1,4 @@
->=app-misc/hivex-1.3.1 dev-libs/libpcre app-arch/cpio dev-lang/perl app-cdr/cdrkit >=app-emulation/qemu-kvm-1.0[qemu_user_targets_x86_64,qemu_softmmu_targets_x86_64] sys-apps/fakeroot sys-apps/file app-emulation/libvirt dev-libs/libxml2:2 >=sys-apps/fakechroot-2.8 >=app-admin/augeas-0.7.1 sys-fs/squashfs-tools dev-libs/libconfig dev-libs/libpcre sys-libs/readline >=sys-libs/db-4.6 perl? ( virtual/perl-ExtUtils-MakeMaker >=dev-perl/Sys-Virt-0.2.4 virtual/perl-Getopt-Long virtual/perl-Data-Dumper dev-perl/libintl-perl >=app-misc/hivex-1.3.1[perl?] dev-perl/String-ShellQuote ) fuse? ( sys-fs/fuse ) introspection? ( >=dev-libs/gobject-introspection-1.30.0 dev-libs/gjs ) selinux? ( sys-libs/libselinux sys-libs/libsemanage ) systemtap? ( dev-util/systemtap ) ocaml? ( dev-lang/ocaml[ocamlopt] dev-ml/findlib[ocamlopt] ) erlang? ( dev-lang/erlang ) dev-util/gperf doc? ( app-text/po4a ) ruby? ( dev-lang/ruby virtual/rubygems dev-ruby/rake ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-lang/perl[-build]
+>=app-misc/hivex-1.3.1 dev-libs/libpcre app-arch/cpio dev-lang/perl app-cdr/cdrkit >=app-emulation/qemu-kvm-1.0[qemu_user_targets_x86_64,qemu_softmmu_targets_x86_64] sys-apps/fakeroot sys-apps/file app-emulation/libvirt dev-libs/libxml2:2 >=sys-apps/fakechroot-2.8 >=app-admin/augeas-0.7.1 sys-fs/squashfs-tools dev-libs/libconfig dev-libs/libpcre sys-libs/readline >=sys-libs/db-4.6 perl? ( virtual/perl-ExtUtils-MakeMaker >=dev-perl/Sys-Virt-0.2.4 virtual/perl-Getopt-Long virtual/perl-Data-Dumper dev-perl/libintl-perl >=app-misc/hivex-1.3.1[perl?] dev-perl/String-ShellQuote ) fuse? ( sys-fs/fuse ) introspection? ( >=dev-libs/gobject-introspection-1.30.0 dev-libs/gjs ) selinux? ( sys-libs/libselinux sys-libs/libsemanage ) systemtap? ( dev-util/systemtap ) ocaml? ( dev-lang/ocaml[ocamlopt] dev-ml/findlib[ocamlopt] ) erlang? ( dev-lang/erlang ) dev-util/gperf doc? ( app-text/po4a ) ruby? ( dev-lang/ruby virtual/rubygems dev-ruby/rake ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-lang/perl[-build]
 >=app-misc/hivex-1.3.1 dev-libs/libpcre app-arch/cpio dev-lang/perl app-cdr/cdrkit >=app-emulation/qemu-kvm-1.0[qemu_user_targets_x86_64,qemu_softmmu_targets_x86_64] sys-apps/fakeroot sys-apps/file app-emulation/libvirt dev-libs/libxml2:2 >=sys-apps/fakechroot-2.8 >=app-admin/augeas-0.7.1 sys-fs/squashfs-tools dev-libs/libconfig dev-libs/libpcre sys-libs/readline >=sys-libs/db-4.6 perl? ( virtual/perl-ExtUtils-MakeMaker >=dev-perl/Sys-Virt-0.2.4 virtual/perl-Getopt-Long virtual/perl-Data-Dumper dev-perl/libintl-perl >=app-misc/hivex-1.3.1[perl?] dev-perl/String-ShellQuote ) fuse? ( sys-fs/fuse ) introspection? ( >=dev-libs/gobject-introspection-1.30.0 dev-libs/gjs ) selinux? ( sys-libs/libselinux sys-libs/libsemanage ) systemtap? ( dev-util/systemtap ) ocaml? ( dev-lang/ocaml[ocamlopt] dev-ml/findlib[ocamlopt] ) erlang? ( dev-lang/erlang ) dev-lang/perl[-build]
 0
 http://libguestfs.org/download/1.17-development/libguestfs-1.17.14.tar.gz http://rion-overlay.googlecode.com/files/appliance-1.17.14.tar.xz
diff --git a/metadata/cache/app-emulation/libguestfs-1.17.18 b/metadata/cache/app-emulation/libguestfs-1.17.18
index 97a298fed72f..c23034c17c0d 100644
--- a/metadata/cache/app-emulation/libguestfs-1.17.18
+++ b/metadata/cache/app-emulation/libguestfs-1.17.18
@@ -1,4 +1,4 @@
->=app-misc/hivex-1.3.1 dev-libs/libpcre app-arch/cpio dev-lang/perl app-cdr/cdrkit >=app-emulation/qemu-kvm-1.0[qemu_user_targets_x86_64,qemu_softmmu_targets_x86_64] sys-apps/fakeroot sys-apps/file app-emulation/libvirt dev-libs/libxml2:2 >=sys-apps/fakechroot-2.8 >=app-admin/augeas-0.7.1 sys-fs/squashfs-tools dev-libs/libconfig dev-libs/libpcre sys-libs/readline >=sys-libs/db-4.6 perl? ( virtual/perl-ExtUtils-MakeMaker >=dev-perl/Sys-Virt-0.2.4 virtual/perl-Getopt-Long virtual/perl-Data-Dumper dev-perl/libintl-perl >=app-misc/hivex-1.3.1[perl?] dev-perl/String-ShellQuote ) fuse? ( sys-fs/fuse ) introspection? ( >=dev-libs/gobject-introspection-1.30.0 dev-libs/gjs ) selinux? ( sys-libs/libselinux sys-libs/libsemanage ) systemtap? ( dev-util/systemtap ) ocaml? ( dev-lang/ocaml[ocamlopt] dev-ml/findlib[ocamlopt] ) erlang? ( dev-lang/erlang ) dev-util/gperf doc? ( app-text/po4a ) ruby? ( dev-lang/ruby virtual/rubygems dev-ruby/rake ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-lang/perl[-build]
+>=app-misc/hivex-1.3.1 dev-libs/libpcre app-arch/cpio dev-lang/perl app-cdr/cdrkit >=app-emulation/qemu-kvm-1.0[qemu_user_targets_x86_64,qemu_softmmu_targets_x86_64] sys-apps/fakeroot sys-apps/file app-emulation/libvirt dev-libs/libxml2:2 >=sys-apps/fakechroot-2.8 >=app-admin/augeas-0.7.1 sys-fs/squashfs-tools dev-libs/libconfig dev-libs/libpcre sys-libs/readline >=sys-libs/db-4.6 perl? ( virtual/perl-ExtUtils-MakeMaker >=dev-perl/Sys-Virt-0.2.4 virtual/perl-Getopt-Long virtual/perl-Data-Dumper dev-perl/libintl-perl >=app-misc/hivex-1.3.1[perl?] dev-perl/String-ShellQuote ) fuse? ( sys-fs/fuse ) introspection? ( >=dev-libs/gobject-introspection-1.30.0 dev-libs/gjs ) selinux? ( sys-libs/libselinux sys-libs/libsemanage ) systemtap? ( dev-util/systemtap ) ocaml? ( dev-lang/ocaml[ocamlopt] dev-ml/findlib[ocamlopt] ) erlang? ( dev-lang/erlang ) dev-util/gperf doc? ( app-text/po4a ) ruby? ( dev-lang/ruby virtual/rubygems dev-ruby/rake ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-lang/perl[-build]
 >=app-misc/hivex-1.3.1 dev-libs/libpcre app-arch/cpio dev-lang/perl app-cdr/cdrkit >=app-emulation/qemu-kvm-1.0[qemu_user_targets_x86_64,qemu_softmmu_targets_x86_64] sys-apps/fakeroot sys-apps/file app-emulation/libvirt dev-libs/libxml2:2 >=sys-apps/fakechroot-2.8 >=app-admin/augeas-0.7.1 sys-fs/squashfs-tools dev-libs/libconfig dev-libs/libpcre sys-libs/readline >=sys-libs/db-4.6 perl? ( virtual/perl-ExtUtils-MakeMaker >=dev-perl/Sys-Virt-0.2.4 virtual/perl-Getopt-Long virtual/perl-Data-Dumper dev-perl/libintl-perl >=app-misc/hivex-1.3.1[perl?] dev-perl/String-ShellQuote ) fuse? ( sys-fs/fuse ) introspection? ( >=dev-libs/gobject-introspection-1.30.0 dev-libs/gjs ) selinux? ( sys-libs/libselinux sys-libs/libsemanage ) systemtap? ( dev-util/systemtap ) ocaml? ( dev-lang/ocaml[ocamlopt] dev-ml/findlib[ocamlopt] ) erlang? ( dev-lang/erlang ) dev-lang/perl[-build]
 0
 http://libguestfs.org/download/1.17-development/libguestfs-1.17.18.tar.gz http://rion-overlay.googlecode.com/files/appliance-1.17.14.tar.xz
diff --git a/metadata/cache/app-emulation/libvirt-9999 b/metadata/cache/app-emulation/libvirt-9999
index e976af132d79..323253136e40 100644
--- a/metadata/cache/app-emulation/libvirt-9999
+++ b/metadata/cache/app-emulation/libvirt-9999
@@ -1,4 +1,4 @@
-sys-libs/readline sys-libs/ncurses >=net-misc/curl-7.18.0 >=dev-libs/libxml2-2.7.6 >=dev-libs/libnl-1.1:1.1 >=net-libs/gnutls-1.0.25 sys-apps/dmidecode >=sys-apps/util-linux-2.17 sys-devel/gettext >=net-analyzer/netcat6-1.0-r2 app-misc/scrub avahi? ( >=net-dns/avahi-0.6[dbus] ) caps? ( sys-libs/libcap-ng ) iscsi? ( sys-block/open-iscsi ) libvirtd? ( net-misc/bridge-utils ) lvm? ( >=sys-fs/lvm2-2.02.48-r2 ) nfs? ( net-fs/nfs-utils ) numa? ( >sys-process/numactl-2.0.2 ) openvz? ( sys-kernel/openvz-sources ) parted? ( >=sys-block/parted-1.8[device-mapper] sys-fs/lvm2 ) pcap? ( >=net-libs/libpcap-1.0.0 ) phyp? ( net-libs/libssh2 ) policykit? ( >=sys-auth/polkit-0.9 ) qemu? ( || ( app-emulation/qemu-kvm >=app-emulation/qemu-0.10.0 ) dev-libs/yajl ) sasl? ( dev-libs/cyrus-sasl ) selinux? ( >=sys-libs/libselinux-2.0.85 ) virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) ) xen? ( app-emulation/xen-tools app-emulation/xen ) udev? ( >=sys-fs/udev-145 >=x11-libs/libpciaccess-0.10.9 ) virt-network? ( net-dns/dnsmasq >=net-firewall/iptables-1.4.10 net-firewall/ebtables sys-apps/iproute2[-minimal] ) elibc_glibc? ( || ( >=net-libs/libtirpc-0.2.2-r1 <sys-libs/glibc-2.14 ) ) dev-util/pkgconfig app-text/xhtml1 python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
+sys-libs/readline sys-libs/ncurses >=net-misc/curl-7.18.0 >=dev-libs/libxml2-2.7.6 >=dev-libs/libnl-1.1:1.1 >=net-libs/gnutls-1.0.25 sys-apps/dmidecode >=sys-apps/util-linux-2.17 sys-devel/gettext >=net-analyzer/netcat6-1.0-r2 app-misc/scrub avahi? ( >=net-dns/avahi-0.6[dbus] ) caps? ( sys-libs/libcap-ng ) iscsi? ( sys-block/open-iscsi ) libvirtd? ( net-misc/bridge-utils ) lvm? ( >=sys-fs/lvm2-2.02.48-r2 ) nfs? ( net-fs/nfs-utils ) numa? ( >sys-process/numactl-2.0.2 ) openvz? ( sys-kernel/openvz-sources ) parted? ( >=sys-block/parted-1.8[device-mapper] sys-fs/lvm2 ) pcap? ( >=net-libs/libpcap-1.0.0 ) phyp? ( net-libs/libssh2 ) policykit? ( >=sys-auth/polkit-0.9 ) qemu? ( || ( app-emulation/qemu-kvm >=app-emulation/qemu-0.10.0 ) dev-libs/yajl ) sasl? ( dev-libs/cyrus-sasl ) selinux? ( >=sys-libs/libselinux-2.0.85 ) virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) ) xen? ( app-emulation/xen-tools app-emulation/xen ) udev? ( >=sys-fs/udev-145 >=x11-libs/libpciaccess-0.10.9 ) virt-network? ( net-dns/dnsmasq >=net-firewall/iptables-1.4.10 net-firewall/ebtables sys-apps/iproute2[-minimal] ) elibc_glibc? ( || ( >=net-libs/libtirpc-0.2.2-r1 <sys-libs/glibc-2.14 ) ) dev-util/pkgconfig app-text/xhtml1 python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
 sys-libs/readline sys-libs/ncurses >=net-misc/curl-7.18.0 >=dev-libs/libxml2-2.7.6 >=dev-libs/libnl-1.1:1.1 >=net-libs/gnutls-1.0.25 sys-apps/dmidecode >=sys-apps/util-linux-2.17 sys-devel/gettext >=net-analyzer/netcat6-1.0-r2 app-misc/scrub avahi? ( >=net-dns/avahi-0.6[dbus] ) caps? ( sys-libs/libcap-ng ) iscsi? ( sys-block/open-iscsi ) libvirtd? ( net-misc/bridge-utils ) lvm? ( >=sys-fs/lvm2-2.02.48-r2 ) nfs? ( net-fs/nfs-utils ) numa? ( >sys-process/numactl-2.0.2 ) openvz? ( sys-kernel/openvz-sources ) parted? ( >=sys-block/parted-1.8[device-mapper] sys-fs/lvm2 ) pcap? ( >=net-libs/libpcap-1.0.0 ) phyp? ( net-libs/libssh2 ) policykit? ( >=sys-auth/polkit-0.9 ) qemu? ( || ( app-emulation/qemu-kvm >=app-emulation/qemu-0.10.0 ) dev-libs/yajl ) sasl? ( dev-libs/cyrus-sasl ) selinux? ( >=sys-libs/libselinux-2.0.85 ) virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) ) xen? ( app-emulation/xen-tools app-emulation/xen ) udev? ( >=sys-fs/udev-145 >=x11-libs/libpciaccess-0.10.9 ) virt-network? ( net-dns/dnsmasq >=net-firewall/iptables-1.4.10 net-firewall/ebtables sys-apps/iproute2[-minimal] ) elibc_glibc? ( || ( >=net-libs/libtirpc-0.2.2-r1 <sys-libs/glibc-2.14 ) ) python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) )
 0
 
diff --git a/metadata/cache/app-emulation/spice-0.10.1 b/metadata/cache/app-emulation/spice-0.10.1
index f6b235471dcf..d6eda3a812de 100644
--- a/metadata/cache/app-emulation/spice-0.10.1
+++ b/metadata/cache/app-emulation/spice-0.10.1
@@ -1,4 +1,4 @@
-dev-util/pkgconfig >=app-emulation/spice-protocol-0.10.1 >=x11-libs/pixman-0.17.7 media-libs/alsa-lib media-libs/celt:0.5.1 dev-libs/openssl >=x11-libs/libXrandr-1.2 x11-libs/libX11 x11-libs/libXext x11-libs/libXinerama x11-libs/libXfixes x11-libs/libXrender virtual/jpeg sys-libs/zlib client? ( gui? ( =dev-games/cegui-0.6* ) ) sasl? ( dev-libs/cyrus-sasl ) smartcard? ( >=app-emulation/libcacard-0.1.2 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-util/pkgconfig >=app-emulation/spice-protocol-0.10.1 >=x11-libs/pixman-0.17.7 media-libs/alsa-lib media-libs/celt:0.5.1 dev-libs/openssl >=x11-libs/libXrandr-1.2 x11-libs/libX11 x11-libs/libXext x11-libs/libXinerama x11-libs/libXfixes x11-libs/libXrender virtual/jpeg sys-libs/zlib client? ( gui? ( =dev-games/cegui-0.6* ) ) sasl? ( dev-libs/cyrus-sasl ) smartcard? ( >=app-emulation/libcacard-0.1.2 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=app-emulation/spice-protocol-0.10.1 >=x11-libs/pixman-0.17.7 media-libs/alsa-lib media-libs/celt:0.5.1 dev-libs/openssl >=x11-libs/libXrandr-1.2 x11-libs/libX11 x11-libs/libXext x11-libs/libXinerama x11-libs/libXfixes x11-libs/libXrender virtual/jpeg sys-libs/zlib client? ( gui? ( =dev-games/cegui-0.6* ) ) sasl? ( dev-libs/cyrus-sasl ) smartcard? ( >=app-emulation/libcacard-0.1.2 )
 0
 http://spice-space.org/download/releases/spice-0.10.1.tar.bz2
diff --git a/metadata/cache/app-emulation/spice-0.8.2-r1 b/metadata/cache/app-emulation/spice-0.8.2-r1
index 3e139abef199..065ee9f2d8a0 100644
--- a/metadata/cache/app-emulation/spice-0.8.2-r1
+++ b/metadata/cache/app-emulation/spice-0.8.2-r1
@@ -1,4 +1,4 @@
-dev-util/pkgconfig >=app-emulation/spice-protocol-0.8.1 >=x11-libs/pixman-0.17.7 media-libs/alsa-lib media-libs/celt:0.5.1 dev-libs/openssl >=x11-libs/libXrandr-1.2 x11-libs/libX11 x11-libs/libXext x11-libs/libXrender x11-libs/libXfixes virtual/jpeg sys-libs/zlib gui? ( =dev-games/cegui-0.6* ) sasl? ( dev-libs/cyrus-sasl ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-util/pkgconfig >=app-emulation/spice-protocol-0.8.1 >=x11-libs/pixman-0.17.7 media-libs/alsa-lib media-libs/celt:0.5.1 dev-libs/openssl >=x11-libs/libXrandr-1.2 x11-libs/libX11 x11-libs/libXext x11-libs/libXrender x11-libs/libXfixes virtual/jpeg sys-libs/zlib gui? ( =dev-games/cegui-0.6* ) sasl? ( dev-libs/cyrus-sasl ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=app-emulation/spice-protocol-0.8.1 >=x11-libs/pixman-0.17.7 media-libs/alsa-lib media-libs/celt:0.5.1 dev-libs/openssl >=x11-libs/libXrandr-1.2 x11-libs/libX11 x11-libs/libXext x11-libs/libXrender x11-libs/libXfixes virtual/jpeg sys-libs/zlib gui? ( =dev-games/cegui-0.6* ) sasl? ( dev-libs/cyrus-sasl )
 0
 http://spice-space.org/download/releases/spice-0.8.2.tar.bz2
diff --git a/metadata/cache/app-emulation/vice-2.3 b/metadata/cache/app-emulation/vice-2.3
index 50b0e5c9252e..9197fc18f04f 100644
--- a/metadata/cache/app-emulation/vice-2.3
+++ b/metadata/cache/app-emulation/vice-2.3
@@ -1,4 +1,4 @@
-x11-libs/libX11 x11-libs/libXext x11-libs/libXpm x11-libs/libICE x11-libs/libSM x11-libs/libXt x11-libs/libXxf86vm x11-apps/xset Xaw3d? ( x11-libs/libXaw3d ) !Xaw3d? ( !gnome? ( x11-libs/libXaw ) ) alsa? ( media-libs/alsa-lib ) gnome? ( x11-libs/gtk+:2 dev-libs/atk x11-libs/pango ) lame? ( media-sound/lame ) ffmpeg? ( virtual/ffmpeg ) ethernet? ( >=net-libs/libpcap-0.9.8 >=net-libs/libnet-1.1.2.1 ) nls? ( virtual/libintl ) png? ( media-libs/libpng ) readline? ( sys-libs/readline ) sdl? ( media-libs/libsdl ) gif? ( media-libs/giflib ) jpeg? ( virtual/jpeg ) xv? ( x11-libs/libXv ) dga? ( x11-libs/libXxf86dga ) xrandr? ( x11-libs/libXrandr ) dev-util/pkgconfig x11-apps/bdftopcf x11-apps/mkfontdir x11-proto/xproto x11-proto/xf86vidmodeproto x11-proto/xextproto dga? ( x11-proto/xf86dgaproto ) xv? ( x11-proto/videoproto ) nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+x11-libs/libX11 x11-libs/libXext x11-libs/libXpm x11-libs/libICE x11-libs/libSM x11-libs/libXt x11-libs/libXxf86vm x11-apps/xset Xaw3d? ( x11-libs/libXaw3d ) !Xaw3d? ( !gnome? ( x11-libs/libXaw ) ) alsa? ( media-libs/alsa-lib ) gnome? ( x11-libs/gtk+:2 dev-libs/atk x11-libs/pango ) lame? ( media-sound/lame ) ffmpeg? ( virtual/ffmpeg ) ethernet? ( >=net-libs/libpcap-0.9.8 >=net-libs/libnet-1.1.2.1 ) nls? ( virtual/libintl ) png? ( media-libs/libpng ) readline? ( sys-libs/readline ) sdl? ( media-libs/libsdl ) gif? ( media-libs/giflib ) jpeg? ( virtual/jpeg ) xv? ( x11-libs/libXv ) dga? ( x11-libs/libXxf86dga ) xrandr? ( x11-libs/libXrandr ) dev-util/pkgconfig x11-apps/bdftopcf x11-apps/mkfontdir x11-proto/xproto x11-proto/xf86vidmodeproto x11-proto/xextproto dga? ( x11-proto/xf86dgaproto ) xv? ( x11-proto/videoproto ) nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 x11-libs/libX11 x11-libs/libXext x11-libs/libXpm x11-libs/libICE x11-libs/libSM x11-libs/libXt x11-libs/libXxf86vm x11-apps/xset Xaw3d? ( x11-libs/libXaw3d ) !Xaw3d? ( !gnome? ( x11-libs/libXaw ) ) alsa? ( media-libs/alsa-lib ) gnome? ( x11-libs/gtk+:2 dev-libs/atk x11-libs/pango ) lame? ( media-sound/lame ) ffmpeg? ( virtual/ffmpeg ) ethernet? ( >=net-libs/libpcap-0.9.8 >=net-libs/libnet-1.1.2.1 ) nls? ( virtual/libintl ) png? ( media-libs/libpng ) readline? ( sys-libs/readline ) sdl? ( media-libs/libsdl ) gif? ( media-libs/giflib ) jpeg? ( virtual/jpeg ) xv? ( x11-libs/libXv ) dga? ( x11-libs/libXxf86dga ) xrandr? ( x11-libs/libXrandr )
 0
 http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/vice-2.3.tar.gz
diff --git a/metadata/cache/app-emulation/virt-manager-9999 b/metadata/cache/app-emulation/virt-manager-9999
index 779afe71453c..90e1fe4742da 100644
--- a/metadata/cache/app-emulation/virt-manager-9999
+++ b/metadata/cache/app-emulation/virt-manager-9999
@@ -1,4 +1,4 @@
->=dev-python/pygtk-1.99.12 >=app-emulation/libvirt-0.7.0[python,sasl?] >=dev-libs/libxml2-2.6.23[python] >=app-emulation/virtinst-9999 >=gnome-base/librsvg-2 >=x11-libs/vte-0.12.2:0[python] >=net-libs/gtk-vnc-0.3.8[python,sasl?] >=dev-python/dbus-python-0.61 >=dev-python/gconf-python-1.99.11 dev-python/urlgrabber gnome-keyring? ( dev-python/gnome-keyring-python ) policykit? ( sys-auth/polkit ) spice? ( >=net-misc/spice-gtk-0.6[python,sasl?,-gtk3] ) app-text/rarian dev-util/intltool app-arch/xz-utils >=sys-apps/sed-4 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) dev-vcs/git || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-python/pygtk-1.99.12 >=app-emulation/libvirt-0.7.0[python,sasl?] >=dev-libs/libxml2-2.6.23[python] >=app-emulation/virtinst-9999 >=gnome-base/librsvg-2 >=x11-libs/vte-0.12.2:0[python] >=net-libs/gtk-vnc-0.3.8[python,sasl?] >=dev-python/dbus-python-0.61 >=dev-python/gconf-python-1.99.11 dev-python/urlgrabber gnome-keyring? ( dev-python/gnome-keyring-python ) policykit? ( sys-auth/polkit ) spice? ( >=net-misc/spice-gtk-0.6[python,sasl?,-gtk3] ) app-text/rarian dev-util/intltool app-arch/xz-utils >=sys-apps/sed-4 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) dev-vcs/git || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=dev-python/pygtk-1.99.12 >=app-emulation/libvirt-0.7.0[python,sasl?] >=dev-libs/libxml2-2.6.23[python] >=app-emulation/virtinst-9999 >=gnome-base/librsvg-2 >=x11-libs/vte-0.12.2:0[python] >=net-libs/gtk-vnc-0.3.8[python,sasl?] >=dev-python/dbus-python-0.61 >=dev-python/gconf-python-1.99.11 dev-python/urlgrabber gnome-keyring? ( dev-python/gnome-keyring-python ) policykit? ( sys-auth/polkit ) spice? ( >=net-misc/spice-gtk-0.6[python,sasl?,-gtk3] ) || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
 0
 
diff --git a/metadata/cache/app-emulation/virt-what-1.11 b/metadata/cache/app-emulation/virt-what-1.11
index 8f060801e738..bafae18e2f28 100644
--- a/metadata/cache/app-emulation/virt-what-1.11
+++ b/metadata/cache/app-emulation/virt-what-1.11
@@ -1,4 +1,4 @@
-dev-lang/perl || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-lang/perl || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 app-shells/bash sys-apps/dmidecode
 0
 http://people.redhat.com/~rjones/virt-what/files/virt-what-1.11.tar.gz
diff --git a/metadata/cache/app-emulation/virt-what-1.2 b/metadata/cache/app-emulation/virt-what-1.2
index 02e391834316..af6989d871cf 100644
--- a/metadata/cache/app-emulation/virt-what-1.2
+++ b/metadata/cache/app-emulation/virt-what-1.2
@@ -1,4 +1,4 @@
-dev-lang/perl || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-lang/perl || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 app-shells/bash sys-apps/dmidecode
 0
 http://people.redhat.com/~rjones/virt-what/files/virt-what-1.2.tar.gz
diff --git a/metadata/cache/app-emulation/vmware-view-open-client-4.5.0.297975-r1 b/metadata/cache/app-emulation/vmware-view-open-client-4.5.0.297975-r1
index 0999ee8b546d..c4097a160fb7 100644
--- a/metadata/cache/app-emulation/vmware-view-open-client-4.5.0.297975-r1
+++ b/metadata/cache/app-emulation/vmware-view-open-client-4.5.0.297975-r1
@@ -1,4 +1,4 @@
->=dev-libs/boost-1.34.1 >=dev-libs/icu-3.8.0 >=dev-libs/libxml2-2.6.0 >=dev-libs/openssl-0.9.8 >=net-misc/curl-7.16.0[ssl] x11-libs/gtk+:2 >=dev-util/intltool-0.21 >=dev-util/pkgconfig-0.9.0 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-libs/boost-1.34.1 >=dev-libs/icu-3.8.0 >=dev-libs/libxml2-2.6.0 >=dev-libs/openssl-0.9.8 >=net-misc/curl-7.16.0[ssl] x11-libs/gtk+:2 >=dev-util/intltool-0.21 >=dev-util/pkgconfig-0.9.0 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=dev-libs/boost-1.34.1 >=dev-libs/icu-3.8.0 >=dev-libs/libxml2-2.6.0 >=dev-libs/openssl-0.9.8 >=net-misc/curl-7.16.0[ssl] x11-libs/gtk+:2 >=net-misc/rdesktop-1.4.1
 0
 http://vmware-view-open-client.googlecode.com/files/VMware-view-open-client-source-4.5.0-297975.tar.gz
diff --git a/metadata/cache/app-emulation/wine-1.2 b/metadata/cache/app-emulation/wine-1.2
index ce45a42c9f8f..d4148d3072ca 100644
--- a/metadata/cache/app-emulation/wine-1.2
+++ b/metadata/cache/app-emulation/wine-1.2
@@ -1,4 +1,4 @@
-truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2 ) fontconfig? ( media-libs/fontconfig ) gphoto2? ( media-libs/libgphoto2 ) jack? ( media-sound/jack-audio-connection-kit ) openal? ( media-libs/openal ) dbus? ( sys-apps/dbus ) gnutls? ( net-libs/gnutls ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm x11-apps/xmessage ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) nas? ( media-libs/nas ) cups? ( net-print/cups ) opengl? ( virtual/opengl ) pulseaudio? ( media-sound/pulseaudio ) gsm? ( media-sound/gsm ) jpeg? ( virtual/jpeg ) ldap? ( net-nds/openldap ) lcms? ( =media-libs/lcms-1* ) mp3? ( >=media-sound/mpg123-1.5.0 ) samba? ( >=net-fs/samba-3.0.25 ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1[pulseaudio?] ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite ) pulseaudio? ( || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) !hardened? ( sys-devel/prelink ) dev-util/pkgconfig virtual/yacc sys-devel/flex
+truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2 ) fontconfig? ( media-libs/fontconfig ) gphoto2? ( media-libs/libgphoto2 ) jack? ( media-sound/jack-audio-connection-kit ) openal? ( media-libs/openal ) dbus? ( sys-apps/dbus ) gnutls? ( net-libs/gnutls ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm x11-apps/xmessage ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) nas? ( media-libs/nas ) cups? ( net-print/cups ) opengl? ( virtual/opengl ) pulseaudio? ( media-sound/pulseaudio ) gsm? ( media-sound/gsm ) jpeg? ( virtual/jpeg ) ldap? ( net-nds/openldap ) lcms? ( =media-libs/lcms-1* ) mp3? ( >=media-sound/mpg123-1.5.0 ) samba? ( >=net-fs/samba-3.0.25 ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1[pulseaudio?] ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite ) pulseaudio? ( || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) !hardened? ( sys-devel/prelink ) dev-util/pkgconfig virtual/yacc sys-devel/flex
 truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2 ) fontconfig? ( media-libs/fontconfig ) gphoto2? ( media-libs/libgphoto2 ) jack? ( media-sound/jack-audio-connection-kit ) openal? ( media-libs/openal ) dbus? ( sys-apps/dbus ) gnutls? ( net-libs/gnutls ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm x11-apps/xmessage ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) nas? ( media-libs/nas ) cups? ( net-print/cups ) opengl? ( virtual/opengl ) pulseaudio? ( media-sound/pulseaudio ) gsm? ( media-sound/gsm ) jpeg? ( virtual/jpeg ) ldap? ( net-nds/openldap ) lcms? ( =media-libs/lcms-1* ) mp3? ( >=media-sound/mpg123-1.5.0 ) samba? ( >=net-fs/samba-3.0.25 ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1[pulseaudio?] ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite )
 0
 mirror://sourceforge/wine/wine-1.2.tar.bz2 gecko? ( mirror://sourceforge/wine/wine_gecko-1.0.0-x86.cab ) pulseaudio? ( http://art.ified.ca/downloads/winepulse/winepulse-0.36.patch http://art.ified.ca/downloads/winepulse/winepulse-0.35-configure.ac.patch http://art.ified.ca/downloads/winepulse/winepulse-0.38-winecfg.patch )
diff --git a/metadata/cache/app-emulation/wine-1.2.1 b/metadata/cache/app-emulation/wine-1.2.1
index 3ff2fddd8b62..b1bc89b0c68c 100644
--- a/metadata/cache/app-emulation/wine-1.2.1
+++ b/metadata/cache/app-emulation/wine-1.2.1
@@ -1,4 +1,4 @@
-truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2 ) fontconfig? ( media-libs/fontconfig ) gphoto2? ( media-libs/libgphoto2 ) jack? ( media-sound/jack-audio-connection-kit ) openal? ( media-libs/openal ) dbus? ( sys-apps/dbus ) gnutls? ( net-libs/gnutls ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm x11-apps/xmessage ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) nas? ( media-libs/nas ) cups? ( net-print/cups ) opengl? ( virtual/opengl ) pulseaudio? ( media-sound/pulseaudio ) gsm? ( media-sound/gsm ) jpeg? ( virtual/jpeg ) ldap? ( net-nds/openldap ) lcms? ( =media-libs/lcms-1* ) mp3? ( >=media-sound/mpg123-1.5.0 ) samba? ( >=net-fs/samba-3.0.25 ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1[pulseaudio?] ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) win32? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1[pulseaudio?] ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite ) pulseaudio? ( || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) !hardened? ( sys-devel/prelink ) dev-util/pkgconfig virtual/yacc sys-devel/flex
+truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2 ) fontconfig? ( media-libs/fontconfig ) gphoto2? ( media-libs/libgphoto2 ) jack? ( media-sound/jack-audio-connection-kit ) openal? ( media-libs/openal ) dbus? ( sys-apps/dbus ) gnutls? ( net-libs/gnutls ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm x11-apps/xmessage ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) nas? ( media-libs/nas ) cups? ( net-print/cups ) opengl? ( virtual/opengl ) pulseaudio? ( media-sound/pulseaudio ) gsm? ( media-sound/gsm ) jpeg? ( virtual/jpeg ) ldap? ( net-nds/openldap ) lcms? ( =media-libs/lcms-1* ) mp3? ( >=media-sound/mpg123-1.5.0 ) samba? ( >=net-fs/samba-3.0.25 ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1[pulseaudio?] ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) win32? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1[pulseaudio?] ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite ) pulseaudio? ( || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) !hardened? ( sys-devel/prelink ) dev-util/pkgconfig virtual/yacc sys-devel/flex
 truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2 ) fontconfig? ( media-libs/fontconfig ) gphoto2? ( media-libs/libgphoto2 ) jack? ( media-sound/jack-audio-connection-kit ) openal? ( media-libs/openal ) dbus? ( sys-apps/dbus ) gnutls? ( net-libs/gnutls ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm x11-apps/xmessage ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) nas? ( media-libs/nas ) cups? ( net-print/cups ) opengl? ( virtual/opengl ) pulseaudio? ( media-sound/pulseaudio ) gsm? ( media-sound/gsm ) jpeg? ( virtual/jpeg ) ldap? ( net-nds/openldap ) lcms? ( =media-libs/lcms-1* ) mp3? ( >=media-sound/mpg123-1.5.0 ) samba? ( >=net-fs/samba-3.0.25 ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1[pulseaudio?] ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) win32? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1[pulseaudio?] ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite )
 0
 mirror://sourceforge/wine/wine-1.2.1.tar.bz2 gecko? ( mirror://sourceforge/wine/wine_gecko-1.0.0-x86.cab )
diff --git a/metadata/cache/app-emulation/wine-1.2.2 b/metadata/cache/app-emulation/wine-1.2.2
index 4e289d890834..6d9b97e438a3 100644
--- a/metadata/cache/app-emulation/wine-1.2.2
+++ b/metadata/cache/app-emulation/wine-1.2.2
@@ -1,4 +1,4 @@
-truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2 ) fontconfig? ( media-libs/fontconfig ) gphoto2? ( media-libs/libgphoto2 ) jack? ( media-sound/jack-audio-connection-kit ) openal? ( media-libs/openal ) dbus? ( sys-apps/dbus ) gnutls? ( net-libs/gnutls ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm x11-apps/xmessage ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) nas? ( media-libs/nas ) cups? ( net-print/cups ) opengl? ( virtual/opengl ) pulseaudio? ( media-sound/pulseaudio ) gsm? ( media-sound/gsm ) jpeg? ( virtual/jpeg ) ldap? ( net-nds/openldap ) lcms? ( =media-libs/lcms-1* ) mp3? ( >=media-sound/mpg123-1.5.0 ) samba? ( >=net-fs/samba-3.0.25 ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1[pulseaudio?] ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) win32? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1[pulseaudio?] ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite ) pulseaudio? ( || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) !hardened? ( sys-devel/prelink ) dev-util/pkgconfig virtual/yacc sys-devel/flex
+truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2 ) fontconfig? ( media-libs/fontconfig ) gphoto2? ( media-libs/libgphoto2 ) jack? ( media-sound/jack-audio-connection-kit ) openal? ( media-libs/openal ) dbus? ( sys-apps/dbus ) gnutls? ( net-libs/gnutls ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm x11-apps/xmessage ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) nas? ( media-libs/nas ) cups? ( net-print/cups ) opengl? ( virtual/opengl ) pulseaudio? ( media-sound/pulseaudio ) gsm? ( media-sound/gsm ) jpeg? ( virtual/jpeg ) ldap? ( net-nds/openldap ) lcms? ( =media-libs/lcms-1* ) mp3? ( >=media-sound/mpg123-1.5.0 ) samba? ( >=net-fs/samba-3.0.25 ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1[pulseaudio?] ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) win32? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1[pulseaudio?] ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite ) pulseaudio? ( || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) !hardened? ( sys-devel/prelink ) dev-util/pkgconfig virtual/yacc sys-devel/flex
 truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2 ) fontconfig? ( media-libs/fontconfig ) gphoto2? ( media-libs/libgphoto2 ) jack? ( media-sound/jack-audio-connection-kit ) openal? ( media-libs/openal ) dbus? ( sys-apps/dbus ) gnutls? ( net-libs/gnutls ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm x11-apps/xmessage ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) nas? ( media-libs/nas ) cups? ( net-print/cups ) opengl? ( virtual/opengl ) pulseaudio? ( media-sound/pulseaudio ) gsm? ( media-sound/gsm ) jpeg? ( virtual/jpeg ) ldap? ( net-nds/openldap ) lcms? ( =media-libs/lcms-1* ) mp3? ( >=media-sound/mpg123-1.5.0 ) samba? ( >=net-fs/samba-3.0.25 ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1[pulseaudio?] ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) win32? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1[pulseaudio?] ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite )
 0
 mirror://sourceforge/wine/wine-1.2.2.tar.bz2 gecko? ( mirror://sourceforge/wine/wine_gecko-1.0.0-x86.cab ) pulseaudio? ( http://art.ified.ca/downloads/winepulse/winepulse-0.36.patch http://art.ified.ca/downloads/winepulse/winepulse-0.35-configure.ac.patch http://art.ified.ca/downloads/winepulse/winepulse-0.38-winecfg.patch )
diff --git a/metadata/cache/app-emulation/wine-1.2.3 b/metadata/cache/app-emulation/wine-1.2.3
index ce8cd3018156..a4150a20eaba 100644
--- a/metadata/cache/app-emulation/wine-1.2.3
+++ b/metadata/cache/app-emulation/wine-1.2.3
@@ -1,4 +1,4 @@
-truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2 ) fontconfig? ( media-libs/fontconfig ) gphoto2? ( media-libs/libgphoto2 ) jack? ( media-sound/jack-audio-connection-kit ) openal? ( media-libs/openal ) dbus? ( sys-apps/dbus ) gnutls? ( net-libs/gnutls ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm x11-apps/xmessage ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) nas? ( media-libs/nas ) cups? ( net-print/cups ) opengl? ( virtual/opengl ) pulseaudio? ( media-sound/pulseaudio ) gsm? ( media-sound/gsm ) jpeg? ( virtual/jpeg ) ldap? ( net-nds/openldap ) lcms? ( =media-libs/lcms-1* ) mp3? ( >=media-sound/mpg123-1.5.0 ) samba? ( >=net-fs/samba-3.0.25 ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1[pulseaudio?] ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) win32? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1[pulseaudio?] ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite ) pulseaudio? ( || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) !hardened? ( sys-devel/prelink ) dev-util/pkgconfig virtual/yacc sys-devel/flex
+truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2 ) fontconfig? ( media-libs/fontconfig ) gphoto2? ( media-libs/libgphoto2 ) jack? ( media-sound/jack-audio-connection-kit ) openal? ( media-libs/openal ) dbus? ( sys-apps/dbus ) gnutls? ( net-libs/gnutls ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm x11-apps/xmessage ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) nas? ( media-libs/nas ) cups? ( net-print/cups ) opengl? ( virtual/opengl ) pulseaudio? ( media-sound/pulseaudio ) gsm? ( media-sound/gsm ) jpeg? ( virtual/jpeg ) ldap? ( net-nds/openldap ) lcms? ( =media-libs/lcms-1* ) mp3? ( >=media-sound/mpg123-1.5.0 ) samba? ( >=net-fs/samba-3.0.25 ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1[pulseaudio?] ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) win32? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1[pulseaudio?] ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite ) pulseaudio? ( || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) !hardened? ( sys-devel/prelink ) dev-util/pkgconfig virtual/yacc sys-devel/flex
 truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2 ) fontconfig? ( media-libs/fontconfig ) gphoto2? ( media-libs/libgphoto2 ) jack? ( media-sound/jack-audio-connection-kit ) openal? ( media-libs/openal ) dbus? ( sys-apps/dbus ) gnutls? ( net-libs/gnutls ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm x11-apps/xmessage ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) nas? ( media-libs/nas ) cups? ( net-print/cups ) opengl? ( virtual/opengl ) pulseaudio? ( media-sound/pulseaudio ) gsm? ( media-sound/gsm ) jpeg? ( virtual/jpeg ) ldap? ( net-nds/openldap ) lcms? ( =media-libs/lcms-1* ) mp3? ( >=media-sound/mpg123-1.5.0 ) samba? ( >=net-fs/samba-3.0.25 ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1[pulseaudio?] ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) win32? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1[pulseaudio?] ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite )
 0
 mirror://sourceforge/wine/wine-1.2.3.tar.bz2 gecko? ( mirror://sourceforge/wine/wine_gecko-1.0.0-x86.cab ) pulseaudio? ( http://art.ified.ca/downloads/winepulse/winepulse-0.36.patch http://art.ified.ca/downloads/winepulse/winepulse-0.35-configure.ac.patch http://art.ified.ca/downloads/winepulse/winepulse-0.38-winecfg.patch )
diff --git a/metadata/cache/app-emulation/wine-1.4 b/metadata/cache/app-emulation/wine-1.4
index 017555803ee1..fd9b974ab2a2 100644
--- a/metadata/cache/app-emulation/wine-1.4
+++ b/metadata/cache/app-emulation/wine-1.4
@@ -1,4 +1,4 @@
-truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2 ) fontconfig? ( media-libs/fontconfig ) gphoto2? ( media-libs/libgphoto2 ) openal? ( media-libs/openal ) udisks? ( sys-apps/dbus sys-fs/udisks ) gnutls? ( net-libs/gnutls ) gstreamer? ( media-libs/gstreamer media-libs/gst-plugins-base ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm x11-apps/xmessage ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) opencl? ( virtual/opencl ) opengl? ( virtual/opengl ) gsm? ( media-sound/gsm ) jpeg? ( virtual/jpeg ) ldap? ( net-nds/openldap ) lcms? ( =media-libs/lcms-1* ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC ) samba? ( >=net-fs/samba-3.0.25 ) selinux? ( sec-policy/selinux-wine ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) odbc? ( app-emulation/emul-linux-x86-db ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) win32? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) odbc? ( app-emulation/emul-linux-x86-db ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) !hardened? ( sys-devel/prelink ) dev-util/pkgconfig virtual/yacc sys-devel/flex || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2 ) fontconfig? ( media-libs/fontconfig ) gphoto2? ( media-libs/libgphoto2 ) openal? ( media-libs/openal ) udisks? ( sys-apps/dbus sys-fs/udisks ) gnutls? ( net-libs/gnutls ) gstreamer? ( media-libs/gstreamer media-libs/gst-plugins-base ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm x11-apps/xmessage ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) opencl? ( virtual/opencl ) opengl? ( virtual/opengl ) gsm? ( media-sound/gsm ) jpeg? ( virtual/jpeg ) ldap? ( net-nds/openldap ) lcms? ( =media-libs/lcms-1* ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC ) samba? ( >=net-fs/samba-3.0.25 ) selinux? ( sec-policy/selinux-wine ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) odbc? ( app-emulation/emul-linux-x86-db ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) win32? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) odbc? ( app-emulation/emul-linux-x86-db ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) !hardened? ( sys-devel/prelink ) dev-util/pkgconfig virtual/yacc sys-devel/flex || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2 ) fontconfig? ( media-libs/fontconfig ) gphoto2? ( media-libs/libgphoto2 ) openal? ( media-libs/openal ) udisks? ( sys-apps/dbus sys-fs/udisks ) gnutls? ( net-libs/gnutls ) gstreamer? ( media-libs/gstreamer media-libs/gst-plugins-base ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm x11-apps/xmessage ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) opencl? ( virtual/opencl ) opengl? ( virtual/opengl ) gsm? ( media-sound/gsm ) jpeg? ( virtual/jpeg ) ldap? ( net-nds/openldap ) lcms? ( =media-libs/lcms-1* ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC ) samba? ( >=net-fs/samba-3.0.25 ) selinux? ( sec-policy/selinux-wine ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) odbc? ( app-emulation/emul-linux-x86-db ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) win32? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) odbc? ( app-emulation/emul-linux-x86-db ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite )
 0
 mirror://sourceforge/wine/wine-1.4.tar.bz2 gecko? ( mirror://sourceforge/wine/wine_gecko-1.4-x86.msi win64? ( mirror://sourceforge/wine/wine_gecko-1.4-x86_64.msi ) )
diff --git a/metadata/cache/app-emulation/wine-1.4_rc2 b/metadata/cache/app-emulation/wine-1.4_rc2
index 9c4a2441f9f9..db62db05dd75 100644
--- a/metadata/cache/app-emulation/wine-1.4_rc2
+++ b/metadata/cache/app-emulation/wine-1.4_rc2
@@ -1,4 +1,4 @@
-truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2 ) fontconfig? ( media-libs/fontconfig ) gphoto2? ( media-libs/libgphoto2 ) openal? ( media-libs/openal ) udisks? ( sys-apps/dbus sys-fs/udisks ) gnutls? ( net-libs/gnutls ) gstreamer? ( media-libs/gstreamer media-libs/gst-plugins-base ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm x11-apps/xmessage ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) opencl? ( virtual/opencl ) opengl? ( virtual/opengl ) gsm? ( media-sound/gsm ) jpeg? ( virtual/jpeg ) ldap? ( net-nds/openldap ) lcms? ( =media-libs/lcms-1* ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) samba? ( >=net-fs/samba-3.0.25 ) selinux? ( sec-policy/selinux-wine ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) win32? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) !hardened? ( sys-devel/prelink ) dev-util/pkgconfig virtual/yacc sys-devel/flex || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2 ) fontconfig? ( media-libs/fontconfig ) gphoto2? ( media-libs/libgphoto2 ) openal? ( media-libs/openal ) udisks? ( sys-apps/dbus sys-fs/udisks ) gnutls? ( net-libs/gnutls ) gstreamer? ( media-libs/gstreamer media-libs/gst-plugins-base ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm x11-apps/xmessage ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) opencl? ( virtual/opencl ) opengl? ( virtual/opengl ) gsm? ( media-sound/gsm ) jpeg? ( virtual/jpeg ) ldap? ( net-nds/openldap ) lcms? ( =media-libs/lcms-1* ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) samba? ( >=net-fs/samba-3.0.25 ) selinux? ( sec-policy/selinux-wine ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) win32? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) !hardened? ( sys-devel/prelink ) dev-util/pkgconfig virtual/yacc sys-devel/flex || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2 ) fontconfig? ( media-libs/fontconfig ) gphoto2? ( media-libs/libgphoto2 ) openal? ( media-libs/openal ) udisks? ( sys-apps/dbus sys-fs/udisks ) gnutls? ( net-libs/gnutls ) gstreamer? ( media-libs/gstreamer media-libs/gst-plugins-base ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm x11-apps/xmessage ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) opencl? ( virtual/opencl ) opengl? ( virtual/opengl ) gsm? ( media-sound/gsm ) jpeg? ( virtual/jpeg ) ldap? ( net-nds/openldap ) lcms? ( =media-libs/lcms-1* ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) samba? ( >=net-fs/samba-3.0.25 ) selinux? ( sec-policy/selinux-wine ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) win32? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite )
 0
 mirror://sourceforge/wine/wine-1.4-rc2.tar.bz2 gecko? ( mirror://sourceforge/wine/wine_gecko-1.4-x86.msi win64? ( mirror://sourceforge/wine/wine_gecko-1.4-x86_64.msi ) )
diff --git a/metadata/cache/app-emulation/wine-1.4_rc3 b/metadata/cache/app-emulation/wine-1.4_rc3
index b70580af5636..dd6691c541af 100644
--- a/metadata/cache/app-emulation/wine-1.4_rc3
+++ b/metadata/cache/app-emulation/wine-1.4_rc3
@@ -1,4 +1,4 @@
-truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2 ) fontconfig? ( media-libs/fontconfig ) gphoto2? ( media-libs/libgphoto2 ) openal? ( media-libs/openal ) udisks? ( sys-apps/dbus sys-fs/udisks ) gnutls? ( net-libs/gnutls ) gstreamer? ( media-libs/gstreamer media-libs/gst-plugins-base ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm x11-apps/xmessage ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) opencl? ( virtual/opencl ) opengl? ( virtual/opengl ) gsm? ( media-sound/gsm ) jpeg? ( virtual/jpeg ) ldap? ( net-nds/openldap ) lcms? ( =media-libs/lcms-1* ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) samba? ( >=net-fs/samba-3.0.25 ) selinux? ( sec-policy/selinux-wine ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) win32? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) !hardened? ( sys-devel/prelink ) dev-util/pkgconfig virtual/yacc sys-devel/flex || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2 ) fontconfig? ( media-libs/fontconfig ) gphoto2? ( media-libs/libgphoto2 ) openal? ( media-libs/openal ) udisks? ( sys-apps/dbus sys-fs/udisks ) gnutls? ( net-libs/gnutls ) gstreamer? ( media-libs/gstreamer media-libs/gst-plugins-base ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm x11-apps/xmessage ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) opencl? ( virtual/opencl ) opengl? ( virtual/opengl ) gsm? ( media-sound/gsm ) jpeg? ( virtual/jpeg ) ldap? ( net-nds/openldap ) lcms? ( =media-libs/lcms-1* ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) samba? ( >=net-fs/samba-3.0.25 ) selinux? ( sec-policy/selinux-wine ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) win32? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) !hardened? ( sys-devel/prelink ) dev-util/pkgconfig virtual/yacc sys-devel/flex || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2 ) fontconfig? ( media-libs/fontconfig ) gphoto2? ( media-libs/libgphoto2 ) openal? ( media-libs/openal ) udisks? ( sys-apps/dbus sys-fs/udisks ) gnutls? ( net-libs/gnutls ) gstreamer? ( media-libs/gstreamer media-libs/gst-plugins-base ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm x11-apps/xmessage ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) opencl? ( virtual/opencl ) opengl? ( virtual/opengl ) gsm? ( media-sound/gsm ) jpeg? ( virtual/jpeg ) ldap? ( net-nds/openldap ) lcms? ( =media-libs/lcms-1* ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) samba? ( >=net-fs/samba-3.0.25 ) selinux? ( sec-policy/selinux-wine ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) win32? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite )
 0
 mirror://sourceforge/wine/wine-1.4-rc3.tar.bz2 gecko? ( mirror://sourceforge/wine/wine_gecko-1.4-x86.msi win64? ( mirror://sourceforge/wine/wine_gecko-1.4-x86_64.msi ) )
diff --git a/metadata/cache/app-emulation/wine-1.4_rc4 b/metadata/cache/app-emulation/wine-1.4_rc4
index 3fe65a5a8f48..c0ae4a87105b 100644
--- a/metadata/cache/app-emulation/wine-1.4_rc4
+++ b/metadata/cache/app-emulation/wine-1.4_rc4
@@ -1,4 +1,4 @@
-truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2 ) fontconfig? ( media-libs/fontconfig ) gphoto2? ( media-libs/libgphoto2 ) openal? ( media-libs/openal ) udisks? ( sys-apps/dbus sys-fs/udisks ) gnutls? ( net-libs/gnutls ) gstreamer? ( media-libs/gstreamer media-libs/gst-plugins-base ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm x11-apps/xmessage ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) opencl? ( virtual/opencl ) opengl? ( virtual/opengl ) gsm? ( media-sound/gsm ) jpeg? ( virtual/jpeg ) ldap? ( net-nds/openldap ) lcms? ( =media-libs/lcms-1* ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC ) samba? ( >=net-fs/samba-3.0.25 ) selinux? ( sec-policy/selinux-wine ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) odbc? ( app-emulation/emul-linux-x86-db ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) win32? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) odbc? ( app-emulation/emul-linux-x86-db ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) !hardened? ( sys-devel/prelink ) dev-util/pkgconfig virtual/yacc sys-devel/flex || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2 ) fontconfig? ( media-libs/fontconfig ) gphoto2? ( media-libs/libgphoto2 ) openal? ( media-libs/openal ) udisks? ( sys-apps/dbus sys-fs/udisks ) gnutls? ( net-libs/gnutls ) gstreamer? ( media-libs/gstreamer media-libs/gst-plugins-base ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm x11-apps/xmessage ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) opencl? ( virtual/opencl ) opengl? ( virtual/opengl ) gsm? ( media-sound/gsm ) jpeg? ( virtual/jpeg ) ldap? ( net-nds/openldap ) lcms? ( =media-libs/lcms-1* ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC ) samba? ( >=net-fs/samba-3.0.25 ) selinux? ( sec-policy/selinux-wine ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) odbc? ( app-emulation/emul-linux-x86-db ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) win32? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) odbc? ( app-emulation/emul-linux-x86-db ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) !hardened? ( sys-devel/prelink ) dev-util/pkgconfig virtual/yacc sys-devel/flex || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2 ) fontconfig? ( media-libs/fontconfig ) gphoto2? ( media-libs/libgphoto2 ) openal? ( media-libs/openal ) udisks? ( sys-apps/dbus sys-fs/udisks ) gnutls? ( net-libs/gnutls ) gstreamer? ( media-libs/gstreamer media-libs/gst-plugins-base ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm x11-apps/xmessage ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) opencl? ( virtual/opencl ) opengl? ( virtual/opengl ) gsm? ( media-sound/gsm ) jpeg? ( virtual/jpeg ) ldap? ( net-nds/openldap ) lcms? ( =media-libs/lcms-1* ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC ) samba? ( >=net-fs/samba-3.0.25 ) selinux? ( sec-policy/selinux-wine ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) odbc? ( app-emulation/emul-linux-x86-db ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) win32? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) odbc? ( app-emulation/emul-linux-x86-db ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite )
 0
 mirror://sourceforge/wine/wine-1.4-rc4.tar.bz2 gecko? ( mirror://sourceforge/wine/wine_gecko-1.4-x86.msi win64? ( mirror://sourceforge/wine/wine_gecko-1.4-x86_64.msi ) )
diff --git a/metadata/cache/app-emulation/wine-1.4_rc5 b/metadata/cache/app-emulation/wine-1.4_rc5
index 14f848c6cb77..3b6a70873790 100644
--- a/metadata/cache/app-emulation/wine-1.4_rc5
+++ b/metadata/cache/app-emulation/wine-1.4_rc5
@@ -1,4 +1,4 @@
-truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2 ) fontconfig? ( media-libs/fontconfig ) gphoto2? ( media-libs/libgphoto2 ) openal? ( media-libs/openal ) udisks? ( sys-apps/dbus sys-fs/udisks ) gnutls? ( net-libs/gnutls ) gstreamer? ( media-libs/gstreamer media-libs/gst-plugins-base ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm x11-apps/xmessage ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) opencl? ( virtual/opencl ) opengl? ( virtual/opengl ) gsm? ( media-sound/gsm ) jpeg? ( virtual/jpeg ) ldap? ( net-nds/openldap ) lcms? ( =media-libs/lcms-1* ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC ) samba? ( >=net-fs/samba-3.0.25 ) selinux? ( sec-policy/selinux-wine ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) odbc? ( app-emulation/emul-linux-x86-db ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) win32? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) odbc? ( app-emulation/emul-linux-x86-db ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) !hardened? ( sys-devel/prelink ) dev-util/pkgconfig virtual/yacc sys-devel/flex || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2 ) fontconfig? ( media-libs/fontconfig ) gphoto2? ( media-libs/libgphoto2 ) openal? ( media-libs/openal ) udisks? ( sys-apps/dbus sys-fs/udisks ) gnutls? ( net-libs/gnutls ) gstreamer? ( media-libs/gstreamer media-libs/gst-plugins-base ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm x11-apps/xmessage ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) opencl? ( virtual/opencl ) opengl? ( virtual/opengl ) gsm? ( media-sound/gsm ) jpeg? ( virtual/jpeg ) ldap? ( net-nds/openldap ) lcms? ( =media-libs/lcms-1* ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC ) samba? ( >=net-fs/samba-3.0.25 ) selinux? ( sec-policy/selinux-wine ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) odbc? ( app-emulation/emul-linux-x86-db ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) win32? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) odbc? ( app-emulation/emul-linux-x86-db ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) !hardened? ( sys-devel/prelink ) dev-util/pkgconfig virtual/yacc sys-devel/flex || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2 ) fontconfig? ( media-libs/fontconfig ) gphoto2? ( media-libs/libgphoto2 ) openal? ( media-libs/openal ) udisks? ( sys-apps/dbus sys-fs/udisks ) gnutls? ( net-libs/gnutls ) gstreamer? ( media-libs/gstreamer media-libs/gst-plugins-base ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm x11-apps/xmessage ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) opencl? ( virtual/opencl ) opengl? ( virtual/opengl ) gsm? ( media-sound/gsm ) jpeg? ( virtual/jpeg ) ldap? ( net-nds/openldap ) lcms? ( =media-libs/lcms-1* ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC ) samba? ( >=net-fs/samba-3.0.25 ) selinux? ( sec-policy/selinux-wine ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) odbc? ( app-emulation/emul-linux-x86-db ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) win32? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) odbc? ( app-emulation/emul-linux-x86-db ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite )
 0
 mirror://sourceforge/wine/wine-1.4-rc5.tar.bz2 gecko? ( mirror://sourceforge/wine/wine_gecko-1.4-x86.msi win64? ( mirror://sourceforge/wine/wine_gecko-1.4-x86_64.msi ) )
diff --git a/metadata/cache/app-emulation/wine-1.4_rc6 b/metadata/cache/app-emulation/wine-1.4_rc6
index c65df0a1ec6b..09220d6ff553 100644
--- a/metadata/cache/app-emulation/wine-1.4_rc6
+++ b/metadata/cache/app-emulation/wine-1.4_rc6
@@ -1,4 +1,4 @@
-truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2 ) fontconfig? ( media-libs/fontconfig ) gphoto2? ( media-libs/libgphoto2 ) openal? ( media-libs/openal ) udisks? ( sys-apps/dbus sys-fs/udisks ) gnutls? ( net-libs/gnutls ) gstreamer? ( media-libs/gstreamer media-libs/gst-plugins-base ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm x11-apps/xmessage ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) opencl? ( virtual/opencl ) opengl? ( virtual/opengl ) gsm? ( media-sound/gsm ) jpeg? ( virtual/jpeg ) ldap? ( net-nds/openldap ) lcms? ( =media-libs/lcms-1* ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC ) samba? ( >=net-fs/samba-3.0.25 ) selinux? ( sec-policy/selinux-wine ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) odbc? ( app-emulation/emul-linux-x86-db ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) win32? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) odbc? ( app-emulation/emul-linux-x86-db ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) !hardened? ( sys-devel/prelink ) dev-util/pkgconfig virtual/yacc sys-devel/flex || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2 ) fontconfig? ( media-libs/fontconfig ) gphoto2? ( media-libs/libgphoto2 ) openal? ( media-libs/openal ) udisks? ( sys-apps/dbus sys-fs/udisks ) gnutls? ( net-libs/gnutls ) gstreamer? ( media-libs/gstreamer media-libs/gst-plugins-base ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm x11-apps/xmessage ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) opencl? ( virtual/opencl ) opengl? ( virtual/opengl ) gsm? ( media-sound/gsm ) jpeg? ( virtual/jpeg ) ldap? ( net-nds/openldap ) lcms? ( =media-libs/lcms-1* ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC ) samba? ( >=net-fs/samba-3.0.25 ) selinux? ( sec-policy/selinux-wine ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) odbc? ( app-emulation/emul-linux-x86-db ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) win32? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) odbc? ( app-emulation/emul-linux-x86-db ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) !hardened? ( sys-devel/prelink ) dev-util/pkgconfig virtual/yacc sys-devel/flex || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2 ) fontconfig? ( media-libs/fontconfig ) gphoto2? ( media-libs/libgphoto2 ) openal? ( media-libs/openal ) udisks? ( sys-apps/dbus sys-fs/udisks ) gnutls? ( net-libs/gnutls ) gstreamer? ( media-libs/gstreamer media-libs/gst-plugins-base ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm x11-apps/xmessage ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) opencl? ( virtual/opencl ) opengl? ( virtual/opengl ) gsm? ( media-sound/gsm ) jpeg? ( virtual/jpeg ) ldap? ( net-nds/openldap ) lcms? ( =media-libs/lcms-1* ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC ) samba? ( >=net-fs/samba-3.0.25 ) selinux? ( sec-policy/selinux-wine ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) odbc? ( app-emulation/emul-linux-x86-db ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) win32? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) odbc? ( app-emulation/emul-linux-x86-db ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite )
 0
 mirror://sourceforge/wine/wine-1.4-rc6.tar.bz2 gecko? ( mirror://sourceforge/wine/wine_gecko-1.4-x86.msi win64? ( mirror://sourceforge/wine/wine_gecko-1.4-x86_64.msi ) )
diff --git a/metadata/cache/app-emulation/wine-1.5.0 b/metadata/cache/app-emulation/wine-1.5.0
index 43f71f918f8d..f47ea0014b1f 100644
--- a/metadata/cache/app-emulation/wine-1.5.0
+++ b/metadata/cache/app-emulation/wine-1.5.0
@@ -1,4 +1,4 @@
-truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2 ) fontconfig? ( media-libs/fontconfig ) gphoto2? ( media-libs/libgphoto2 ) openal? ( media-libs/openal ) udisks? ( sys-apps/dbus sys-fs/udisks ) gnutls? ( net-libs/gnutls ) gstreamer? ( media-libs/gstreamer media-libs/gst-plugins-base ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm x11-apps/xmessage ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) opencl? ( virtual/opencl ) opengl? ( virtual/opengl ) gsm? ( media-sound/gsm ) jpeg? ( virtual/jpeg ) ldap? ( net-nds/openldap ) lcms? ( =media-libs/lcms-1* ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC ) samba? ( >=net-fs/samba-3.0.25 ) selinux? ( sec-policy/selinux-wine ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) odbc? ( app-emulation/emul-linux-x86-db ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) win32? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) odbc? ( app-emulation/emul-linux-x86-db ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) !hardened? ( sys-devel/prelink ) dev-util/pkgconfig virtual/yacc sys-devel/flex || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2 ) fontconfig? ( media-libs/fontconfig ) gphoto2? ( media-libs/libgphoto2 ) openal? ( media-libs/openal ) udisks? ( sys-apps/dbus sys-fs/udisks ) gnutls? ( net-libs/gnutls ) gstreamer? ( media-libs/gstreamer media-libs/gst-plugins-base ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm x11-apps/xmessage ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) opencl? ( virtual/opencl ) opengl? ( virtual/opengl ) gsm? ( media-sound/gsm ) jpeg? ( virtual/jpeg ) ldap? ( net-nds/openldap ) lcms? ( =media-libs/lcms-1* ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC ) samba? ( >=net-fs/samba-3.0.25 ) selinux? ( sec-policy/selinux-wine ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) odbc? ( app-emulation/emul-linux-x86-db ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) win32? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) odbc? ( app-emulation/emul-linux-x86-db ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) !hardened? ( sys-devel/prelink ) dev-util/pkgconfig virtual/yacc sys-devel/flex || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2 ) fontconfig? ( media-libs/fontconfig ) gphoto2? ( media-libs/libgphoto2 ) openal? ( media-libs/openal ) udisks? ( sys-apps/dbus sys-fs/udisks ) gnutls? ( net-libs/gnutls ) gstreamer? ( media-libs/gstreamer media-libs/gst-plugins-base ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm x11-apps/xmessage ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) opencl? ( virtual/opencl ) opengl? ( virtual/opengl ) gsm? ( media-sound/gsm ) jpeg? ( virtual/jpeg ) ldap? ( net-nds/openldap ) lcms? ( =media-libs/lcms-1* ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC ) samba? ( >=net-fs/samba-3.0.25 ) selinux? ( sec-policy/selinux-wine ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) odbc? ( app-emulation/emul-linux-x86-db ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) win32? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) odbc? ( app-emulation/emul-linux-x86-db ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite )
 0
 mirror://sourceforge/wine/wine-1.5.0.tar.bz2 gecko? ( mirror://sourceforge/wine/wine_gecko-1.5-x86.msi win64? ( mirror://sourceforge/wine/wine_gecko-1.5-x86_64.msi ) )
diff --git a/metadata/cache/app-emulation/wine-9999 b/metadata/cache/app-emulation/wine-9999
index 30a33e945a7a..b22362e09caf 100644
--- a/metadata/cache/app-emulation/wine-9999
+++ b/metadata/cache/app-emulation/wine-9999
@@ -1,4 +1,4 @@
-truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2 ) fontconfig? ( media-libs/fontconfig ) gphoto2? ( media-libs/libgphoto2 ) openal? ( media-libs/openal ) udisks? ( sys-apps/dbus sys-fs/udisks ) gnutls? ( net-libs/gnutls ) gstreamer? ( media-libs/gstreamer media-libs/gst-plugins-base ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm x11-apps/xmessage ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) opencl? ( virtual/opencl ) opengl? ( virtual/opengl ) gsm? ( media-sound/gsm ) jpeg? ( virtual/jpeg ) ldap? ( net-nds/openldap ) lcms? ( =media-libs/lcms-1* ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC ) samba? ( >=net-fs/samba-3.0.25 ) selinux? ( sec-policy/selinux-wine ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) odbc? ( app-emulation/emul-linux-x86-db ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) win32? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) odbc? ( app-emulation/emul-linux-x86-db ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) !hardened? ( sys-devel/prelink ) dev-util/pkgconfig virtual/yacc sys-devel/flex || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
+truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2 ) fontconfig? ( media-libs/fontconfig ) gphoto2? ( media-libs/libgphoto2 ) openal? ( media-libs/openal ) udisks? ( sys-apps/dbus sys-fs/udisks ) gnutls? ( net-libs/gnutls ) gstreamer? ( media-libs/gstreamer media-libs/gst-plugins-base ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm x11-apps/xmessage ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) opencl? ( virtual/opencl ) opengl? ( virtual/opengl ) gsm? ( media-sound/gsm ) jpeg? ( virtual/jpeg ) ldap? ( net-nds/openldap ) lcms? ( =media-libs/lcms-1* ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC ) samba? ( >=net-fs/samba-3.0.25 ) selinux? ( sec-policy/selinux-wine ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) odbc? ( app-emulation/emul-linux-x86-db ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) win32? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) odbc? ( app-emulation/emul-linux-x86-db ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite ) X? ( x11-proto/inputproto x11-proto/xextproto x11-proto/xf86vidmodeproto ) xinerama? ( x11-proto/xineramaproto ) !hardened? ( sys-devel/prelink ) dev-util/pkgconfig virtual/yacc sys-devel/flex || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
 truetype? ( >=media-libs/freetype-2.0.0 media-fonts/corefonts ) perl? ( dev-lang/perl dev-perl/XML-Simple ) capi? ( net-dialup/capi4k-utils ) ncurses? ( >=sys-libs/ncurses-5.2 ) fontconfig? ( media-libs/fontconfig ) gphoto2? ( media-libs/libgphoto2 ) openal? ( media-libs/openal ) udisks? ( sys-apps/dbus sys-fs/udisks ) gnutls? ( net-libs/gnutls ) gstreamer? ( media-libs/gstreamer media-libs/gst-plugins-base ) X? ( x11-libs/libXcursor x11-libs/libXrandr x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm x11-apps/xmessage ) xinerama? ( x11-libs/libXinerama ) alsa? ( media-libs/alsa-lib ) cups? ( net-print/cups ) opencl? ( virtual/opencl ) opengl? ( virtual/opengl ) gsm? ( media-sound/gsm ) jpeg? ( virtual/jpeg ) ldap? ( net-nds/openldap ) lcms? ( =media-libs/lcms-1* ) mp3? ( >=media-sound/mpg123-1.5.0 ) nls? ( sys-devel/gettext ) odbc? ( dev-db/unixODBC ) samba? ( >=net-fs/samba-3.0.25 ) selinux? ( sec-policy/selinux-wine ) xml? ( dev-libs/libxml2 dev-libs/libxslt ) scanner? ( media-gfx/sane-backends ) ssl? ( dev-libs/openssl ) png? ( media-libs/libpng ) v4l? ( media-libs/libv4l ) !win64? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) odbc? ( app-emulation/emul-linux-x86-db ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) win32? ( amd64? ( truetype? ( >=app-emulation/emul-linux-x86-xlibs-2.1 ) X? ( >=app-emulation/emul-linux-x86-xlibs-2.1 >=app-emulation/emul-linux-x86-soundlibs-2.1 ) mp3? ( app-emulation/emul-linux-x86-soundlibs ) odbc? ( app-emulation/emul-linux-x86-db ) openal? ( app-emulation/emul-linux-x86-sdl ) opengl? ( app-emulation/emul-linux-x86-opengl ) scanner? ( app-emulation/emul-linux-x86-medialibs ) v4l? ( app-emulation/emul-linux-x86-medialibs ) app-emulation/emul-linux-x86-baselibs >=sys-kernel/linux-headers-2.6 ) ) xcomposite? ( x11-libs/libXcomposite )
 0
 gecko? ( mirror://sourceforge/wine/wine_gecko-1.5-x86.msi win64? ( mirror://sourceforge/wine/wine_gecko-1.5-x86_64.msi ) )
diff --git a/metadata/cache/app-emulation/x48-0.6.3 b/metadata/cache/app-emulation/x48-0.6.3
index 1cb1a49bed56..1996eba15485 100644
--- a/metadata/cache/app-emulation/x48-0.6.3
+++ b/metadata/cache/app-emulation/x48-0.6.3
@@ -1,4 +1,4 @@
-x11-libs/libX11 x11-libs/libXext readline? ( sys-libs/readline ) dev-util/pkgconfig x11-libs/libXt || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+x11-libs/libX11 x11-libs/libXext readline? ( sys-libs/readline ) dev-util/pkgconfig x11-libs/libXt || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 x11-libs/libX11 x11-libs/libXext readline? ( sys-libs/readline )
 0
 mirror://berlios/x48/x48-0.6.3.tar.gz
diff --git a/metadata/cache/app-forensics/afflib-3.6.16 b/metadata/cache/app-forensics/afflib-3.6.16
index 0ba4cadf2146..7aaadecbf07e 100644
--- a/metadata/cache/app-forensics/afflib-3.6.16
+++ b/metadata/cache/app-forensics/afflib-3.6.16
@@ -1,4 +1,4 @@
-dev-libs/expat dev-libs/openssl sys-libs/zlib fuse? ( sys-fs/fuse ) ncurses? ( sys-libs/ncurses ) readline? ( sys-libs/readline ) s3? ( net-misc/curl ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( =dev-lang/python-2* )
+dev-libs/expat dev-libs/openssl sys-libs/zlib fuse? ( sys-fs/fuse ) ncurses? ( sys-libs/ncurses ) readline? ( sys-libs/readline ) s3? ( net-misc/curl ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( =dev-lang/python-2* )
 dev-libs/expat dev-libs/openssl sys-libs/zlib fuse? ( sys-fs/fuse ) ncurses? ( sys-libs/ncurses ) readline? ( sys-libs/readline ) s3? ( net-misc/curl ) python? ( =dev-lang/python-2* )
 0
 http://afflib.org/downloads/afflib-3.6.16.tar.gz
diff --git a/metadata/cache/app-forensics/aide-0.14.2 b/metadata/cache/app-forensics/aide-0.14.2
index 9f29989ff9c1..0fbb0d3c6e9c 100644
--- a/metadata/cache/app-forensics/aide-0.14.2
+++ b/metadata/cache/app-forensics/aide-0.14.2
@@ -1,4 +1,4 @@
-acl? ( virtual/acl ) audit? ( sys-process/audit ) curl? ( net-misc/curl ) mhash? ( >=app-crypt/mhash-0.9.2 ) !mhash? ( dev-libs/libgcrypt ) nls? ( virtual/libintl ) postgres? ( dev-db/postgresql-base ) prelink? ( sys-devel/prelink ) selinux? ( sys-libs/libselinux ) xattr? ( sys-apps/attr ) zlib? ( sys-libs/zlib ) nls? ( sys-devel/gettext ) sys-devel/bison sys-devel/flex || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+acl? ( virtual/acl ) audit? ( sys-process/audit ) curl? ( net-misc/curl ) mhash? ( >=app-crypt/mhash-0.9.2 ) !mhash? ( dev-libs/libgcrypt ) nls? ( virtual/libintl ) postgres? ( dev-db/postgresql-base ) prelink? ( sys-devel/prelink ) selinux? ( sys-libs/libselinux ) xattr? ( sys-apps/attr ) zlib? ( sys-libs/zlib ) nls? ( sys-devel/gettext ) sys-devel/bison sys-devel/flex || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 !static? ( acl? ( virtual/acl ) audit? ( sys-process/audit ) curl? ( net-misc/curl ) mhash? ( >=app-crypt/mhash-0.9.2 ) !mhash? ( dev-libs/libgcrypt ) nls? ( virtual/libintl ) postgres? ( dev-db/postgresql-base ) prelink? ( sys-devel/prelink ) selinux? ( sys-libs/libselinux ) xattr? ( sys-apps/attr ) zlib? ( sys-libs/zlib ) )
 0
 mirror://sourceforge/aide/aide-0.14.2.tar.gz
diff --git a/metadata/cache/app-forensics/aide-0.15.1 b/metadata/cache/app-forensics/aide-0.15.1
index e5cc168478a1..41ac3202ac07 100644
--- a/metadata/cache/app-forensics/aide-0.15.1
+++ b/metadata/cache/app-forensics/aide-0.15.1
@@ -1,4 +1,4 @@
-acl? ( virtual/acl ) audit? ( sys-process/audit ) curl? ( net-misc/curl ) mhash? ( >=app-crypt/mhash-0.9.2 ) !mhash? ( dev-libs/libgcrypt ) nls? ( virtual/libintl ) postgres? ( dev-db/postgresql-base ) prelink? ( sys-devel/prelink ) selinux? ( sys-libs/libselinux ) xattr? ( sys-apps/attr ) zlib? ( sys-libs/zlib ) nls? ( sys-devel/gettext ) sys-devel/bison sys-devel/flex || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+acl? ( virtual/acl ) audit? ( sys-process/audit ) curl? ( net-misc/curl ) mhash? ( >=app-crypt/mhash-0.9.2 ) !mhash? ( dev-libs/libgcrypt ) nls? ( virtual/libintl ) postgres? ( dev-db/postgresql-base ) prelink? ( sys-devel/prelink ) selinux? ( sys-libs/libselinux ) xattr? ( sys-apps/attr ) zlib? ( sys-libs/zlib ) nls? ( sys-devel/gettext ) sys-devel/bison sys-devel/flex || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 !static? ( acl? ( virtual/acl ) audit? ( sys-process/audit ) curl? ( net-misc/curl ) mhash? ( >=app-crypt/mhash-0.9.2 ) !mhash? ( dev-libs/libgcrypt ) nls? ( virtual/libintl ) postgres? ( dev-db/postgresql-base ) prelink? ( sys-devel/prelink ) selinux? ( sys-libs/libselinux ) xattr? ( sys-apps/attr ) zlib? ( sys-libs/zlib ) )
 0
 mirror://sourceforge/aide/aide-0.15.1.tar.gz
diff --git a/metadata/cache/app-forensics/rdd-2.0.7 b/metadata/cache/app-forensics/rdd-2.0.7
index 0e3368fcdfb9..1662a2b0a16e 100644
--- a/metadata/cache/app-forensics/rdd-2.0.7
+++ b/metadata/cache/app-forensics/rdd-2.0.7
@@ -1,4 +1,4 @@
-gtk? ( x11-libs/gtk+:2 gnome-base/libglade:2.0 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+gtk? ( x11-libs/gtk+:2 gnome-base/libglade:2.0 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 gtk? ( x11-libs/gtk+:2 gnome-base/libglade:2.0 )
 0
 mirror://sourceforge/rdd/rdd-2.0.7.tar.gz
diff --git a/metadata/cache/app-forensics/sleuthkit-3.2.3 b/metadata/cache/app-forensics/sleuthkit-3.2.3
index 70df86f87291..185d64c80d8e 100644
--- a/metadata/cache/app-forensics/sleuthkit-3.2.3
+++ b/metadata/cache/app-forensics/sleuthkit-3.2.3
@@ -1,4 +1,4 @@
-dev-db/sqlite:3 ewf? ( app-forensics/libewf[-ewf2] ) aff? ( app-forensics/afflib ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-db/sqlite:3 ewf? ( app-forensics/libewf[-ewf2] ) aff? ( app-forensics/afflib ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-db/sqlite:3 ewf? ( app-forensics/libewf[-ewf2] ) aff? ( app-forensics/afflib ) dev-perl/DateManip
 0
 mirror://sourceforge/sleuthkit/sleuthkit-3.2.3.tar.gz
diff --git a/metadata/cache/app-forensics/zzuf-0.13-r1 b/metadata/cache/app-forensics/zzuf-0.13-r1
index 11bc45b253b7..9b2ee1c28609 100644
--- a/metadata/cache/app-forensics/zzuf-0.13-r1
+++ b/metadata/cache/app-forensics/zzuf-0.13-r1
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 http://caca.zoy.org/files/zzuf/zzuf-0.13.tar.gz http://dev.gentoo.org/~cardoe/distfiles/zzuf-0.13-zzcat-zzat-rename.patch.bz2
diff --git a/metadata/cache/app-i18n/fcitx-3.6.3 b/metadata/cache/app-i18n/fcitx-3.6.3
index 9f90d33ab533..d6b865896347 100644
--- a/metadata/cache/app-i18n/fcitx-3.6.3
+++ b/metadata/cache/app-i18n/fcitx-3.6.3
@@ -1,4 +1,4 @@
-x11-libs/libX11 x11-libs/libXpm x11-libs/libXrender x11-libs/libXt x11-libs/libXtst x11-libs/libXext x11-libs/libXft dbus? ( >=sys-apps/dbus-0.2 ) x11-proto/xproto dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+x11-libs/libX11 x11-libs/libXpm x11-libs/libXrender x11-libs/libXt x11-libs/libXtst x11-libs/libXext x11-libs/libXft dbus? ( >=sys-apps/dbus-0.2 ) x11-proto/xproto dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 x11-libs/libX11 x11-libs/libXpm x11-libs/libXrender x11-libs/libXt x11-libs/libXtst x11-libs/libXext x11-libs/libXft dbus? ( >=sys-apps/dbus-0.2 )
 0
 http://www.fcitx.org/download/fcitx-3.6.3.tar.bz2
diff --git a/metadata/cache/app-i18n/fcitx-3.6.4 b/metadata/cache/app-i18n/fcitx-3.6.4
index 44f6a85c7d78..de9676371deb 100644
--- a/metadata/cache/app-i18n/fcitx-3.6.4
+++ b/metadata/cache/app-i18n/fcitx-3.6.4
@@ -1,4 +1,4 @@
-x11-libs/libX11 x11-libs/libXpm x11-libs/libXrender x11-libs/libXt x11-libs/libXtst x11-libs/libXext x11-libs/libXft dbus? ( >=sys-apps/dbus-0.2 ) x11-proto/xproto dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+x11-libs/libX11 x11-libs/libXpm x11-libs/libXrender x11-libs/libXt x11-libs/libXtst x11-libs/libXext x11-libs/libXft dbus? ( >=sys-apps/dbus-0.2 ) x11-proto/xproto dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 x11-libs/libX11 x11-libs/libXpm x11-libs/libXrender x11-libs/libXt x11-libs/libXtst x11-libs/libXext x11-libs/libXft dbus? ( >=sys-apps/dbus-0.2 )
 0
 http://fcitx.googlecode.com/files/fcitx-3.6.4.tar.gz
diff --git a/metadata/cache/app-i18n/ibus-1.4.1 b/metadata/cache/app-i18n/ibus-1.4.1
index 69197c70dd33..d245e6689445 100644
--- a/metadata/cache/app-i18n/ibus-1.4.1
+++ b/metadata/cache/app-i18n/ibus-1.4.1
@@ -1,4 +1,4 @@
->=dev-libs/glib-2.26 dconf? ( >=gnome-base/dconf-0.7.5 ) gconf? ( >=gnome-base/gconf-2.12:2 ) gnome-base/librsvg sys-apps/dbus[X?] app-text/iso-codes gtk? ( x11-libs/gtk+:2 ) gtk3? ( x11-libs/gtk+:3 ) X? ( x11-libs/libX11 x11-libs/gtk+:2 ) introspection? ( >=dev-libs/gobject-introspection-0.6.8 ) python? ( dev-python/notify-python >=dev-python/dbus-python-0.83 ) nls? ( virtual/libintl ) >=dev-lang/perl-5.8.1 dev-util/intltool dev-util/pkgconfig doc? ( >=dev-util/gtk-doc-1.9 ) nls? ( >=sys-devel/gettext-0.16.1 ) >=sys-apps/sed-4 python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-libs/glib-2.26 dconf? ( >=gnome-base/dconf-0.7.5 ) gconf? ( >=gnome-base/gconf-2.12:2 ) gnome-base/librsvg sys-apps/dbus[X?] app-text/iso-codes gtk? ( x11-libs/gtk+:2 ) gtk3? ( x11-libs/gtk+:3 ) X? ( x11-libs/libX11 x11-libs/gtk+:2 ) introspection? ( >=dev-libs/gobject-introspection-0.6.8 ) python? ( dev-python/notify-python >=dev-python/dbus-python-0.83 ) nls? ( virtual/libintl ) >=dev-lang/perl-5.8.1 dev-util/intltool dev-util/pkgconfig doc? ( >=dev-util/gtk-doc-1.9 ) nls? ( >=sys-devel/gettext-0.16.1 ) >=sys-apps/sed-4 python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=dev-libs/glib-2.26 dconf? ( >=gnome-base/dconf-0.7.5 ) gconf? ( >=gnome-base/gconf-2.12:2 ) gnome-base/librsvg sys-apps/dbus[X?] app-text/iso-codes gtk? ( x11-libs/gtk+:2 ) gtk3? ( x11-libs/gtk+:3 ) X? ( x11-libs/libX11 x11-libs/gtk+:2 ) introspection? ( >=dev-libs/gobject-introspection-0.6.8 ) python? ( dev-python/notify-python >=dev-python/dbus-python-0.83 ) nls? ( virtual/libintl ) python? ( dev-python/pygtk dev-python/pyxdg ) python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) )
 0
 http://ibus.googlecode.com/files/ibus-1.4.1.tar.gz
diff --git a/metadata/cache/app-i18n/ibus-hangul-1.3.1-r1 b/metadata/cache/app-i18n/ibus-hangul-1.3.1-r1
deleted file mode 100644
index 3d2b7b5a3d03..000000000000
--- a/metadata/cache/app-i18n/ibus-hangul-1.3.1-r1
+++ /dev/null
@@ -1,22 +0,0 @@
->=app-i18n/ibus-1.2.99 >=app-i18n/libhangul-0.0.12 nls? ( virtual/libintl ) dev-util/pkgconfig nls? ( >=sys-devel/gettext-0.17 ) || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
->=app-i18n/ibus-1.2.99 >=app-i18n/libhangul-0.0.12 nls? ( virtual/libintl ) || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
-0
-http://ibus.googlecode.com/files/ibus-hangul-1.3.1.tar.gz
-
-http://code.google.com/p/ibus/
-GPL-2
-The Hangul engine for IBus input platform
-amd64 x86
-eutils multilib python toolchain-funcs user
-nls
-
-
-
-3
-
-configure install prepare
-
-
-
-
-
diff --git a/metadata/cache/app-i18n/ibus-hangul-1.4.0 b/metadata/cache/app-i18n/ibus-hangul-1.4.0
index 5f613e26ad2c..9470b8d9267b 100644
--- a/metadata/cache/app-i18n/ibus-hangul-1.4.0
+++ b/metadata/cache/app-i18n/ibus-hangul-1.4.0
@@ -1,20 +1,20 @@
->=app-i18n/ibus-1.3.99 dev-python/pygobject dev-python/pygtk >=app-i18n/libhangul-0.1 nls? ( virtual/libintl ) dev-util/pkgconfig nls? ( >=sys-devel/gettext-0.17 ) || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
->=app-i18n/ibus-1.3.99 dev-python/pygobject dev-python/pygtk >=app-i18n/libhangul-0.1 nls? ( virtual/libintl ) || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
+>=app-i18n/ibus-1.4 =dev-python/pygobject-2* =dev-python/pygtk-2* >=app-i18n/libhangul-0.1 nls? ( virtual/libintl ) dev-util/pkgconfig nls? ( dev-util/intltool >=sys-devel/gettext-0.17 ) || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
+>=app-i18n/ibus-1.4 =dev-python/pygobject-2* =dev-python/pygtk-2* >=app-i18n/libhangul-0.1 nls? ( virtual/libintl ) || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
 0
 http://ibus.googlecode.com/files/ibus-hangul-1.4.0.tar.gz
 
 http://code.google.com/p/ibus/
 GPL-2
 The Hangul engine for IBus input platform
-amd64 ~x86
-eutils multilib python toolchain-funcs user
+amd64 x86
+multilib python toolchain-funcs
 nls
 
 
 
-3
+4
 
-configure install postinst postrm prepare setup
+configure postinst postrm prepare setup
 
 
 
diff --git a/metadata/cache/app-i18n/im-freewnn-0.0.2-r1 b/metadata/cache/app-i18n/im-freewnn-0.0.2-r1
index e23b39f88371..7fb8af84b661 100644
--- a/metadata/cache/app-i18n/im-freewnn-0.0.2-r1
+++ b/metadata/cache/app-i18n/im-freewnn-0.0.2-r1
@@ -1,4 +1,4 @@
-dev-libs/glib x11-libs/pango >=x11-libs/gtk+-2.4:2 >=app-i18n/freewnn-1.1.1_alpha21-r1 dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-libs/glib x11-libs/pango >=x11-libs/gtk+-2.4:2 >=app-i18n/freewnn-1.1.1_alpha21-r1 dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-libs/glib x11-libs/pango >=x11-libs/gtk+-2.4:2 >=app-i18n/freewnn-1.1.1_alpha21-r1
 0
 http://bonobo.gnome.gr.jp/~nakai/immodule/im-freewnn-0.0.2.tar.gz
diff --git a/metadata/cache/app-i18n/im-ja-1.5-r1 b/metadata/cache/app-i18n/im-ja-1.5-r1
index 1693186648e5..87a15ac7d4f6 100644
--- a/metadata/cache/app-i18n/im-ja-1.5-r1
+++ b/metadata/cache/app-i18n/im-ja-1.5-r1
@@ -1,4 +1,4 @@
->=dev-libs/glib-2.4:2 >=dev-libs/atk-1.6 >=x11-libs/gtk+-2.4:2 >=x11-libs/pango-1.2.1 >=gnome-base/gconf-2.4:2 >=gnome-base/libglade-2.4:2.0 >=gnome-base/libgnomeui-2.4 gnome? ( >=gnome-base/gnome-panel-2.0 ) freewnn? ( app-i18n/freewnn ) canna? ( app-i18n/canna ) skk? ( virtual/skkserv ) anthy? ( app-i18n/anthy ) dev-lang/perl dev-perl/URI dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+>=dev-libs/glib-2.4:2 >=dev-libs/atk-1.6 >=x11-libs/gtk+-2.4:2 >=x11-libs/pango-1.2.1 >=gnome-base/gconf-2.4:2 >=gnome-base/libglade-2.4:2.0 >=gnome-base/libgnomeui-2.4 gnome? ( >=gnome-base/gnome-panel-2.0 ) freewnn? ( app-i18n/freewnn ) canna? ( app-i18n/canna ) skk? ( virtual/skkserv ) anthy? ( app-i18n/anthy ) dev-lang/perl dev-perl/URI dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 >=dev-libs/glib-2.4:2 >=dev-libs/atk-1.6 >=x11-libs/gtk+-2.4:2 >=x11-libs/pango-1.2.1 >=gnome-base/gconf-2.4:2 >=gnome-base/libglade-2.4:2.0 >=gnome-base/libgnomeui-2.4 gnome? ( >=gnome-base/gnome-panel-2.0 ) freewnn? ( app-i18n/freewnn ) canna? ( app-i18n/canna ) skk? ( virtual/skkserv ) anthy? ( app-i18n/anthy )
 0
 http://im-ja.sourceforge.net/im-ja-1.5.tar.gz http://im-ja.sourceforge.net/old/im-ja-1.5.tar.gz
diff --git a/metadata/cache/app-i18n/im-ja-1.5-r2 b/metadata/cache/app-i18n/im-ja-1.5-r2
index 89097c08dd58..231e28ecb9de 100644
--- a/metadata/cache/app-i18n/im-ja-1.5-r2
+++ b/metadata/cache/app-i18n/im-ja-1.5-r2
@@ -1,4 +1,4 @@
->=dev-libs/glib-2.4:2 >=dev-libs/atk-1.6 >=x11-libs/gtk+-2.4:2 >=x11-libs/pango-1.2.1 >=gnome-base/gconf-2.4:2 >=gnome-base/libglade-2.4:2.0 >=gnome-base/libgnomeui-2.4 gnome? ( || ( gnome-base/gnome-panel[bonobo] <gnome-base/gnome-panel-2.32 ) ) freewnn? ( app-i18n/freewnn ) canna? ( app-i18n/canna ) skk? ( virtual/skkserv ) anthy? ( app-i18n/anthy ) dev-lang/perl dev-perl/URI dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+>=dev-libs/glib-2.4:2 >=dev-libs/atk-1.6 >=x11-libs/gtk+-2.4:2 >=x11-libs/pango-1.2.1 >=gnome-base/gconf-2.4:2 >=gnome-base/libglade-2.4:2.0 >=gnome-base/libgnomeui-2.4 gnome? ( || ( gnome-base/gnome-panel[bonobo] <gnome-base/gnome-panel-2.32 ) ) freewnn? ( app-i18n/freewnn ) canna? ( app-i18n/canna ) skk? ( virtual/skkserv ) anthy? ( app-i18n/anthy ) dev-lang/perl dev-perl/URI dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 >=dev-libs/glib-2.4:2 >=dev-libs/atk-1.6 >=x11-libs/gtk+-2.4:2 >=x11-libs/pango-1.2.1 >=gnome-base/gconf-2.4:2 >=gnome-base/libglade-2.4:2.0 >=gnome-base/libgnomeui-2.4 gnome? ( || ( gnome-base/gnome-panel[bonobo] <gnome-base/gnome-panel-2.32 ) ) freewnn? ( app-i18n/freewnn ) canna? ( app-i18n/canna ) skk? ( virtual/skkserv ) anthy? ( app-i18n/anthy )
 0
 http://im-ja.sourceforge.net/im-ja-1.5.tar.gz http://im-ja.sourceforge.net/old/im-ja-1.5.tar.gz
diff --git a/metadata/cache/app-i18n/libhangul-0.1.0 b/metadata/cache/app-i18n/libhangul-0.1.0
index 39edf59c9dfe..b2644ad5ae3b 100644
--- a/metadata/cache/app-i18n/libhangul-0.1.0
+++ b/metadata/cache/app-i18n/libhangul-0.1.0
@@ -1,4 +1,4 @@
-nls? ( sys-devel/gettext ) dev-util/pkgconfig test? ( dev-libs/check )
+nls? ( virtual/libintl ) dev-util/pkgconfig nls? ( sys-devel/gettext ) test? ( dev-libs/check )
 nls? ( virtual/libintl )
 0
 http://libhangul.googlecode.com/files/libhangul-0.1.0.tar.gz
@@ -6,13 +6,13 @@ http://libhangul.googlecode.com/files/libhangul-0.1.0.tar.gz
 http://code.google.com/p/libhangul/
 LGPL-2.1
 libhangul is a generalized and portable library for processing hangul.
-amd64 ~ppc ~x86
+amd64 ~ppc x86
 
 nls static-libs test
 
 
 
-3
+4
 
 configure install
 
diff --git a/metadata/cache/app-i18n/libtomoe-gtk-0.6.0-r1 b/metadata/cache/app-i18n/libtomoe-gtk-0.6.0-r1
index 125f52c2c9dc..4fbdf8467a6f 100644
--- a/metadata/cache/app-i18n/libtomoe-gtk-0.6.0-r1
+++ b/metadata/cache/app-i18n/libtomoe-gtk-0.6.0-r1
@@ -1,4 +1,4 @@
->=app-i18n/tomoe-0.6.0 >=dev-python/pygtk-2 >=dev-python/pygobject-2:2 gucharmap? ( >=gnome-extra/gucharmap-1.4.0 ) dev-util/pkgconfig sys-devel/gettext doc? ( >=dev-util/gtk-doc-1.4 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=app-i18n/tomoe-0.6.0 >=dev-python/pygtk-2 >=dev-python/pygobject-2:2 gucharmap? ( >=gnome-extra/gucharmap-1.4.0 ) dev-util/pkgconfig sys-devel/gettext doc? ( >=dev-util/gtk-doc-1.4 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=app-i18n/tomoe-0.6.0 >=dev-python/pygtk-2 >=dev-python/pygobject-2:2 gucharmap? ( >=gnome-extra/gucharmap-1.4.0 )
 0
 mirror://sourceforge/tomoe/tomoe-gtk-0.6.0.tar.gz
diff --git a/metadata/cache/app-i18n/libtomoe-gtk-0.6.0-r2 b/metadata/cache/app-i18n/libtomoe-gtk-0.6.0-r2
index f85f7c46a38f..e978182ab9ad 100644
--- a/metadata/cache/app-i18n/libtomoe-gtk-0.6.0-r2
+++ b/metadata/cache/app-i18n/libtomoe-gtk-0.6.0-r2
@@ -1,4 +1,4 @@
->=app-i18n/tomoe-0.6.0[python?] python? ( dev-python/pygtk:2 dev-python/pygobject:2 ) gucharmap? ( gnome-extra/gucharmap:0 ) dev-util/gtk-doc-am dev-util/pkgconfig sys-devel/gettext doc? ( >=dev-util/gtk-doc-1.4 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( =dev-lang/python-2* )
+>=app-i18n/tomoe-0.6.0[python?] python? ( dev-python/pygtk:2 dev-python/pygobject:2 ) gucharmap? ( gnome-extra/gucharmap:0 ) dev-util/gtk-doc-am dev-util/pkgconfig sys-devel/gettext doc? ( >=dev-util/gtk-doc-1.4 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( =dev-lang/python-2* )
 >=app-i18n/tomoe-0.6.0[python?] python? ( dev-python/pygtk:2 dev-python/pygobject:2 ) gucharmap? ( gnome-extra/gucharmap:0 ) python? ( =dev-lang/python-2* )
 0
 mirror://sourceforge/tomoe/tomoe-gtk-0.6.0.tar.gz
diff --git a/metadata/cache/app-i18n/man-pages-pl-20070628-r2 b/metadata/cache/app-i18n/man-pages-pl-20070628-r2
index bad756695486..a6083dbe99e3 100644
--- a/metadata/cache/app-i18n/man-pages-pl-20070628-r2
+++ b/metadata/cache/app-i18n/man-pages-pl-20070628-r2
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 http://www.batnet.pl/ptm/man-PL28-06-2007.tar.gz
diff --git a/metadata/cache/app-i18n/nabi-0.15 b/metadata/cache/app-i18n/nabi-0.15
index fdc6bae4843d..75cf416c09ad 100644
--- a/metadata/cache/app-i18n/nabi-0.15
+++ b/metadata/cache/app-i18n/nabi-0.15
@@ -1,4 +1,4 @@
->=x11-libs/gtk+-2.2:2 dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=x11-libs/gtk+-2.2:2 dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=x11-libs/gtk+-2.2:2
 0
 http://download.kldp.net/nabi/nabi-0.15.tar.gz
diff --git a/metadata/cache/app-i18n/nabi-0.17 b/metadata/cache/app-i18n/nabi-0.17
index 80a1ec013d72..dd577c7cca9b 100644
--- a/metadata/cache/app-i18n/nabi-0.17
+++ b/metadata/cache/app-i18n/nabi-0.17
@@ -1,4 +1,4 @@
->=x11-libs/gtk+-2.2:2 >=app-i18n/libhangul-0.0.4 dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=x11-libs/gtk+-2.2:2 >=app-i18n/libhangul-0.0.4 dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=x11-libs/gtk+-2.2:2 >=app-i18n/libhangul-0.0.4
 0
 http://kldp.net/frs/download.php/3742/nabi-0.17.tar.gz
diff --git a/metadata/cache/app-i18n/nabi-0.99.3 b/metadata/cache/app-i18n/nabi-0.99.3
index f18efd704df4..28992f43680f 100644
--- a/metadata/cache/app-i18n/nabi-0.99.3
+++ b/metadata/cache/app-i18n/nabi-0.99.3
@@ -1,4 +1,4 @@
->=x11-libs/gtk+-2.4:2 >=app-i18n/libhangul-0.0.8 dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=x11-libs/gtk+-2.4:2 >=app-i18n/libhangul-0.0.8 dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=x11-libs/gtk+-2.4:2 >=app-i18n/libhangul-0.0.8
 0
 http://kldp.net/frs/download.php/4929/nabi-0.99.3.tar.gz
diff --git a/metadata/cache/app-i18n/prime-1.0.0.1-r1 b/metadata/cache/app-i18n/prime-1.0.0.1-r1
index 2fa936ba3773..0d0ed7b5c521 100644
--- a/metadata/cache/app-i18n/prime-1.0.0.1-r1
+++ b/metadata/cache/app-i18n/prime-1.0.0.1-r1
@@ -1,4 +1,4 @@
-test? ( ruby_targets_ruby18? ( >=app-dicts/prime-dict-1.0.0[ruby_targets_ruby18] >=dev-libs/suikyo-2.1.0[ruby_targets_ruby18] dev-ruby/ruby-progressbar[ruby_targets_ruby18] dev-ruby/sary-ruby[ruby_targets_ruby18] ) ruby_targets_ree18? ( >=app-dicts/prime-dict-1.0.0[ruby_targets_ree18] >=dev-libs/suikyo-2.1.0[ruby_targets_ree18] dev-ruby/ruby-progressbar[ruby_targets_ree18] dev-ruby/sary-ruby[ruby_targets_ree18] ) ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 )
+test? ( ruby_targets_ruby18? ( >=app-dicts/prime-dict-1.0.0[ruby_targets_ruby18] >=dev-libs/suikyo-2.1.0[ruby_targets_ruby18] dev-ruby/ruby-progressbar[ruby_targets_ruby18] dev-ruby/sary-ruby[ruby_targets_ruby18] ) ruby_targets_ree18? ( >=app-dicts/prime-dict-1.0.0[ruby_targets_ree18] >=dev-libs/suikyo-2.1.0[ruby_targets_ree18] dev-ruby/ruby-progressbar[ruby_targets_ree18] dev-ruby/sary-ruby[ruby_targets_ree18] ) ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 )
 ruby_targets_ruby18? ( >=app-dicts/prime-dict-1.0.0[ruby_targets_ruby18] >=dev-libs/suikyo-2.1.0[ruby_targets_ruby18] dev-ruby/ruby-progressbar[ruby_targets_ruby18] dev-ruby/sary-ruby[ruby_targets_ruby18] ) ruby_targets_ree18? ( >=app-dicts/prime-dict-1.0.0[ruby_targets_ree18] >=dev-libs/suikyo-2.1.0[ruby_targets_ree18] dev-ruby/ruby-progressbar[ruby_targets_ree18] dev-ruby/sary-ruby[ruby_targets_ree18] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 )
 0
 http://prime.sourceforge.jp/src/prime-1.0.0.1.tar.gz
diff --git a/metadata/cache/app-i18n/scim-1.4.11 b/metadata/cache/app-i18n/scim-1.4.11
index 90b9cbb73508..f4120ec1fb65 100644
--- a/metadata/cache/app-i18n/scim-1.4.11
+++ b/metadata/cache/app-i18n/scim-1.4.11
@@ -1,4 +1,4 @@
-x11-libs/libX11 dev-libs/glib:2 x11-libs/gtk+:2 >=dev-libs/atk-1 >=x11-libs/pango-1 !app-i18n/scim-cvs doc? ( app-doc/doxygen >=app-text/docbook-xsl-stylesheets-1.73.1 ) dev-lang/perl dev-util/pkgconfig >=dev-util/intltool-0.33 sys-devel/libtool || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+x11-libs/libX11 dev-libs/glib:2 x11-libs/gtk+:2 >=dev-libs/atk-1 >=x11-libs/pango-1 !app-i18n/scim-cvs doc? ( app-doc/doxygen >=app-text/docbook-xsl-stylesheets-1.73.1 ) dev-lang/perl dev-util/pkgconfig >=dev-util/intltool-0.33 sys-devel/libtool || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 x11-libs/libX11 dev-libs/glib:2 x11-libs/gtk+:2 >=dev-libs/atk-1 >=x11-libs/pango-1 !app-i18n/scim-cvs
 0
 mirror://sourceforge/scim/scim-1.4.11.tar.gz
diff --git a/metadata/cache/app-i18n/scim-1.4.11-r1 b/metadata/cache/app-i18n/scim-1.4.11-r1
index c45a25bb4166..6b0b24dbd522 100644
--- a/metadata/cache/app-i18n/scim-1.4.11-r1
+++ b/metadata/cache/app-i18n/scim-1.4.11-r1
@@ -1,4 +1,4 @@
-x11-libs/libX11 dev-libs/glib:2 x11-libs/gtk+:2 >=dev-libs/atk-1 >=x11-libs/pango-1 !app-i18n/scim-cvs doc? ( app-doc/doxygen >=app-text/docbook-xsl-stylesheets-1.73.1 ) dev-lang/perl dev-util/pkgconfig >=dev-util/intltool-0.33 sys-devel/libtool || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+x11-libs/libX11 dev-libs/glib:2 x11-libs/gtk+:2 >=dev-libs/atk-1 >=x11-libs/pango-1 !app-i18n/scim-cvs doc? ( app-doc/doxygen >=app-text/docbook-xsl-stylesheets-1.73.1 ) dev-lang/perl dev-util/pkgconfig >=dev-util/intltool-0.33 sys-devel/libtool || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 x11-libs/libX11 dev-libs/glib:2 x11-libs/gtk+:2 >=dev-libs/atk-1 >=x11-libs/pango-1 !app-i18n/scim-cvs
 0
 mirror://sourceforge/scim/scim-1.4.11.tar.gz
diff --git a/metadata/cache/app-i18n/scim-1.4.9-r1 b/metadata/cache/app-i18n/scim-1.4.9-r1
index 092df0c6e10f..9e0528ea1185 100644
--- a/metadata/cache/app-i18n/scim-1.4.9-r1
+++ b/metadata/cache/app-i18n/scim-1.4.9-r1
@@ -1,4 +1,4 @@
-x11-libs/libX11 dev-libs/glib:2 x11-libs/gtk+:2 >=dev-libs/atk-1 >=x11-libs/pango-1 !app-i18n/scim-cvs doc? ( app-doc/doxygen >=app-text/docbook-xsl-stylesheets-1.73.1 ) dev-lang/perl dev-util/pkgconfig >=dev-util/intltool-0.33 sys-devel/libtool || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+x11-libs/libX11 dev-libs/glib:2 x11-libs/gtk+:2 >=dev-libs/atk-1 >=x11-libs/pango-1 !app-i18n/scim-cvs doc? ( app-doc/doxygen >=app-text/docbook-xsl-stylesheets-1.73.1 ) dev-lang/perl dev-util/pkgconfig >=dev-util/intltool-0.33 sys-devel/libtool || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 x11-libs/libX11 dev-libs/glib:2 x11-libs/gtk+:2 >=dev-libs/atk-1 >=x11-libs/pango-1 !app-i18n/scim-cvs
 0
 mirror://sourceforge/scim/scim-1.4.9.tar.gz
diff --git a/metadata/cache/app-i18n/scim-1.4.9-r2 b/metadata/cache/app-i18n/scim-1.4.9-r2
index b6f754138203..c65f93ee9001 100644
--- a/metadata/cache/app-i18n/scim-1.4.9-r2
+++ b/metadata/cache/app-i18n/scim-1.4.9-r2
@@ -1,4 +1,4 @@
-x11-libs/libX11 dev-libs/glib:2 x11-libs/gtk+:2 >=dev-libs/atk-1 >=x11-libs/pango-1 !app-i18n/scim-cvs doc? ( app-doc/doxygen >=app-text/docbook-xsl-stylesheets-1.73.1 ) dev-lang/perl dev-util/pkgconfig >=dev-util/intltool-0.33 sys-devel/libtool || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+x11-libs/libX11 dev-libs/glib:2 x11-libs/gtk+:2 >=dev-libs/atk-1 >=x11-libs/pango-1 !app-i18n/scim-cvs doc? ( app-doc/doxygen >=app-text/docbook-xsl-stylesheets-1.73.1 ) dev-lang/perl dev-util/pkgconfig >=dev-util/intltool-0.33 sys-devel/libtool || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 x11-libs/libX11 dev-libs/glib:2 x11-libs/gtk+:2 >=dev-libs/atk-1 >=x11-libs/pango-1 !app-i18n/scim-cvs
 0
 mirror://sourceforge/scim/scim-1.4.9.tar.gz
diff --git a/metadata/cache/app-i18n/scim-bridge-0.4.16-r1 b/metadata/cache/app-i18n/scim-bridge-0.4.16-r1
index 9e7f5536d222..7c4cd0604f8a 100644
--- a/metadata/cache/app-i18n/scim-bridge-0.4.16-r1
+++ b/metadata/cache/app-i18n/scim-bridge-0.4.16-r1
@@ -1,4 +1,4 @@
->=app-i18n/scim-1.4.6 gtk? ( >=x11-libs/gtk+-2.2:2 >=x11-libs/pango-1.1 ) qt4? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 >=x11-libs/pango-1.1 ) dev-util/pkgconfig dev-util/intltool doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=app-i18n/scim-1.4.6 gtk? ( >=x11-libs/gtk+-2.2:2 >=x11-libs/pango-1.1 ) qt4? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 >=x11-libs/pango-1.1 ) dev-util/pkgconfig dev-util/intltool doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=app-i18n/scim-1.4.6 gtk? ( >=x11-libs/gtk+-2.2:2 >=x11-libs/pango-1.1 ) qt4? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 >=x11-libs/pango-1.1 )
 0
 mirror://sourceforge/scim/scim-bridge-0.4.16.tar.gz
diff --git a/metadata/cache/app-i18n/scim-bridge-0.4.16-r2 b/metadata/cache/app-i18n/scim-bridge-0.4.16-r2
index 9e7f5536d222..7c4cd0604f8a 100644
--- a/metadata/cache/app-i18n/scim-bridge-0.4.16-r2
+++ b/metadata/cache/app-i18n/scim-bridge-0.4.16-r2
@@ -1,4 +1,4 @@
->=app-i18n/scim-1.4.6 gtk? ( >=x11-libs/gtk+-2.2:2 >=x11-libs/pango-1.1 ) qt4? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 >=x11-libs/pango-1.1 ) dev-util/pkgconfig dev-util/intltool doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=app-i18n/scim-1.4.6 gtk? ( >=x11-libs/gtk+-2.2:2 >=x11-libs/pango-1.1 ) qt4? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 >=x11-libs/pango-1.1 ) dev-util/pkgconfig dev-util/intltool doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=app-i18n/scim-1.4.6 gtk? ( >=x11-libs/gtk+-2.2:2 >=x11-libs/pango-1.1 ) qt4? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 >=x11-libs/pango-1.1 )
 0
 mirror://sourceforge/scim/scim-bridge-0.4.16.tar.gz
diff --git a/metadata/cache/app-i18n/scim-input-pad-0.1.3 b/metadata/cache/app-i18n/scim-input-pad-0.1.3
index c1dfb54b4de5..5a6c54b987ff 100644
--- a/metadata/cache/app-i18n/scim-input-pad-0.1.3
+++ b/metadata/cache/app-i18n/scim-input-pad-0.1.3
@@ -1,4 +1,4 @@
->=app-i18n/scim-1.2.0 >=x11-libs/gtk+-2.6.0:2 dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=app-i18n/scim-1.2.0 >=x11-libs/gtk+-2.6.0:2 dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=app-i18n/scim-1.2.0 >=x11-libs/gtk+-2.6.0:2
 0
 mirror://sourceforge/scim/scim-input-pad-0.1.3.tar.gz
diff --git a/metadata/cache/app-i18n/tomoe-0.6.0-r1 b/metadata/cache/app-i18n/tomoe-0.6.0-r1
index 66d34b465763..7b3a59f3876a 100644
--- a/metadata/cache/app-i18n/tomoe-0.6.0-r1
+++ b/metadata/cache/app-i18n/tomoe-0.6.0-r1
@@ -1,4 +1,4 @@
-dev-util/gtk-doc-am dev-util/intltool dev-util/pkgconfig doc? ( dev-util/gtk-doc ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( =dev-lang/python-2* )
+dev-util/gtk-doc-am dev-util/intltool dev-util/pkgconfig doc? ( dev-util/gtk-doc ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( =dev-lang/python-2* )
 >=dev-libs/glib-2.4 ruby? ( dev-ruby/ruby-glib2 ) hyperestraier? ( app-text/hyperestraier ) subversion? ( >=dev-libs/apr-1 dev-vcs/subversion ) mysql? ( dev-db/mysql ) python? ( dev-python/pygobject:2 dev-python/pygtk:2 ) python? ( =dev-lang/python-2* )
 0
 mirror://sourceforge/tomoe/tomoe-0.6.0.tar.gz
diff --git a/metadata/cache/app-i18n/uim-1.5.7 b/metadata/cache/app-i18n/uim-1.5.7
index 0e30a76a5df6..034f4bf85e05 100644
--- a/metadata/cache/app-i18n/uim-1.5.7
+++ b/metadata/cache/app-i18n/uim-1.5.7
@@ -1,4 +1,4 @@
-X? ( x11-libs/libX11 x11-libs/libXft x11-libs/libXt x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXrender ) anthy? ( unicode? ( >=app-i18n/anthy-8622 ) !unicode? ( app-i18n/anthy ) ) canna? ( app-i18n/canna ) eb? ( dev-libs/eb ) emacs? ( virtual/emacs ) gnome? ( >=gnome-base/gnome-panel-2.14 ) gtk? ( >=x11-libs/gtk+-2.4:2 ) kde? ( >=kde-base/kdelibs-4 ) libedit? ( dev-libs/libedit ) libnotify? ( >=x11-libs/libnotify-0.4.5 ) m17n-lib? ( >=dev-libs/m17n-lib-1.3.1 ) ncurses? ( sys-libs/ncurses ) nls? ( virtual/libintl ) prime? ( app-i18n/prime ) qt4? ( x11-libs/qt-gui:4[qt3support] ) !app-i18n/uim-svn !<app-i18n/prime-0.9.4 dev-util/pkgconfig >=sys-devel/gettext-0.15 kde? ( dev-util/cmake ) X? ( x11-proto/xextproto x11-proto/xproto ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+X? ( x11-libs/libX11 x11-libs/libXft x11-libs/libXt x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXrender ) anthy? ( unicode? ( >=app-i18n/anthy-8622 ) !unicode? ( app-i18n/anthy ) ) canna? ( app-i18n/canna ) eb? ( dev-libs/eb ) emacs? ( virtual/emacs ) gnome? ( >=gnome-base/gnome-panel-2.14 ) gtk? ( >=x11-libs/gtk+-2.4:2 ) kde? ( >=kde-base/kdelibs-4 ) libedit? ( dev-libs/libedit ) libnotify? ( >=x11-libs/libnotify-0.4.5 ) m17n-lib? ( >=dev-libs/m17n-lib-1.3.1 ) ncurses? ( sys-libs/ncurses ) nls? ( virtual/libintl ) prime? ( app-i18n/prime ) qt4? ( x11-libs/qt-gui:4[qt3support] ) !app-i18n/uim-svn !<app-i18n/prime-0.9.4 dev-util/pkgconfig >=sys-devel/gettext-0.15 kde? ( dev-util/cmake ) X? ( x11-proto/xextproto x11-proto/xproto ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 X? ( x11-libs/libX11 x11-libs/libXft x11-libs/libXt x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXrender ) anthy? ( unicode? ( >=app-i18n/anthy-8622 ) !unicode? ( app-i18n/anthy ) ) canna? ( app-i18n/canna ) eb? ( dev-libs/eb ) emacs? ( virtual/emacs ) gnome? ( >=gnome-base/gnome-panel-2.14 ) gtk? ( >=x11-libs/gtk+-2.4:2 ) kde? ( >=kde-base/kdelibs-4 ) libedit? ( dev-libs/libedit ) libnotify? ( >=x11-libs/libnotify-0.4.5 ) m17n-lib? ( >=dev-libs/m17n-lib-1.3.1 ) ncurses? ( sys-libs/ncurses ) nls? ( virtual/libintl ) prime? ( app-i18n/prime ) qt4? ( x11-libs/qt-gui:4[qt3support] ) !app-i18n/uim-svn !<app-i18n/prime-0.9.4 X? ( media-fonts/font-sony-misc linguas_zh_CN? ( || ( media-fonts/font-isas-misc media-fonts/intlfonts ) ) linguas_zh_TW? ( media-fonts/intlfonts ) linguas_ja? ( || ( media-fonts/font-jis-misc media-fonts/intlfonts ) ) linguas_ko? ( || ( media-fonts/font-daewoo-misc media-fonts/intlfonts ) ) )
 0
 http://uim.googlecode.com/files/uim-1.5.7.tar.bz2
diff --git a/metadata/cache/app-i18n/uim-1.6.1 b/metadata/cache/app-i18n/uim-1.6.1
index e6a2b0e7b1ef..82a23672dfa2 100644
--- a/metadata/cache/app-i18n/uim-1.6.1
+++ b/metadata/cache/app-i18n/uim-1.6.1
@@ -1,4 +1,4 @@
-X? ( x11-libs/libX11 x11-libs/libXft x11-libs/libXt x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXrender ) anthy? ( unicode? ( >=app-i18n/anthy-8622 ) !unicode? ( app-i18n/anthy ) ) canna? ( app-i18n/canna ) curl? ( >=net-misc/curl-7.16.4 ) eb? ( dev-libs/eb ) emacs? ( virtual/emacs ) libffi? ( virtual/libffi ) gnome? ( >=gnome-base/gnome-panel-2.14 ) gtk? ( >=x11-libs/gtk+-2.4:2 ) kde? ( >=kde-base/kdelibs-4 ) libedit? ( dev-libs/libedit ) libnotify? ( >=x11-libs/libnotify-0.4 ) m17n-lib? ( >=dev-libs/m17n-lib-1.3.1 ) ncurses? ( sys-libs/ncurses ) nls? ( virtual/libintl ) prime? ( app-i18n/prime ) qt4? ( x11-libs/qt-gui:4[qt3support] ) skk? ( app-i18n/skk-jisyo ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/openssl ) !dev-scheme/sigscheme !app-i18n/uim-svn !<app-i18n/prime-0.9.4 dev-util/pkgconfig >=sys-devel/gettext-0.15 kde? ( dev-util/cmake ) X? ( x11-proto/xextproto x11-proto/xproto ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+X? ( x11-libs/libX11 x11-libs/libXft x11-libs/libXt x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXrender ) anthy? ( unicode? ( >=app-i18n/anthy-8622 ) !unicode? ( app-i18n/anthy ) ) canna? ( app-i18n/canna ) curl? ( >=net-misc/curl-7.16.4 ) eb? ( dev-libs/eb ) emacs? ( virtual/emacs ) libffi? ( virtual/libffi ) gnome? ( >=gnome-base/gnome-panel-2.14 ) gtk? ( >=x11-libs/gtk+-2.4:2 ) kde? ( >=kde-base/kdelibs-4 ) libedit? ( dev-libs/libedit ) libnotify? ( >=x11-libs/libnotify-0.4 ) m17n-lib? ( >=dev-libs/m17n-lib-1.3.1 ) ncurses? ( sys-libs/ncurses ) nls? ( virtual/libintl ) prime? ( app-i18n/prime ) qt4? ( x11-libs/qt-gui:4[qt3support] ) skk? ( app-i18n/skk-jisyo ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/openssl ) !dev-scheme/sigscheme !app-i18n/uim-svn !<app-i18n/prime-0.9.4 dev-util/pkgconfig >=sys-devel/gettext-0.15 kde? ( dev-util/cmake ) X? ( x11-proto/xextproto x11-proto/xproto ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 X? ( x11-libs/libX11 x11-libs/libXft x11-libs/libXt x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXrender ) anthy? ( unicode? ( >=app-i18n/anthy-8622 ) !unicode? ( app-i18n/anthy ) ) canna? ( app-i18n/canna ) curl? ( >=net-misc/curl-7.16.4 ) eb? ( dev-libs/eb ) emacs? ( virtual/emacs ) libffi? ( virtual/libffi ) gnome? ( >=gnome-base/gnome-panel-2.14 ) gtk? ( >=x11-libs/gtk+-2.4:2 ) kde? ( >=kde-base/kdelibs-4 ) libedit? ( dev-libs/libedit ) libnotify? ( >=x11-libs/libnotify-0.4 ) m17n-lib? ( >=dev-libs/m17n-lib-1.3.1 ) ncurses? ( sys-libs/ncurses ) nls? ( virtual/libintl ) prime? ( app-i18n/prime ) qt4? ( x11-libs/qt-gui:4[qt3support] ) skk? ( app-i18n/skk-jisyo ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/openssl ) !dev-scheme/sigscheme !app-i18n/uim-svn !<app-i18n/prime-0.9.4 X? ( media-fonts/font-sony-misc linguas_zh_CN? ( || ( media-fonts/font-isas-misc media-fonts/intlfonts ) ) linguas_zh_TW? ( media-fonts/intlfonts ) linguas_ja? ( || ( media-fonts/font-jis-misc media-fonts/intlfonts ) ) linguas_ko? ( || ( media-fonts/font-daewoo-misc media-fonts/intlfonts ) ) )
 0
 http://uim.googlecode.com/files/uim-1.6.1.tar.bz2
diff --git a/metadata/cache/app-i18n/uim-1.7.1 b/metadata/cache/app-i18n/uim-1.7.1
index 962e17313c01..c21d5a9d3c34 100644
--- a/metadata/cache/app-i18n/uim-1.7.1
+++ b/metadata/cache/app-i18n/uim-1.7.1
@@ -1,4 +1,4 @@
-X? ( x11-libs/libX11 x11-libs/libXft x11-libs/libXt x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXrender ) anthy? ( unicode? ( >=app-i18n/anthy-8622 ) !unicode? ( app-i18n/anthy ) ) canna? ( app-i18n/canna ) curl? ( >=net-misc/curl-7.16.4 ) eb? ( dev-libs/eb ) emacs? ( virtual/emacs ) libffi? ( virtual/libffi ) gnome? ( >=gnome-base/gnome-panel-2.14 ) gtk? ( >=x11-libs/gtk+-2.4:2 ) gtk3? ( x11-libs/gtk+:3 ) kde? ( >=kde-base/kdelibs-4 ) libedit? ( dev-libs/libedit ) libnotify? ( >=x11-libs/libnotify-0.4 ) m17n-lib? ( >=dev-libs/m17n-lib-1.3.1 ) ncurses? ( sys-libs/ncurses ) nls? ( virtual/libintl ) prime? ( app-i18n/prime ) qt4? ( x11-libs/qt-gui:4[qt3support] ) skk? ( app-i18n/skk-jisyo ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/openssl ) !dev-scheme/sigscheme !app-i18n/uim-svn !<app-i18n/prime-0.9.4 dev-util/pkgconfig >=sys-devel/gettext-0.15 kde? ( dev-util/cmake ) X? ( x11-proto/xextproto x11-proto/xproto ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+X? ( x11-libs/libX11 x11-libs/libXft x11-libs/libXt x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXrender ) anthy? ( unicode? ( >=app-i18n/anthy-8622 ) !unicode? ( app-i18n/anthy ) ) canna? ( app-i18n/canna ) curl? ( >=net-misc/curl-7.16.4 ) eb? ( dev-libs/eb ) emacs? ( virtual/emacs ) libffi? ( virtual/libffi ) gnome? ( >=gnome-base/gnome-panel-2.14 ) gtk? ( >=x11-libs/gtk+-2.4:2 ) gtk3? ( x11-libs/gtk+:3 ) kde? ( >=kde-base/kdelibs-4 ) libedit? ( dev-libs/libedit ) libnotify? ( >=x11-libs/libnotify-0.4 ) m17n-lib? ( >=dev-libs/m17n-lib-1.3.1 ) ncurses? ( sys-libs/ncurses ) nls? ( virtual/libintl ) prime? ( app-i18n/prime ) qt4? ( x11-libs/qt-gui:4[qt3support] ) skk? ( app-i18n/skk-jisyo ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/openssl ) !dev-scheme/sigscheme !app-i18n/uim-svn !<app-i18n/prime-0.9.4 dev-util/pkgconfig >=sys-devel/gettext-0.15 kde? ( dev-util/cmake ) X? ( x11-proto/xextproto x11-proto/xproto ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 X? ( x11-libs/libX11 x11-libs/libXft x11-libs/libXt x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXrender ) anthy? ( unicode? ( >=app-i18n/anthy-8622 ) !unicode? ( app-i18n/anthy ) ) canna? ( app-i18n/canna ) curl? ( >=net-misc/curl-7.16.4 ) eb? ( dev-libs/eb ) emacs? ( virtual/emacs ) libffi? ( virtual/libffi ) gnome? ( >=gnome-base/gnome-panel-2.14 ) gtk? ( >=x11-libs/gtk+-2.4:2 ) gtk3? ( x11-libs/gtk+:3 ) kde? ( >=kde-base/kdelibs-4 ) libedit? ( dev-libs/libedit ) libnotify? ( >=x11-libs/libnotify-0.4 ) m17n-lib? ( >=dev-libs/m17n-lib-1.3.1 ) ncurses? ( sys-libs/ncurses ) nls? ( virtual/libintl ) prime? ( app-i18n/prime ) qt4? ( x11-libs/qt-gui:4[qt3support] ) skk? ( app-i18n/skk-jisyo ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/openssl ) !dev-scheme/sigscheme !app-i18n/uim-svn !<app-i18n/prime-0.9.4 X? ( media-fonts/font-sony-misc linguas_zh_CN? ( || ( media-fonts/font-isas-misc media-fonts/intlfonts ) ) linguas_zh_TW? ( media-fonts/intlfonts ) linguas_ja? ( || ( media-fonts/font-jis-misc media-fonts/intlfonts ) ) linguas_ko? ( || ( media-fonts/font-daewoo-misc media-fonts/intlfonts ) ) )
 0
 http://uim.googlecode.com/files/uim-1.7.1.tar.bz2
diff --git a/metadata/cache/app-i18n/uim-1.7.1-r1 b/metadata/cache/app-i18n/uim-1.7.1-r1
index fed94e1de8a2..319c15d8c7d7 100644
--- a/metadata/cache/app-i18n/uim-1.7.1-r1
+++ b/metadata/cache/app-i18n/uim-1.7.1-r1
@@ -1,4 +1,4 @@
-X? ( x11-libs/libX11 x11-libs/libXft x11-libs/libXt x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXrender ) anthy? ( unicode? ( >=app-i18n/anthy-8622 ) !unicode? ( app-i18n/anthy ) ) canna? ( app-i18n/canna ) curl? ( >=net-misc/curl-7.16.4 ) eb? ( dev-libs/eb ) emacs? ( virtual/emacs ) libffi? ( virtual/libffi ) gnome? ( >=gnome-base/gnome-panel-2.14 ) gtk? ( >=x11-libs/gtk+-2.4:2 ) gtk3? ( x11-libs/gtk+:3 ) kde? ( >=kde-base/kdelibs-4 ) libedit? ( dev-libs/libedit ) libnotify? ( >=x11-libs/libnotify-0.4 ) m17n-lib? ( >=dev-libs/m17n-lib-1.3.1 ) ncurses? ( sys-libs/ncurses ) nls? ( virtual/libintl ) prime? ( app-i18n/prime ) qt4? ( x11-libs/qt-gui:4[qt3support] ) skk? ( app-i18n/skk-jisyo ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/openssl ) !dev-scheme/sigscheme !app-i18n/uim-svn !<app-i18n/prime-0.9.4 dev-util/intltool dev-util/pkgconfig >=sys-devel/gettext-0.15 kde? ( dev-util/cmake ) X? ( x11-proto/xextproto x11-proto/xproto ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+X? ( x11-libs/libX11 x11-libs/libXft x11-libs/libXt x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXrender ) anthy? ( unicode? ( >=app-i18n/anthy-8622 ) !unicode? ( app-i18n/anthy ) ) canna? ( app-i18n/canna ) curl? ( >=net-misc/curl-7.16.4 ) eb? ( dev-libs/eb ) emacs? ( virtual/emacs ) libffi? ( virtual/libffi ) gnome? ( >=gnome-base/gnome-panel-2.14 ) gtk? ( >=x11-libs/gtk+-2.4:2 ) gtk3? ( x11-libs/gtk+:3 ) kde? ( >=kde-base/kdelibs-4 ) libedit? ( dev-libs/libedit ) libnotify? ( >=x11-libs/libnotify-0.4 ) m17n-lib? ( >=dev-libs/m17n-lib-1.3.1 ) ncurses? ( sys-libs/ncurses ) nls? ( virtual/libintl ) prime? ( app-i18n/prime ) qt4? ( x11-libs/qt-gui:4[qt3support] ) skk? ( app-i18n/skk-jisyo ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/openssl ) !dev-scheme/sigscheme !app-i18n/uim-svn !<app-i18n/prime-0.9.4 dev-util/intltool dev-util/pkgconfig >=sys-devel/gettext-0.15 kde? ( dev-util/cmake ) X? ( x11-proto/xextproto x11-proto/xproto ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 X? ( x11-libs/libX11 x11-libs/libXft x11-libs/libXt x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXrender ) anthy? ( unicode? ( >=app-i18n/anthy-8622 ) !unicode? ( app-i18n/anthy ) ) canna? ( app-i18n/canna ) curl? ( >=net-misc/curl-7.16.4 ) eb? ( dev-libs/eb ) emacs? ( virtual/emacs ) libffi? ( virtual/libffi ) gnome? ( >=gnome-base/gnome-panel-2.14 ) gtk? ( >=x11-libs/gtk+-2.4:2 ) gtk3? ( x11-libs/gtk+:3 ) kde? ( >=kde-base/kdelibs-4 ) libedit? ( dev-libs/libedit ) libnotify? ( >=x11-libs/libnotify-0.4 ) m17n-lib? ( >=dev-libs/m17n-lib-1.3.1 ) ncurses? ( sys-libs/ncurses ) nls? ( virtual/libintl ) prime? ( app-i18n/prime ) qt4? ( x11-libs/qt-gui:4[qt3support] ) skk? ( app-i18n/skk-jisyo ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/openssl ) !dev-scheme/sigscheme !app-i18n/uim-svn !<app-i18n/prime-0.9.4 X? ( media-fonts/font-sony-misc linguas_zh_CN? ( || ( media-fonts/font-isas-misc media-fonts/intlfonts ) ) linguas_zh_TW? ( media-fonts/intlfonts ) linguas_ja? ( || ( media-fonts/font-jis-misc media-fonts/intlfonts ) ) linguas_ko? ( || ( media-fonts/font-daewoo-misc media-fonts/intlfonts ) ) )
 0
 http://uim.googlecode.com/files/uim-1.7.1.tar.bz2
diff --git a/metadata/cache/app-i18n/uim-1.7.3 b/metadata/cache/app-i18n/uim-1.7.3
index 5c570fddff87..ca3023d6a0d1 100644
--- a/metadata/cache/app-i18n/uim-1.7.3
+++ b/metadata/cache/app-i18n/uim-1.7.3
@@ -1,4 +1,4 @@
-X? ( x11-libs/libX11 x11-libs/libXft x11-libs/libXt x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXrender ) anthy? ( unicode? ( >=app-i18n/anthy-8622 ) !unicode? ( app-i18n/anthy ) ) canna? ( app-i18n/canna ) curl? ( >=net-misc/curl-7.16.4 ) eb? ( dev-libs/eb ) emacs? ( virtual/emacs ) libffi? ( virtual/libffi ) gnome? ( >=gnome-base/gnome-panel-2.14 ) gtk? ( >=x11-libs/gtk+-2.4:2 ) gtk3? ( x11-libs/gtk+:3 ) kde? ( >=kde-base/kdelibs-4 ) libedit? ( dev-libs/libedit ) libnotify? ( >=x11-libs/libnotify-0.4 ) m17n-lib? ( >=dev-libs/m17n-lib-1.3.1 ) ncurses? ( sys-libs/ncurses ) nls? ( virtual/libintl ) prime? ( app-i18n/prime ) qt4? ( x11-libs/qt-gui:4[qt3support] ) skk? ( app-i18n/skk-jisyo ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/openssl ) !dev-scheme/sigscheme !app-i18n/uim-svn !<app-i18n/prime-0.9.4 dev-util/intltool dev-util/pkgconfig >=sys-devel/gettext-0.15 kde? ( dev-util/cmake ) X? ( x11-proto/xextproto x11-proto/xproto ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+X? ( x11-libs/libX11 x11-libs/libXft x11-libs/libXt x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXrender ) anthy? ( unicode? ( >=app-i18n/anthy-8622 ) !unicode? ( app-i18n/anthy ) ) canna? ( app-i18n/canna ) curl? ( >=net-misc/curl-7.16.4 ) eb? ( dev-libs/eb ) emacs? ( virtual/emacs ) libffi? ( virtual/libffi ) gnome? ( >=gnome-base/gnome-panel-2.14 ) gtk? ( >=x11-libs/gtk+-2.4:2 ) gtk3? ( x11-libs/gtk+:3 ) kde? ( >=kde-base/kdelibs-4 ) libedit? ( dev-libs/libedit ) libnotify? ( >=x11-libs/libnotify-0.4 ) m17n-lib? ( >=dev-libs/m17n-lib-1.3.1 ) ncurses? ( sys-libs/ncurses ) nls? ( virtual/libintl ) prime? ( app-i18n/prime ) qt4? ( x11-libs/qt-gui:4[qt3support] ) skk? ( app-i18n/skk-jisyo ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/openssl ) !dev-scheme/sigscheme !app-i18n/uim-svn !<app-i18n/prime-0.9.4 dev-util/intltool dev-util/pkgconfig >=sys-devel/gettext-0.15 kde? ( dev-util/cmake ) X? ( x11-proto/xextproto x11-proto/xproto ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 X? ( x11-libs/libX11 x11-libs/libXft x11-libs/libXt x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXrender ) anthy? ( unicode? ( >=app-i18n/anthy-8622 ) !unicode? ( app-i18n/anthy ) ) canna? ( app-i18n/canna ) curl? ( >=net-misc/curl-7.16.4 ) eb? ( dev-libs/eb ) emacs? ( virtual/emacs ) libffi? ( virtual/libffi ) gnome? ( >=gnome-base/gnome-panel-2.14 ) gtk? ( >=x11-libs/gtk+-2.4:2 ) gtk3? ( x11-libs/gtk+:3 ) kde? ( >=kde-base/kdelibs-4 ) libedit? ( dev-libs/libedit ) libnotify? ( >=x11-libs/libnotify-0.4 ) m17n-lib? ( >=dev-libs/m17n-lib-1.3.1 ) ncurses? ( sys-libs/ncurses ) nls? ( virtual/libintl ) prime? ( app-i18n/prime ) qt4? ( x11-libs/qt-gui:4[qt3support] ) skk? ( app-i18n/skk-jisyo ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/openssl ) !dev-scheme/sigscheme !app-i18n/uim-svn !<app-i18n/prime-0.9.4 X? ( media-fonts/font-sony-misc linguas_zh_CN? ( || ( media-fonts/font-isas-misc media-fonts/intlfonts ) ) linguas_zh_TW? ( media-fonts/intlfonts ) linguas_ja? ( || ( media-fonts/font-jis-misc media-fonts/intlfonts ) ) linguas_ko? ( || ( media-fonts/font-daewoo-misc media-fonts/intlfonts ) ) )
 0
 http://uim.googlecode.com/files/uim-1.7.3.tar.bz2
diff --git a/metadata/cache/app-i18n/x-unikey-1.0.4-r1 b/metadata/cache/app-i18n/x-unikey-1.0.4-r1
index 35d9bec0ce23..2315b3c0627e 100644
--- a/metadata/cache/app-i18n/x-unikey-1.0.4-r1
+++ b/metadata/cache/app-i18n/x-unikey-1.0.4-r1
@@ -1,4 +1,4 @@
-x11-libs/libX11 x11-libs/libSM x11-libs/libICE gtk? ( >=x11-libs/gtk+-2.2:2 ) nls? ( virtual/libintl ) dev-util/pkgconfig nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+x11-libs/libX11 x11-libs/libSM x11-libs/libICE gtk? ( >=x11-libs/gtk+-2.2:2 ) nls? ( virtual/libintl ) dev-util/pkgconfig nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 x11-libs/libX11 x11-libs/libSM x11-libs/libICE gtk? ( >=x11-libs/gtk+-2.2:2 ) nls? ( virtual/libintl )
 0
 mirror://sourceforge/unikey/x-unikey-1.0.4.tar.bz2
diff --git a/metadata/cache/app-i18n/xcin-2.5.3_pre3-r3 b/metadata/cache/app-i18n/xcin-2.5.3_pre3-r3
index f4a3ea24bc36..a5a5f9e11ed0 100644
--- a/metadata/cache/app-i18n/xcin-2.5.3_pre3-r3
+++ b/metadata/cache/app-i18n/xcin-2.5.3_pre3-r3
@@ -1,4 +1,4 @@
->=sys-libs/db-4.5 >=app-i18n/libtabe-0.2.6 unicode? ( media-fonts/hkscs-ming media-fonts/arphicfonts ) dev-libs/libchewing x11-libs/libX11 nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=sys-libs/db-4.5 >=app-i18n/libtabe-0.2.6 unicode? ( media-fonts/hkscs-ming media-fonts/arphicfonts ) dev-libs/libchewing x11-libs/libX11 nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=sys-libs/db-4.5 >=app-i18n/libtabe-0.2.6 unicode? ( media-fonts/hkscs-ming media-fonts/arphicfonts ) dev-libs/libchewing x11-libs/libX11
 0
 mirror://debian/pool/main/x/xcin/xcin_2.5.2.99.pre2+cvs20030224.orig.tar.gz mirror://debian/pool/main/x/xcin/xcin_2.5.2.99.pre2+cvs20030224-1.4.diff.gz
diff --git a/metadata/cache/app-i18n/zinnia-0.06-r1 b/metadata/cache/app-i18n/zinnia-0.06-r1
index 6c3d1d30f400..3d517e088cc6 100644
--- a/metadata/cache/app-i18n/zinnia-0.06-r1
+++ b/metadata/cache/app-i18n/zinnia-0.06-r1
@@ -1,4 +1,4 @@
-dev-lang/perl[-build] || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-lang/perl[-build] || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-lang/perl[-build]
 0
 mirror://sourceforge/zinnia/zinnia-0.06.tar.gz
diff --git a/metadata/cache/app-laptop/radeontool-1.6.3 b/metadata/cache/app-laptop/radeontool-1.6.3
new file mode 100644
index 000000000000..09233e22c91c
--- /dev/null
+++ b/metadata/cache/app-laptop/radeontool-1.6.3
@@ -0,0 +1,22 @@
+x11-libs/libpciaccess
+x11-libs/libpciaccess
+0
+http://people.freedesktop.org/~airlied/radeontool/radeontool-1.6.3.tar.bz2
+
+http://cgit.freedesktop.org/~airlied/radeontool/
+ZLIB
+Manage the backlight, external video output and registers of ATI Radeon graphics cards
+~amd64 ~ppc ~x86
+eutils multilib toolchain-funcs user
+
+
+
+
+2
+
+install
+
+
+
+
+
diff --git a/metadata/cache/app-misc/bb-1.3.0_rc1-r2 b/metadata/cache/app-misc/bb-1.3.0_rc1-r2
index 13041099c621..17a1e3d2f854 100644
--- a/metadata/cache/app-misc/bb-1.3.0_rc1-r2
+++ b/metadata/cache/app-misc/bb-1.3.0_rc1-r2
@@ -1,4 +1,4 @@
-media-libs/aalib mikmod? ( media-libs/libmikmod ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+media-libs/aalib mikmod? ( media-libs/libmikmod ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 media-libs/aalib mikmod? ( media-libs/libmikmod )
 0
 mirror://sourceforge/aa-project/bb-1.3rc1.tar.gz
diff --git a/metadata/cache/app-misc/beagle-0.3.9-r5 b/metadata/cache/app-misc/beagle-0.3.9-r5
index 061dba8c7a2d..0db570e86588 100644
--- a/metadata/cache/app-misc/beagle-0.3.9-r5
+++ b/metadata/cache/app-misc/beagle-0.3.9-r5
@@ -1,4 +1,4 @@
-!!sci-libs/beagle >dev-lang/mono-2.4 >=app-shells/bash-3.2 app-arch/zip >=dev-db/sqlite-3.3.1 >=dev-dotnet/ndesk-dbus-0.6.0 >=dev-dotnet/ndesk-dbus-glib-0.4.1 >=dev-dotnet/taglib-sharp-2.0 gtk? ( x11-libs/libX11 >=gnome-base/librsvg-2.22.0:2 sys-devel/gettext >=dev-dotnet/gtk-sharp-2.12.6:2 >=dev-dotnet/gconf-sharp-2.24.0:2 >=dev-dotnet/glade-sharp-2.12.6:2 >=dev-dotnet/gnome-sharp-2.24.0:2 >=dev-dotnet/gnomevfs-sharp-2.24.0:2 x11-misc/xdg-utils >=x11-libs/gtk+-2.14.0:2 >=dev-libs/atk-1.22.0 ) eds? ( >=dev-dotnet/evolution-sharp-0.18.1 >=dev-dotnet/gconf-sharp-2.24.0:2 >=dev-dotnet/glib-sharp-2.12.6:2 ) ole? ( >=app-text/wv-1.2.3 >=dev-dotnet/gsf-sharp-0.8.1 >=app-office/gnumeric-1.4.3-r3 ) x11-misc/shared-mime-info >=dev-dotnet/glib-sharp-2.12.6:2 dev-libs/gmime:2.4[mono] chm? ( dev-libs/chmlib ) pdf? ( >=app-text/poppler-0.12.3-r3[utils] ) galago? ( >=dev-dotnet/galago-sharp-0.5.0 ) thunderbird? ( || ( >=mail-client/thunderbird-1.5 >=mail-client/thunderbird-bin-1.5 ) ) firefox? ( || ( >=www-client/firefox-1.5 >=www-client/firefox-bin-1.5 ) ) xscreensaver? ( x11-libs/libXScrnSaver ) >=dev-libs/libbeagle-0.3.9 avahi? ( >=net-dns/avahi-0.6.10[mono] ) doc? ( >=virtual/monodoc-1.2.4 ) dev-util/pkgconfig xscreensaver? ( x11-proto/scrnsaverproto ) >=dev-util/intltool-0.35 app-arch/unzip || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+!!sci-libs/beagle >dev-lang/mono-2.4 >=app-shells/bash-3.2 app-arch/zip >=dev-db/sqlite-3.3.1 >=dev-dotnet/ndesk-dbus-0.6.0 >=dev-dotnet/ndesk-dbus-glib-0.4.1 >=dev-dotnet/taglib-sharp-2.0 gtk? ( x11-libs/libX11 >=gnome-base/librsvg-2.22.0:2 sys-devel/gettext >=dev-dotnet/gtk-sharp-2.12.6:2 >=dev-dotnet/gconf-sharp-2.24.0:2 >=dev-dotnet/glade-sharp-2.12.6:2 >=dev-dotnet/gnome-sharp-2.24.0:2 >=dev-dotnet/gnomevfs-sharp-2.24.0:2 x11-misc/xdg-utils >=x11-libs/gtk+-2.14.0:2 >=dev-libs/atk-1.22.0 ) eds? ( >=dev-dotnet/evolution-sharp-0.18.1 >=dev-dotnet/gconf-sharp-2.24.0:2 >=dev-dotnet/glib-sharp-2.12.6:2 ) ole? ( >=app-text/wv-1.2.3 >=dev-dotnet/gsf-sharp-0.8.1 >=app-office/gnumeric-1.4.3-r3 ) x11-misc/shared-mime-info >=dev-dotnet/glib-sharp-2.12.6:2 dev-libs/gmime:2.4[mono] chm? ( dev-libs/chmlib ) pdf? ( >=app-text/poppler-0.12.3-r3[utils] ) galago? ( >=dev-dotnet/galago-sharp-0.5.0 ) thunderbird? ( || ( >=mail-client/thunderbird-1.5 >=mail-client/thunderbird-bin-1.5 ) ) firefox? ( || ( >=www-client/firefox-1.5 >=www-client/firefox-bin-1.5 ) ) xscreensaver? ( x11-libs/libXScrnSaver ) >=dev-libs/libbeagle-0.3.9 avahi? ( >=net-dns/avahi-0.6.10[mono] ) doc? ( >=virtual/monodoc-1.2.4 ) dev-util/pkgconfig xscreensaver? ( x11-proto/scrnsaverproto ) >=dev-util/intltool-0.35 app-arch/unzip || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 !!sci-libs/beagle >dev-lang/mono-2.4 >=app-shells/bash-3.2 app-arch/zip >=dev-db/sqlite-3.3.1 >=dev-dotnet/ndesk-dbus-0.6.0 >=dev-dotnet/ndesk-dbus-glib-0.4.1 >=dev-dotnet/taglib-sharp-2.0 gtk? ( x11-libs/libX11 >=gnome-base/librsvg-2.22.0:2 sys-devel/gettext >=dev-dotnet/gtk-sharp-2.12.6:2 >=dev-dotnet/gconf-sharp-2.24.0:2 >=dev-dotnet/glade-sharp-2.12.6:2 >=dev-dotnet/gnome-sharp-2.24.0:2 >=dev-dotnet/gnomevfs-sharp-2.24.0:2 x11-misc/xdg-utils >=x11-libs/gtk+-2.14.0:2 >=dev-libs/atk-1.22.0 ) eds? ( >=dev-dotnet/evolution-sharp-0.18.1 >=dev-dotnet/gconf-sharp-2.24.0:2 >=dev-dotnet/glib-sharp-2.12.6:2 ) ole? ( >=app-text/wv-1.2.3 >=dev-dotnet/gsf-sharp-0.8.1 >=app-office/gnumeric-1.4.3-r3 ) x11-misc/shared-mime-info >=dev-dotnet/glib-sharp-2.12.6:2 dev-libs/gmime:2.4[mono] chm? ( dev-libs/chmlib ) pdf? ( >=app-text/poppler-0.12.3-r3[utils] ) galago? ( >=dev-dotnet/galago-sharp-0.5.0 ) thunderbird? ( || ( >=mail-client/thunderbird-1.5 >=mail-client/thunderbird-bin-1.5 ) ) firefox? ( || ( >=www-client/firefox-1.5 >=www-client/firefox-bin-1.5 ) ) xscreensaver? ( x11-libs/libXScrnSaver ) >=dev-libs/libbeagle-0.3.9 avahi? ( >=net-dns/avahi-0.6.10[mono] )
 0
 mirror://gnome/sources/beagle/0.3/beagle-0.3.9.tar.bz2
diff --git a/metadata/cache/app-misc/beagle-0.3.9-r6 b/metadata/cache/app-misc/beagle-0.3.9-r6
index bac067cfd58f..003a1c92d904 100644
--- a/metadata/cache/app-misc/beagle-0.3.9-r6
+++ b/metadata/cache/app-misc/beagle-0.3.9-r6
@@ -1,4 +1,4 @@
-!!sci-libs/beagle >dev-lang/mono-2.4 >=app-shells/bash-3.2 app-arch/zip >=dev-db/sqlite-3.3.1 >=dev-dotnet/ndesk-dbus-0.6.0 >=dev-dotnet/ndesk-dbus-glib-0.4.1 >=dev-dotnet/taglib-sharp-2.0 gtk? ( x11-libs/libX11 >=gnome-base/librsvg-2.22.0:2 sys-devel/gettext >=dev-dotnet/gtk-sharp-2.12.6:2 >=dev-dotnet/gconf-sharp-2.24.0:2 >=dev-dotnet/glade-sharp-2.12.6:2 >=dev-dotnet/gnome-sharp-2.24.0:2 >=dev-dotnet/gnomevfs-sharp-2.24.0:2 x11-misc/xdg-utils >=x11-libs/gtk+-2.14.0:2 >=dev-libs/atk-1.22.0 ) eds? ( >=dev-dotnet/evolution-sharp-0.18.1 >=dev-dotnet/gconf-sharp-2.24.0:2 >=dev-dotnet/glib-sharp-2.12.6:2 ) ole? ( >=app-text/wv-1.2.3 >=dev-dotnet/gsf-sharp-0.8.1 >=app-office/gnumeric-1.4.3-r3 ) x11-misc/shared-mime-info >=dev-dotnet/glib-sharp-2.12.6:2 dev-libs/gmime:2.4[mono] chm? ( dev-libs/chmlib ) pdf? ( >=app-text/poppler-0.12.3-r3[utils] ) thunderbird? ( || ( >=mail-client/thunderbird-1.5 >=mail-client/thunderbird-bin-1.5 ) ) firefox? ( || ( >=www-client/firefox-1.5 >=www-client/firefox-bin-1.5 ) ) xscreensaver? ( x11-libs/libXScrnSaver ) >=dev-libs/libbeagle-0.3.9 avahi? ( >=net-dns/avahi-0.6.10[mono] ) doc? ( >=virtual/monodoc-1.2.4 ) dev-util/pkgconfig xscreensaver? ( x11-proto/scrnsaverproto ) >=dev-util/intltool-0.35 app-arch/unzip || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+!!sci-libs/beagle >dev-lang/mono-2.4 >=app-shells/bash-3.2 app-arch/zip >=dev-db/sqlite-3.3.1 >=dev-dotnet/ndesk-dbus-0.6.0 >=dev-dotnet/ndesk-dbus-glib-0.4.1 >=dev-dotnet/taglib-sharp-2.0 gtk? ( x11-libs/libX11 >=gnome-base/librsvg-2.22.0:2 sys-devel/gettext >=dev-dotnet/gtk-sharp-2.12.6:2 >=dev-dotnet/gconf-sharp-2.24.0:2 >=dev-dotnet/glade-sharp-2.12.6:2 >=dev-dotnet/gnome-sharp-2.24.0:2 >=dev-dotnet/gnomevfs-sharp-2.24.0:2 x11-misc/xdg-utils >=x11-libs/gtk+-2.14.0:2 >=dev-libs/atk-1.22.0 ) eds? ( >=dev-dotnet/evolution-sharp-0.18.1 >=dev-dotnet/gconf-sharp-2.24.0:2 >=dev-dotnet/glib-sharp-2.12.6:2 ) ole? ( >=app-text/wv-1.2.3 >=dev-dotnet/gsf-sharp-0.8.1 >=app-office/gnumeric-1.4.3-r3 ) x11-misc/shared-mime-info >=dev-dotnet/glib-sharp-2.12.6:2 dev-libs/gmime:2.4[mono] chm? ( dev-libs/chmlib ) pdf? ( >=app-text/poppler-0.12.3-r3[utils] ) thunderbird? ( || ( >=mail-client/thunderbird-1.5 >=mail-client/thunderbird-bin-1.5 ) ) firefox? ( || ( >=www-client/firefox-1.5 >=www-client/firefox-bin-1.5 ) ) xscreensaver? ( x11-libs/libXScrnSaver ) >=dev-libs/libbeagle-0.3.9 avahi? ( >=net-dns/avahi-0.6.10[mono] ) doc? ( >=virtual/monodoc-1.2.4 ) dev-util/pkgconfig xscreensaver? ( x11-proto/scrnsaverproto ) >=dev-util/intltool-0.35 app-arch/unzip || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 !!sci-libs/beagle >dev-lang/mono-2.4 >=app-shells/bash-3.2 app-arch/zip >=dev-db/sqlite-3.3.1 >=dev-dotnet/ndesk-dbus-0.6.0 >=dev-dotnet/ndesk-dbus-glib-0.4.1 >=dev-dotnet/taglib-sharp-2.0 gtk? ( x11-libs/libX11 >=gnome-base/librsvg-2.22.0:2 sys-devel/gettext >=dev-dotnet/gtk-sharp-2.12.6:2 >=dev-dotnet/gconf-sharp-2.24.0:2 >=dev-dotnet/glade-sharp-2.12.6:2 >=dev-dotnet/gnome-sharp-2.24.0:2 >=dev-dotnet/gnomevfs-sharp-2.24.0:2 x11-misc/xdg-utils >=x11-libs/gtk+-2.14.0:2 >=dev-libs/atk-1.22.0 ) eds? ( >=dev-dotnet/evolution-sharp-0.18.1 >=dev-dotnet/gconf-sharp-2.24.0:2 >=dev-dotnet/glib-sharp-2.12.6:2 ) ole? ( >=app-text/wv-1.2.3 >=dev-dotnet/gsf-sharp-0.8.1 >=app-office/gnumeric-1.4.3-r3 ) x11-misc/shared-mime-info >=dev-dotnet/glib-sharp-2.12.6:2 dev-libs/gmime:2.4[mono] chm? ( dev-libs/chmlib ) pdf? ( >=app-text/poppler-0.12.3-r3[utils] ) thunderbird? ( || ( >=mail-client/thunderbird-1.5 >=mail-client/thunderbird-bin-1.5 ) ) firefox? ( || ( >=www-client/firefox-1.5 >=www-client/firefox-bin-1.5 ) ) xscreensaver? ( x11-libs/libXScrnSaver ) >=dev-libs/libbeagle-0.3.9 avahi? ( >=net-dns/avahi-0.6.10[mono] )
 0
 mirror://gnome/sources/beagle/0.3/beagle-0.3.9.tar.bz2
diff --git a/metadata/cache/app-misc/cstream-2.7.6 b/metadata/cache/app-misc/cstream-2.7.6
index 884b24dd4831..e711d4998edf 100644
--- a/metadata/cache/app-misc/cstream-2.7.6
+++ b/metadata/cache/app-misc/cstream-2.7.6
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 http://www.cons.org/cracauer/download/cstream-2.7.6.tar.gz
diff --git a/metadata/cache/app-misc/cstream-3.0.0 b/metadata/cache/app-misc/cstream-3.0.0
index 9bd21aeff57b..30f33c78b9eb 100644
--- a/metadata/cache/app-misc/cstream-3.0.0
+++ b/metadata/cache/app-misc/cstream-3.0.0
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 http://www.cons.org/cracauer/download/cstream-3.0.0.tar.gz
diff --git a/metadata/cache/app-misc/cwiid-20110107-r1 b/metadata/cache/app-misc/cwiid-20110107-r1
index 65df7ecb67ba..63889bc57ca3 100644
--- a/metadata/cache/app-misc/cwiid-20110107-r1
+++ b/metadata/cache/app-misc/cwiid-20110107-r1
@@ -1,4 +1,4 @@
-sys-apps/gawk sys-apps/sed sys-devel/bison >=sys-devel/flex-2.5.35 kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+sys-apps/gawk sys-apps/sed sys-devel/bison >=sys-devel/flex-2.5.35 kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 net-wireless/bluez x11-libs/gtk+:2 python? ( >=dev-lang/python-2.4 ) kernel_linux? ( virtual/modutils )
 0
 http://dev.gentoo.org/~lxnay/cwiid/cwiid-20110107.tar.bz2
diff --git a/metadata/cache/app-misc/datovka-2.0 b/metadata/cache/app-misc/datovka-2.0.2
similarity index 72%
rename from metadata/cache/app-misc/datovka-2.0
rename to metadata/cache/app-misc/datovka-2.0.2
index 34faa5d0579c..7c11f19959ed 100644
--- a/metadata/cache/app-misc/datovka-2.0
+++ b/metadata/cache/app-misc/datovka-2.0.2
@@ -1,7 +1,7 @@
-dev-python/pygtk:2 dev-python/pyopenssl dev-python/reportlab dev-python/sqlalchemy media-fonts/dejavu >=net-libs/dslib-1.7 =dev-lang/python-2*
-dev-python/pygtk:2 dev-python/pyopenssl dev-python/reportlab dev-python/sqlalchemy media-fonts/dejavu >=net-libs/dslib-1.7 =dev-lang/python-2*
+dev-python/pygtk:2 dev-python/pyopenssl dev-python/reportlab dev-python/sqlalchemy media-fonts/dejavu >=net-libs/dslib-2.0 =dev-lang/python-2*
+dev-python/pygtk:2 dev-python/pyopenssl dev-python/reportlab dev-python/sqlalchemy media-fonts/dejavu >=net-libs/dslib-2.0 =dev-lang/python-2*
 0
-http://www.nic.cz/public_media/datove_schranky/releases/datovka-2.0/src/datovka-2.0.tar.gz
+http://www.nic.cz/public_media/datove_schranky/releases/datovka-2.0.2/src/datovka-2.0.2.tar.gz
 
 http://labs.nic.cz/page/969/datovka/
 GPL-2
diff --git a/metadata/cache/app-misc/ddccontrol-0.3-r1 b/metadata/cache/app-misc/ddccontrol-0.3-r1
index 6852e157aa4e..3d61cff76450 100644
--- a/metadata/cache/app-misc/ddccontrol-0.3-r1
+++ b/metadata/cache/app-misc/ddccontrol-0.3-r1
@@ -1,4 +1,4 @@
-dev-libs/libxml2:2 gtk? ( >=x11-libs/gtk+-2.4:2 ) gnome? ( >=gnome-base/gnome-panel-2.10 ) sys-apps/pciutils nls? ( sys-devel/gettext ) >=app-misc/ddccontrol-db-20051114 doc? ( >=app-text/docbook-xsl-stylesheets-1.65.1 >=dev-libs/libxslt-1.1.6 app-text/htmltidy ) sys-kernel/linux-headers || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-libs/libxml2:2 gtk? ( >=x11-libs/gtk+-2.4:2 ) gnome? ( >=gnome-base/gnome-panel-2.10 ) sys-apps/pciutils nls? ( sys-devel/gettext ) >=app-misc/ddccontrol-db-20051114 doc? ( >=app-text/docbook-xsl-stylesheets-1.65.1 >=dev-libs/libxslt-1.1.6 app-text/htmltidy ) sys-kernel/linux-headers || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-libs/libxml2:2 gtk? ( >=x11-libs/gtk+-2.4:2 ) gnome? ( >=gnome-base/gnome-panel-2.10 ) sys-apps/pciutils nls? ( sys-devel/gettext ) >=app-misc/ddccontrol-db-20051114
 0
 mirror://sourceforge/ddccontrol/ddccontrol-0.3.tar.bz2
diff --git a/metadata/cache/app-misc/ddccontrol-0.3-r2 b/metadata/cache/app-misc/ddccontrol-0.3-r2
index 6852e157aa4e..3d61cff76450 100644
--- a/metadata/cache/app-misc/ddccontrol-0.3-r2
+++ b/metadata/cache/app-misc/ddccontrol-0.3-r2
@@ -1,4 +1,4 @@
-dev-libs/libxml2:2 gtk? ( >=x11-libs/gtk+-2.4:2 ) gnome? ( >=gnome-base/gnome-panel-2.10 ) sys-apps/pciutils nls? ( sys-devel/gettext ) >=app-misc/ddccontrol-db-20051114 doc? ( >=app-text/docbook-xsl-stylesheets-1.65.1 >=dev-libs/libxslt-1.1.6 app-text/htmltidy ) sys-kernel/linux-headers || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-libs/libxml2:2 gtk? ( >=x11-libs/gtk+-2.4:2 ) gnome? ( >=gnome-base/gnome-panel-2.10 ) sys-apps/pciutils nls? ( sys-devel/gettext ) >=app-misc/ddccontrol-db-20051114 doc? ( >=app-text/docbook-xsl-stylesheets-1.65.1 >=dev-libs/libxslt-1.1.6 app-text/htmltidy ) sys-kernel/linux-headers || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-libs/libxml2:2 gtk? ( >=x11-libs/gtk+-2.4:2 ) gnome? ( >=gnome-base/gnome-panel-2.10 ) sys-apps/pciutils nls? ( sys-devel/gettext ) >=app-misc/ddccontrol-db-20051114
 0
 mirror://sourceforge/ddccontrol/ddccontrol-0.3.tar.bz2
diff --git a/metadata/cache/app-misc/ddccontrol-0.4.2 b/metadata/cache/app-misc/ddccontrol-0.4.2
index e48079e1f811..86300308a913 100644
--- a/metadata/cache/app-misc/ddccontrol-0.4.2
+++ b/metadata/cache/app-misc/ddccontrol-0.4.2
@@ -1,4 +1,4 @@
-dev-libs/libxml2:2 gtk? ( >=x11-libs/gtk+-2.4:2 ) gnome? ( >=gnome-base/gnome-panel-2.10 ) sys-apps/pciutils nls? ( sys-devel/gettext ) >=app-misc/ddccontrol-db-20060730 dev-perl/XML-Parser dev-util/intltool doc? ( >=app-text/docbook-xsl-stylesheets-1.65.1 >=dev-libs/libxslt-1.1.6 app-text/htmltidy ) sys-kernel/linux-headers || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-libs/libxml2:2 gtk? ( >=x11-libs/gtk+-2.4:2 ) gnome? ( >=gnome-base/gnome-panel-2.10 ) sys-apps/pciutils nls? ( sys-devel/gettext ) >=app-misc/ddccontrol-db-20060730 dev-perl/XML-Parser dev-util/intltool doc? ( >=app-text/docbook-xsl-stylesheets-1.65.1 >=dev-libs/libxslt-1.1.6 app-text/htmltidy ) sys-kernel/linux-headers || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-libs/libxml2:2 gtk? ( >=x11-libs/gtk+-2.4:2 ) gnome? ( >=gnome-base/gnome-panel-2.10 ) sys-apps/pciutils nls? ( sys-devel/gettext ) >=app-misc/ddccontrol-db-20060730
 0
 mirror://sourceforge/ddccontrol/ddccontrol-0.4.2.tar.bz2
diff --git a/metadata/cache/app-misc/ddccontrol-0.4.2-r1 b/metadata/cache/app-misc/ddccontrol-0.4.2-r1
index d9094f610a91..270f03914f23 100644
--- a/metadata/cache/app-misc/ddccontrol-0.4.2-r1
+++ b/metadata/cache/app-misc/ddccontrol-0.4.2-r1
@@ -1,4 +1,4 @@
-dev-libs/libxml2:2 gtk? ( >=x11-libs/gtk+-2.4:2 ) gnome? ( >=gnome-base/gnome-panel-2.10 ) sys-apps/pciutils nls? ( sys-devel/gettext ) >=app-misc/ddccontrol-db-20060730 dev-perl/XML-Parser dev-util/intltool doc? ( >=app-text/docbook-xsl-stylesheets-1.65.1 >=dev-libs/libxslt-1.1.6 app-text/htmltidy ) sys-kernel/linux-headers || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-libs/libxml2:2 gtk? ( >=x11-libs/gtk+-2.4:2 ) gnome? ( >=gnome-base/gnome-panel-2.10 ) sys-apps/pciutils nls? ( sys-devel/gettext ) >=app-misc/ddccontrol-db-20060730 dev-perl/XML-Parser dev-util/intltool doc? ( >=app-text/docbook-xsl-stylesheets-1.65.1 >=dev-libs/libxslt-1.1.6 app-text/htmltidy ) sys-kernel/linux-headers || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-libs/libxml2:2 gtk? ( >=x11-libs/gtk+-2.4:2 ) gnome? ( >=gnome-base/gnome-panel-2.10 ) sys-apps/pciutils nls? ( sys-devel/gettext ) >=app-misc/ddccontrol-db-20060730
 0
 mirror://sourceforge/ddccontrol/ddccontrol-0.4.2.tar.bz2
diff --git a/metadata/cache/app-misc/devtodo-0.1.20 b/metadata/cache/app-misc/devtodo-0.1.20
index acab7d5054f8..e0e299bf48bf 100644
--- a/metadata/cache/app-misc/devtodo-0.1.20
+++ b/metadata/cache/app-misc/devtodo-0.1.20
@@ -1,4 +1,4 @@
->=sys-libs/ncurses-5.2 >=sys-libs/readline-4.1 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=sys-libs/ncurses-5.2 >=sys-libs/readline-4.1 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=sys-libs/ncurses-5.2 >=sys-libs/readline-4.1 bash-completion? ( app-admin/eselect )
 0
 http://swapoff.org/files/devtodo/devtodo-0.1.20.tar.gz
diff --git a/metadata/cache/app-misc/evtest-1.29 b/metadata/cache/app-misc/evtest-1.29
index 72e1cb753ca3..d617affd7e78 100644
--- a/metadata/cache/app-misc/evtest-1.29
+++ b/metadata/cache/app-misc/evtest-1.29
@@ -1,4 +1,4 @@
-xml? ( dev-libs/libxml2 ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+xml? ( dev-libs/libxml2 ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 xml? ( dev-libs/libxml2 )
 0
 http://cgit.freedesktop.org/evtest/snapshot/evtest-1.29.tar.bz2 mirror://gentoo/evtest-1.29-mans.tar.xz
diff --git a/metadata/cache/app-misc/g15mpd-1.0.0 b/metadata/cache/app-misc/g15mpd-1.0.0
index 12c59b28475e..31a5c4b1a3f6 100644
--- a/metadata/cache/app-misc/g15mpd-1.0.0
+++ b/metadata/cache/app-misc/g15mpd-1.0.0
@@ -1,4 +1,4 @@
->=app-misc/g15daemon-1.9 dev-libs/libg15 dev-libs/libg15render >=media-libs/libmpd-0.17 sys-libs/zlib x11-libs/libX11 x11-libs/libXtst x11-proto/xproto x11-proto/xextproto || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=app-misc/g15daemon-1.9 dev-libs/libg15 dev-libs/libg15render >=media-libs/libmpd-0.17 sys-libs/zlib x11-libs/libX11 x11-libs/libXtst x11-proto/xproto x11-proto/xextproto || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=app-misc/g15daemon-1.9 dev-libs/libg15 dev-libs/libg15render >=media-libs/libmpd-0.17 sys-libs/zlib x11-libs/libX11 x11-libs/libXtst
 0
 mirror://sourceforge/g15daemon/g15mpd-1.0.0.tar.bz2
diff --git a/metadata/cache/app-misc/gentoo-0.19.12 b/metadata/cache/app-misc/gentoo-0.19.12
index f9980d17917d..d9280b798b7f 100644
--- a/metadata/cache/app-misc/gentoo-0.19.12
+++ b/metadata/cache/app-misc/gentoo-0.19.12
@@ -1,4 +1,4 @@
->=x11-libs/gtk+-2.24:2 >=dev-libs/glib-2 x11-libs/gdk-pixbuf x11-libs/pango nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=x11-libs/gtk+-2.24:2 >=dev-libs/glib-2 x11-libs/gdk-pixbuf x11-libs/pango nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=x11-libs/gtk+-2.24:2 >=dev-libs/glib-2 x11-libs/gdk-pixbuf x11-libs/pango
 0
 mirror://sourceforge/gentoo/gentoo-0.19.12.tar.gz
diff --git a/metadata/cache/app-misc/geoclue-0.12.0_p20110307 b/metadata/cache/app-misc/geoclue-0.12.0_p20110307
index cfae9b9b75a1..9afd114c32a9 100644
--- a/metadata/cache/app-misc/geoclue-0.12.0_p20110307
+++ b/metadata/cache/app-misc/geoclue-0.12.0_p20110307
@@ -1,4 +1,4 @@
-dev-libs/dbus-glib dev-libs/glib:2 dev-libs/libxml2 gnome-base/gconf skyhook? ( net-libs/libsoup ) sys-apps/dbus gtk? ( x11-libs/gtk+:2 ) gps? ( <=sci-geosciences/gpsd-2.95-r1 ) networkmanager? ( net-misc/networkmanager ) dev-util/gtk-doc dev-util/gtk-doc-am || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-libs/dbus-glib dev-libs/glib:2 dev-libs/libxml2 gnome-base/gconf skyhook? ( net-libs/libsoup ) sys-apps/dbus gtk? ( x11-libs/gtk+:2 ) gps? ( <=sci-geosciences/gpsd-2.95-r1 ) networkmanager? ( net-misc/networkmanager ) dev-util/gtk-doc dev-util/gtk-doc-am || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-libs/dbus-glib dev-libs/glib:2 dev-libs/libxml2 gnome-base/gconf skyhook? ( net-libs/libsoup ) sys-apps/dbus gtk? ( x11-libs/gtk+:2 ) gps? ( <=sci-geosciences/gpsd-2.95-r1 ) networkmanager? ( net-misc/networkmanager )
 0
 http://dev.gentoo.org/~signals/geoclue-0.12.0_p20110307.tar.bz2
diff --git a/metadata/cache/app-misc/gramps-3.2.5 b/metadata/cache/app-misc/gramps-3.2.5
index f3bea39d5dc5..8de6398591b2 100644
--- a/metadata/cache/app-misc/gramps-3.2.5
+++ b/metadata/cache/app-misc/gramps-3.2.5
@@ -1,4 +1,4 @@
-dev-python/bsddb3 >=dev-python/pygtk-2.10.0 x11-misc/xdg-utils gnome-base/librsvg:2 gnome? ( dev-python/libgnome-python dev-python/gconf-python ) spell? ( dev-python/gtkspell-python dev-python/pyenchant ) reports? ( media-gfx/graphviz ) webkit? ( dev-python/pywebkitgtk ) dev-util/intltool sys-devel/gettext virtual/libiconv dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
+dev-python/bsddb3 >=dev-python/pygtk-2.10.0 x11-misc/xdg-utils gnome-base/librsvg:2 gnome? ( dev-python/libgnome-python dev-python/gconf-python ) spell? ( dev-python/gtkspell-python dev-python/pyenchant ) reports? ( media-gfx/graphviz ) webkit? ( dev-python/pywebkitgtk ) dev-util/intltool sys-devel/gettext virtual/libiconv dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
 dev-python/bsddb3 >=dev-python/pygtk-2.10.0 x11-misc/xdg-utils gnome-base/librsvg:2 gnome? ( dev-python/libgnome-python dev-python/gconf-python ) spell? ( dev-python/gtkspell-python dev-python/pyenchant ) reports? ( media-gfx/graphviz ) webkit? ( dev-python/pywebkitgtk ) || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
 0
 mirror://sourceforge/gramps/Stable/3.2.5/gramps-3.2.5.tar.gz
diff --git a/metadata/cache/app-misc/gramps-3.2.6 b/metadata/cache/app-misc/gramps-3.2.6
index 9f90cb7ab10c..c0a3524bd710 100644
--- a/metadata/cache/app-misc/gramps-3.2.6
+++ b/metadata/cache/app-misc/gramps-3.2.6
@@ -1,4 +1,4 @@
-dev-python/bsddb3 >=dev-python/pygtk-2.10.0 x11-misc/xdg-utils gnome-base/librsvg:2 gnome? ( dev-python/libgnome-python dev-python/gconf-python ) spell? ( dev-python/gtkspell-python dev-python/pyenchant ) reports? ( media-gfx/graphviz ) webkit? ( dev-python/pywebkitgtk ) dev-util/intltool sys-devel/gettext virtual/libiconv dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
+dev-python/bsddb3 >=dev-python/pygtk-2.10.0 x11-misc/xdg-utils gnome-base/librsvg:2 gnome? ( dev-python/libgnome-python dev-python/gconf-python ) spell? ( dev-python/gtkspell-python dev-python/pyenchant ) reports? ( media-gfx/graphviz ) webkit? ( dev-python/pywebkitgtk ) dev-util/intltool sys-devel/gettext virtual/libiconv dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
 dev-python/bsddb3 >=dev-python/pygtk-2.10.0 x11-misc/xdg-utils gnome-base/librsvg:2 gnome? ( dev-python/libgnome-python dev-python/gconf-python ) spell? ( dev-python/gtkspell-python dev-python/pyenchant ) reports? ( media-gfx/graphviz ) webkit? ( dev-python/pywebkitgtk ) || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
 0
 mirror://sourceforge/gramps/Stable/3.2.6/gramps-3.2.6.tar.gz
diff --git a/metadata/cache/app-misc/kanatest-0.4.8 b/metadata/cache/app-misc/kanatest-0.4.8
index 20f774a92c4a..04fc883ef424 100644
--- a/metadata/cache/app-misc/kanatest-0.4.8
+++ b/metadata/cache/app-misc/kanatest-0.4.8
@@ -1,4 +1,4 @@
->=x11-libs/gtk+-2.12:2 dev-libs/libxml2:2 dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=x11-libs/gtk+-2.12:2 dev-libs/libxml2:2 dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=x11-libs/gtk+-2.12:2 dev-libs/libxml2:2
 0
 http://www.clayo.org/kanatest/kanatest-0.4.8.tar.gz
diff --git a/metadata/cache/app-misc/lirc-0.8.5 b/metadata/cache/app-misc/lirc-0.8.5
index 704c6b0051f7..b45ce595c4cc 100644
--- a/metadata/cache/app-misc/lirc-0.8.5
+++ b/metadata/cache/app-misc/lirc-0.8.5
@@ -1,4 +1,4 @@
-X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) lirc_devices_alsa_usb? ( media-libs/alsa-lib ) lirc_devices_audio? ( >media-libs/portaudio-18 ) lirc_devices_irman? ( media-libs/libirman ) lirc_devices_usbirboy? ( app-misc/usbirboy ) lirc_devices_inputlirc? ( app-misc/inputlircd ) virtual/linux-sources lirc_devices_all? ( dev-embedded/libftdi ) kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) lirc_devices_alsa_usb? ( media-libs/alsa-lib ) lirc_devices_audio? ( >media-libs/portaudio-18 ) lirc_devices_irman? ( media-libs/libirman ) lirc_devices_usbirboy? ( app-misc/usbirboy ) lirc_devices_inputlirc? ( app-misc/inputlircd ) virtual/linux-sources lirc_devices_all? ( dev-embedded/libftdi ) kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) lirc_devices_alsa_usb? ( media-libs/alsa-lib ) lirc_devices_audio? ( >media-libs/portaudio-18 ) lirc_devices_irman? ( media-libs/libirman ) lirc_devices_usbirboy? ( app-misc/usbirboy ) lirc_devices_inputlirc? ( app-misc/inputlircd ) kernel_linux? ( virtual/modutils )
 0
 mirror://sourceforge/lirc/lirc-0.8.5.tar.bz2
diff --git a/metadata/cache/app-misc/lirc-0.8.7 b/metadata/cache/app-misc/lirc-0.8.7
index 6604e76a4d4b..adced21960bb 100644
--- a/metadata/cache/app-misc/lirc-0.8.7
+++ b/metadata/cache/app-misc/lirc-0.8.7
@@ -1,4 +1,4 @@
-X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) lirc_devices_alsa_usb? ( media-libs/alsa-lib ) lirc_devices_audio? ( >media-libs/portaudio-18 ) lirc_devices_irman? ( media-libs/libirman ) lirc_devices_all? ( virtual/libusb:0 ) lirc_devices_atilibusb? ( virtual/libusb:0 ) lirc_devices_awlibusb? ( virtual/libusb:0 ) lirc_devices_sasem? ( virtual/libusb:0 ) lirc_devices_igorplugusb? ( virtual/libusb:0 ) lirc_devices_imon? ( virtual/libusb:0 ) lirc_devices_imon_lcd? ( virtual/libusb:0 ) lirc_devices_imon_pad? ( virtual/libusb:0 ) lirc_devices_imon_rsc? ( virtual/libusb:0 ) lirc_devices_streamzap? ( virtual/libusb:0 ) lirc_devices_mceusb? ( virtual/libusb:0 ) lirc_devices_xboxusb? ( virtual/libusb:0 ) lirc_devices_irlink? ( virtual/libusb:0 ) lirc_devices_commandir? ( virtual/libusb:0 ) virtual/linux-sources lirc_devices_ftdi? ( dev-embedded/libftdi ) lirc_devices_all? ( dev-embedded/libftdi ) kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) lirc_devices_alsa_usb? ( media-libs/alsa-lib ) lirc_devices_audio? ( >media-libs/portaudio-18 ) lirc_devices_irman? ( media-libs/libirman ) lirc_devices_all? ( virtual/libusb:0 ) lirc_devices_atilibusb? ( virtual/libusb:0 ) lirc_devices_awlibusb? ( virtual/libusb:0 ) lirc_devices_sasem? ( virtual/libusb:0 ) lirc_devices_igorplugusb? ( virtual/libusb:0 ) lirc_devices_imon? ( virtual/libusb:0 ) lirc_devices_imon_lcd? ( virtual/libusb:0 ) lirc_devices_imon_pad? ( virtual/libusb:0 ) lirc_devices_imon_rsc? ( virtual/libusb:0 ) lirc_devices_streamzap? ( virtual/libusb:0 ) lirc_devices_mceusb? ( virtual/libusb:0 ) lirc_devices_xboxusb? ( virtual/libusb:0 ) lirc_devices_irlink? ( virtual/libusb:0 ) lirc_devices_commandir? ( virtual/libusb:0 ) virtual/linux-sources lirc_devices_ftdi? ( dev-embedded/libftdi ) lirc_devices_all? ( dev-embedded/libftdi ) kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) lirc_devices_alsa_usb? ( media-libs/alsa-lib ) lirc_devices_audio? ( >media-libs/portaudio-18 ) lirc_devices_irman? ( media-libs/libirman ) lirc_devices_usbirboy? ( app-misc/usbirboy ) lirc_devices_inputlirc? ( app-misc/inputlircd ) lirc_devices_iguanaIR? ( app-misc/iguanaIR ) kernel_linux? ( virtual/modutils )
 0
 mirror://sourceforge/lirc/lirc-0.8.7.tar.bz2
diff --git a/metadata/cache/app-misc/lirc-0.8.7_pre1 b/metadata/cache/app-misc/lirc-0.8.7_pre1
index cf2d291c833a..c4c14c2befc9 100644
--- a/metadata/cache/app-misc/lirc-0.8.7_pre1
+++ b/metadata/cache/app-misc/lirc-0.8.7_pre1
@@ -1,4 +1,4 @@
-X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) lirc_devices_alsa_usb? ( media-libs/alsa-lib ) lirc_devices_audio? ( >media-libs/portaudio-18 ) lirc_devices_irman? ( media-libs/libirman ) lirc_devices_all? ( virtual/libusb:0 ) lirc_devices_atilibusb? ( virtual/libusb:0 ) lirc_devices_awlibusb? ( virtual/libusb:0 ) lirc_devices_sasem? ( virtual/libusb:0 ) lirc_devices_igorplugusb? ( virtual/libusb:0 ) lirc_devices_imon? ( virtual/libusb:0 ) lirc_devices_imon_lcd? ( virtual/libusb:0 ) lirc_devices_imon_pad? ( virtual/libusb:0 ) lirc_devices_imon_rsc? ( virtual/libusb:0 ) lirc_devices_streamzap? ( virtual/libusb:0 ) lirc_devices_mceusb? ( virtual/libusb:0 ) lirc_devices_xboxusb? ( virtual/libusb:0 ) lirc_devices_irlink? ( virtual/libusb:0 ) lirc_devices_commandir? ( virtual/libusb:0 ) virtual/linux-sources lirc_devices_ftdi? ( dev-embedded/libftdi ) lirc_devices_all? ( dev-embedded/libftdi ) kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) lirc_devices_alsa_usb? ( media-libs/alsa-lib ) lirc_devices_audio? ( >media-libs/portaudio-18 ) lirc_devices_irman? ( media-libs/libirman ) lirc_devices_all? ( virtual/libusb:0 ) lirc_devices_atilibusb? ( virtual/libusb:0 ) lirc_devices_awlibusb? ( virtual/libusb:0 ) lirc_devices_sasem? ( virtual/libusb:0 ) lirc_devices_igorplugusb? ( virtual/libusb:0 ) lirc_devices_imon? ( virtual/libusb:0 ) lirc_devices_imon_lcd? ( virtual/libusb:0 ) lirc_devices_imon_pad? ( virtual/libusb:0 ) lirc_devices_imon_rsc? ( virtual/libusb:0 ) lirc_devices_streamzap? ( virtual/libusb:0 ) lirc_devices_mceusb? ( virtual/libusb:0 ) lirc_devices_xboxusb? ( virtual/libusb:0 ) lirc_devices_irlink? ( virtual/libusb:0 ) lirc_devices_commandir? ( virtual/libusb:0 ) virtual/linux-sources lirc_devices_ftdi? ( dev-embedded/libftdi ) lirc_devices_all? ( dev-embedded/libftdi ) kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) lirc_devices_alsa_usb? ( media-libs/alsa-lib ) lirc_devices_audio? ( >media-libs/portaudio-18 ) lirc_devices_irman? ( media-libs/libirman ) lirc_devices_usbirboy? ( app-misc/usbirboy ) lirc_devices_inputlirc? ( app-misc/inputlircd ) lirc_devices_iguanaIR? ( app-misc/iguanaIR ) kernel_linux? ( virtual/modutils )
 0
 http://www.lirc.org/software/snapshots/lirc-0.8.7pre1.tar.bz2
diff --git a/metadata/cache/app-misc/lirc-0.9.0 b/metadata/cache/app-misc/lirc-0.9.0
index 7c43966235e4..4c6e8e534391 100644
--- a/metadata/cache/app-misc/lirc-0.9.0
+++ b/metadata/cache/app-misc/lirc-0.9.0
@@ -1,4 +1,4 @@
-X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) lirc_devices_alsa_usb? ( media-libs/alsa-lib ) lirc_devices_audio? ( >media-libs/portaudio-18 ) lirc_devices_irman? ( media-libs/libirman ) lirc_devices_all? ( virtual/libusb:0 ) lirc_devices_atilibusb? ( virtual/libusb:0 ) lirc_devices_awlibusb? ( virtual/libusb:0 ) lirc_devices_sasem? ( virtual/libusb:0 ) lirc_devices_igorplugusb? ( virtual/libusb:0 ) lirc_devices_imon? ( virtual/libusb:0 ) lirc_devices_imon_lcd? ( virtual/libusb:0 ) lirc_devices_imon_pad? ( virtual/libusb:0 ) lirc_devices_imon_rsc? ( virtual/libusb:0 ) lirc_devices_streamzap? ( virtual/libusb:0 ) lirc_devices_xboxusb? ( virtual/libusb:0 ) lirc_devices_irlink? ( virtual/libusb:0 ) lirc_devices_commandir? ( virtual/libusb:0 ) virtual/linux-sources lirc_devices_ftdi? ( dev-embedded/libftdi ) lirc_devices_all? ( dev-embedded/libftdi ) kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) lirc_devices_alsa_usb? ( media-libs/alsa-lib ) lirc_devices_audio? ( >media-libs/portaudio-18 ) lirc_devices_irman? ( media-libs/libirman ) lirc_devices_all? ( virtual/libusb:0 ) lirc_devices_atilibusb? ( virtual/libusb:0 ) lirc_devices_awlibusb? ( virtual/libusb:0 ) lirc_devices_sasem? ( virtual/libusb:0 ) lirc_devices_igorplugusb? ( virtual/libusb:0 ) lirc_devices_imon? ( virtual/libusb:0 ) lirc_devices_imon_lcd? ( virtual/libusb:0 ) lirc_devices_imon_pad? ( virtual/libusb:0 ) lirc_devices_imon_rsc? ( virtual/libusb:0 ) lirc_devices_streamzap? ( virtual/libusb:0 ) lirc_devices_xboxusb? ( virtual/libusb:0 ) lirc_devices_irlink? ( virtual/libusb:0 ) lirc_devices_commandir? ( virtual/libusb:0 ) virtual/linux-sources lirc_devices_ftdi? ( dev-embedded/libftdi ) lirc_devices_all? ( dev-embedded/libftdi ) kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 X? ( x11-libs/libX11 x11-libs/libSM x11-libs/libICE ) lirc_devices_alsa_usb? ( media-libs/alsa-lib ) lirc_devices_audio? ( >media-libs/portaudio-18 ) lirc_devices_irman? ( media-libs/libirman ) lirc_devices_usbirboy? ( app-misc/usbirboy ) lirc_devices_inputlirc? ( app-misc/inputlircd ) lirc_devices_iguanaIR? ( app-misc/iguanaIR ) kernel_linux? ( virtual/modutils )
 0
 mirror://sourceforge/lirc/lirc-0.9.0.tar.bz2
diff --git a/metadata/cache/app-misc/mc-4.8.1-r2 b/metadata/cache/app-misc/mc-4.8.1-r2
index fa41be5bbe2d..db23cd647277 100644
--- a/metadata/cache/app-misc/mc-4.8.1-r2
+++ b/metadata/cache/app-misc/mc-4.8.1-r2
@@ -1,4 +1,4 @@
->=dev-libs/glib-2.8:2 gpm? ( sys-libs/gpm ) kernel_linux? ( sys-fs/e2fsprogs ) ncurses? ( sys-libs/ncurses ) samba? ( net-fs/samba ) slang? ( >=sys-libs/slang-2 ) X? ( x11-libs/libX11 x11-libs/libICE x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM ) app-arch/xz-utils dev-util/pkgconfig nls? ( sys-devel/gettext ) test? ( dev-libs/check ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-libs/glib-2.8:2 gpm? ( sys-libs/gpm ) kernel_linux? ( sys-fs/e2fsprogs ) ncurses? ( sys-libs/ncurses ) samba? ( net-fs/samba ) slang? ( >=sys-libs/slang-2 ) X? ( x11-libs/libX11 x11-libs/libICE x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM ) app-arch/xz-utils dev-util/pkgconfig nls? ( sys-devel/gettext ) test? ( dev-libs/check ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=dev-libs/glib-2.8:2 gpm? ( sys-libs/gpm ) kernel_linux? ( sys-fs/e2fsprogs ) ncurses? ( sys-libs/ncurses ) samba? ( net-fs/samba ) slang? ( >=sys-libs/slang-2 ) X? ( x11-libs/libX11 x11-libs/libICE x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM )
 0
 http://www.midnight-commander.org/downloads/mc-4.8.1.tar.xz
diff --git a/metadata/cache/app-misc/mc-9999 b/metadata/cache/app-misc/mc-9999
index e95e753df908..6bb8bde1135b 100644
--- a/metadata/cache/app-misc/mc-9999
+++ b/metadata/cache/app-misc/mc-9999
@@ -1,4 +1,4 @@
->=dev-libs/glib-2.8:2 gpm? ( sys-libs/gpm ) kernel_linux? ( sys-fs/e2fsprogs ) samba? ( net-fs/samba ) slang? ( >=sys-libs/slang-2 ) !slang? ( sys-libs/ncurses ) X? ( x11-libs/libX11 x11-libs/libICE x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM ) app-arch/xz-utils dev-util/pkgconfig nls? ( sys-devel/gettext ) test? ( dev-libs/check ) dev-vcs/cvs dev-vcs/git || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-libs/glib-2.8:2 gpm? ( sys-libs/gpm ) kernel_linux? ( sys-fs/e2fsprogs ) samba? ( net-fs/samba ) slang? ( >=sys-libs/slang-2 ) !slang? ( sys-libs/ncurses ) X? ( x11-libs/libX11 x11-libs/libICE x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM ) app-arch/xz-utils dev-util/pkgconfig nls? ( sys-devel/gettext ) test? ( dev-libs/check ) dev-vcs/cvs dev-vcs/git || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=dev-libs/glib-2.8:2 gpm? ( sys-libs/gpm ) kernel_linux? ( sys-fs/e2fsprogs ) samba? ( net-fs/samba ) slang? ( >=sys-libs/slang-2 ) !slang? ( sys-libs/ncurses ) X? ( x11-libs/libX11 x11-libs/libICE x11-libs/libXau x11-libs/libXdmcp x11-libs/libSM )
 0
 
diff --git a/metadata/cache/app-misc/screen-4.0.3-r4 b/metadata/cache/app-misc/screen-4.0.3-r4
index c4a51c6c3bc4..0a1c7590ac07 100644
--- a/metadata/cache/app-misc/screen-4.0.3-r4
+++ b/metadata/cache/app-misc/screen-4.0.3-r4
@@ -1,4 +1,4 @@
->=sys-libs/ncurses-5.2 pam? ( virtual/pam ) selinux? ( sec-policy/selinux-screen ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=sys-libs/ncurses-5.2 pam? ( virtual/pam ) selinux? ( sec-policy/selinux-screen ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=sys-libs/ncurses-5.2 pam? ( virtual/pam ) selinux? ( sec-policy/selinux-screen )
 0
 ftp://ftp.uni-erlangen.de/pub/utilities/screen/screen-4.0.3.tar.gz
diff --git a/metadata/cache/app-misc/slmon-0.5.13 b/metadata/cache/app-misc/slmon-0.5.13
index 7216977b64f8..25bbbc376a73 100644
--- a/metadata/cache/app-misc/slmon-0.5.13
+++ b/metadata/cache/app-misc/slmon-0.5.13
@@ -1,4 +1,4 @@
-dev-libs/glib:2 sys-libs/slang gnome-base/libgtop dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-libs/glib:2 sys-libs/slang gnome-base/libgtop dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-libs/glib:2 sys-libs/slang gnome-base/libgtop
 0
 mirror://sourceforge/slmon/slmon-0.5.13.tar.gz
diff --git a/metadata/cache/app-misc/sphinx-0.9.9 b/metadata/cache/app-misc/sphinx-0.9.9
index 2c649eb1fccf..8dbd09ddebf9 100644
--- a/metadata/cache/app-misc/sphinx-0.9.9
+++ b/metadata/cache/app-misc/sphinx-0.9.9
@@ -1,4 +1,4 @@
-mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-base ) test? ( dev-lang/php ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-base ) test? ( dev-lang/php ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-base )
 0
 http://sphinxsearch.com/downloads/sphinx-0.9.9.tar.gz stemmer? ( mirror://gentoo/libstemmer_c-20091122.tgz )
diff --git a/metadata/cache/app-misc/sphinx-0.9.9-r2 b/metadata/cache/app-misc/sphinx-0.9.9-r2
index 37f848d55fde..163123aa1792 100644
--- a/metadata/cache/app-misc/sphinx-0.9.9-r2
+++ b/metadata/cache/app-misc/sphinx-0.9.9-r2
@@ -1,4 +1,4 @@
-mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-base ) virtual/libiconv test? ( dev-lang/php ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-base ) virtual/libiconv test? ( dev-lang/php ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-base ) virtual/libiconv
 0
 http://sphinxsearch.com/downloads/sphinx-0.9.9.tar.gz stemmer? ( mirror://gentoo/libstemmer_c-20091122.tgz )
diff --git a/metadata/cache/app-misc/sphinx-1.10_beta-r1 b/metadata/cache/app-misc/sphinx-1.10_beta-r1
index 95b4b4a3c6f8..037d2a0c8cf9 100644
--- a/metadata/cache/app-misc/sphinx-1.10_beta-r1
+++ b/metadata/cache/app-misc/sphinx-1.10_beta-r1
@@ -1,4 +1,4 @@
-mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-base ) odbc? ( dev-db/unixODBC ) virtual/libiconv test? ( dev-lang/php ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-base ) odbc? ( dev-db/unixODBC ) virtual/libiconv test? ( dev-lang/php ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-base ) odbc? ( dev-db/unixODBC ) virtual/libiconv
 0
 http://sphinxsearch.com/downloads/sphinx-1.10-beta.tar.gz stemmer? ( mirror://gentoo/libstemmer_c-20091122.tgz )
diff --git a/metadata/cache/app-misc/sphinx-2.0.3 b/metadata/cache/app-misc/sphinx-2.0.3
index 926c0a341234..5c460cbfd57c 100644
--- a/metadata/cache/app-misc/sphinx-2.0.3
+++ b/metadata/cache/app-misc/sphinx-2.0.3
@@ -1,4 +1,4 @@
-mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-base ) odbc? ( dev-db/unixODBC ) virtual/libiconv test? ( dev-lang/php ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-base ) odbc? ( dev-db/unixODBC ) virtual/libiconv test? ( dev-lang/php ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-base ) odbc? ( dev-db/unixODBC ) virtual/libiconv
 0
 http://sphinxsearch.com/files/sphinx-2.0.3-release.tar.gz stemmer? ( mirror://gentoo/libstemmer_c-20091122.tgz )
diff --git a/metadata/cache/app-misc/sphinx-2.0.4 b/metadata/cache/app-misc/sphinx-2.0.4
index 0d2e2fe1931a..4f21d1a49e6e 100644
--- a/metadata/cache/app-misc/sphinx-2.0.4
+++ b/metadata/cache/app-misc/sphinx-2.0.4
@@ -1,4 +1,4 @@
-mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-base ) odbc? ( dev-db/unixODBC ) virtual/libiconv test? ( dev-lang/php ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-base ) odbc? ( dev-db/unixODBC ) virtual/libiconv test? ( dev-lang/php ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-base ) odbc? ( dev-db/unixODBC ) virtual/libiconv
 0
 http://sphinxsearch.com/files/sphinx-2.0.4-release.tar.gz stemmer? ( mirror://gentoo/libstemmer_c-20091122.tgz )
diff --git a/metadata/cache/app-misc/srm-1.2.11-r2 b/metadata/cache/app-misc/srm-1.2.11-r2
index c5a0a01feae6..04d22041896d 100644
--- a/metadata/cache/app-misc/srm-1.2.11-r2
+++ b/metadata/cache/app-misc/srm-1.2.11-r2
@@ -1,4 +1,4 @@
-!app-misc/secure-delete sys-kernel/linux-headers || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+!app-misc/secure-delete sys-kernel/linux-headers || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 mirror://sourceforge/srm/srm-1.2.11.tar.gz
diff --git a/metadata/cache/app-misc/tablix-0.3.5-r1 b/metadata/cache/app-misc/tablix-0.3.5-r1
index 21bcd7990d94..d00fc35aff6b 100644
--- a/metadata/cache/app-misc/tablix-0.3.5-r1
+++ b/metadata/cache/app-misc/tablix-0.3.5-r1
@@ -1,4 +1,4 @@
->=dev-libs/libxml2-2.4.3 pvm? ( sys-cluster/pvm ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-libs/libxml2-2.4.3 pvm? ( sys-cluster/pvm ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=dev-libs/libxml2-2.4.3 pvm? ( sys-cluster/pvm )
 0
 http://www.tablix.org/releases/stable/tablix2-0.3.5.tar.gz
diff --git a/metadata/cache/app-misc/tmux-1.5 b/metadata/cache/app-misc/tmux-1.5
index 9a5dfb06bb58..85be8b0f5f16 100644
--- a/metadata/cache/app-misc/tmux-1.5
+++ b/metadata/cache/app-misc/tmux-1.5
@@ -1,4 +1,4 @@
-|| ( >=dev-libs/libevent-2.0.10 <dev-libs/libevent-2 ) sys-libs/ncurses || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+|| ( >=dev-libs/libevent-2.0.10 <dev-libs/libevent-2 ) sys-libs/ncurses || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 || ( >=dev-libs/libevent-2.0.10 <dev-libs/libevent-2 ) sys-libs/ncurses vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
 0
 mirror://sourceforge/tmux/tmux-1.5.tar.gz
diff --git a/metadata/cache/app-misc/tmux-9999 b/metadata/cache/app-misc/tmux-9999
index 2ee5a6f23de8..3be806890b5b 100644
--- a/metadata/cache/app-misc/tmux-9999
+++ b/metadata/cache/app-misc/tmux-9999
@@ -1,4 +1,4 @@
-|| ( >=dev-libs/libevent-2.0.10 <dev-libs/libevent-2 ) sys-libs/ncurses || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/subversion net-misc/rsync
+|| ( >=dev-libs/libevent-2.0.10 <dev-libs/libevent-2 ) sys-libs/ncurses || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/subversion net-misc/rsync
 || ( >=dev-libs/libevent-2.0.10 <dev-libs/libevent-2 ) sys-libs/ncurses vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
 0
 
diff --git a/metadata/cache/app-misc/tracker-9999 b/metadata/cache/app-misc/tracker-9999
index 0992a61cdead..1c1d7b925e5d 100644
--- a/metadata/cache/app-misc/tracker-9999
+++ b/metadata/cache/app-misc/tracker-9999
@@ -1,4 +1,4 @@
->=app-i18n/enca-1.9 >=dev-db/sqlite-3.7[threadsafe] >=dev-libs/glib-2.28:2 >=dev-libs/gobject-introspection-0.9.5 >=dev-libs/icu-4 || ( >=media-gfx/imagemagick-5.2.1[png,jpeg=] media-gfx/graphicsmagick[imagemagick,png,jpeg=] ) >=media-libs/libpng-1.2 >=x11-libs/pango-1 sys-apps/util-linux applet? ( >=gnome-base/gnome-panel-2.91.6 >=x11-libs/gdk-pixbuf-2.12:2 >=x11-libs/gtk+-3:3 ) eds? ( >=mail-client/evolution-2.91.90 >=gnome-extra/evolution-data-server-2.91.90 ) elibc_glibc? ( >=sys-libs/glibc-2.12 ) exif? ( >=media-libs/libexif-0.6 ) firefox-bookmarks? ( || ( >=www-client/firefox-4.0 >=www-client/firefox-bin-4.0 ) ) flac? ( >=media-libs/flac-1.2.1 ) flickr? ( net-libs/rest:0.7 ) gif? ( media-libs/giflib ) gnome-keyring? ( >=gnome-base/gnome-keyring-2.26 ) gsf? ( app-text/odt2txt >=gnome-extra/libgsf-1.13 ) gstreamer? ( >=media-libs/gstreamer-0.10.31:0.10 upnp? ( >=media-libs/gupnp-dlna-0.5 ) !upnp? ( >=media-libs/gst-plugins-base-0.10.31 ) ) !gstreamer? ( !xine? ( || ( media-video/totem media-video/mplayer ) ) ) gtk? ( >=dev-libs/libgee-0.3:0 >=x11-libs/gtk+-3:3 ) iptc? ( media-libs/libiptcdata ) jpeg? ( virtual/jpeg:0 ) laptop? ( >=sys-power/upower-0.9 ) mp3? ( >=media-libs/taglib-1.6 gtk? ( x11-libs/gdk-pixbuf:2 ) ) networkmanager? ( >=net-misc/networkmanager-0.8 ) pdf? ( >=x11-libs/cairo-1 >=app-text/poppler-0.16[cairo,utils] >=x11-libs/gtk+-2.12:2 ) playlist? ( dev-libs/totem-pl-parser ) rss? ( net-libs/libgrss ) thunderbird? ( || ( >=mail-client/thunderbird-5.0 >=mail-client/thunderbird-bin-5.0 ) ) tiff? ( media-libs/tiff ) vorbis? ( >=media-libs/libvorbis-0.22 ) xine? ( >=media-libs/xine-lib-1 ) xml? ( >=dev-libs/libxml2-2.6 ) xmp? ( >=media-libs/exempi-2.1 ) >=dev-util/intltool-0.40 >=sys-devel/gettext-0.17 >=dev-util/pkgconfig-0.20 dev-util/gtk-doc-am >=dev-util/gtk-doc-1.8 applet? ( >=dev-lang/vala-0.12:0.12 ) gtk? ( app-office/dia >=dev-lang/vala-0.12:0.12 >=dev-libs/libgee-0.3 ) doc? ( media-gfx/graphviz ) test? ( >=dev-libs/dbus-glib-0.82-r1 >=sys-apps/dbus-1.3.1[X] ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git >=sys-apps/sed-4 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+>=app-i18n/enca-1.9 >=dev-db/sqlite-3.7[threadsafe] >=dev-libs/glib-2.28:2 >=dev-libs/gobject-introspection-0.9.5 >=dev-libs/icu-4 || ( >=media-gfx/imagemagick-5.2.1[png,jpeg=] media-gfx/graphicsmagick[imagemagick,png,jpeg=] ) >=media-libs/libpng-1.2 >=x11-libs/pango-1 sys-apps/util-linux applet? ( >=gnome-base/gnome-panel-2.91.6 >=x11-libs/gdk-pixbuf-2.12:2 >=x11-libs/gtk+-3:3 ) eds? ( >=mail-client/evolution-2.91.90 >=gnome-extra/evolution-data-server-2.91.90 ) elibc_glibc? ( >=sys-libs/glibc-2.12 ) exif? ( >=media-libs/libexif-0.6 ) firefox-bookmarks? ( || ( >=www-client/firefox-4.0 >=www-client/firefox-bin-4.0 ) ) flac? ( >=media-libs/flac-1.2.1 ) flickr? ( net-libs/rest:0.7 ) gif? ( media-libs/giflib ) gnome-keyring? ( >=gnome-base/gnome-keyring-2.26 ) gsf? ( app-text/odt2txt >=gnome-extra/libgsf-1.13 ) gstreamer? ( >=media-libs/gstreamer-0.10.31:0.10 upnp? ( >=media-libs/gupnp-dlna-0.5 ) !upnp? ( >=media-libs/gst-plugins-base-0.10.31 ) ) !gstreamer? ( !xine? ( || ( media-video/totem media-video/mplayer ) ) ) gtk? ( >=dev-libs/libgee-0.3:0 >=x11-libs/gtk+-3:3 ) iptc? ( media-libs/libiptcdata ) jpeg? ( virtual/jpeg:0 ) laptop? ( >=sys-power/upower-0.9 ) mp3? ( >=media-libs/taglib-1.6 gtk? ( x11-libs/gdk-pixbuf:2 ) ) networkmanager? ( >=net-misc/networkmanager-0.8 ) pdf? ( >=x11-libs/cairo-1 >=app-text/poppler-0.16[cairo,utils] >=x11-libs/gtk+-2.12:2 ) playlist? ( dev-libs/totem-pl-parser ) rss? ( net-libs/libgrss ) thunderbird? ( || ( >=mail-client/thunderbird-5.0 >=mail-client/thunderbird-bin-5.0 ) ) tiff? ( media-libs/tiff ) vorbis? ( >=media-libs/libvorbis-0.22 ) xine? ( >=media-libs/xine-lib-1 ) xml? ( >=dev-libs/libxml2-2.6 ) xmp? ( >=media-libs/exempi-2.1 ) >=dev-util/intltool-0.40 >=sys-devel/gettext-0.17 >=dev-util/pkgconfig-0.20 dev-util/gtk-doc-am >=dev-util/gtk-doc-1.8 applet? ( >=dev-lang/vala-0.12:0.12 ) gtk? ( app-office/dia >=dev-lang/vala-0.12:0.12 >=dev-libs/libgee-0.3 ) doc? ( media-gfx/graphviz ) test? ( >=dev-libs/dbus-glib-0.82-r1 >=sys-apps/dbus-1.3.1[X] ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git >=sys-apps/sed-4 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 >=app-i18n/enca-1.9 >=dev-db/sqlite-3.7[threadsafe] >=dev-libs/glib-2.28:2 >=dev-libs/gobject-introspection-0.9.5 >=dev-libs/icu-4 || ( >=media-gfx/imagemagick-5.2.1[png,jpeg=] media-gfx/graphicsmagick[imagemagick,png,jpeg=] ) >=media-libs/libpng-1.2 >=x11-libs/pango-1 sys-apps/util-linux applet? ( >=gnome-base/gnome-panel-2.91.6 >=x11-libs/gdk-pixbuf-2.12:2 >=x11-libs/gtk+-3:3 ) eds? ( >=mail-client/evolution-2.91.90 >=gnome-extra/evolution-data-server-2.91.90 ) elibc_glibc? ( >=sys-libs/glibc-2.12 ) exif? ( >=media-libs/libexif-0.6 ) firefox-bookmarks? ( || ( >=www-client/firefox-4.0 >=www-client/firefox-bin-4.0 ) ) flac? ( >=media-libs/flac-1.2.1 ) flickr? ( net-libs/rest:0.7 ) gif? ( media-libs/giflib ) gnome-keyring? ( >=gnome-base/gnome-keyring-2.26 ) gsf? ( app-text/odt2txt >=gnome-extra/libgsf-1.13 ) gstreamer? ( >=media-libs/gstreamer-0.10.31:0.10 upnp? ( >=media-libs/gupnp-dlna-0.5 ) !upnp? ( >=media-libs/gst-plugins-base-0.10.31 ) ) !gstreamer? ( !xine? ( || ( media-video/totem media-video/mplayer ) ) ) gtk? ( >=dev-libs/libgee-0.3:0 >=x11-libs/gtk+-3:3 ) iptc? ( media-libs/libiptcdata ) jpeg? ( virtual/jpeg:0 ) laptop? ( >=sys-power/upower-0.9 ) mp3? ( >=media-libs/taglib-1.6 gtk? ( x11-libs/gdk-pixbuf:2 ) ) networkmanager? ( >=net-misc/networkmanager-0.8 ) pdf? ( >=x11-libs/cairo-1 >=app-text/poppler-0.16[cairo,utils] >=x11-libs/gtk+-2.12:2 ) playlist? ( dev-libs/totem-pl-parser ) rss? ( net-libs/libgrss ) thunderbird? ( || ( >=mail-client/thunderbird-5.0 >=mail-client/thunderbird-bin-5.0 ) ) tiff? ( media-libs/tiff ) vorbis? ( >=media-libs/libvorbis-0.22 ) xine? ( >=media-libs/xine-lib-1 ) xml? ( >=dev-libs/libxml2-2.6 ) xmp? ( >=media-libs/exempi-2.1 ) || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
 0
 
diff --git a/metadata/cache/app-misc/vittk-1.3 b/metadata/cache/app-misc/vittk-1.3
index 13b180cdba51..c1c787ef085f 100644
--- a/metadata/cache/app-misc/vittk-1.3
+++ b/metadata/cache/app-misc/vittk-1.3
@@ -1,4 +1,4 @@
-dev-lang/tcl || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-lang/tcl || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-lang/tcl dev-lang/tk app-misc/task
 0
 http://taskwarrior.org/download/vittk-1.3.tar.gz
diff --git a/metadata/cache/app-misc/wipe-2.2.20050509-r1 b/metadata/cache/app-misc/wipe-2.2.20050509-r1
index 80f9b31dc070..5b9463b878bf 100644
--- a/metadata/cache/app-misc/wipe-2.2.20050509-r1
+++ b/metadata/cache/app-misc/wipe-2.2.20050509-r1
@@ -1,4 +1,4 @@
-!sys-cluster/lam-mpi || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+!sys-cluster/lam-mpi || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 !sys-cluster/lam-mpi
 0
 mirror://sourceforge/wipe/wipe-wip-20050509.tar.bz2
diff --git a/metadata/cache/app-misc/wipe-2.3.1 b/metadata/cache/app-misc/wipe-2.3.1
index 061a73687480..1ceb7d0da897 100644
--- a/metadata/cache/app-misc/wipe-2.3.1
+++ b/metadata/cache/app-misc/wipe-2.3.1
@@ -1,4 +1,4 @@
-!sys-cluster/lam-mpi || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+!sys-cluster/lam-mpi || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 !sys-cluster/lam-mpi
 0
 mirror://sourceforge/wipe/wipe-2.3.1.tar.bz2
diff --git a/metadata/cache/app-misc/ytree-1.97 b/metadata/cache/app-misc/ytree-1.97
index 572468de7cb8..daccc2baa418 100644
--- a/metadata/cache/app-misc/ytree-1.97
+++ b/metadata/cache/app-misc/ytree-1.97
@@ -6,7 +6,7 @@ http://www.han.de/~werner/ytree-1.97.tar.gz
 http://www.han.de/~werner/ytree.html
 GPL-2
 A (curses-based) file manager
-~x86
+x86
 eutils multilib toolchain-funcs user
 
 
diff --git a/metadata/cache/app-mobilephone/dfu-util-9999 b/metadata/cache/app-mobilephone/dfu-util-9999
index 5a66fb902a04..4396b6e01de8 100644
--- a/metadata/cache/app-mobilephone/dfu-util-9999
+++ b/metadata/cache/app-mobilephone/dfu-util-9999
@@ -1,4 +1,4 @@
-virtual/libusb:1 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
+virtual/libusb:1 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
 virtual/libusb:1
 0
 
diff --git a/metadata/cache/app-mobilephone/gnokii-0.6.27-r2 b/metadata/cache/app-mobilephone/gnokii-0.6.27-r2
index 6b917bda5c7f..cdc90b42fbcf 100644
--- a/metadata/cache/app-mobilephone/gnokii-0.6.27-r2
+++ b/metadata/cache/app-mobilephone/gnokii-0.6.27-r2
@@ -1,4 +1,4 @@
-!app-mobilephone/smstools sys-apps/pcsc-lite X? ( x11-libs/gtk+:2 ) bluetooth? ( net-wireless/bluez ) sms? ( !app-mobilephone/smstools dev-libs/glib:2 postgres? ( >=dev-db/postgresql-base-8.0 ) mysql? ( >=virtual/mysql-4.1 ) ) ical? ( dev-libs/libical ) usb? ( =virtual/libusb-0* ) irda? ( virtual/os-headers ) nls? ( sys-devel/gettext ) dev-util/intltool || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+!app-mobilephone/smstools sys-apps/pcsc-lite X? ( x11-libs/gtk+:2 ) bluetooth? ( net-wireless/bluez ) sms? ( !app-mobilephone/smstools dev-libs/glib:2 postgres? ( >=dev-db/postgresql-base-8.0 ) mysql? ( >=virtual/mysql-4.1 ) ) ical? ( dev-libs/libical ) usb? ( =virtual/libusb-0* ) irda? ( virtual/os-headers ) nls? ( sys-devel/gettext ) dev-util/intltool || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 !app-mobilephone/smstools sys-apps/pcsc-lite X? ( x11-libs/gtk+:2 ) bluetooth? ( net-wireless/bluez ) sms? ( !app-mobilephone/smstools dev-libs/glib:2 postgres? ( >=dev-db/postgresql-base-8.0 ) mysql? ( >=virtual/mysql-4.1 ) ) ical? ( dev-libs/libical ) usb? ( =virtual/libusb-0* )
 0
 http://www.gnokii.org/download/gnokii/gnokii-0.6.27.tar.bz2
diff --git a/metadata/cache/app-mobilephone/gnokii-0.6.27-r4 b/metadata/cache/app-mobilephone/gnokii-0.6.27-r4
index 2b71f0f240f9..316332fc184e 100644
--- a/metadata/cache/app-mobilephone/gnokii-0.6.27-r4
+++ b/metadata/cache/app-mobilephone/gnokii-0.6.27-r4
@@ -1,4 +1,4 @@
-!app-mobilephone/smstools sys-apps/pcsc-lite X? ( x11-libs/gtk+:2 ) bluetooth? ( net-wireless/bluez ) sms? ( !app-mobilephone/smstools dev-libs/glib:2 postgres? ( >=dev-db/postgresql-base-8.0 ) mysql? ( >=virtual/mysql-4.1 ) ) ical? ( dev-libs/libical ) usb? ( =virtual/libusb-0* ) irda? ( virtual/os-headers ) nls? ( sys-devel/gettext ) dev-util/intltool || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+!app-mobilephone/smstools sys-apps/pcsc-lite X? ( x11-libs/gtk+:2 ) bluetooth? ( net-wireless/bluez ) sms? ( !app-mobilephone/smstools dev-libs/glib:2 postgres? ( >=dev-db/postgresql-base-8.0 ) mysql? ( >=virtual/mysql-4.1 ) ) ical? ( dev-libs/libical ) usb? ( =virtual/libusb-0* ) irda? ( virtual/os-headers ) nls? ( sys-devel/gettext ) dev-util/intltool || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 !app-mobilephone/smstools sys-apps/pcsc-lite X? ( x11-libs/gtk+:2 ) bluetooth? ( net-wireless/bluez ) sms? ( !app-mobilephone/smstools dev-libs/glib:2 postgres? ( >=dev-db/postgresql-base-8.0 ) mysql? ( >=virtual/mysql-4.1 ) ) ical? ( dev-libs/libical ) usb? ( =virtual/libusb-0* )
 0
 http://www.gnokii.org/download/gnokii/gnokii-0.6.27.tar.bz2
diff --git a/metadata/cache/app-mobilephone/gnokii-0.6.28.1 b/metadata/cache/app-mobilephone/gnokii-0.6.28.1
index fe15866cbeaa..a5cdbed1229a 100644
--- a/metadata/cache/app-mobilephone/gnokii-0.6.28.1
+++ b/metadata/cache/app-mobilephone/gnokii-0.6.28.1
@@ -1,4 +1,4 @@
-!app-mobilephone/smstools sys-apps/pcsc-lite X? ( x11-libs/gtk+:2 ) bluetooth? ( net-wireless/bluez ) sms? ( !app-mobilephone/smstools dev-libs/glib:2 postgres? ( >=dev-db/postgresql-base-8.0 ) mysql? ( >=virtual/mysql-4.1 ) ) ical? ( dev-libs/libical ) usb? ( =virtual/libusb-0* ) irda? ( virtual/os-headers ) nls? ( sys-devel/gettext ) dev-util/intltool || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+!app-mobilephone/smstools sys-apps/pcsc-lite X? ( x11-libs/gtk+:2 ) bluetooth? ( net-wireless/bluez ) sms? ( !app-mobilephone/smstools dev-libs/glib:2 postgres? ( >=dev-db/postgresql-base-8.0 ) mysql? ( >=virtual/mysql-4.1 ) ) ical? ( dev-libs/libical ) usb? ( =virtual/libusb-0* ) irda? ( virtual/os-headers ) nls? ( sys-devel/gettext ) dev-util/intltool || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 !app-mobilephone/smstools sys-apps/pcsc-lite X? ( x11-libs/gtk+:2 ) bluetooth? ( net-wireless/bluez ) sms? ( !app-mobilephone/smstools dev-libs/glib:2 postgres? ( >=dev-db/postgresql-base-8.0 ) mysql? ( >=virtual/mysql-4.1 ) ) ical? ( dev-libs/libical ) usb? ( =virtual/libusb-0* )
 0
 http://www.gnokii.org/download/gnokii/gnokii-0.6.28.1.tar.bz2
diff --git a/metadata/cache/app-mobilephone/gnokii-0.6.29 b/metadata/cache/app-mobilephone/gnokii-0.6.29
index 72175cc86662..05e67789f395 100644
--- a/metadata/cache/app-mobilephone/gnokii-0.6.29
+++ b/metadata/cache/app-mobilephone/gnokii-0.6.29
@@ -1,4 +1,4 @@
-!app-mobilephone/smstools sys-apps/pcsc-lite X? ( x11-libs/gtk+:2 ) bluetooth? ( net-wireless/bluez ) sms? ( !app-mobilephone/smstools dev-libs/glib:2 postgres? ( >=dev-db/postgresql-base-8.0 ) mysql? ( >=virtual/mysql-4.1 ) ) ical? ( dev-libs/libical ) usb? ( =virtual/libusb-0* ) irda? ( virtual/os-headers ) nls? ( sys-devel/gettext ) dev-util/intltool || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+!app-mobilephone/smstools sys-apps/pcsc-lite X? ( x11-libs/gtk+:2 ) bluetooth? ( net-wireless/bluez ) sms? ( !app-mobilephone/smstools dev-libs/glib:2 postgres? ( >=dev-db/postgresql-base-8.0 ) mysql? ( >=virtual/mysql-4.1 ) ) ical? ( dev-libs/libical ) usb? ( =virtual/libusb-0* ) irda? ( virtual/os-headers ) nls? ( sys-devel/gettext ) dev-util/intltool || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 !app-mobilephone/smstools sys-apps/pcsc-lite X? ( x11-libs/gtk+:2 ) bluetooth? ( net-wireless/bluez ) sms? ( !app-mobilephone/smstools dev-libs/glib:2 postgres? ( >=dev-db/postgresql-base-8.0 ) mysql? ( >=virtual/mysql-4.1 ) ) ical? ( dev-libs/libical ) usb? ( =virtual/libusb-0* )
 0
 http://www.gnokii.org/download/gnokii/gnokii-0.6.29.tar.bz2
diff --git a/metadata/cache/app-mobilephone/gnokii-9999 b/metadata/cache/app-mobilephone/gnokii-9999
index d5f358cec6e9..33c26ef7a8b2 100644
--- a/metadata/cache/app-mobilephone/gnokii-9999
+++ b/metadata/cache/app-mobilephone/gnokii-9999
@@ -1,4 +1,4 @@
-!app-mobilephone/smstools sys-apps/pcsc-lite X? ( x11-libs/gtk+:2 ) bluetooth? ( net-wireless/bluez ) sms? ( !app-mobilephone/smstools >=dev-libs/glib-2 postgres? ( >=dev-db/postgresql-base-8.0 ) mysql? ( >=virtual/mysql-4.1 ) ) ical? ( dev-libs/libical ) usb? ( =virtual/libusb-0* ) irda? ( virtual/os-headers ) nls? ( sys-devel/gettext ) dev-util/intltool || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
+!app-mobilephone/smstools sys-apps/pcsc-lite X? ( x11-libs/gtk+:2 ) bluetooth? ( net-wireless/bluez ) sms? ( !app-mobilephone/smstools >=dev-libs/glib-2 postgres? ( >=dev-db/postgresql-base-8.0 ) mysql? ( >=virtual/mysql-4.1 ) ) ical? ( dev-libs/libical ) usb? ( =virtual/libusb-0* ) irda? ( virtual/os-headers ) nls? ( sys-devel/gettext ) dev-util/intltool || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
 !app-mobilephone/smstools sys-apps/pcsc-lite X? ( x11-libs/gtk+:2 ) bluetooth? ( net-wireless/bluez ) sms? ( !app-mobilephone/smstools >=dev-libs/glib-2 postgres? ( >=dev-db/postgresql-base-8.0 ) mysql? ( >=virtual/mysql-4.1 ) ) ical? ( dev-libs/libical ) usb? ( =virtual/libusb-0* )
 0
 
diff --git a/metadata/cache/app-mobilephone/kannel-sqlbox-0.7.2 b/metadata/cache/app-mobilephone/kannel-sqlbox-0.7.2
index 911eec70b28b..f953dd6a1d49 100644
--- a/metadata/cache/app-mobilephone/kannel-sqlbox-0.7.2
+++ b/metadata/cache/app-mobilephone/kannel-sqlbox-0.7.2
@@ -1,4 +1,4 @@
-|| ( >=app-mobilephone/kannel-1.4.3-r1[mysql] >=app-mobilephone/kannel-1.4.3-r1[sqlite] >=app-mobilephone/kannel-1.4.3-r1[postgres] ) ssl? ( dev-libs/openssl ) doc? ( media-gfx/transfig app-text/jadetex app-text/docbook-dsssl-stylesheets app-text/docbook-sgml-dtd:3.1 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+|| ( >=app-mobilephone/kannel-1.4.3-r1[mysql] >=app-mobilephone/kannel-1.4.3-r1[sqlite] >=app-mobilephone/kannel-1.4.3-r1[postgres] ) ssl? ( dev-libs/openssl ) doc? ( media-gfx/transfig app-text/jadetex app-text/docbook-dsssl-stylesheets app-text/docbook-sgml-dtd:3.1 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 || ( >=app-mobilephone/kannel-1.4.3-r1[mysql] >=app-mobilephone/kannel-1.4.3-r1[sqlite] >=app-mobilephone/kannel-1.4.3-r1[postgres] ) ssl? ( dev-libs/openssl )
 0
 http://www.kannel.org/~aguerrieri/SqlBox/Releases/sqlbox-0.7.2.tar.gz
diff --git a/metadata/cache/app-office/abiword-2.8.6-r2 b/metadata/cache/app-office/abiword-2.8.6-r2
index 3610eb48b0b2..0ccdd642b143 100644
--- a/metadata/cache/app-office/abiword-2.8.6-r2
+++ b/metadata/cache/app-office/abiword-2.8.6-r2
@@ -1,4 +1,4 @@
->=app-text/wv-1.2 >=dev-libs/fribidi-0.10.4 >=dev-libs/glib-2.16:2 >=gnome-base/librsvg-2.16:2 >=gnome-extra/libgsf-1.14.15 >=media-libs/libpng-1.2 virtual/jpeg >=x11-libs/cairo-1.8[X] >=x11-libs/gtk+-2.14:2[cups?] gnome? ( >=gnome-extra/gucharmap-2 >=x11-libs/goffice-0.8:0.8 ) plugins? ( collab? ( >=dev-libs/boost-1.33.1 >=dev-libs/libxml2-2.4 >=net-libs/loudmouth-1 net-libs/libsoup:2.4 net-libs/gnutls ) grammar? ( >=dev-libs/link-grammar-4.2.1 ) latex? ( dev-libs/libxslt ) math? ( >=x11-libs/gtkmathview-0.7.5 ) openxml? ( dev-libs/boost ) ots? ( >=app-text/ots-0.5 ) readline? ( sys-libs/readline ) thesaurus? ( >=app-text/aiksaurus-1.2[gtk] ) wordperfect? ( app-text/libwpd:0.9 app-text/libwpg:0.2 ) wmf? ( >=media-libs/libwmf-0.2.8 ) ) spell? ( >=app-text/enchant-1.2 ) !<app-office/abiword-plugins-2.8 >=dev-util/pkgconfig-0.9 collab? ( dev-cpp/asio ) app-arch/xz-utils >=sys-apps/sed-4 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=app-text/wv-1.2 >=dev-libs/fribidi-0.10.4 >=dev-libs/glib-2.16:2 >=gnome-base/librsvg-2.16:2 >=gnome-extra/libgsf-1.14.15 >=media-libs/libpng-1.2 virtual/jpeg >=x11-libs/cairo-1.8[X] >=x11-libs/gtk+-2.14:2[cups?] gnome? ( >=gnome-extra/gucharmap-2 >=x11-libs/goffice-0.8:0.8 ) plugins? ( collab? ( >=dev-libs/boost-1.33.1 >=dev-libs/libxml2-2.4 >=net-libs/loudmouth-1 net-libs/libsoup:2.4 net-libs/gnutls ) grammar? ( >=dev-libs/link-grammar-4.2.1 ) latex? ( dev-libs/libxslt ) math? ( >=x11-libs/gtkmathview-0.7.5 ) openxml? ( dev-libs/boost ) ots? ( >=app-text/ots-0.5 ) readline? ( sys-libs/readline ) thesaurus? ( >=app-text/aiksaurus-1.2[gtk] ) wordperfect? ( app-text/libwpd:0.9 app-text/libwpg:0.2 ) wmf? ( >=media-libs/libwmf-0.2.8 ) ) spell? ( >=app-text/enchant-1.2 ) !<app-office/abiword-plugins-2.8 >=dev-util/pkgconfig-0.9 collab? ( dev-cpp/asio ) app-arch/xz-utils >=sys-apps/sed-4 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=app-text/wv-1.2 >=dev-libs/fribidi-0.10.4 >=dev-libs/glib-2.16:2 >=gnome-base/librsvg-2.16:2 >=gnome-extra/libgsf-1.14.15 >=media-libs/libpng-1.2 virtual/jpeg >=x11-libs/cairo-1.8[X] >=x11-libs/gtk+-2.14:2[cups?] gnome? ( >=gnome-extra/gucharmap-2 >=x11-libs/goffice-0.8:0.8 ) plugins? ( collab? ( >=dev-libs/boost-1.33.1 >=dev-libs/libxml2-2.4 >=net-libs/loudmouth-1 net-libs/libsoup:2.4 net-libs/gnutls ) grammar? ( >=dev-libs/link-grammar-4.2.1 ) latex? ( dev-libs/libxslt ) math? ( >=x11-libs/gtkmathview-0.7.5 ) openxml? ( dev-libs/boost ) ots? ( >=app-text/ots-0.5 ) readline? ( sys-libs/readline ) thesaurus? ( >=app-text/aiksaurus-1.2[gtk] ) wordperfect? ( app-text/libwpd:0.9 app-text/libwpg:0.2 ) wmf? ( >=media-libs/libwmf-0.2.8 ) ) spell? ( >=app-text/enchant-1.2 ) !<app-office/abiword-plugins-2.8
 2
 http://www.abisource.com/downloads/abiword/2.8.6/source/abiword-2.8.6.tar.gz
diff --git a/metadata/cache/app-office/dia-0.97.1 b/metadata/cache/app-office/dia-0.97.1
index ad985b1b3531..90fcd496bb98 100644
--- a/metadata/cache/app-office/dia-0.97.1
+++ b/metadata/cache/app-office/dia-0.97.1
@@ -1,4 +1,4 @@
->=x11-libs/gtk+-2.6.0:2 >=dev-libs/glib-2.6.0 >=x11-libs/pango-1.8 >=dev-libs/libxml2-2.3.9 >=dev-libs/libxslt-1 >=media-libs/freetype-2.0.95 dev-libs/popt sys-libs/zlib media-libs/libpng >=media-libs/libart_lgpl-2 gnome? ( >=gnome-base/libgnome-2.0 >=gnome-base/libgnomeui-2.0 ) cairo? ( >=x11-libs/cairo-1 ) python? ( >=dev-python/pygtk-1.99 ) doc? ( ~app-text/docbook-xml-dtd-4.5 app-text/docbook-xsl-stylesheets ) >=dev-util/intltool-0.35.0 dev-util/pkgconfig doc? ( dev-libs/libxslt ) >=sys-apps/sed-4 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( =dev-lang/python-2* )
+>=x11-libs/gtk+-2.6.0:2 >=dev-libs/glib-2.6.0 >=x11-libs/pango-1.8 >=dev-libs/libxml2-2.3.9 >=dev-libs/libxslt-1 >=media-libs/freetype-2.0.95 dev-libs/popt sys-libs/zlib media-libs/libpng >=media-libs/libart_lgpl-2 gnome? ( >=gnome-base/libgnome-2.0 >=gnome-base/libgnomeui-2.0 ) cairo? ( >=x11-libs/cairo-1 ) python? ( >=dev-python/pygtk-1.99 ) doc? ( ~app-text/docbook-xml-dtd-4.5 app-text/docbook-xsl-stylesheets ) >=dev-util/intltool-0.35.0 dev-util/pkgconfig doc? ( dev-libs/libxslt ) >=sys-apps/sed-4 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( =dev-lang/python-2* )
 >=x11-libs/gtk+-2.6.0:2 >=dev-libs/glib-2.6.0 >=x11-libs/pango-1.8 >=dev-libs/libxml2-2.3.9 >=dev-libs/libxslt-1 >=media-libs/freetype-2.0.95 dev-libs/popt sys-libs/zlib media-libs/libpng >=media-libs/libart_lgpl-2 gnome? ( >=gnome-base/libgnome-2.0 >=gnome-base/libgnomeui-2.0 ) cairo? ( >=x11-libs/cairo-1 ) python? ( >=dev-python/pygtk-1.99 ) doc? ( ~app-text/docbook-xml-dtd-4.5 app-text/docbook-xsl-stylesheets ) python? ( =dev-lang/python-2* )
 0
 mirror://gnome/sources/dia/0.97/dia-0.97.1.tar.bz2
diff --git a/metadata/cache/app-office/dia-0.97.2 b/metadata/cache/app-office/dia-0.97.2
index dd6f9ac6c1bc..f05199cc671c 100644
--- a/metadata/cache/app-office/dia-0.97.2
+++ b/metadata/cache/app-office/dia-0.97.2
@@ -1,4 +1,4 @@
->=dev-libs/glib-2 dev-libs/libxml2 dev-libs/libxslt dev-libs/popt >=media-libs/freetype-2 >=media-libs/libart_lgpl-2 media-libs/libpng sys-libs/zlib x11-libs/gtk+:2 x11-libs/pango cairo? ( x11-libs/cairo ) doc? ( app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets ) gnome? ( >=gnome-base/libgnome-2 >=gnome-base/libgnomeui-2 ) python? ( >=dev-python/pygtk-2 ) dev-util/intltool dev-util/pkgconfig doc? ( dev-libs/libxslt ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 python? ( =dev-lang/python-2* )
+>=dev-libs/glib-2 dev-libs/libxml2 dev-libs/libxslt dev-libs/popt >=media-libs/freetype-2 >=media-libs/libart_lgpl-2 media-libs/libpng sys-libs/zlib x11-libs/gtk+:2 x11-libs/pango cairo? ( x11-libs/cairo ) doc? ( app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets ) gnome? ( >=gnome-base/libgnome-2 >=gnome-base/libgnomeui-2 ) python? ( >=dev-python/pygtk-2 ) dev-util/intltool dev-util/pkgconfig doc? ( dev-libs/libxslt ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 python? ( =dev-lang/python-2* )
 >=dev-libs/glib-2 dev-libs/libxml2 dev-libs/libxslt dev-libs/popt >=media-libs/freetype-2 >=media-libs/libart_lgpl-2 media-libs/libpng sys-libs/zlib x11-libs/gtk+:2 x11-libs/pango cairo? ( x11-libs/cairo ) doc? ( app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets ) gnome? ( >=gnome-base/libgnome-2 >=gnome-base/libgnomeui-2 ) python? ( >=dev-python/pygtk-2 ) python? ( =dev-lang/python-2* )
 0
 mirror://gnome/sources/dia/0.97/dia-0.97.2.tar.xz
diff --git a/metadata/cache/app-office/gnotime-2.3.0-r3 b/metadata/cache/app-office/gnotime-2.3.0-r3
index 52e4e80c84ae..47c6a0fa0932 100644
--- a/metadata/cache/app-office/gnotime-2.3.0-r3
+++ b/metadata/cache/app-office/gnotime-2.3.0-r3
@@ -1,4 +1,4 @@
->=x11-libs/gtk+-2.10:2 >=dev-libs/glib-2.14:2 >=gnome-base/libgnome-2.0 >=gnome-base/libgnomeui-2.0.3 >=gnome-base/gnome-vfs-2:2 >=gnome-base/libglade-2.0:2.0 >=gnome-extra/gtkhtml-3.14.3:3.14 >=gnome-base/gconf-2.0:2 dev-libs/libxml2:2 >=dev-libs/dbus-glib-0.74 dev-scheme/guile[deprecated] dev-libs/qof:0 x11-libs/libXScrnSaver x11-libs/pango x11-proto/scrnsaverproto dev-util/pkgconfig dev-util/intltool >=app-text/scrollkeeper-0.3.11 doc? ( ~app-text/docbook-xml-dtd-4.2 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+>=x11-libs/gtk+-2.10:2 >=dev-libs/glib-2.14:2 >=gnome-base/libgnome-2.0 >=gnome-base/libgnomeui-2.0.3 >=gnome-base/gnome-vfs-2:2 >=gnome-base/libglade-2.0:2.0 >=gnome-extra/gtkhtml-3.14.3:3.14 >=gnome-base/gconf-2.0:2 dev-libs/libxml2:2 >=dev-libs/dbus-glib-0.74 dev-scheme/guile[deprecated] dev-libs/qof:0 x11-libs/libXScrnSaver x11-libs/pango x11-proto/scrnsaverproto dev-util/pkgconfig dev-util/intltool >=app-text/scrollkeeper-0.3.11 doc? ( ~app-text/docbook-xml-dtd-4.2 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 >=x11-libs/gtk+-2.10:2 >=dev-libs/glib-2.14:2 >=gnome-base/libgnome-2.0 >=gnome-base/libgnomeui-2.0.3 >=gnome-base/gnome-vfs-2:2 >=gnome-base/libglade-2.0:2.0 >=gnome-extra/gtkhtml-3.14.3:3.14 >=gnome-base/gconf-2.0:2 dev-libs/libxml2:2 >=dev-libs/dbus-glib-0.74 dev-scheme/guile[deprecated] dev-libs/qof:0 x11-libs/libXScrnSaver x11-libs/pango
 0
 mirror://sourceforge/gttr/gnotime-2.3.0.tar.gz
diff --git a/metadata/cache/app-office/gnucash-2.4.7 b/metadata/cache/app-office/gnucash-2.4.7
index e504000aea58..91c65a4fe72b 100644
--- a/metadata/cache/app-office/gnucash-2.4.7
+++ b/metadata/cache/app-office/gnucash-2.4.7
@@ -1,4 +1,4 @@
->=dev-libs/glib-2.13:2 >=dev-libs/popt-1.5 >=dev-libs/libxml2-2.5.10:2 >=dev-scheme/guile-1.8.3:12[deprecated,regex] dev-scheme/guile-www >=dev-scheme/slib-3.1.4 >=gnome-base/gconf-2:2 >=gnome-base/libgnomeui-2.4 >=gnome-base/libglade-2.4:2.0 gnome-base/libgnome-keyring media-libs/libart_lgpl >=sys-libs/zlib-1.1.4 >=x11-libs/gtk+-2.14:2 x11-libs/goffice:0.8[gnome] x11-libs/pango cxx? ( dev-cpp/gtkmm:2.4 ) ofx? ( >=dev-libs/libofx-0.9.1 ) hbci? ( >=net-libs/aqbanking-5[gtk] sys-libs/gwenhywfar[gtk] chipcard? ( sys-libs/libchipcard ) ) quotes? ( dev-perl/DateManip >=dev-perl/Finance-Quote-1.11 dev-perl/HTML-TableExtract ) webkit? ( net-libs/webkit-gtk:2 ) !webkit? ( >=gnome-extra/gtkhtml-3.16:3.14 ) sqlite? ( dev-db/libdbi dev-db/libdbi-drivers[sqlite3] ) postgres? ( dev-db/libdbi dev-db/libdbi-drivers[postgres] ) mysql? ( dev-db/libdbi dev-db/libdbi-drivers[mysql] ) >=app-text/scrollkeeper-0.3 dev-util/pkgconfig dev-util/intltool gnome-base/gnome-common sys-devel/libtool >=sys-apps/sed-4 python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-libs/glib-2.13:2 >=dev-libs/popt-1.5 >=dev-libs/libxml2-2.5.10:2 >=dev-scheme/guile-1.8.3:12[deprecated,regex] dev-scheme/guile-www >=dev-scheme/slib-3.1.4 >=gnome-base/gconf-2:2 >=gnome-base/libgnomeui-2.4 >=gnome-base/libglade-2.4:2.0 gnome-base/libgnome-keyring media-libs/libart_lgpl >=sys-libs/zlib-1.1.4 >=x11-libs/gtk+-2.14:2 x11-libs/goffice:0.8[gnome] x11-libs/pango cxx? ( dev-cpp/gtkmm:2.4 ) ofx? ( >=dev-libs/libofx-0.9.1 ) hbci? ( >=net-libs/aqbanking-5[gtk] sys-libs/gwenhywfar[gtk] chipcard? ( sys-libs/libchipcard ) ) quotes? ( dev-perl/DateManip >=dev-perl/Finance-Quote-1.11 dev-perl/HTML-TableExtract ) webkit? ( net-libs/webkit-gtk:2 ) !webkit? ( >=gnome-extra/gtkhtml-3.16:3.14 ) sqlite? ( dev-db/libdbi dev-db/libdbi-drivers[sqlite3] ) postgres? ( dev-db/libdbi dev-db/libdbi-drivers[postgres] ) mysql? ( dev-db/libdbi dev-db/libdbi-drivers[mysql] ) >=app-text/scrollkeeper-0.3 dev-util/pkgconfig dev-util/intltool gnome-base/gnome-common sys-devel/libtool >=sys-apps/sed-4 python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=dev-libs/glib-2.13:2 >=dev-libs/popt-1.5 >=dev-libs/libxml2-2.5.10:2 >=dev-scheme/guile-1.8.3:12[deprecated,regex] dev-scheme/guile-www >=dev-scheme/slib-3.1.4 >=gnome-base/gconf-2:2 >=gnome-base/libgnomeui-2.4 >=gnome-base/libglade-2.4:2.0 gnome-base/libgnome-keyring media-libs/libart_lgpl >=sys-libs/zlib-1.1.4 >=x11-libs/gtk+-2.14:2 x11-libs/goffice:0.8[gnome] x11-libs/pango cxx? ( dev-cpp/gtkmm:2.4 ) ofx? ( >=dev-libs/libofx-0.9.1 ) hbci? ( >=net-libs/aqbanking-5[gtk] sys-libs/gwenhywfar[gtk] chipcard? ( sys-libs/libchipcard ) ) quotes? ( dev-perl/DateManip >=dev-perl/Finance-Quote-1.11 dev-perl/HTML-TableExtract ) webkit? ( net-libs/webkit-gtk:2 ) !webkit? ( >=gnome-extra/gtkhtml-3.16:3.14 ) sqlite? ( dev-db/libdbi dev-db/libdbi-drivers[sqlite3] ) postgres? ( dev-db/libdbi dev-db/libdbi-drivers[postgres] ) mysql? ( dev-db/libdbi dev-db/libdbi-drivers[mysql] ) python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) )
 0
 mirror://sourceforge/gnucash/gnucash-2.4.7.tar.bz2
diff --git a/metadata/cache/app-office/gnucash-2.4.8 b/metadata/cache/app-office/gnucash-2.4.8
index c16806af4b4a..2062bfc6c12e 100644
--- a/metadata/cache/app-office/gnucash-2.4.8
+++ b/metadata/cache/app-office/gnucash-2.4.8
@@ -1,4 +1,4 @@
->=dev-libs/glib-2.13:2 >=dev-libs/popt-1.5 >=dev-libs/libxml2-2.5.10:2 >=dev-scheme/guile-1.8.3:12[deprecated,regex] dev-scheme/guile-www >=dev-scheme/slib-3.1.4 >=gnome-base/gconf-2:2 >=gnome-base/libgnomeui-2.4 >=gnome-base/libglade-2.4:2.0 gnome-base/libgnome-keyring media-libs/libart_lgpl >=sys-libs/zlib-1.1.4 >=x11-libs/gtk+-2.14:2 x11-libs/goffice:0.8[gnome] x11-libs/pango cxx? ( dev-cpp/gtkmm:2.4 ) ofx? ( >=dev-libs/libofx-0.9.1 ) hbci? ( >=net-libs/aqbanking-5[gtk] sys-libs/gwenhywfar[gtk] chipcard? ( sys-libs/libchipcard ) ) quotes? ( dev-perl/DateManip >=dev-perl/Finance-Quote-1.11 dev-perl/HTML-TableExtract ) webkit? ( net-libs/webkit-gtk:2 ) !webkit? ( >=gnome-extra/gtkhtml-3.16:3.14 ) sqlite? ( dev-db/libdbi dev-db/libdbi-drivers[sqlite3] ) postgres? ( dev-db/libdbi dev-db/libdbi-drivers[postgres] ) mysql? ( dev-db/libdbi dev-db/libdbi-drivers[mysql] ) >=app-text/scrollkeeper-0.3 dev-util/pkgconfig dev-util/intltool gnome-base/gnome-common sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-libs/glib-2.13:2 >=dev-libs/popt-1.5 >=dev-libs/libxml2-2.5.10:2 >=dev-scheme/guile-1.8.3:12[deprecated,regex] dev-scheme/guile-www >=dev-scheme/slib-3.1.4 >=gnome-base/gconf-2:2 >=gnome-base/libgnomeui-2.4 >=gnome-base/libglade-2.4:2.0 gnome-base/libgnome-keyring media-libs/libart_lgpl >=sys-libs/zlib-1.1.4 >=x11-libs/gtk+-2.14:2 x11-libs/goffice:0.8[gnome] x11-libs/pango cxx? ( dev-cpp/gtkmm:2.4 ) ofx? ( >=dev-libs/libofx-0.9.1 ) hbci? ( >=net-libs/aqbanking-5[gtk] sys-libs/gwenhywfar[gtk] chipcard? ( sys-libs/libchipcard ) ) quotes? ( dev-perl/DateManip >=dev-perl/Finance-Quote-1.11 dev-perl/HTML-TableExtract ) webkit? ( net-libs/webkit-gtk:2 ) !webkit? ( >=gnome-extra/gtkhtml-3.16:3.14 ) sqlite? ( dev-db/libdbi dev-db/libdbi-drivers[sqlite3] ) postgres? ( dev-db/libdbi dev-db/libdbi-drivers[postgres] ) mysql? ( dev-db/libdbi dev-db/libdbi-drivers[mysql] ) >=app-text/scrollkeeper-0.3 dev-util/pkgconfig dev-util/intltool gnome-base/gnome-common sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=dev-libs/glib-2.13:2 >=dev-libs/popt-1.5 >=dev-libs/libxml2-2.5.10:2 >=dev-scheme/guile-1.8.3:12[deprecated,regex] dev-scheme/guile-www >=dev-scheme/slib-3.1.4 >=gnome-base/gconf-2:2 >=gnome-base/libgnomeui-2.4 >=gnome-base/libglade-2.4:2.0 gnome-base/libgnome-keyring media-libs/libart_lgpl >=sys-libs/zlib-1.1.4 >=x11-libs/gtk+-2.14:2 x11-libs/goffice:0.8[gnome] x11-libs/pango cxx? ( dev-cpp/gtkmm:2.4 ) ofx? ( >=dev-libs/libofx-0.9.1 ) hbci? ( >=net-libs/aqbanking-5[gtk] sys-libs/gwenhywfar[gtk] chipcard? ( sys-libs/libchipcard ) ) quotes? ( dev-perl/DateManip >=dev-perl/Finance-Quote-1.11 dev-perl/HTML-TableExtract ) webkit? ( net-libs/webkit-gtk:2 ) !webkit? ( >=gnome-extra/gtkhtml-3.16:3.14 ) sqlite? ( dev-db/libdbi dev-db/libdbi-drivers[sqlite3] ) postgres? ( dev-db/libdbi dev-db/libdbi-drivers[postgres] ) mysql? ( dev-db/libdbi dev-db/libdbi-drivers[mysql] ) python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) )
 0
 mirror://sourceforge/gnucash/gnucash-2.4.8.tar.bz2
diff --git a/metadata/cache/app-office/grisbi-0.6.0_rc2 b/metadata/cache/app-office/grisbi-0.6.0_rc2
index 259c4ae9e48a..0baad2beba85 100644
--- a/metadata/cache/app-office/grisbi-0.6.0_rc2
+++ b/metadata/cache/app-office/grisbi-0.6.0_rc2
@@ -1,4 +1,4 @@
-dev-libs/libxml2 >=x11-libs/gtk+-2.10.0:2 ssl? ( dev-libs/openssl ) ofx? ( >=dev-libs/libofx-0.7.0 ) >=dev-util/pkgconfig-0.20 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-libs/libxml2 >=x11-libs/gtk+-2.10.0:2 ssl? ( dev-libs/openssl ) ofx? ( >=dev-libs/libofx-0.7.0 ) >=dev-util/pkgconfig-0.20 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-libs/libxml2 >=x11-libs/gtk+-2.10.0:2 ssl? ( dev-libs/openssl ) ofx? ( >=dev-libs/libofx-0.7.0 )
 0
 mirror://sourceforge/grisbi/grisbi-0.6.0rc2.tar.bz2
diff --git a/metadata/cache/app-office/homebank-4.3 b/metadata/cache/app-office/homebank-4.3
index c98455f53461..d595e4f50987 100644
--- a/metadata/cache/app-office/homebank-4.3
+++ b/metadata/cache/app-office/homebank-4.3
@@ -1,4 +1,4 @@
->=x11-libs/gtk+-2.14:2 >=dev-libs/glib-2.17:2 sys-libs/zlib ofx? ( >=dev-libs/libofx-0.7 ) dev-util/pkgconfig >=dev-util/intltool-0.40.5 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=x11-libs/gtk+-2.14:2 >=dev-libs/glib-2.17:2 sys-libs/zlib ofx? ( >=dev-libs/libofx-0.7 ) dev-util/pkgconfig >=dev-util/intltool-0.40.5 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=x11-libs/gtk+-2.14:2 >=dev-libs/glib-2.17:2 sys-libs/zlib ofx? ( >=dev-libs/libofx-0.7 ) gnome-base/librsvg
 0
 http://homebank.free.fr/public/homebank-4.3.tar.gz
diff --git a/metadata/cache/app-office/ical-3.0-r1 b/metadata/cache/app-office/ical-3.0-r1
index 45efdcb408b9..d0a3ce76a441 100644
--- a/metadata/cache/app-office/ical-3.0-r1
+++ b/metadata/cache/app-office/ical-3.0-r1
@@ -1,4 +1,4 @@
-dev-lang/tcl dev-lang/tk || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+dev-lang/tcl dev-lang/tk || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 dev-lang/tcl dev-lang/tk
 0
 http://launchpad.net/ical-tcl/3.x/3.0/+download/ical-3.0.tar.gz
diff --git a/metadata/cache/app-office/ledger-2.6.3-r1 b/metadata/cache/app-office/ledger-2.6.3-r1
index bfc1b07886ff..6065cc6c412a 100644
--- a/metadata/cache/app-office/ledger-2.6.3-r1
+++ b/metadata/cache/app-office/ledger-2.6.3-r1
@@ -1,4 +1,4 @@
-dev-libs/gmp dev-libs/libpcre ofx? ( >=dev-libs/libofx-0.9 ) xml? ( dev-libs/expat ) emacs? ( virtual/emacs ) gnuplot? ( sci-visualization/gnuplot ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-libs/gmp dev-libs/libpcre ofx? ( >=dev-libs/libofx-0.9 ) xml? ( dev-libs/expat ) emacs? ( virtual/emacs ) gnuplot? ( sci-visualization/gnuplot ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-libs/gmp dev-libs/libpcre ofx? ( >=dev-libs/libofx-0.9 ) xml? ( dev-libs/expat ) emacs? ( virtual/emacs ) gnuplot? ( sci-visualization/gnuplot ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
 0
 mirror://github/jwiegley/ledger/ledger-2.6.3.tar.gz
diff --git a/metadata/cache/app-office/libreoffice-3.4.3.2-r1 b/metadata/cache/app-office/libreoffice-3.4.3.2-r1
index 90a373519f25..7bb0784945b0 100644
--- a/metadata/cache/app-office/libreoffice-3.4.3.2-r1
+++ b/metadata/cache/app-office/libreoffice-3.4.3.2-r1
@@ -1,4 +1,4 @@
-app-arch/zip app-arch/unzip >=app-text/hunspell-1.3.2-r1 app-text/mythes app-text/libwpd:0.9[tools] app-text/libwpg:0.2 >=app-text/libwps-0.2.2 dev-db/unixODBC dev-libs/expat >=dev-libs/glib-2.28 >=dev-libs/hyphen-2.7.1 >=dev-libs/icu-4.8.1-r1 >=dev-lang/perl-5.0 >=dev-libs/openssl-0.9.8g >=dev-libs/redland-1.0.14[ssl] media-libs/freetype:2 >=media-libs/fontconfig-2.8.0 >=media-libs/vigra-1.7 >=media-libs/libpng-1.4 net-print/cups sci-mathematics/lpsolve >=sys-libs/db-4.8 virtual/jpeg >=x11-libs/cairo-1.10.0[X] x11-libs/libXaw x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender pdfimport? ( >=app-text/poppler-0.12.3-r3[xpdf-headers,cairo] ) dbus? ( >=dev-libs/dbus-glib-0.92 ) eds? ( gnome-extra/evolution-data-server ) gnome? ( gnome-base/gconf:2 gnome-base/orbit:2 ) gtk? ( >=x11-libs/gtk+-2.24:2 ) graphite? ( media-gfx/graphite2 ) gstreamer? ( >=media-libs/gstreamer-0.10 >=media-libs/gst-plugins-base-0.10 ) java? ( >=dev-java/bsh-2.0_beta4 dev-java/lucene:2.9 dev-java/lucene-analyzers:2.3 dev-java/saxon:0 ) ldap? ( net-nds/openldap ) mysql? ( >=dev-db/mysql-connector-c++-1.1.0 ) nsplugin? ( net-libs/xulrunner:1.9 >=dev-libs/nspr-4.8.8 >=dev-libs/nss-3.12.9 ) opengl? ( virtual/opengl ) webdav? ( net-libs/neon ) >=dev-libs/boost-1.46 >=dev-libs/libxml2-2.7.8 dev-libs/libxslt dev-perl/Archive-Zip >=dev-util/gperf-3 dev-util/intltool dev-util/mdds >=dev-util/pkgconfig-0.26 >=net-misc/curl-7.21.4 >=sys-apps/findutils-4.4.2 sys-devel/bison sys-apps/coreutils sys-devel/flex >=sys-devel/make-3.82 sys-libs/zlib x11-libs/libXtst x11-proto/randrproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto java? ( =virtual/jdk-1.6* >=dev-java/ant-core-1.7 test? ( dev-java/junit:4 ) ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool java? ( >=dev-java/java-config-2.1.9-r1 ) >=sys-apps/sed-4 kde? ( dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) ) kde? ( dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=] ) =dev-lang/python-2* =dev-lang/python-2*[threads,xml]
+app-arch/zip app-arch/unzip >=app-text/hunspell-1.3.2-r1 app-text/mythes app-text/libwpd:0.9[tools] app-text/libwpg:0.2 >=app-text/libwps-0.2.2 dev-db/unixODBC dev-libs/expat >=dev-libs/glib-2.28 >=dev-libs/hyphen-2.7.1 >=dev-libs/icu-4.8.1-r1 >=dev-lang/perl-5.0 >=dev-libs/openssl-0.9.8g >=dev-libs/redland-1.0.14[ssl] media-libs/freetype:2 >=media-libs/fontconfig-2.8.0 >=media-libs/vigra-1.7 >=media-libs/libpng-1.4 net-print/cups sci-mathematics/lpsolve >=sys-libs/db-4.8 virtual/jpeg >=x11-libs/cairo-1.10.0[X] x11-libs/libXaw x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender pdfimport? ( >=app-text/poppler-0.12.3-r3[xpdf-headers,cairo] ) dbus? ( >=dev-libs/dbus-glib-0.92 ) eds? ( gnome-extra/evolution-data-server ) gnome? ( gnome-base/gconf:2 gnome-base/orbit:2 ) gtk? ( >=x11-libs/gtk+-2.24:2 ) graphite? ( media-gfx/graphite2 ) gstreamer? ( >=media-libs/gstreamer-0.10 >=media-libs/gst-plugins-base-0.10 ) java? ( >=dev-java/bsh-2.0_beta4 dev-java/lucene:2.9 dev-java/lucene-analyzers:2.3 dev-java/saxon:0 ) ldap? ( net-nds/openldap ) mysql? ( >=dev-db/mysql-connector-c++-1.1.0 ) nsplugin? ( net-libs/xulrunner:1.9 >=dev-libs/nspr-4.8.8 >=dev-libs/nss-3.12.9 ) opengl? ( virtual/opengl ) webdav? ( net-libs/neon ) >=dev-libs/boost-1.46 >=dev-libs/libxml2-2.7.8 dev-libs/libxslt dev-perl/Archive-Zip >=dev-util/gperf-3 dev-util/intltool dev-util/mdds >=dev-util/pkgconfig-0.26 >=net-misc/curl-7.21.4 >=sys-apps/findutils-4.4.2 sys-devel/bison sys-apps/coreutils sys-devel/flex >=sys-devel/make-3.82 sys-libs/zlib x11-libs/libXtst x11-proto/randrproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto java? ( =virtual/jdk-1.6* >=dev-java/ant-core-1.7 test? ( dev-java/junit:4 ) ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool java? ( >=dev-java/java-config-2.1.9-r1 ) >=sys-apps/sed-4 kde? ( dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) ) kde? ( dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=] ) =dev-lang/python-2* =dev-lang/python-2*[threads,xml]
 app-arch/zip app-arch/unzip >=app-text/hunspell-1.3.2-r1 app-text/mythes app-text/libwpd:0.9[tools] app-text/libwpg:0.2 >=app-text/libwps-0.2.2 dev-db/unixODBC dev-libs/expat >=dev-libs/glib-2.28 >=dev-libs/hyphen-2.7.1 >=dev-libs/icu-4.8.1-r1 >=dev-lang/perl-5.0 >=dev-libs/openssl-0.9.8g >=dev-libs/redland-1.0.14[ssl] media-libs/freetype:2 >=media-libs/fontconfig-2.8.0 >=media-libs/vigra-1.7 >=media-libs/libpng-1.4 net-print/cups sci-mathematics/lpsolve >=sys-libs/db-4.8 virtual/jpeg >=x11-libs/cairo-1.10.0[X] x11-libs/libXaw x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender pdfimport? ( >=app-text/poppler-0.12.3-r3[xpdf-headers,cairo] ) dbus? ( >=dev-libs/dbus-glib-0.92 ) eds? ( gnome-extra/evolution-data-server ) gnome? ( gnome-base/gconf:2 gnome-base/orbit:2 ) gtk? ( >=x11-libs/gtk+-2.24:2 ) graphite? ( media-gfx/graphite2 ) gstreamer? ( >=media-libs/gstreamer-0.10 >=media-libs/gst-plugins-base-0.10 ) java? ( >=dev-java/bsh-2.0_beta4 dev-java/lucene:2.9 dev-java/lucene-analyzers:2.3 dev-java/saxon:0 ) ldap? ( net-nds/openldap ) mysql? ( >=dev-db/mysql-connector-c++-1.1.0 ) nsplugin? ( net-libs/xulrunner:1.9 >=dev-libs/nspr-4.8.8 >=dev-libs/nss-3.12.9 ) opengl? ( virtual/opengl ) webdav? ( net-libs/neon ) !app-office/libreoffice-bin !app-office/libreoffice-bin-debug !app-office/openoffice-bin !app-office/openoffice java? ( >=virtual/jre-1.6 ) bash-completion? ( app-admin/eselect ) java? ( >=dev-java/java-config-2.1.9-r1 ) kde? ( >=kde-base/oxygen-icons-4.4:4[aqua=] ) kde? ( dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=] ) =dev-lang/python-2* =dev-lang/python-2*[threads,xml]
 0
 branding? ( http://dev.gentooexperimental.org/~scarabeus/libreoffice-branding-gentoo-0.3.tar.xz ) http://dev-builds.libreoffice.org/pre-releases/src/libreoffice-bootstrap-3.4.3.2.tar.bz2 http://dev-builds.libreoffice.org/pre-releases/src/libreoffice-artwork-3.4.3.2.tar.bz2 http://dev-builds.libreoffice.org/pre-releases/src/libreoffice-base-3.4.3.2.tar.bz2 http://dev-builds.libreoffice.org/pre-releases/src/libreoffice-calc-3.4.3.2.tar.bz2 http://dev-builds.libreoffice.org/pre-releases/src/libreoffice-components-3.4.3.2.tar.bz2 http://dev-builds.libreoffice.org/pre-releases/src/libreoffice-extensions-3.4.3.2.tar.bz2 http://dev-builds.libreoffice.org/pre-releases/src/libreoffice-extras-3.4.3.2.tar.bz2 http://dev-builds.libreoffice.org/pre-releases/src/libreoffice-filters-3.4.3.2.tar.bz2 http://dev-builds.libreoffice.org/pre-releases/src/libreoffice-help-3.4.3.2.tar.bz2 http://dev-builds.libreoffice.org/pre-releases/src/libreoffice-impress-3.4.3.2.tar.bz2 http://dev-builds.libreoffice.org/pre-releases/src/libreoffice-libs-core-3.4.3.2.tar.bz2 http://dev-builds.libreoffice.org/pre-releases/src/libreoffice-libs-extern-3.4.3.2.tar.bz2 http://dev-builds.libreoffice.org/pre-releases/src/libreoffice-libs-extern-sys-3.4.3.2.tar.bz2 http://dev-builds.libreoffice.org/pre-releases/src/libreoffice-libs-gui-3.4.3.2.tar.bz2 http://dev-builds.libreoffice.org/pre-releases/src/libreoffice-postprocess-3.4.3.2.tar.bz2 http://dev-builds.libreoffice.org/pre-releases/src/libreoffice-sdk-3.4.3.2.tar.bz2 http://dev-builds.libreoffice.org/pre-releases/src/libreoffice-testing-3.4.3.2.tar.bz2 http://dev-builds.libreoffice.org/pre-releases/src/libreoffice-ure-3.4.3.2.tar.bz2 http://dev-builds.libreoffice.org/pre-releases/src/libreoffice-writer-3.4.3.2.tar.bz2 http://download.documentfoundation.org/libreoffice/src/libreoffice-bootstrap-3.4.3.2.tar.bz2 http://download.documentfoundation.org/libreoffice/src/libreoffice-artwork-3.4.3.2.tar.bz2 http://download.documentfoundation.org/libreoffice/src/libreoffice-base-3.4.3.2.tar.bz2 http://download.documentfoundation.org/libreoffice/src/libreoffice-calc-3.4.3.2.tar.bz2 http://download.documentfoundation.org/libreoffice/src/libreoffice-components-3.4.3.2.tar.bz2 http://download.documentfoundation.org/libreoffice/src/libreoffice-extensions-3.4.3.2.tar.bz2 http://download.documentfoundation.org/libreoffice/src/libreoffice-extras-3.4.3.2.tar.bz2 http://download.documentfoundation.org/libreoffice/src/libreoffice-filters-3.4.3.2.tar.bz2 http://download.documentfoundation.org/libreoffice/src/libreoffice-help-3.4.3.2.tar.bz2 http://download.documentfoundation.org/libreoffice/src/libreoffice-impress-3.4.3.2.tar.bz2 http://download.documentfoundation.org/libreoffice/src/libreoffice-libs-core-3.4.3.2.tar.bz2 http://download.documentfoundation.org/libreoffice/src/libreoffice-libs-extern-3.4.3.2.tar.bz2 http://download.documentfoundation.org/libreoffice/src/libreoffice-libs-extern-sys-3.4.3.2.tar.bz2 http://download.documentfoundation.org/libreoffice/src/libreoffice-libs-gui-3.4.3.2.tar.bz2 http://download.documentfoundation.org/libreoffice/src/libreoffice-postprocess-3.4.3.2.tar.bz2 http://download.documentfoundation.org/libreoffice/src/libreoffice-sdk-3.4.3.2.tar.bz2 http://download.documentfoundation.org/libreoffice/src/libreoffice-testing-3.4.3.2.tar.bz2 http://download.documentfoundation.org/libreoffice/src/libreoffice-ure-3.4.3.2.tar.bz2 http://download.documentfoundation.org/libreoffice/src/libreoffice-writer-3.4.3.2.tar.bz2 http://download.documentfoundation.org/libreoffice/old/src/libreoffice-bootstrap-3.4.3.2.tar.bz2 http://download.documentfoundation.org/libreoffice/old/src/libreoffice-artwork-3.4.3.2.tar.bz2 http://download.documentfoundation.org/libreoffice/old/src/libreoffice-base-3.4.3.2.tar.bz2 http://download.documentfoundation.org/libreoffice/old/src/libreoffice-calc-3.4.3.2.tar.bz2 http://download.documentfoundation.org/libreoffice/old/src/libreoffice-components-3.4.3.2.tar.bz2 http://download.documentfoundation.org/libreoffice/old/src/libreoffice-extensions-3.4.3.2.tar.bz2 http://download.documentfoundation.org/libreoffice/old/src/libreoffice-extras-3.4.3.2.tar.bz2 http://download.documentfoundation.org/libreoffice/old/src/libreoffice-filters-3.4.3.2.tar.bz2 http://download.documentfoundation.org/libreoffice/old/src/libreoffice-help-3.4.3.2.tar.bz2 http://download.documentfoundation.org/libreoffice/old/src/libreoffice-impress-3.4.3.2.tar.bz2 http://download.documentfoundation.org/libreoffice/old/src/libreoffice-libs-core-3.4.3.2.tar.bz2 http://download.documentfoundation.org/libreoffice/old/src/libreoffice-libs-extern-3.4.3.2.tar.bz2 http://download.documentfoundation.org/libreoffice/old/src/libreoffice-libs-extern-sys-3.4.3.2.tar.bz2 http://download.documentfoundation.org/libreoffice/old/src/libreoffice-libs-gui-3.4.3.2.tar.bz2 http://download.documentfoundation.org/libreoffice/old/src/libreoffice-postprocess-3.4.3.2.tar.bz2 http://download.documentfoundation.org/libreoffice/old/src/libreoffice-sdk-3.4.3.2.tar.bz2 http://download.documentfoundation.org/libreoffice/old/src/libreoffice-testing-3.4.3.2.tar.bz2 http://download.documentfoundation.org/libreoffice/old/src/libreoffice-ure-3.4.3.2.tar.bz2 http://download.documentfoundation.org/libreoffice/old/src/libreoffice-writer-3.4.3.2.tar.bz2 http://dev-www.libreoffice.org/src//128cfc86ed5953e57fe0f5ae98b62c2e-libtextcat-2.2.tar.gz http://dev-www.libreoffice.org/src//17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip http://dev-www.libreoffice.org/src//bd30e9cf5523cdfc019b94f5e1d7fd19-cppunit-1.12.1.tar.gz http://dev-www.libreoffice.org/src//1756c4fa6c616ae15973c104cd8cb256-Adobe-Core35_AFMs-314.tar.gz http://dev-www.libreoffice.org/src//1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz http://dev-www.libreoffice.org/src//24be19595acad0a2cae931af77a0148a-LICENSE_source-9.0.0.7-bj.html http://dev-www.libreoffice.org/src//2a177023f9ea8ec8bd00837605c5df1b-jakarta-tomcat-5.0.30-src.tar.gz http://dev-www.libreoffice.org/src//35c94d2df8893241173de1d16b6034c0-swingExSrc.zip http://dev-www.libreoffice.org/src//35efabc239af896dfb79be7ebdd6e6b9-gentiumbasic-fonts-1.10.zip http://dev-www.libreoffice.org/src//39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip http://dev-www.libreoffice.org/src//48470d662650c3c074e1c3fabbc67bbd-README_source-9.0.0.7-bj.txt http://dev-www.libreoffice.org/src//4a660ce8466c9df01f19036435425c3a-glibc-2.1.3-stub.tar.gz http://dev-www.libreoffice.org/src//798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip http://dev-www.libreoffice.org/src//8294d6c42e3553229af9934c5c0ed997-stax-api-1.0-2-sources.jar http://dev-www.libreoffice.org/src//a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip http://dev-www.libreoffice.org/src//ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip http://dev-www.libreoffice.org/src//d4c4d91ab3a8e52a2e69d48d34ef4df4-core.zip http://dev-www.libreoffice.org/src//fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz http://dev-www.libreoffice.org/src//3404ab6b1792ae5f16bbd603bd1e1d03-libformula-1.1.7.zip http://dev-www.libreoffice.org/src//3bdf40c0d199af31923e900d082ca2dd-libfonts-1.1.6.zip http://dev-www.libreoffice.org/src//8ce2fcd72becf06c41f7201d15373ed9-librepository-1.1.6.zip http://dev-www.libreoffice.org/src//97b2d4dba862397f446b217e2b623e71-libloader-1.1.6.zip http://dev-www.libreoffice.org/src//d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip http://dev-www.libreoffice.org/src//eeb2c7ddf0d302fba4bfc6e97eac9624-libbase-1.1.6.zip http://dev-www.libreoffice.org/src//f94d9870737518e3b597f9265f4e9803-libserializer-1.1.6.zip http://dev-www.libreoffice.org/src//ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip http://dev-www.libreoffice.org/src//451ccf439a36a568653b024534669971-ConvertTextToNumber-1.3.2.oxt http://dev-www.libreoffice.org/src//47e1edaa44269bc537ae8cabebb0f638-JLanguageTool-1.0.0.tar.bz2 http://dev-www.libreoffice.org/src//90401bca927835b6fbae4a707ed187c8-nlpsolver-0.9.tar.bz2 http://dev-www.libreoffice.org/src//0f63ee487fda8f21fafa767b3c447ac9-ixion-0.2.0.tar.gz http://dev-www.libreoffice.org/src//71474203939fafbe271e1263e61d083e-nss-3.12.8-with-nspr-4.8.6.tar.gz http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll http://download.go-oo.org/extern/b4cae0700aa1c2aef7eb7f345365e6f1-translate-toolkit-1.8.1.tar.bz2 http://www.numbertext.org/linux/881af2b7dca9b8259abbca00bbbc004d-LinLibertineG-20110101.zip templates? ( http://ooo.itc.hu/oxygenoffice/download/libreoffice/472ffb92d82cf502be039203c606643d-Sun-ODF-Template-Pack-en-US_1.0.0.oxt linguas_de? ( http://ooo.itc.hu/oxygenoffice/download/libreoffice/53ca5e56ccd4cab3693ad32c6bd13343-Sun-ODF-Template-Pack-de_1.0.0.oxt ) linguas_en_GB? ( http://ooo.itc.hu/oxygenoffice/download/libreoffice/472ffb92d82cf502be039203c606643d-Sun-ODF-Template-Pack-en-US_1.0.0.oxt ) linguas_en_ZA? ( http://ooo.itc.hu/oxygenoffice/download/libreoffice/472ffb92d82cf502be039203c606643d-Sun-ODF-Template-Pack-en-US_1.0.0.oxt ) linguas_es? ( http://ooo.itc.hu/oxygenoffice/download/libreoffice/4ad003e7bbda5715f5f38fde1f707af2-Sun-ODF-Template-Pack-es_1.0.0.oxt ) linguas_fr? ( http://ooo.itc.hu/oxygenoffice/download/libreoffice/a53080dc876edcddb26eb4c3c7537469-Sun-ODF-Template-Pack-fr_1.0.0.oxt ) linguas_hu? ( http://ooo.itc.hu/oxygenoffice/download/libreoffice/09ec2dac030e1dcd5ef7fa1692691dc0-Sun-ODF-Template-Pack-hu_1.0.0.oxt ) linguas_it? ( http://ooo.itc.hu/oxygenoffice/download/libreoffice/b33775feda3bcf823cad7ac361fd49a6-Sun-ODF-Template-Pack-it_1.0.0.oxt ) )
diff --git a/metadata/cache/app-office/libreoffice-3.4.5.2 b/metadata/cache/app-office/libreoffice-3.4.5.2
index 6da14fe90c41..13466e2d05aa 100644
--- a/metadata/cache/app-office/libreoffice-3.4.5.2
+++ b/metadata/cache/app-office/libreoffice-3.4.5.2
@@ -1,4 +1,4 @@
-app-arch/zip app-arch/unzip >=app-text/hunspell-1.3.2-r3 app-text/mythes app-text/libwpd:0.9[tools] app-text/libwpg:0.2 >=app-text/libwps-0.2.2 dev-db/unixODBC dev-libs/expat >=dev-libs/glib-2.28 >=dev-libs/hyphen-2.7.1 >=dev-libs/icu-4.8.1-r1 >=dev-lang/perl-5.0 >=dev-libs/openssl-1.0.0d >=dev-libs/redland-1.0.14[ssl] media-libs/freetype:2 >=media-libs/fontconfig-2.8.0 >=media-libs/libpng-1.4 net-print/cups sci-mathematics/lpsolve >=sys-libs/db-4.8 virtual/jpeg >=x11-libs/cairo-1.10.0[X] x11-libs/libXaw x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender dbus? ( >=dev-libs/dbus-glib-0.92 ) eds? ( gnome-extra/evolution-data-server ) gnome? ( gnome-base/gconf:2 gnome-base/orbit:2 ) gtk? ( >=x11-libs/gtk+-2.24:2 ) graphite? ( media-gfx/graphite2 ) gstreamer? ( >=media-libs/gstreamer-0.10 >=media-libs/gst-plugins-base-0.10 ) java? ( >=dev-java/bsh-2.0_beta4 dev-java/lucene:2.9 dev-java/lucene-analyzers:2.3 dev-java/saxon:0 ) jemalloc? ( dev-libs/jemalloc ) mysql? ( >=dev-db/mysql-connector-c++-1.1.0 ) nsplugin? ( net-libs/xulrunner:1.9 >=dev-libs/nspr-4.8.8 >=dev-libs/nss-3.12.9 ) opengl? ( virtual/opengl ) pdfimport? ( >=app-text/poppler-0.16[xpdf-headers,cxx] ) webdav? ( net-libs/neon ) >=dev-libs/boost-1.46 >=dev-libs/libxml2-2.7.8 dev-libs/libxslt dev-perl/Archive-Zip >=dev-util/gperf-3 dev-util/intltool dev-util/mdds >=dev-util/pkgconfig-0.26 >=net-misc/curl-7.21.4 >=sys-apps/findutils-4.4.2 sys-devel/bison sys-apps/coreutils sys-devel/flex >=sys-devel/make-3.82 sys-libs/zlib x11-libs/libXtst x11-proto/randrproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto java? ( =virtual/jdk-1.6* >=dev-java/ant-core-1.7 test? ( dev-java/junit:4 ) ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool java? ( >=dev-java/java-config-2.1.9-r1 ) >=sys-apps/sed-4 kde? ( dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) ) kde? ( dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=] ) =dev-lang/python-2* =dev-lang/python-2*[threads,xml]
+app-arch/zip app-arch/unzip >=app-text/hunspell-1.3.2-r3 app-text/mythes app-text/libwpd:0.9[tools] app-text/libwpg:0.2 >=app-text/libwps-0.2.2 dev-db/unixODBC dev-libs/expat >=dev-libs/glib-2.28 >=dev-libs/hyphen-2.7.1 >=dev-libs/icu-4.8.1-r1 >=dev-lang/perl-5.0 >=dev-libs/openssl-1.0.0d >=dev-libs/redland-1.0.14[ssl] media-libs/freetype:2 >=media-libs/fontconfig-2.8.0 >=media-libs/libpng-1.4 net-print/cups sci-mathematics/lpsolve >=sys-libs/db-4.8 virtual/jpeg >=x11-libs/cairo-1.10.0[X] x11-libs/libXaw x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender dbus? ( >=dev-libs/dbus-glib-0.92 ) eds? ( gnome-extra/evolution-data-server ) gnome? ( gnome-base/gconf:2 gnome-base/orbit:2 ) gtk? ( >=x11-libs/gtk+-2.24:2 ) graphite? ( media-gfx/graphite2 ) gstreamer? ( >=media-libs/gstreamer-0.10 >=media-libs/gst-plugins-base-0.10 ) java? ( >=dev-java/bsh-2.0_beta4 dev-java/lucene:2.9 dev-java/lucene-analyzers:2.3 dev-java/saxon:0 ) jemalloc? ( dev-libs/jemalloc ) mysql? ( >=dev-db/mysql-connector-c++-1.1.0 ) nsplugin? ( net-libs/xulrunner:1.9 >=dev-libs/nspr-4.8.8 >=dev-libs/nss-3.12.9 ) opengl? ( virtual/opengl ) pdfimport? ( >=app-text/poppler-0.16[xpdf-headers,cxx] ) webdav? ( net-libs/neon ) >=dev-libs/boost-1.46 >=dev-libs/libxml2-2.7.8 dev-libs/libxslt dev-perl/Archive-Zip >=dev-util/gperf-3 dev-util/intltool dev-util/mdds >=dev-util/pkgconfig-0.26 >=net-misc/curl-7.21.4 >=sys-apps/findutils-4.4.2 sys-devel/bison sys-apps/coreutils sys-devel/flex >=sys-devel/make-3.82 sys-libs/zlib x11-libs/libXtst x11-proto/randrproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto java? ( =virtual/jdk-1.6* >=dev-java/ant-core-1.7 test? ( dev-java/junit:4 ) ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool java? ( >=dev-java/java-config-2.1.9-r1 ) >=sys-apps/sed-4 kde? ( dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) ) kde? ( dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=] ) =dev-lang/python-2* =dev-lang/python-2*[threads,xml]
 app-arch/zip app-arch/unzip >=app-text/hunspell-1.3.2-r3 app-text/mythes app-text/libwpd:0.9[tools] app-text/libwpg:0.2 >=app-text/libwps-0.2.2 dev-db/unixODBC dev-libs/expat >=dev-libs/glib-2.28 >=dev-libs/hyphen-2.7.1 >=dev-libs/icu-4.8.1-r1 >=dev-lang/perl-5.0 >=dev-libs/openssl-1.0.0d >=dev-libs/redland-1.0.14[ssl] media-libs/freetype:2 >=media-libs/fontconfig-2.8.0 >=media-libs/libpng-1.4 net-print/cups sci-mathematics/lpsolve >=sys-libs/db-4.8 virtual/jpeg >=x11-libs/cairo-1.10.0[X] x11-libs/libXaw x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender dbus? ( >=dev-libs/dbus-glib-0.92 ) eds? ( gnome-extra/evolution-data-server ) gnome? ( gnome-base/gconf:2 gnome-base/orbit:2 ) gtk? ( >=x11-libs/gtk+-2.24:2 ) graphite? ( media-gfx/graphite2 ) gstreamer? ( >=media-libs/gstreamer-0.10 >=media-libs/gst-plugins-base-0.10 ) java? ( >=dev-java/bsh-2.0_beta4 dev-java/lucene:2.9 dev-java/lucene-analyzers:2.3 dev-java/saxon:0 ) jemalloc? ( dev-libs/jemalloc ) mysql? ( >=dev-db/mysql-connector-c++-1.1.0 ) nsplugin? ( net-libs/xulrunner:1.9 >=dev-libs/nspr-4.8.8 >=dev-libs/nss-3.12.9 ) opengl? ( virtual/opengl ) pdfimport? ( >=app-text/poppler-0.16[xpdf-headers,cxx] ) webdav? ( net-libs/neon ) !app-office/libreoffice-bin !app-office/libreoffice-bin-debug !app-office/openoffice-bin !app-office/openoffice media-fonts/libertine-ttf media-fonts/liberation-fonts media-fonts/urw-fonts java? ( >=virtual/jre-1.6 ) java? ( >=dev-java/java-config-2.1.9-r1 ) kde? ( >=kde-base/oxygen-icons-4.4:4[aqua=] ) kde? ( dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=] ) =dev-lang/python-2* =dev-lang/python-2*[threads,xml]
 0
 branding? ( http://dev.gentooexperimental.org/~scarabeus/libreoffice-branding-gentoo-0.3.tar.xz ) http://dev-builds.libreoffice.org/pre-releases/src/libreoffice-bootstrap-3.4.5.2.tar.bz2 http://dev-builds.libreoffice.org/pre-releases/src/libreoffice-artwork-3.4.5.2.tar.bz2 http://dev-builds.libreoffice.org/pre-releases/src/libreoffice-base-3.4.5.2.tar.bz2 http://dev-builds.libreoffice.org/pre-releases/src/libreoffice-calc-3.4.5.2.tar.bz2 http://dev-builds.libreoffice.org/pre-releases/src/libreoffice-components-3.4.5.2.tar.bz2 http://dev-builds.libreoffice.org/pre-releases/src/libreoffice-extensions-3.4.5.2.tar.bz2 http://dev-builds.libreoffice.org/pre-releases/src/libreoffice-extras-3.4.5.2.tar.bz2 http://dev-builds.libreoffice.org/pre-releases/src/libreoffice-filters-3.4.5.2.tar.bz2 http://dev-builds.libreoffice.org/pre-releases/src/libreoffice-help-3.4.5.2.tar.bz2 http://dev-builds.libreoffice.org/pre-releases/src/libreoffice-impress-3.4.5.2.tar.bz2 http://dev-builds.libreoffice.org/pre-releases/src/libreoffice-libs-core-3.4.5.2.tar.bz2 http://dev-builds.libreoffice.org/pre-releases/src/libreoffice-libs-extern-3.4.5.2.tar.bz2 http://dev-builds.libreoffice.org/pre-releases/src/libreoffice-libs-extern-sys-3.4.5.2.tar.bz2 http://dev-builds.libreoffice.org/pre-releases/src/libreoffice-libs-gui-3.4.5.2.tar.bz2 http://dev-builds.libreoffice.org/pre-releases/src/libreoffice-postprocess-3.4.5.2.tar.bz2 http://dev-builds.libreoffice.org/pre-releases/src/libreoffice-sdk-3.4.5.2.tar.bz2 http://dev-builds.libreoffice.org/pre-releases/src/libreoffice-testing-3.4.5.2.tar.bz2 http://dev-builds.libreoffice.org/pre-releases/src/libreoffice-ure-3.4.5.2.tar.bz2 http://dev-builds.libreoffice.org/pre-releases/src/libreoffice-writer-3.4.5.2.tar.bz2 http://download.documentfoundation.org/libreoffice/src/libreoffice-bootstrap-3.4.5.2.tar.bz2 http://download.documentfoundation.org/libreoffice/src/libreoffice-artwork-3.4.5.2.tar.bz2 http://download.documentfoundation.org/libreoffice/src/libreoffice-base-3.4.5.2.tar.bz2 http://download.documentfoundation.org/libreoffice/src/libreoffice-calc-3.4.5.2.tar.bz2 http://download.documentfoundation.org/libreoffice/src/libreoffice-components-3.4.5.2.tar.bz2 http://download.documentfoundation.org/libreoffice/src/libreoffice-extensions-3.4.5.2.tar.bz2 http://download.documentfoundation.org/libreoffice/src/libreoffice-extras-3.4.5.2.tar.bz2 http://download.documentfoundation.org/libreoffice/src/libreoffice-filters-3.4.5.2.tar.bz2 http://download.documentfoundation.org/libreoffice/src/libreoffice-help-3.4.5.2.tar.bz2 http://download.documentfoundation.org/libreoffice/src/libreoffice-impress-3.4.5.2.tar.bz2 http://download.documentfoundation.org/libreoffice/src/libreoffice-libs-core-3.4.5.2.tar.bz2 http://download.documentfoundation.org/libreoffice/src/libreoffice-libs-extern-3.4.5.2.tar.bz2 http://download.documentfoundation.org/libreoffice/src/libreoffice-libs-extern-sys-3.4.5.2.tar.bz2 http://download.documentfoundation.org/libreoffice/src/libreoffice-libs-gui-3.4.5.2.tar.bz2 http://download.documentfoundation.org/libreoffice/src/libreoffice-postprocess-3.4.5.2.tar.bz2 http://download.documentfoundation.org/libreoffice/src/libreoffice-sdk-3.4.5.2.tar.bz2 http://download.documentfoundation.org/libreoffice/src/libreoffice-testing-3.4.5.2.tar.bz2 http://download.documentfoundation.org/libreoffice/src/libreoffice-ure-3.4.5.2.tar.bz2 http://download.documentfoundation.org/libreoffice/src/libreoffice-writer-3.4.5.2.tar.bz2 http://download.documentfoundation.org/libreoffice/old/src/libreoffice-bootstrap-3.4.5.2.tar.bz2 http://download.documentfoundation.org/libreoffice/old/src/libreoffice-artwork-3.4.5.2.tar.bz2 http://download.documentfoundation.org/libreoffice/old/src/libreoffice-base-3.4.5.2.tar.bz2 http://download.documentfoundation.org/libreoffice/old/src/libreoffice-calc-3.4.5.2.tar.bz2 http://download.documentfoundation.org/libreoffice/old/src/libreoffice-components-3.4.5.2.tar.bz2 http://download.documentfoundation.org/libreoffice/old/src/libreoffice-extensions-3.4.5.2.tar.bz2 http://download.documentfoundation.org/libreoffice/old/src/libreoffice-extras-3.4.5.2.tar.bz2 http://download.documentfoundation.org/libreoffice/old/src/libreoffice-filters-3.4.5.2.tar.bz2 http://download.documentfoundation.org/libreoffice/old/src/libreoffice-help-3.4.5.2.tar.bz2 http://download.documentfoundation.org/libreoffice/old/src/libreoffice-impress-3.4.5.2.tar.bz2 http://download.documentfoundation.org/libreoffice/old/src/libreoffice-libs-core-3.4.5.2.tar.bz2 http://download.documentfoundation.org/libreoffice/old/src/libreoffice-libs-extern-3.4.5.2.tar.bz2 http://download.documentfoundation.org/libreoffice/old/src/libreoffice-libs-extern-sys-3.4.5.2.tar.bz2 http://download.documentfoundation.org/libreoffice/old/src/libreoffice-libs-gui-3.4.5.2.tar.bz2 http://download.documentfoundation.org/libreoffice/old/src/libreoffice-postprocess-3.4.5.2.tar.bz2 http://download.documentfoundation.org/libreoffice/old/src/libreoffice-sdk-3.4.5.2.tar.bz2 http://download.documentfoundation.org/libreoffice/old/src/libreoffice-testing-3.4.5.2.tar.bz2 http://download.documentfoundation.org/libreoffice/old/src/libreoffice-ure-3.4.5.2.tar.bz2 http://download.documentfoundation.org/libreoffice/old/src/libreoffice-writer-3.4.5.2.tar.bz2 http://dev-www.libreoffice.org/src//ea91f2fb4212a21d708aced277e6e85a-vigra1.4.0.tar.gz http://dev-www.libreoffice.org/src//128cfc86ed5953e57fe0f5ae98b62c2e-libtextcat-2.2.tar.gz http://dev-www.libreoffice.org/src//17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip http://dev-www.libreoffice.org/src//bd30e9cf5523cdfc019b94f5e1d7fd19-cppunit-1.12.1.tar.gz http://dev-www.libreoffice.org/src//1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz http://dev-www.libreoffice.org/src//fdb27bfe2dbe2e7b57ae194d9bf36bab-SampleICC-1.3.2.tar.gz http://dev-www.libreoffice.org/src//798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip http://dev-www.libreoffice.org/src//35c94d2df8893241173de1d16b6034c0-swingExSrc.zip http://download.go-oo.org/extern/b4cae0700aa1c2aef7eb7f345365e6f1-translate-toolkit-1.8.1.tar.bz2 http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll
diff --git a/metadata/cache/app-office/libreoffice-3.5.1.2 b/metadata/cache/app-office/libreoffice-3.5.1.2
index fae6f487be15..b75dab1a2692 100644
--- a/metadata/cache/app-office/libreoffice-3.5.1.2
+++ b/metadata/cache/app-office/libreoffice-3.5.1.2
@@ -1,4 +1,4 @@
-app-arch/zip app-arch/unzip >=app-text/hunspell-1.3.2-r3 app-text/mythes >=app-text/libexttextcat-3.2 app-text/libwpd:0.9[tools] app-text/libwpg:0.2 >=app-text/libwps-0.2.2 dev-cpp/libcmis dev-db/unixODBC dev-libs/expat >=dev-libs/glib-2.28 >=dev-libs/hyphen-2.7.1 >=dev-libs/icu-4.8.1.1 >=dev-lang/perl-5.0 >=dev-libs/openssl-1.0.0d >=dev-libs/redland-1.0.14[ssl] >=media-libs/fontconfig-2.8.0 media-libs/freetype:2 >=media-libs/libpng-1.4 media-libs/libvisio sci-mathematics/lpsolve >=sys-libs/db-4.8 virtual/jpeg >=x11-libs/cairo-1.10.0[X] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender dbus? ( >=dev-libs/dbus-glib-0.92 ) eds? ( gnome-extra/evolution-data-server ) gnome? ( gnome-base/gconf:2 gnome-base/orbit ) gtk? ( >=x11-libs/gtk+-2.24:2 ) graphite? ( media-gfx/graphite2 ) gstreamer? ( >=media-libs/gstreamer-0.10 >=media-libs/gst-plugins-base-0.10 ) java? ( >=dev-java/bsh-2.0_beta4 dev-java/lucene:2.9 dev-java/lucene-analyzers:2.3 ) jemalloc? ( dev-libs/jemalloc ) mysql? ( >=dev-db/mysql-connector-c++-1.1.0 ) opengl? ( virtual/opengl ) pdfimport? ( >=app-text/poppler-0.16[xpdf-headers,cxx] ) postgres? ( >=dev-db/postgresql-base-8.4.0 ) svg? ( gnome-base/librsvg ) webdav? ( net-libs/neon ) xmlsec? ( >=dev-libs/nspr-4.8.8 >=dev-libs/nss-3.12.9 ) >=dev-libs/boost-1.46 >=dev-libs/libxml2-2.7.8 dev-libs/libxslt dev-perl/Archive-Zip dev-util/cppunit >=dev-util/gperf-3 dev-util/intltool dev-util/mdds >=dev-util/pkgconfig-0.26 media-libs/sampleicc >=net-misc/curl-7.21.4 net-misc/npapi-sdk net-print/cups >=sys-apps/findutils-4.4.2 sys-devel/bison sys-apps/coreutils sys-devel/flex sys-devel/gettext >=sys-devel/make-3.82 sys-libs/zlib x11-libs/libXtst x11-proto/randrproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto java? ( =virtual/jdk-1.6* >=dev-java/ant-core-1.7 test? ( dev-java/junit:4 ) ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool java? ( >=dev-java/java-config-2.1.9-r1 ) >=sys-apps/sed-4 kde? ( dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) ) kde? ( dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=] ) =dev-lang/python-2* =dev-lang/python-2*[threads,xml]
+app-arch/zip app-arch/unzip >=app-text/hunspell-1.3.2-r3 app-text/mythes >=app-text/libexttextcat-3.2 app-text/libwpd:0.9[tools] app-text/libwpg:0.2 >=app-text/libwps-0.2.2 dev-cpp/libcmis dev-db/unixODBC dev-libs/expat >=dev-libs/glib-2.28 >=dev-libs/hyphen-2.7.1 >=dev-libs/icu-4.8.1.1 >=dev-lang/perl-5.0 >=dev-libs/openssl-1.0.0d >=dev-libs/redland-1.0.14[ssl] >=media-libs/fontconfig-2.8.0 media-libs/freetype:2 >=media-libs/libpng-1.4 media-libs/libvisio sci-mathematics/lpsolve >=sys-libs/db-4.8 virtual/jpeg >=x11-libs/cairo-1.10.0[X] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender dbus? ( >=dev-libs/dbus-glib-0.92 ) eds? ( gnome-extra/evolution-data-server ) gnome? ( gnome-base/gconf:2 gnome-base/orbit ) gtk? ( >=x11-libs/gtk+-2.24:2 ) graphite? ( media-gfx/graphite2 ) gstreamer? ( >=media-libs/gstreamer-0.10 >=media-libs/gst-plugins-base-0.10 ) java? ( >=dev-java/bsh-2.0_beta4 dev-java/lucene:2.9 dev-java/lucene-analyzers:2.3 ) jemalloc? ( dev-libs/jemalloc ) mysql? ( >=dev-db/mysql-connector-c++-1.1.0 ) opengl? ( virtual/opengl ) pdfimport? ( >=app-text/poppler-0.16[xpdf-headers,cxx] ) postgres? ( >=dev-db/postgresql-base-8.4.0 ) svg? ( gnome-base/librsvg ) webdav? ( net-libs/neon ) xmlsec? ( >=dev-libs/nspr-4.8.8 >=dev-libs/nss-3.12.9 ) >=dev-libs/boost-1.46 >=dev-libs/libxml2-2.7.8 dev-libs/libxslt dev-perl/Archive-Zip dev-util/cppunit >=dev-util/gperf-3 dev-util/intltool dev-util/mdds >=dev-util/pkgconfig-0.26 media-libs/sampleicc >=net-misc/curl-7.21.4 net-misc/npapi-sdk net-print/cups >=sys-apps/findutils-4.4.2 sys-devel/bison sys-apps/coreutils sys-devel/flex sys-devel/gettext >=sys-devel/make-3.82 sys-libs/zlib x11-libs/libXtst x11-proto/randrproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto java? ( =virtual/jdk-1.6* >=dev-java/ant-core-1.7 test? ( dev-java/junit:4 ) ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool java? ( >=dev-java/java-config-2.1.9-r1 ) >=sys-apps/sed-4 kde? ( dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) ) kde? ( dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=] ) =dev-lang/python-2* =dev-lang/python-2*[threads,xml]
 app-arch/zip app-arch/unzip >=app-text/hunspell-1.3.2-r3 app-text/mythes >=app-text/libexttextcat-3.2 app-text/libwpd:0.9[tools] app-text/libwpg:0.2 >=app-text/libwps-0.2.2 dev-cpp/libcmis dev-db/unixODBC dev-libs/expat >=dev-libs/glib-2.28 >=dev-libs/hyphen-2.7.1 >=dev-libs/icu-4.8.1.1 >=dev-lang/perl-5.0 >=dev-libs/openssl-1.0.0d >=dev-libs/redland-1.0.14[ssl] >=media-libs/fontconfig-2.8.0 media-libs/freetype:2 >=media-libs/libpng-1.4 media-libs/libvisio sci-mathematics/lpsolve >=sys-libs/db-4.8 virtual/jpeg >=x11-libs/cairo-1.10.0[X] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender dbus? ( >=dev-libs/dbus-glib-0.92 ) eds? ( gnome-extra/evolution-data-server ) gnome? ( gnome-base/gconf:2 gnome-base/orbit ) gtk? ( >=x11-libs/gtk+-2.24:2 ) graphite? ( media-gfx/graphite2 ) gstreamer? ( >=media-libs/gstreamer-0.10 >=media-libs/gst-plugins-base-0.10 ) java? ( >=dev-java/bsh-2.0_beta4 dev-java/lucene:2.9 dev-java/lucene-analyzers:2.3 ) jemalloc? ( dev-libs/jemalloc ) mysql? ( >=dev-db/mysql-connector-c++-1.1.0 ) opengl? ( virtual/opengl ) pdfimport? ( >=app-text/poppler-0.16[xpdf-headers,cxx] ) postgres? ( >=dev-db/postgresql-base-8.4.0 ) svg? ( gnome-base/librsvg ) webdav? ( net-libs/neon ) xmlsec? ( >=dev-libs/nspr-4.8.8 >=dev-libs/nss-3.12.9 ) !app-office/libreoffice-bin !app-office/libreoffice-bin-debug !app-office/openoffice-bin !app-office/openoffice media-fonts/libertine-ttf media-fonts/liberation-fonts media-fonts/urw-fonts cups? ( net-print/cups ) java? ( >=virtual/jre-1.6 ) java? ( >=dev-java/java-config-2.1.9-r1 ) kde? ( >=kde-base/oxygen-icons-4.4:4[aqua=] ) kde? ( dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=] ) =dev-lang/python-2* =dev-lang/python-2*[threads,xml]
 0
 branding? ( http://dev.gentooexperimental.org/~scarabeus/libreoffice-branding-gentoo-0.3.tar.xz ) http://dev-builds.libreoffice.org/pre-releases/src/libreoffice-core-3.5.1.2.tar.xz binfilter? ( http://dev-builds.libreoffice.org/pre-releases/src/libreoffice-binfilter-3.5.1.2.tar.xz ) http://download.documentfoundation.org/libreoffice/src/libreoffice-core-3.5.1.2.tar.xz binfilter? ( http://download.documentfoundation.org/libreoffice/src/libreoffice-binfilter-3.5.1.2.tar.xz ) http://download.documentfoundation.org/libreoffice/old/src/libreoffice-core-3.5.1.2.tar.xz binfilter? ( http://download.documentfoundation.org/libreoffice/old/src/libreoffice-binfilter-3.5.1.2.tar.xz ) http://dev-www.libreoffice.org/src//ea91f2fb4212a21d708aced277e6e85a-vigra1.4.0.tar.gz xmlsec? ( http://dev-www.libreoffice.org/src//1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz ) java? ( http://dev-www.libreoffice.org/src//17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip ) java? ( http://dev-www.libreoffice.org/src//798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip ) java? ( http://dev-www.libreoffice.org/src//35c94d2df8893241173de1d16b6034c0-swingExSrc.zip ) java? ( http://dev-www.libreoffice.org/src//ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip ) odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )
diff --git a/metadata/cache/app-office/libreoffice-3.5.9999 b/metadata/cache/app-office/libreoffice-3.5.9999
index 9cf57cb2274e..5ecc32185ead 100644
--- a/metadata/cache/app-office/libreoffice-3.5.9999
+++ b/metadata/cache/app-office/libreoffice-3.5.9999
@@ -1,4 +1,4 @@
-app-arch/zip app-arch/unzip >=app-text/hunspell-1.3.2-r3 app-text/mythes >=app-text/libexttextcat-3.2 app-text/libwpd:0.9[tools] app-text/libwpg:0.2 >=app-text/libwps-0.2.2 dev-cpp/libcmis dev-db/unixODBC dev-libs/expat >=dev-libs/glib-2.28 >=dev-libs/hyphen-2.7.1 >=dev-libs/icu-4.8.1.1 >=dev-lang/perl-5.0 >=dev-libs/openssl-1.0.0d >=dev-libs/redland-1.0.14[ssl] >=media-libs/fontconfig-2.8.0 media-libs/freetype:2 >=media-libs/libpng-1.4 media-libs/libvisio sci-mathematics/lpsolve >=sys-libs/db-4.8 virtual/jpeg >=x11-libs/cairo-1.10.0[X] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender dbus? ( >=dev-libs/dbus-glib-0.92 ) eds? ( gnome-extra/evolution-data-server ) gnome? ( gnome-base/gconf:2 gnome-base/orbit ) gtk? ( >=x11-libs/gtk+-2.24:2 ) graphite? ( media-gfx/graphite2 ) gstreamer? ( >=media-libs/gstreamer-0.10 >=media-libs/gst-plugins-base-0.10 ) java? ( >=dev-java/bsh-2.0_beta4 dev-java/lucene:2.9 dev-java/lucene-analyzers:2.3 ) jemalloc? ( dev-libs/jemalloc ) mysql? ( >=dev-db/mysql-connector-c++-1.1.0 ) opengl? ( virtual/opengl ) pdfimport? ( >=app-text/poppler-0.16[xpdf-headers,cxx] ) postgres? ( >=dev-db/postgresql-base-8.4.0 ) svg? ( gnome-base/librsvg ) webdav? ( net-libs/neon ) xmlsec? ( >=dev-libs/nspr-4.8.8 >=dev-libs/nss-3.12.9 ) >=dev-libs/boost-1.46 >=dev-libs/libxml2-2.7.8 dev-libs/libxslt dev-perl/Archive-Zip dev-util/cppunit >=dev-util/gperf-3 dev-util/intltool dev-util/mdds >=dev-util/pkgconfig-0.26 media-libs/sampleicc >=net-misc/curl-7.21.4 net-misc/npapi-sdk net-print/cups >=sys-apps/findutils-4.4.2 sys-devel/bison sys-apps/coreutils sys-devel/flex sys-devel/gettext >=sys-devel/make-3.82 sys-libs/zlib x11-libs/libXtst x11-proto/randrproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto java? ( =virtual/jdk-1.6* >=dev-java/ant-core-1.7 test? ( dev-java/junit:4 ) ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool java? ( >=dev-java/java-config-2.1.9-r1 ) >=sys-apps/sed-4 dev-vcs/git kde? ( dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) ) kde? ( dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=] ) =dev-lang/python-2* =dev-lang/python-2*[threads,xml] dev-vcs/git
+app-arch/zip app-arch/unzip >=app-text/hunspell-1.3.2-r3 app-text/mythes >=app-text/libexttextcat-3.2 app-text/libwpd:0.9[tools] app-text/libwpg:0.2 >=app-text/libwps-0.2.2 dev-cpp/libcmis dev-db/unixODBC dev-libs/expat >=dev-libs/glib-2.28 >=dev-libs/hyphen-2.7.1 >=dev-libs/icu-4.8.1.1 >=dev-lang/perl-5.0 >=dev-libs/openssl-1.0.0d >=dev-libs/redland-1.0.14[ssl] >=media-libs/fontconfig-2.8.0 media-libs/freetype:2 >=media-libs/libpng-1.4 media-libs/libvisio sci-mathematics/lpsolve >=sys-libs/db-4.8 virtual/jpeg >=x11-libs/cairo-1.10.0[X] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender dbus? ( >=dev-libs/dbus-glib-0.92 ) eds? ( gnome-extra/evolution-data-server ) gnome? ( gnome-base/gconf:2 gnome-base/orbit ) gtk? ( >=x11-libs/gtk+-2.24:2 ) graphite? ( media-gfx/graphite2 ) gstreamer? ( >=media-libs/gstreamer-0.10 >=media-libs/gst-plugins-base-0.10 ) java? ( >=dev-java/bsh-2.0_beta4 dev-java/lucene:2.9 dev-java/lucene-analyzers:2.3 ) jemalloc? ( dev-libs/jemalloc ) mysql? ( >=dev-db/mysql-connector-c++-1.1.0 ) opengl? ( virtual/opengl ) pdfimport? ( >=app-text/poppler-0.16[xpdf-headers,cxx] ) postgres? ( >=dev-db/postgresql-base-8.4.0 ) svg? ( gnome-base/librsvg ) webdav? ( net-libs/neon ) xmlsec? ( >=dev-libs/nspr-4.8.8 >=dev-libs/nss-3.12.9 ) >=dev-libs/boost-1.46 >=dev-libs/libxml2-2.7.8 dev-libs/libxslt dev-perl/Archive-Zip dev-util/cppunit >=dev-util/gperf-3 dev-util/intltool dev-util/mdds >=dev-util/pkgconfig-0.26 media-libs/sampleicc >=net-misc/curl-7.21.4 net-misc/npapi-sdk net-print/cups >=sys-apps/findutils-4.4.2 sys-devel/bison sys-apps/coreutils sys-devel/flex sys-devel/gettext >=sys-devel/make-3.82 sys-libs/zlib x11-libs/libXtst x11-proto/randrproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto java? ( =virtual/jdk-1.6* >=dev-java/ant-core-1.7 test? ( dev-java/junit:4 ) ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool java? ( >=dev-java/java-config-2.1.9-r1 ) >=sys-apps/sed-4 dev-vcs/git kde? ( dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) ) kde? ( dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=] ) =dev-lang/python-2* =dev-lang/python-2*[threads,xml] dev-vcs/git
 app-arch/zip app-arch/unzip >=app-text/hunspell-1.3.2-r3 app-text/mythes >=app-text/libexttextcat-3.2 app-text/libwpd:0.9[tools] app-text/libwpg:0.2 >=app-text/libwps-0.2.2 dev-cpp/libcmis dev-db/unixODBC dev-libs/expat >=dev-libs/glib-2.28 >=dev-libs/hyphen-2.7.1 >=dev-libs/icu-4.8.1.1 >=dev-lang/perl-5.0 >=dev-libs/openssl-1.0.0d >=dev-libs/redland-1.0.14[ssl] >=media-libs/fontconfig-2.8.0 media-libs/freetype:2 >=media-libs/libpng-1.4 media-libs/libvisio sci-mathematics/lpsolve >=sys-libs/db-4.8 virtual/jpeg >=x11-libs/cairo-1.10.0[X] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender dbus? ( >=dev-libs/dbus-glib-0.92 ) eds? ( gnome-extra/evolution-data-server ) gnome? ( gnome-base/gconf:2 gnome-base/orbit ) gtk? ( >=x11-libs/gtk+-2.24:2 ) graphite? ( media-gfx/graphite2 ) gstreamer? ( >=media-libs/gstreamer-0.10 >=media-libs/gst-plugins-base-0.10 ) java? ( >=dev-java/bsh-2.0_beta4 dev-java/lucene:2.9 dev-java/lucene-analyzers:2.3 ) jemalloc? ( dev-libs/jemalloc ) mysql? ( >=dev-db/mysql-connector-c++-1.1.0 ) opengl? ( virtual/opengl ) pdfimport? ( >=app-text/poppler-0.16[xpdf-headers,cxx] ) postgres? ( >=dev-db/postgresql-base-8.4.0 ) svg? ( gnome-base/librsvg ) webdav? ( net-libs/neon ) xmlsec? ( >=dev-libs/nspr-4.8.8 >=dev-libs/nss-3.12.9 ) !app-office/libreoffice-bin !app-office/libreoffice-bin-debug !app-office/openoffice-bin !app-office/openoffice media-fonts/libertine-ttf media-fonts/liberation-fonts media-fonts/urw-fonts cups? ( net-print/cups ) java? ( >=virtual/jre-1.6 ) java? ( >=dev-java/java-config-2.1.9-r1 ) kde? ( >=kde-base/oxygen-icons-4.4:4[aqua=] ) kde? ( dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=] ) =dev-lang/python-2* =dev-lang/python-2*[threads,xml]
 0
 branding? ( http://dev.gentooexperimental.org/~scarabeus/libreoffice-branding-gentoo-0.3.tar.xz ) http://dev-www.libreoffice.org/src//ea91f2fb4212a21d708aced277e6e85a-vigra1.4.0.tar.gz xmlsec? ( http://dev-www.libreoffice.org/src//1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz ) java? ( http://dev-www.libreoffice.org/src//17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip ) java? ( http://dev-www.libreoffice.org/src//798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip ) java? ( http://dev-www.libreoffice.org/src//35c94d2df8893241173de1d16b6034c0-swingExSrc.zip ) java? ( http://dev-www.libreoffice.org/src//ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip ) odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )
diff --git a/metadata/cache/app-office/libreoffice-9999-r2 b/metadata/cache/app-office/libreoffice-9999-r2
index c3ed1609a3ee..6b08cbb09401 100644
--- a/metadata/cache/app-office/libreoffice-9999-r2
+++ b/metadata/cache/app-office/libreoffice-9999-r2
@@ -1,4 +1,4 @@
-app-arch/zip app-arch/unzip >=app-text/hunspell-1.3.2-r3 app-text/mythes >=app-text/libexttextcat-3.2 app-text/libwpd:0.9[tools] app-text/libwpg:0.2 >=app-text/libwps-0.2.2 >=dev-cpp/clucene-2.3.3.4-r2 dev-cpp/libcmis dev-db/unixODBC dev-libs/expat >=dev-libs/glib-2.28 >=dev-libs/hyphen-2.7.1 >=dev-libs/icu-4.8.1.1 >=dev-lang/perl-5.0 >=dev-libs/openssl-1.0.0d >=dev-libs/redland-1.0.14[ssl] >=media-libs/fontconfig-2.8.0 media-libs/freetype:2 >=media-libs/libpng-1.4 media-libs/libcdr media-libs/libvisio sci-mathematics/lpsolve >=sys-libs/db-4.8 virtual/jpeg >=x11-libs/cairo-1.10.0[X] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender dbus? ( >=dev-libs/dbus-glib-0.92 ) eds? ( gnome-extra/evolution-data-server ) gnome? ( gnome-base/gconf:2 gnome-base/orbit ) gtk? ( x11-libs/gdk-pixbuf[X] >=x11-libs/gtk+-2.24:2 ) gtk3? ( >=x11-libs/gtk+-3.2:3 ) graphite? ( media-gfx/graphite2 ) gstreamer? ( >=media-libs/gstreamer-0.10 >=media-libs/gst-plugins-base-0.10 ) java? ( >=dev-java/bsh-2.0_beta4 ) jemalloc? ( dev-libs/jemalloc ) mysql? ( >=dev-db/mysql-connector-c++-1.1.0 ) opengl? ( virtual/opengl ) pdfimport? ( >=app-text/poppler-0.16[xpdf-headers,cxx] ) postgres? ( >=dev-db/postgresql-base-8.4.0 ) svg? ( gnome-base/librsvg ) webdav? ( net-libs/neon ) xmlsec? ( >=dev-libs/nspr-4.8.8 >=dev-libs/nss-3.12.9 ) >=dev-libs/boost-1.46 >=dev-libs/libxml2-2.7.8 dev-libs/libxslt dev-perl/Archive-Zip dev-util/cppunit >=dev-util/gperf-3 dev-util/intltool dev-util/mdds >=dev-util/pkgconfig-0.26 media-libs/sampleicc >=net-misc/curl-7.21.4 net-misc/npapi-sdk net-print/cups >=sys-apps/findutils-4.4.2 sys-devel/bison sys-apps/coreutils sys-devel/flex sys-devel/gettext >=sys-devel/make-3.82 sys-libs/zlib x11-libs/libXtst x11-proto/randrproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto java? ( =virtual/jdk-1.6* >=dev-java/ant-core-1.7 test? ( dev-java/junit:4 ) ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool java? ( >=dev-java/java-config-2.1.9-r1 ) >=sys-apps/sed-4 dev-vcs/git kde? ( dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) ) kde? ( dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=] ) =dev-lang/python-2* =dev-lang/python-2*[threads,xml] dev-vcs/git
+app-arch/zip app-arch/unzip >=app-text/hunspell-1.3.2-r3 app-text/mythes >=app-text/libexttextcat-3.2 app-text/libwpd:0.9[tools] app-text/libwpg:0.2 >=app-text/libwps-0.2.2 >=dev-cpp/clucene-2.3.3.4-r2 dev-cpp/libcmis dev-db/unixODBC dev-libs/expat >=dev-libs/glib-2.28 >=dev-libs/hyphen-2.7.1 >=dev-libs/icu-4.8.1.1 >=dev-lang/perl-5.0 >=dev-libs/openssl-1.0.0d >=dev-libs/redland-1.0.14[ssl] >=media-libs/fontconfig-2.8.0 media-libs/freetype:2 >=media-libs/libpng-1.4 media-libs/libcdr media-libs/libvisio sci-mathematics/lpsolve >=sys-libs/db-4.8 virtual/jpeg >=x11-libs/cairo-1.10.0[X] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender dbus? ( >=dev-libs/dbus-glib-0.92 ) eds? ( gnome-extra/evolution-data-server ) gnome? ( gnome-base/gconf:2 gnome-base/orbit ) gtk? ( x11-libs/gdk-pixbuf[X] >=x11-libs/gtk+-2.24:2 ) gtk3? ( >=x11-libs/gtk+-3.2:3 ) graphite? ( media-gfx/graphite2 ) gstreamer? ( >=media-libs/gstreamer-0.10 >=media-libs/gst-plugins-base-0.10 ) java? ( >=dev-java/bsh-2.0_beta4 ) jemalloc? ( dev-libs/jemalloc ) mysql? ( >=dev-db/mysql-connector-c++-1.1.0 ) opengl? ( virtual/opengl ) pdfimport? ( >=app-text/poppler-0.16[xpdf-headers,cxx] ) postgres? ( >=dev-db/postgresql-base-8.4.0 ) svg? ( gnome-base/librsvg ) webdav? ( net-libs/neon ) xmlsec? ( >=dev-libs/nspr-4.8.8 >=dev-libs/nss-3.12.9 ) >=dev-libs/boost-1.46 >=dev-libs/libxml2-2.7.8 dev-libs/libxslt dev-perl/Archive-Zip dev-util/cppunit >=dev-util/gperf-3 dev-util/intltool dev-util/mdds >=dev-util/pkgconfig-0.26 media-libs/sampleicc >=net-misc/curl-7.21.4 net-misc/npapi-sdk net-print/cups >=sys-apps/findutils-4.4.2 sys-devel/bison sys-apps/coreutils sys-devel/flex sys-devel/gettext >=sys-devel/make-3.82 sys-libs/zlib x11-libs/libXtst x11-proto/randrproto x11-proto/xextproto x11-proto/xineramaproto x11-proto/xproto java? ( =virtual/jdk-1.6* >=dev-java/ant-core-1.7 test? ( dev-java/junit:4 ) ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool java? ( >=dev-java/java-config-2.1.9-r1 ) >=sys-apps/sed-4 dev-vcs/git kde? ( dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) ) kde? ( dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=] ) =dev-lang/python-2* =dev-lang/python-2*[threads,xml] dev-vcs/git
 app-arch/zip app-arch/unzip >=app-text/hunspell-1.3.2-r3 app-text/mythes >=app-text/libexttextcat-3.2 app-text/libwpd:0.9[tools] app-text/libwpg:0.2 >=app-text/libwps-0.2.2 >=dev-cpp/clucene-2.3.3.4-r2 dev-cpp/libcmis dev-db/unixODBC dev-libs/expat >=dev-libs/glib-2.28 >=dev-libs/hyphen-2.7.1 >=dev-libs/icu-4.8.1.1 >=dev-lang/perl-5.0 >=dev-libs/openssl-1.0.0d >=dev-libs/redland-1.0.14[ssl] >=media-libs/fontconfig-2.8.0 media-libs/freetype:2 >=media-libs/libpng-1.4 media-libs/libcdr media-libs/libvisio sci-mathematics/lpsolve >=sys-libs/db-4.8 virtual/jpeg >=x11-libs/cairo-1.10.0[X] x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender dbus? ( >=dev-libs/dbus-glib-0.92 ) eds? ( gnome-extra/evolution-data-server ) gnome? ( gnome-base/gconf:2 gnome-base/orbit ) gtk? ( x11-libs/gdk-pixbuf[X] >=x11-libs/gtk+-2.24:2 ) gtk3? ( >=x11-libs/gtk+-3.2:3 ) graphite? ( media-gfx/graphite2 ) gstreamer? ( >=media-libs/gstreamer-0.10 >=media-libs/gst-plugins-base-0.10 ) java? ( >=dev-java/bsh-2.0_beta4 ) jemalloc? ( dev-libs/jemalloc ) mysql? ( >=dev-db/mysql-connector-c++-1.1.0 ) opengl? ( virtual/opengl ) pdfimport? ( >=app-text/poppler-0.16[xpdf-headers,cxx] ) postgres? ( >=dev-db/postgresql-base-8.4.0 ) svg? ( gnome-base/librsvg ) webdav? ( net-libs/neon ) xmlsec? ( >=dev-libs/nspr-4.8.8 >=dev-libs/nss-3.12.9 ) !app-office/libreoffice-bin !app-office/libreoffice-bin-debug !app-office/openoffice-bin !app-office/openoffice media-fonts/libertine-ttf media-fonts/liberation-fonts media-fonts/urw-fonts cups? ( net-print/cups ) java? ( >=virtual/jre-1.6 ) java? ( >=dev-java/java-config-2.1.9-r1 ) kde? ( >=kde-base/oxygen-icons-4.4:4[aqua=] ) kde? ( dev-lang/perl >=x11-libs/qt-core-4.7.4:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.4:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.4:4[accessibility] >=x11-libs/qt-script-4.7.4:4 >=x11-libs/qt-sql-4.7.4:4[qt3support] >=x11-libs/qt-svg-4.7.4:4 >=x11-libs/qt-test-4.7.4:4 >=x11-libs/qt-webkit-4.7.4:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=] ) =dev-lang/python-2* =dev-lang/python-2*[threads,xml]
 0
 branding? ( http://dev.gentooexperimental.org/~scarabeus/libreoffice-branding-gentoo-0.3.tar.xz ) http://dev-www.libreoffice.org/src//ea91f2fb4212a21d708aced277e6e85a-vigra1.4.0.tar.gz xmlsec? ( http://dev-www.libreoffice.org/src//1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz ) java? ( http://dev-www.libreoffice.org/src//17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip ) java? ( http://dev-www.libreoffice.org/src//798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip ) java? ( http://dev-www.libreoffice.org/src//35c94d2df8893241173de1d16b6034c0-swingExSrc.zip ) java? ( http://dev-www.libreoffice.org/src//ada24d37d8d638b3d8a9985e80bc2978-source-9.0.0.7-bj.zip ) odk? ( http://download.go-oo.org/extern/185d60944ea767075d27247c3162b3bc-unowinreg.dll )
diff --git a/metadata/cache/app-office/magicpoint-1.13a b/metadata/cache/app-office/magicpoint-1.13a
index 7933371e8ed0..27066d24a2c1 100644
--- a/metadata/cache/app-office/magicpoint-1.13a
+++ b/metadata/cache/app-office/magicpoint-1.13a
@@ -1,4 +1,4 @@
-x11-libs/libICE x11-libs/libSM x11-libs/libXrender x11-libs/libXmu >=media-libs/libpng-1.4 gif? ( >=media-libs/giflib-4.0.1 ) imlib? ( media-libs/imlib ) truetype? ( x11-libs/libXft ) emacs? ( virtual/emacs ) m17n-lib? ( dev-libs/m17n-lib ) mng? ( media-libs/libmng ) sys-devel/autoconf x11-proto/xextproto x11-libs/libxkbfile app-text/rman x11-misc/imake || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+x11-libs/libICE x11-libs/libSM x11-libs/libXrender x11-libs/libXmu >=media-libs/libpng-1.4 gif? ( >=media-libs/giflib-4.0.1 ) imlib? ( media-libs/imlib ) truetype? ( x11-libs/libXft ) emacs? ( virtual/emacs ) m17n-lib? ( dev-libs/m17n-lib ) mng? ( media-libs/libmng ) sys-devel/autoconf x11-proto/xextproto x11-libs/libxkbfile app-text/rman x11-misc/imake || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 x11-libs/libICE x11-libs/libSM x11-libs/libXrender x11-libs/libXmu >=media-libs/libpng-1.4 gif? ( >=media-libs/giflib-4.0.1 ) imlib? ( media-libs/imlib ) truetype? ( x11-libs/libXft ) emacs? ( virtual/emacs ) m17n-lib? ( dev-libs/m17n-lib ) mng? ( media-libs/libmng ) nls? ( sys-devel/gettext ) truetype? ( cjk? ( media-fonts/sazanami ) )
 0
 ftp://sh.wide.ad.jp/WIDE/free-ware/mgp/magicpoint-1.13a.tar.gz ftp://ftp.mew.org/pub/MagicPoint/magicpoint-1.13a.tar.gz
diff --git a/metadata/cache/app-office/passepartout-0.7.0 b/metadata/cache/app-office/passepartout-0.7.0
index bf1828cc31b6..fd29a656c674 100644
--- a/metadata/cache/app-office/passepartout-0.7.0
+++ b/metadata/cache/app-office/passepartout-0.7.0
@@ -1,4 +1,4 @@
-dev-cpp/libxmlpp:2.6 >=dev-libs/libxml2-2 dev-cpp/gtkmm:2.4 dev-cpp/libgnomecanvasmm:2.6 dev-libs/glib:2 dev-libs/libsigc++:2 media-libs/freetype:2 virtual/fam gnome? ( gnome-base/libgnome gnome-base/gnome-vfs ) >=dev-util/pkgconfig-0.9 >=sys-apps/sed-4 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-cpp/libxmlpp:2.6 >=dev-libs/libxml2-2 dev-cpp/gtkmm:2.4 dev-cpp/libgnomecanvasmm:2.6 dev-libs/glib:2 dev-libs/libsigc++:2 media-libs/freetype:2 virtual/fam gnome? ( gnome-base/libgnome gnome-base/gnome-vfs ) >=dev-util/pkgconfig-0.9 >=sys-apps/sed-4 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-cpp/libxmlpp:2.6 >=dev-libs/libxml2-2 dev-cpp/gtkmm:2.4 dev-cpp/libgnomecanvasmm:2.6 dev-libs/glib:2 dev-libs/libsigc++:2 media-libs/freetype:2 virtual/fam gnome? ( gnome-base/libgnome gnome-base/gnome-vfs ) dev-libs/libxslt app-text/ghostscript-gpl
 0
 mirror://gnome/sources/passepartout/0.7/passepartout-0.7.0.tar.bz2
diff --git a/metadata/cache/app-office/planner-0.14.5 b/metadata/cache/app-office/planner-0.14.5
index 84e3040525c1..b1e96b3de2ed 100644
--- a/metadata/cache/app-office/planner-0.14.5
+++ b/metadata/cache/app-office/planner-0.14.5
@@ -1,4 +1,4 @@
->=dev-libs/glib-2.6:2 >=x11-libs/gtk+-2.14:2 >=gnome-base/libgnomecanvas-2.10 >=gnome-base/libgnomeui-2.10 >=gnome-base/libglade-2.4:2.0 >=gnome-base/gconf-2.6:2 >=dev-libs/libxml2-2.6.27:2 >=dev-libs/libxslt-1.1.23 python? ( >=dev-python/pygtk-2.6:2 ) eds? ( >=gnome-extra/evolution-data-server-1.1 >=mail-client/evolution-2.1.3 ) >=dev-util/pkgconfig-0.12.0 app-text/scrollkeeper >=dev-util/intltool-0.35.5 doc? ( >=dev-util/gtk-doc-1.0 ) dev-util/gtk-doc-am gnome-base/gnome-common python? ( =dev-lang/python-2* ) app-arch/xz-utils >=sys-apps/sed-4 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-libs/glib-2.6:2 >=x11-libs/gtk+-2.14:2 >=gnome-base/libgnomecanvas-2.10 >=gnome-base/libgnomeui-2.10 >=gnome-base/libglade-2.4:2.0 >=gnome-base/gconf-2.6:2 >=dev-libs/libxml2-2.6.27:2 >=dev-libs/libxslt-1.1.23 python? ( >=dev-python/pygtk-2.6:2 ) eds? ( >=gnome-extra/evolution-data-server-1.1 >=mail-client/evolution-2.1.3 ) >=dev-util/pkgconfig-0.12.0 app-text/scrollkeeper >=dev-util/intltool-0.35.5 doc? ( >=dev-util/gtk-doc-1.0 ) dev-util/gtk-doc-am gnome-base/gnome-common python? ( =dev-lang/python-2* ) app-arch/xz-utils >=sys-apps/sed-4 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=dev-libs/glib-2.6:2 >=x11-libs/gtk+-2.14:2 >=gnome-base/libgnomecanvas-2.10 >=gnome-base/libgnomeui-2.10 >=gnome-base/libglade-2.4:2.0 >=gnome-base/gconf-2.6:2 >=dev-libs/libxml2-2.6.27:2 >=dev-libs/libxslt-1.1.23 python? ( >=dev-python/pygtk-2.6:2 ) eds? ( >=gnome-extra/evolution-data-server-1.1 >=mail-client/evolution-2.1.3 ) python? ( =dev-lang/python-2* )
 0
 mirror://gnome/sources/planner/0.14/planner-0.14.5.tar.xz
diff --git a/metadata/cache/app-office/planner-0.14.6 b/metadata/cache/app-office/planner-0.14.6
index a04ccdabae41..3eaae9034550 100644
--- a/metadata/cache/app-office/planner-0.14.6
+++ b/metadata/cache/app-office/planner-0.14.6
@@ -1,4 +1,4 @@
->=dev-libs/glib-2.6:2 >=x11-libs/gtk+-2.14:2 >=gnome-base/libgnomecanvas-2.10 >=gnome-base/libgnomeui-2.10 >=gnome-base/libglade-2.4:2.0 >=gnome-base/gconf-2.6:2 >=dev-libs/libxml2-2.6.27:2 >=dev-libs/libxslt-1.1.23 python? ( >=dev-python/pygtk-2.6:2 ) eds? ( >=gnome-extra/evolution-data-server-1.1 >=mail-client/evolution-2.1.3 ) >=dev-util/pkgconfig-0.12.0 app-text/scrollkeeper >=dev-util/intltool-0.35.5 doc? ( >=dev-util/gtk-doc-1.0 ) dev-util/gtk-doc-am gnome-base/gnome-common python? ( =dev-lang/python-2* ) app-arch/xz-utils >=sys-apps/sed-4 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-libs/glib-2.6:2 >=x11-libs/gtk+-2.14:2 >=gnome-base/libgnomecanvas-2.10 >=gnome-base/libgnomeui-2.10 >=gnome-base/libglade-2.4:2.0 >=gnome-base/gconf-2.6:2 >=dev-libs/libxml2-2.6.27:2 >=dev-libs/libxslt-1.1.23 python? ( >=dev-python/pygtk-2.6:2 ) eds? ( >=gnome-extra/evolution-data-server-1.1 >=mail-client/evolution-2.1.3 ) >=dev-util/pkgconfig-0.12.0 app-text/scrollkeeper >=dev-util/intltool-0.35.5 doc? ( >=dev-util/gtk-doc-1.0 ) dev-util/gtk-doc-am gnome-base/gnome-common python? ( =dev-lang/python-2* ) app-arch/xz-utils >=sys-apps/sed-4 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=dev-libs/glib-2.6:2 >=x11-libs/gtk+-2.14:2 >=gnome-base/libgnomecanvas-2.10 >=gnome-base/libgnomeui-2.10 >=gnome-base/libglade-2.4:2.0 >=gnome-base/gconf-2.6:2 >=dev-libs/libxml2-2.6.27:2 >=dev-libs/libxslt-1.1.23 python? ( >=dev-python/pygtk-2.6:2 ) eds? ( >=gnome-extra/evolution-data-server-1.1 >=mail-client/evolution-2.1.3 ) python? ( =dev-lang/python-2* )
 0
 mirror://gnome/sources/planner/0.14/planner-0.14.6.tar.xz
diff --git a/metadata/cache/app-office/pybliographer-1.2.12-r1 b/metadata/cache/app-office/pybliographer-1.2.12-r1
index ef1e2980c4b4..57211615614f 100644
--- a/metadata/cache/app-office/pybliographer-1.2.12-r1
+++ b/metadata/cache/app-office/pybliographer-1.2.12-r1
@@ -1,4 +1,4 @@
->=app-text/recode-3.6-r1 app-text/scrollkeeper dev-libs/glib:2 dev-python/gconf-python:2 dev-python/gnome-vfs-python:2 dev-python/libgnome-python:2 dev-python/pygobject:2 dev-python/pygtk:2 >=dev-python/python-bibtex-1.2.4 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
+>=app-text/recode-3.6-r1 app-text/scrollkeeper dev-libs/glib:2 dev-python/gconf-python:2 dev-python/gnome-vfs-python:2 dev-python/libgnome-python:2 dev-python/pygobject:2 dev-python/pygtk:2 >=dev-python/python-bibtex-1.2.4 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
 >=app-text/recode-3.6-r1 app-text/scrollkeeper dev-libs/glib:2 dev-python/gconf-python:2 dev-python/gnome-vfs-python:2 dev-python/libgnome-python:2 dev-python/pygobject:2 dev-python/pygtk:2 >=dev-python/python-bibtex-1.2.4 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
 0
 mirror://sourceforge/pybliographer/pybliographer-1.2.12.tar.gz
diff --git a/metadata/cache/app-office/pybliographer-1.2.14 b/metadata/cache/app-office/pybliographer-1.2.14
index 83ad8c8ec7df..74d6a8f90016 100644
--- a/metadata/cache/app-office/pybliographer-1.2.14
+++ b/metadata/cache/app-office/pybliographer-1.2.14
@@ -1,4 +1,4 @@
->=app-text/recode-3.6-r1 app-text/scrollkeeper dev-libs/glib:2 dev-python/gconf-python:2 dev-python/gnome-vfs-python:2 dev-python/libgnome-python:2 dev-python/pygobject:2 dev-python/pygtk:2 >=dev-python/python-bibtex-1.2.5 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
+>=app-text/recode-3.6-r1 app-text/scrollkeeper dev-libs/glib:2 dev-python/gconf-python:2 dev-python/gnome-vfs-python:2 dev-python/libgnome-python:2 dev-python/pygobject:2 dev-python/pygtk:2 >=dev-python/python-bibtex-1.2.5 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
 >=app-text/recode-3.6-r1 app-text/scrollkeeper dev-libs/glib:2 dev-python/gconf-python:2 dev-python/gnome-vfs-python:2 dev-python/libgnome-python:2 dev-python/pygobject:2 dev-python/pygtk:2 >=dev-python/python-bibtex-1.2.5 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
 0
 mirror://sourceforge/pybliographer/pybliographer-1.2.14.tar.gz
diff --git a/metadata/cache/app-office/skrooge-0.8.0 b/metadata/cache/app-office/skrooge-0.8.0
deleted file mode 100644
index faf284d20544..000000000000
--- a/metadata/cache/app-office/skrooge-0.8.0
+++ /dev/null
@@ -1,22 +0,0 @@
->=dev-libs/libofx-0.9.1 app-crypt/qca:2 x11-libs/qt-sql:4[sqlite] >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
->=dev-libs/libofx-0.9.1 app-crypt/qca:2 x11-libs/qt-sql:4[sqlite] >=kde-base/kdesdk-scripts-4.4:4[aqua=] >=kde-base/oxygen-icons-4.4:4[aqua=] dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
-4
-http://skrooge.org/files/skrooge-0.8.0.tar.bz2
-test
-http://skrooge.org/
-GPL-3
-personal finances manager for KDE4, aiming at being simple and intuitive
-amd64 x86
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib toolchain-funcs user versionator virtualx
-debug +handbook test linguas_bg linguas_ca linguas_ca@valencia linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_eo linguas_es linguas_et linguas_fr linguas_ga linguas_gl linguas_hu linguas_it linguas_ja linguas_ko linguas_lt linguas_ms linguas_nb linguas_nds linguas_nl linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_sk linguas_sv linguas_tr linguas_uk linguas_zh_TW test aqua
-
-
-
-3
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/app-office/skrooge-1.1.1 b/metadata/cache/app-office/skrooge-1.1.1
deleted file mode 100644
index d8cfa6e90b25..000000000000
--- a/metadata/cache/app-office/skrooge-1.1.1
+++ /dev/null
@@ -1,22 +0,0 @@
-app-crypt/qca:2 dev-libs/grantlee >=dev-libs/libofx-0.9.1 x11-libs/qt-sql:4[sqlite] >=sys-apps/sed-4 >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) handbook? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xsl-stylesheets ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
-app-crypt/qca:2 dev-libs/grantlee >=dev-libs/libofx-0.9.1 x11-libs/qt-sql:4[sqlite] >=kde-base/kdesdk-scripts-4.4:4[aqua=] >=kde-base/oxygen-icons-4.4:4[aqua=] linguas_bg? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_bg(+)] ) linguas_bs? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_bs(+)] ) linguas_ca? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ca(+)] ) linguas_ca@valencia? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ca@valencia(+)] ) linguas_cs? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_cs(+)] ) linguas_da? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_da(+)] ) linguas_de? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_de(+)] ) linguas_el? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_el(+)] ) linguas_en_GB? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_en_GB(+)] ) linguas_eo? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_eo(+)] ) linguas_es? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_es(+)] ) linguas_et? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_et(+)] ) linguas_fr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_fr(+)] ) linguas_ga? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ga(+)] ) linguas_gl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_gl(+)] ) linguas_hu? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_hu(+)] ) linguas_it? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_it(+)] ) linguas_ja? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ja(+)] ) linguas_lt? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_lt(+)] ) linguas_nb? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nb(+)] ) linguas_nl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_nl(+)] ) linguas_pl? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pl(+)] ) linguas_pt? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt(+)] ) linguas_pt_BR? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_pt_BR(+)] ) linguas_ro? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ro(+)] ) linguas_ru? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ru(+)] ) linguas_sk? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sk(+)] ) linguas_sv? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_sv(+)] ) linguas_tr? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_tr(+)] ) linguas_ug? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_ug(+)] ) linguas_zh_CN? ( >=kde-base/kde-l10n-4.4:4[aqua=,linguas_zh_CN(+)] ) handbook? ( >=kde-base/kdelibs-4.4:4[aqua=,handbook] ) dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
-4
-http://www.skrooge.org/files/skrooge-1.1.1.tar.bz2
-
-http://www.skrooge.org/
-GPL-2
-personal finances manager for KDE4, aiming at being simple and intuitive
-~amd64 ~x86
-base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib toolchain-funcs user versionator virtualx
-debug linguas_bg linguas_bs linguas_ca linguas_ca@valencia linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_eo linguas_es linguas_et linguas_fr linguas_ga linguas_gl linguas_hu linguas_it linguas_ja linguas_lt linguas_nb linguas_nl linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_sk linguas_sv linguas_tr linguas_ug linguas_zh_CN +handbook aqua
-
-
-
-4
-
-compile configure install postinst postrm preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/app-office/skrooge-1.2.0 b/metadata/cache/app-office/skrooge-1.2.0
index 7a486bb0b809..c7100b35d53b 100644
--- a/metadata/cache/app-office/skrooge-1.2.0
+++ b/metadata/cache/app-office/skrooge-1.2.0
@@ -6,7 +6,7 @@ http://www.skrooge.org/files/skrooge-1.2.0.tar.bz2
 http://www.skrooge.org/
 GPL-2
 personal finances manager for KDE4, aiming at being simple and intuitive
-~amd64 ~x86
+amd64 x86
 base cmake-utils eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions multilib toolchain-funcs user versionator virtualx
 debug linguas_bg linguas_bs linguas_ca linguas_ca@valencia linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_eo linguas_es linguas_et linguas_fr linguas_ga linguas_gl linguas_hu linguas_it linguas_ja linguas_ko linguas_lt linguas_ms linguas_nb linguas_nl linguas_pl linguas_pt linguas_pt_BR linguas_ro linguas_ru linguas_sk linguas_sv linguas_tr linguas_ug linguas_zh_CN linguas_zh_TW +handbook aqua
 
diff --git a/metadata/cache/app-office/texmacs-1.0.7.14 b/metadata/cache/app-office/texmacs-1.0.7.14
index 83c9e0f7e057..df161176cdd4 100644
--- a/metadata/cache/app-office/texmacs-1.0.7.14
+++ b/metadata/cache/app-office/texmacs-1.0.7.14
@@ -1,4 +1,4 @@
-dev-scheme/guile[deprecated] virtual/latex-base app-text/ghostscript-gpl media-libs/freetype x11-libs/libXext x11-apps/xmodmap qt4? ( x11-libs/qt-gui:4 ) imlib? ( media-libs/imlib2 ) jpeg? ( || ( media-gfx/imagemagick media-gfx/jpeg2ps ) ) svg? ( || ( media-gfx/inkscape gnome-base/librsvg:2 ) ) netpbm? ( media-libs/netpbm ) spell? ( || ( >=app-text/ispell-3.2 >=app-text/aspell-0.5 ) ) x11-proto/xproto || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-scheme/guile[deprecated] virtual/latex-base app-text/ghostscript-gpl media-libs/freetype x11-libs/libXext x11-apps/xmodmap qt4? ( x11-libs/qt-gui:4 ) imlib? ( media-libs/imlib2 ) jpeg? ( || ( media-gfx/imagemagick media-gfx/jpeg2ps ) ) svg? ( || ( media-gfx/inkscape gnome-base/librsvg:2 ) ) netpbm? ( media-libs/netpbm ) spell? ( || ( >=app-text/ispell-3.2 >=app-text/aspell-0.5 ) ) x11-proto/xproto || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-scheme/guile[deprecated] virtual/latex-base app-text/ghostscript-gpl media-libs/freetype x11-libs/libXext x11-apps/xmodmap qt4? ( x11-libs/qt-gui:4 ) imlib? ( media-libs/imlib2 ) jpeg? ( || ( media-gfx/imagemagick media-gfx/jpeg2ps ) ) svg? ( || ( media-gfx/inkscape gnome-base/librsvg:2 ) ) netpbm? ( media-libs/netpbm ) spell? ( || ( >=app-text/ispell-3.2 >=app-text/aspell-0.5 ) )
 0
 ftp://ftp.texmacs.org/pub/TeXmacs/tmftp/source/TeXmacs-1.0.7.14-src.tar.gz
diff --git a/metadata/cache/app-office/texmacs-1.0.7.15 b/metadata/cache/app-office/texmacs-1.0.7.15
index 83643b3b6335..17393e868d4d 100644
--- a/metadata/cache/app-office/texmacs-1.0.7.15
+++ b/metadata/cache/app-office/texmacs-1.0.7.15
@@ -1,4 +1,4 @@
-dev-scheme/guile[deprecated] virtual/latex-base app-text/ghostscript-gpl media-libs/freetype x11-libs/libXext x11-apps/xmodmap qt4? ( x11-libs/qt-gui:4 ) imlib? ( media-libs/imlib2 ) jpeg? ( || ( media-gfx/imagemagick media-gfx/jpeg2ps ) ) svg? ( || ( media-gfx/inkscape gnome-base/librsvg:2 ) ) netpbm? ( media-libs/netpbm ) spell? ( || ( >=app-text/ispell-3.2 >=app-text/aspell-0.5 ) ) x11-proto/xproto || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-scheme/guile[deprecated] virtual/latex-base app-text/ghostscript-gpl media-libs/freetype x11-libs/libXext x11-apps/xmodmap qt4? ( x11-libs/qt-gui:4 ) imlib? ( media-libs/imlib2 ) jpeg? ( || ( media-gfx/imagemagick media-gfx/jpeg2ps ) ) svg? ( || ( media-gfx/inkscape gnome-base/librsvg:2 ) ) netpbm? ( media-libs/netpbm ) spell? ( || ( >=app-text/ispell-3.2 >=app-text/aspell-0.5 ) ) x11-proto/xproto || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-scheme/guile[deprecated] virtual/latex-base app-text/ghostscript-gpl media-libs/freetype x11-libs/libXext x11-apps/xmodmap qt4? ( x11-libs/qt-gui:4 ) imlib? ( media-libs/imlib2 ) jpeg? ( || ( media-gfx/imagemagick media-gfx/jpeg2ps ) ) svg? ( || ( media-gfx/inkscape gnome-base/librsvg:2 ) ) netpbm? ( media-libs/netpbm ) spell? ( || ( >=app-text/ispell-3.2 >=app-text/aspell-0.5 ) )
 0
 ftp://ftp.texmacs.org/pub/TeXmacs/tmftp/source/TeXmacs-1.0.7.15-src.tar.gz
diff --git a/metadata/cache/app-office/texmacs-1.0.7.2-r1 b/metadata/cache/app-office/texmacs-1.0.7.2-r1
index 827b122964c9..651fdb6f8623 100644
--- a/metadata/cache/app-office/texmacs-1.0.7.2-r1
+++ b/metadata/cache/app-office/texmacs-1.0.7.2-r1
@@ -1,4 +1,4 @@
-dev-scheme/guile[deprecated] virtual/latex-base app-text/ghostscript-gpl media-libs/freetype x11-libs/libXext x11-apps/xmodmap imlib? ( media-libs/imlib2 ) jpeg? ( || ( media-gfx/imagemagick media-gfx/jpeg2ps ) ) svg? ( || ( media-gfx/inkscape gnome-base/librsvg:2 ) ) netpbm? ( media-libs/netpbm ) spell? ( || ( >=app-text/ispell-3.2 >=app-text/aspell-0.5 ) ) x11-proto/xproto || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-scheme/guile[deprecated] virtual/latex-base app-text/ghostscript-gpl media-libs/freetype x11-libs/libXext x11-apps/xmodmap imlib? ( media-libs/imlib2 ) jpeg? ( || ( media-gfx/imagemagick media-gfx/jpeg2ps ) ) svg? ( || ( media-gfx/inkscape gnome-base/librsvg:2 ) ) netpbm? ( media-libs/netpbm ) spell? ( || ( >=app-text/ispell-3.2 >=app-text/aspell-0.5 ) ) x11-proto/xproto || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-scheme/guile[deprecated] virtual/latex-base app-text/ghostscript-gpl media-libs/freetype x11-libs/libXext x11-apps/xmodmap imlib? ( media-libs/imlib2 ) jpeg? ( || ( media-gfx/imagemagick media-gfx/jpeg2ps ) ) svg? ( || ( media-gfx/inkscape gnome-base/librsvg:2 ) ) netpbm? ( media-libs/netpbm ) spell? ( || ( >=app-text/ispell-3.2 >=app-text/aspell-0.5 ) )
 0
 ftp://ftp.texmacs.org/pub/TeXmacs/targz/TeXmacs-1.0.7.2-src.tar.gz ftp://ftp.texmacs.org/pub/TeXmacs/targz/TeXmacs-600dpi-fonts.tar.gz
diff --git a/metadata/cache/app-pda/ifuse-1.1.1 b/metadata/cache/app-pda/ifuse-1.1.1
index 02bb7d262a8d..b629025e0899 100644
--- a/metadata/cache/app-pda/ifuse-1.1.1
+++ b/metadata/cache/app-pda/ifuse-1.1.1
@@ -1,4 +1,4 @@
->=app-pda/libimobiledevice-1.0.0 >=dev-libs/glib-2.14.1 >=sys-fs/fuse-2.7.0 dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=app-pda/libimobiledevice-1.0.0 >=dev-libs/glib-2.14.1 >=sys-fs/fuse-2.7.0 dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=app-pda/libimobiledevice-1.0.0 >=dev-libs/glib-2.14.1 >=sys-fs/fuse-2.7.0
 0
 http://www.libimobiledevice.org/downloads/ifuse-1.1.1.tar.bz2
diff --git a/metadata/cache/app-pda/jpilot-1.8.0 b/metadata/cache/app-pda/jpilot-1.8.0
index 0d73205c0fa7..e77a169a66bc 100644
--- a/metadata/cache/app-pda/jpilot-1.8.0
+++ b/metadata/cache/app-pda/jpilot-1.8.0
@@ -1,4 +1,4 @@
->=app-pda/pilot-link-0.12.5 dev-libs/libgcrypt >=x11-libs/gtk+-2.18.9:2 nls? ( dev-util/intltool sys-devel/gettext ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=app-pda/pilot-link-0.12.5 dev-libs/libgcrypt >=x11-libs/gtk+-2.18.9:2 nls? ( dev-util/intltool sys-devel/gettext ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=app-pda/pilot-link-0.12.5 dev-libs/libgcrypt >=x11-libs/gtk+-2.18.9:2
 0
 http://www.jpilot.org/jpilot-1.8.0.tar.gz
diff --git a/metadata/cache/app-pda/jpilot-1.8.1 b/metadata/cache/app-pda/jpilot-1.8.1
index f476d9fcab85..54a776038204 100644
--- a/metadata/cache/app-pda/jpilot-1.8.1
+++ b/metadata/cache/app-pda/jpilot-1.8.1
@@ -1,4 +1,4 @@
->=app-pda/pilot-link-0.12.5 dev-libs/libgcrypt >=x11-libs/gtk+-2.18.9:2 nls? ( dev-util/intltool sys-devel/gettext ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=app-pda/pilot-link-0.12.5 dev-libs/libgcrypt >=x11-libs/gtk+-2.18.9:2 nls? ( dev-util/intltool sys-devel/gettext ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=app-pda/pilot-link-0.12.5 dev-libs/libgcrypt >=x11-libs/gtk+-2.18.9:2
 0
 http://www.jpilot.org/jpilot-1.8.1.tar.gz
diff --git a/metadata/cache/app-pda/libopensync-0.22-r1 b/metadata/cache/app-pda/libopensync-0.22-r1
index c637bbecc597..685b092b4d90 100644
--- a/metadata/cache/app-pda/libopensync-0.22-r1
+++ b/metadata/cache/app-pda/libopensync-0.22-r1
@@ -1,4 +1,4 @@
-dev-db/sqlite:3 dev-libs/glib:2 dev-libs/libxml2 >=dev-util/pkgconfig-0.9.0 doc? ( app-doc/doxygen ) python? ( >=dev-lang/swig-1.3.17 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-db/sqlite:3 dev-libs/glib:2 dev-libs/libxml2 >=dev-util/pkgconfig-0.9.0 doc? ( app-doc/doxygen ) python? ( >=dev-lang/swig-1.3.17 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-db/sqlite:3 dev-libs/glib:2 dev-libs/libxml2
 0
 http://www.opensync.org/download/releases/0.22/libopensync-0.22.tar.bz2
diff --git a/metadata/cache/app-pda/libopensync-plugin-palm-0.22 b/metadata/cache/app-pda/libopensync-plugin-palm-0.22
index 671b6aa92bed..1938896aadfd 100644
--- a/metadata/cache/app-pda/libopensync-plugin-palm-0.22
+++ b/metadata/cache/app-pda/libopensync-plugin-palm-0.22
@@ -1,4 +1,4 @@
-~app-pda/libopensync-0.22 >=app-pda/pilot-link-0.11.8 dev-libs/glib:2 dev-libs/libxml2 >=dev-util/pkgconfig-0.9.0 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+~app-pda/libopensync-0.22 >=app-pda/pilot-link-0.11.8 dev-libs/glib:2 dev-libs/libxml2 >=dev-util/pkgconfig-0.9.0 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 ~app-pda/libopensync-0.22 >=app-pda/pilot-link-0.11.8 dev-libs/glib:2 dev-libs/libxml2
 0
 http://www.opensync.org/download/releases/0.22/libopensync-plugin-palm-0.22.tar.bz2
diff --git a/metadata/cache/app-pda/pilot-link-0.12.5 b/metadata/cache/app-pda/pilot-link-0.12.5
index af3d4d0edba3..9fcf9793ce65 100644
--- a/metadata/cache/app-pda/pilot-link-0.12.5
+++ b/metadata/cache/app-pda/pilot-link-0.12.5
@@ -1,4 +1,4 @@
-virtual/libiconv >=sys-libs/ncurses-5.7 >=dev-libs/popt-1.15 perl? ( >=dev-lang/perl-5.8.8-r2 ) png? ( >=media-libs/libpng-1.4 ) readline? ( >=sys-libs/readline-6 ) usb? ( virtual/libusb:0 ) bluetooth? ( net-wireless/bluez ) java? ( >=virtual/jdk-1.4 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) ) dev-lang/perl[-build] java? ( >=dev-java/java-config-2.1.9-r1 )
+virtual/libiconv >=sys-libs/ncurses-5.7 >=dev-libs/popt-1.15 perl? ( >=dev-lang/perl-5.8.8-r2 ) png? ( >=media-libs/libpng-1.4 ) readline? ( >=sys-libs/readline-6 ) usb? ( virtual/libusb:0 ) bluetooth? ( net-wireless/bluez ) java? ( >=virtual/jdk-1.4 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) ) dev-lang/perl[-build] java? ( >=dev-java/java-config-2.1.9-r1 )
 virtual/libiconv >=sys-libs/ncurses-5.7 >=dev-libs/popt-1.15 perl? ( >=dev-lang/perl-5.8.8-r2 ) png? ( >=media-libs/libpng-1.4 ) readline? ( >=sys-libs/readline-6 ) usb? ( virtual/libusb:0 ) bluetooth? ( net-wireless/bluez ) java? ( >=virtual/jre-1.4 ) python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) ) dev-lang/perl[-build] java? ( >=dev-java/java-config-2.1.9-r1 )
 0
 http://pilot-link.org/source/pilot-link-0.12.5.tar.bz2
diff --git a/metadata/cache/app-shells/dash-0.5.5.1.7 b/metadata/cache/app-shells/dash-0.5.5.1.7
index c3d5fb62c081..f210eebd1b37 100644
--- a/metadata/cache/app-shells/dash-0.5.5.1.7
+++ b/metadata/cache/app-shells/dash-0.5.5.1.7
@@ -1,4 +1,4 @@
-!static? ( libedit? ( dev-libs/libedit ) ) dev-util/pkgconfig libedit? ( static? ( dev-libs/libedit[static-libs] ) ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+!static? ( libedit? ( dev-libs/libedit ) ) dev-util/pkgconfig libedit? ( static? ( dev-libs/libedit[static-libs] ) ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 !static? ( libedit? ( dev-libs/libedit ) )
 0
 http://gondor.apana.org.au/~herbert/dash/files/dash-0.5.5.1.tar.gz mirror://debian/pool/main/d/dash/dash_0.5.5.1-7.diff.gz
diff --git a/metadata/cache/app-shells/dash-0.5.7.1 b/metadata/cache/app-shells/dash-0.5.7.1
index 9ce9cf5ab7ec..08f983405ab3 100644
--- a/metadata/cache/app-shells/dash-0.5.7.1
+++ b/metadata/cache/app-shells/dash-0.5.7.1
@@ -1,4 +1,4 @@
-!static? ( libedit? ( dev-libs/libedit ) ) dev-util/pkgconfig libedit? ( static? ( dev-libs/libedit[static-libs] ) ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+!static? ( libedit? ( dev-libs/libedit ) ) dev-util/pkgconfig libedit? ( static? ( dev-libs/libedit[static-libs] ) ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 !static? ( libedit? ( dev-libs/libedit ) )
 0
 http://gondor.apana.org.au/~herbert/dash/files/dash-0.5.7.tar.gz mirror://debian/pool/main/d/dash/dash_0.5.7-1.diff.gz
diff --git a/metadata/cache/app-shells/fish-1.23.1 b/metadata/cache/app-shells/fish-1.23.1
index 3496e478def9..76de271294a4 100644
--- a/metadata/cache/app-shells/fish-1.23.1
+++ b/metadata/cache/app-shells/fish-1.23.1
@@ -1,4 +1,4 @@
-sys-libs/ncurses sys-devel/bc sys-devel/gettext www-client/htmlview X? ( x11-misc/xsel ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+sys-libs/ncurses sys-devel/bc sys-devel/gettext www-client/htmlview X? ( x11-misc/xsel ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 sys-libs/ncurses sys-devel/bc sys-devel/gettext www-client/htmlview X? ( x11-misc/xsel )
 0
 http://fishshell.com/files/1.23.1/fish-1.23.1.tar.bz2
diff --git a/metadata/cache/app-shells/fish-1.23.1-r1 b/metadata/cache/app-shells/fish-1.23.1-r1
index 07ba12c2966b..9b6b86633b86 100644
--- a/metadata/cache/app-shells/fish-1.23.1-r1
+++ b/metadata/cache/app-shells/fish-1.23.1-r1
@@ -1,4 +1,4 @@
-sys-libs/ncurses sys-devel/bc sys-devel/gettext www-client/htmlview X? ( x11-misc/xsel ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+sys-libs/ncurses sys-devel/bc sys-devel/gettext www-client/htmlview X? ( x11-misc/xsel ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 sys-libs/ncurses sys-devel/bc sys-devel/gettext www-client/htmlview X? ( x11-misc/xsel )
 0
 http://fishshell.com/files/1.23.1/fish-1.23.1.tar.bz2
diff --git a/metadata/cache/app-shells/fish-1.23.1-r2 b/metadata/cache/app-shells/fish-1.23.1-r2
index b3f2aa43ce64..735ff40cd34c 100644
--- a/metadata/cache/app-shells/fish-1.23.1-r2
+++ b/metadata/cache/app-shells/fish-1.23.1-r2
@@ -1,4 +1,4 @@
-sys-libs/ncurses sys-devel/bc sys-devel/gettext www-client/htmlview X? ( x11-misc/xsel ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+sys-libs/ncurses sys-devel/bc sys-devel/gettext www-client/htmlview X? ( x11-misc/xsel ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 sys-libs/ncurses sys-devel/bc sys-devel/gettext www-client/htmlview X? ( x11-misc/xsel )
 0
 http://fishshell.com/files/1.23.1/fish-1.23.1.tar.bz2
diff --git a/metadata/cache/app-shells/pdsh-2.18-r1 b/metadata/cache/app-shells/pdsh-2.18-r1
index 78a19d9a7a95..514f60f8dbf3 100644
--- a/metadata/cache/app-shells/pdsh-2.18-r1
+++ b/metadata/cache/app-shells/pdsh-2.18-r1
@@ -1,4 +1,4 @@
-crypt? ( net-misc/openssh ) rsh? ( net-misc/netkit-rsh ) readline? ( sys-libs/readline ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+crypt? ( net-misc/openssh ) rsh? ( net-misc/netkit-rsh ) readline? ( sys-libs/readline ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 crypt? ( net-misc/openssh ) rsh? ( net-misc/netkit-rsh ) readline? ( sys-libs/readline )
 0
 mirror://sourceforge/pdsh/pdsh-2.18.tar.bz2
diff --git a/metadata/cache/app-shells/tcsh-6.17-r1 b/metadata/cache/app-shells/tcsh-6.17-r1
index 494c13e5b9fd..4ec65ab50280 100644
--- a/metadata/cache/app-shells/tcsh-6.17-r1
+++ b/metadata/cache/app-shells/tcsh-6.17-r1
@@ -1,4 +1,4 @@
->=sys-libs/ncurses-5.1 virtual/libiconv sys-devel/gettext doc? ( dev-lang/perl ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=sys-libs/ncurses-5.1 virtual/libiconv sys-devel/gettext doc? ( dev-lang/perl ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=sys-libs/ncurses-5.1 virtual/libiconv
 0
 ftp://ftp.astron.com/pub/tcsh/old/tcsh-6.17.00.tar.gz http://www.gentoo.org/~grobian/distfiles/tcsh-gentoo-patches-r1.8.tar.bz2
diff --git a/metadata/cache/app-shells/tcsh-6.17.06 b/metadata/cache/app-shells/tcsh-6.17.06
index 64bbbd3c9755..c9db2bc4c3c9 100644
--- a/metadata/cache/app-shells/tcsh-6.17.06
+++ b/metadata/cache/app-shells/tcsh-6.17.06
@@ -1,4 +1,4 @@
->=sys-libs/ncurses-5.1 virtual/libiconv sys-devel/gettext doc? ( dev-lang/perl ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=sys-libs/ncurses-5.1 virtual/libiconv sys-devel/gettext doc? ( dev-lang/perl ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=sys-libs/ncurses-5.1 virtual/libiconv
 0
 ftp://ftp.astron.com/pub/tcsh/beta/tcsh-6.17.06.tar.gz http://www.gentoo.org/~grobian/distfiles/tcsh-gentoo-patches-r1.9.tar.bz2
diff --git a/metadata/cache/app-shells/tcsh-6.18.01 b/metadata/cache/app-shells/tcsh-6.18.01
index bf60c7e0d4b0..2980322d687c 100644
--- a/metadata/cache/app-shells/tcsh-6.18.01
+++ b/metadata/cache/app-shells/tcsh-6.18.01
@@ -1,4 +1,4 @@
->=sys-libs/ncurses-5.1 virtual/libiconv sys-devel/gettext doc? ( dev-lang/perl ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=sys-libs/ncurses-5.1 virtual/libiconv sys-devel/gettext doc? ( dev-lang/perl ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=sys-libs/ncurses-5.1 virtual/libiconv
 0
 ftp://ftp.astron.com/pub/tcsh/tcsh-6.18.01.tar.gz http://www.gentoo.org/~grobian/distfiles/tcsh-gentoo-patches-r1.9.tar.bz2
diff --git a/metadata/cache/app-text/a2ps-4.14-r2 b/metadata/cache/app-text/a2ps-4.14-r2
index fc8355b9157d..9dad3d738e88 100644
--- a/metadata/cache/app-text/a2ps-4.14-r2
+++ b/metadata/cache/app-text/a2ps-4.14-r2
@@ -1,4 +1,4 @@
->=dev-util/gperf-2.7.2 || ( >=dev-util/yacc-1.9.1 sys-devel/bison ) app-text/ghostscript-gpl app-text/libpaper >=app-text/psutils-1.17 emacs? ( virtual/emacs ) latex? ( virtual/latex-base ) nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-util/gperf-2.7.2 || ( >=dev-util/yacc-1.9.1 sys-devel/bison ) app-text/ghostscript-gpl app-text/libpaper >=app-text/psutils-1.17 emacs? ( virtual/emacs ) latex? ( virtual/latex-base ) nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 app-text/ghostscript-gpl app-text/wdiff app-text/libpaper userland_GNU? ( || ( >=sys-apps/coreutils-6.10-r1 ) ) userland_BSD? ( sys-freebsd/freebsd-ubin ) >=app-text/psutils-1.17 emacs? ( virtual/emacs ) latex? ( virtual/latex-base ) nls? ( virtual/libintl )
 0
 mirror://gnu/a2ps/a2ps-4.14.tar.gz linguas_ja? ( mirror://gentoo/a2ps-4.14-ja_nls.patch.gz )
diff --git a/metadata/cache/app-text/active-dvi-1.8 b/metadata/cache/app-text/active-dvi-1.8
index 7ffc856ab8e5..02083cad4410 100644
--- a/metadata/cache/app-text/active-dvi-1.8
+++ b/metadata/cache/app-text/active-dvi-1.8
@@ -1,4 +1,4 @@
->=dev-lang/ocaml-3.10.0[ocamlopt?,tk?] >=dev-ml/camlimages-3.0.1[truetype,tiff,jpeg,gs] virtual/latex-base app-text/ghostscript-gpl x11-libs/libXinerama dev-texlive/texlive-pstricks dev-texlive/texlive-pictures x11-proto/xineramaproto dev-ml/findlib dev-tex/hevea || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-lang/ocaml-3.10.0[ocamlopt?,tk?] >=dev-ml/camlimages-3.0.1[truetype,tiff,jpeg,gs] virtual/latex-base app-text/ghostscript-gpl x11-libs/libXinerama dev-texlive/texlive-pstricks dev-texlive/texlive-pictures x11-proto/xineramaproto dev-ml/findlib dev-tex/hevea || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=dev-lang/ocaml-3.10.0[ocamlopt?,tk?] >=dev-ml/camlimages-3.0.1[truetype,tiff,jpeg,gs] virtual/latex-base app-text/ghostscript-gpl x11-libs/libXinerama
 0
 http://gallium.inria.fr/advi/advi-1.8.tar.gz
diff --git a/metadata/cache/app-text/active-dvi-1.9 b/metadata/cache/app-text/active-dvi-1.9
index 7b15806a12fa..26880d522b3e 100644
--- a/metadata/cache/app-text/active-dvi-1.9
+++ b/metadata/cache/app-text/active-dvi-1.9
@@ -1,4 +1,4 @@
->=dev-lang/ocaml-3.11.2[ocamlopt?] >=dev-ml/camlimages-3.0.1[truetype,tiff,jpeg,gs] virtual/latex-base app-text/ghostscript-gpl x11-libs/libXinerama dev-texlive/texlive-pstricks dev-texlive/texlive-pictures dev-texlive/texlive-latexextra x11-proto/xineramaproto dev-ml/findlib app-text/htmlc dev-tex/hevea || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-lang/ocaml-3.11.2[ocamlopt?] >=dev-ml/camlimages-3.0.1[truetype,tiff,jpeg,gs] virtual/latex-base app-text/ghostscript-gpl x11-libs/libXinerama dev-texlive/texlive-pstricks dev-texlive/texlive-pictures dev-texlive/texlive-latexextra x11-proto/xineramaproto dev-ml/findlib app-text/htmlc dev-tex/hevea || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=dev-lang/ocaml-3.11.2[ocamlopt?] >=dev-ml/camlimages-3.0.1[truetype,tiff,jpeg,gs] virtual/latex-base app-text/ghostscript-gpl x11-libs/libXinerama
 0
 http://gallium.inria.fr/advi/advi-1.9.tar.gz
diff --git a/metadata/cache/app-text/asciidoc-9999 b/metadata/cache/app-text/asciidoc-9999
index c521de9bd112..9b63e1f15bff 100644
--- a/metadata/cache/app-text/asciidoc-9999
+++ b/metadata/cache/app-text/asciidoc-9999
@@ -1,4 +1,4 @@
-test? ( dev-util/source-highlight media-sound/lilypond media-gfx/imagemagick dev-texlive/texlive-latex app-text/dvipng media-gfx/graphviz ) dev-util/aap www-client/lynx dev-util/source-highlight dev-vcs/mercurial || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
+test? ( dev-util/source-highlight media-sound/lilypond media-gfx/imagemagick dev-texlive/texlive-latex app-text/dvipng media-gfx/graphviz ) dev-util/aap www-client/lynx dev-util/source-highlight dev-vcs/mercurial || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
 >=app-text/docbook-xsl-stylesheets-1.75 dev-libs/libxslt graphviz? ( media-gfx/graphviz ) app-text/docbook-xml-dtd:4.5 highlight? ( || ( dev-util/source-highlight dev-python/pygments ) ) || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
 0
 
diff --git a/metadata/cache/app-text/aspell-0.60.6.1 b/metadata/cache/app-text/aspell-0.60.6.1
index b7321a671033..6b07c485dcae 100644
--- a/metadata/cache/app-text/aspell-0.60.6.1
+++ b/metadata/cache/app-text/aspell-0.60.6.1
@@ -1,4 +1,4 @@
->=sys-libs/ncurses-5.2 nls? ( virtual/libintl ) nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=sys-libs/ncurses-5.2 nls? ( virtual/libintl ) nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=sys-libs/ncurses-5.2 nls? ( virtual/libintl ) !=app-dicts/aspell-en-0.5*
 0
 mirror://gnu/aspell/aspell-0.60.6.1.tar.gz
diff --git a/metadata/cache/app-text/crf++-0.54 b/metadata/cache/app-text/crf++-0.54
index d9556d2e0437..319ff6c7db63 100644
--- a/metadata/cache/app-text/crf++-0.54
+++ b/metadata/cache/app-text/crf++-0.54
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 mirror://sourceforge/crfpp/CRF++-0.54.tar.gz
diff --git a/metadata/cache/app-text/djview-4.7 b/metadata/cache/app-text/djview-4.7
index 992802159f02..06000d0d0770 100644
--- a/metadata/cache/app-text/djview-4.7
+++ b/metadata/cache/app-text/djview-4.7
@@ -1,4 +1,4 @@
->=app-text/djvu-3.5.22-r1 x11-libs/qt-gui:4 !!app-text/djview4 >=sys-devel/autoconf-2.67 dev-util/pkgconfig nsplugin? ( dev-libs/glib:2 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=app-text/djvu-3.5.22-r1 x11-libs/qt-gui:4 !!app-text/djview4 >=sys-devel/autoconf-2.67 dev-util/pkgconfig nsplugin? ( dev-libs/glib:2 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=app-text/djvu-3.5.22-r1 x11-libs/qt-gui:4 !!app-text/djview4
 0
 mirror://sourceforge/djvu/djview-4.7.tar.gz
diff --git a/metadata/cache/app-text/djview-4.8 b/metadata/cache/app-text/djview-4.8
index d47fc898887e..42685f74a058 100644
--- a/metadata/cache/app-text/djview-4.8
+++ b/metadata/cache/app-text/djview-4.8
@@ -1,4 +1,4 @@
->=app-text/djvu-3.5.22-r1 x11-libs/qt-gui:4 !!app-text/djview4 >=sys-devel/autoconf-2.67 dev-util/pkgconfig nsplugin? ( dev-libs/glib:2 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=app-text/djvu-3.5.22-r1 x11-libs/qt-gui:4 !!app-text/djview4 >=sys-devel/autoconf-2.67 dev-util/pkgconfig nsplugin? ( dev-libs/glib:2 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=app-text/djvu-3.5.22-r1 x11-libs/qt-gui:4 !!app-text/djview4
 0
 mirror://sourceforge/djvu/djview-4.8.tar.gz
diff --git a/metadata/cache/app-text/djview4-4.5-r1 b/metadata/cache/app-text/djview4-4.5-r1
index 532a11a78408..10b336805b0d 100644
--- a/metadata/cache/app-text/djview4-4.5-r1
+++ b/metadata/cache/app-text/djview4-4.5-r1
@@ -1,4 +1,4 @@
->=app-text/djvu-3.5.22-r1 x11-libs/qt-gui:4 dev-util/pkgconfig nsplugin? ( dev-libs/glib:2 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=app-text/djvu-3.5.22-r1 x11-libs/qt-gui:4 dev-util/pkgconfig nsplugin? ( dev-libs/glib:2 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=app-text/djvu-3.5.22-r1 x11-libs/qt-gui:4
 0
 mirror://sourceforge/djvu/djview4-4.5.tar.gz
diff --git a/metadata/cache/app-text/djview4-4.6 b/metadata/cache/app-text/djview4-4.6
index 2abd1a491c48..515f24b7f980 100644
--- a/metadata/cache/app-text/djview4-4.6
+++ b/metadata/cache/app-text/djview4-4.6
@@ -1,4 +1,4 @@
->=app-text/djvu-3.5.22-r1 x11-libs/qt-gui:4 dev-util/pkgconfig nsplugin? ( dev-libs/glib:2 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=app-text/djvu-3.5.22-r1 x11-libs/qt-gui:4 dev-util/pkgconfig nsplugin? ( dev-libs/glib:2 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=app-text/djvu-3.5.22-r1 x11-libs/qt-gui:4
 0
 mirror://sourceforge/djvu/djview4-4.6.tar.gz
diff --git a/metadata/cache/app-text/djview4-4.6-r1 b/metadata/cache/app-text/djview4-4.6-r1
index 2abd1a491c48..515f24b7f980 100644
--- a/metadata/cache/app-text/djview4-4.6-r1
+++ b/metadata/cache/app-text/djview4-4.6-r1
@@ -1,4 +1,4 @@
->=app-text/djvu-3.5.22-r1 x11-libs/qt-gui:4 dev-util/pkgconfig nsplugin? ( dev-libs/glib:2 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=app-text/djvu-3.5.22-r1 x11-libs/qt-gui:4 dev-util/pkgconfig nsplugin? ( dev-libs/glib:2 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=app-text/djvu-3.5.22-r1 x11-libs/qt-gui:4
 0
 mirror://sourceforge/djvu/djview4-4.6.tar.gz
diff --git a/metadata/cache/app-text/djvu-3.5.24-r1 b/metadata/cache/app-text/djvu-3.5.24-r1
index e53625a88ac7..62a1475eeced 100644
--- a/metadata/cache/app-text/djvu-3.5.24-r1
+++ b/metadata/cache/app-text/djvu-3.5.24-r1
@@ -1,4 +1,4 @@
-jpeg? ( virtual/jpeg ) tiff? ( media-libs/tiff:0 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+jpeg? ( virtual/jpeg ) tiff? ( media-libs/tiff:0 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 jpeg? ( virtual/jpeg ) tiff? ( media-libs/tiff:0 )
 0
 mirror://sourceforge/djvu/djvulibre-3.5.24.tar.gz
diff --git a/metadata/cache/app-text/dvipdfmx-20100328 b/metadata/cache/app-text/dvipdfmx-20100328
index c3636e9b5707..af900f6cfaee 100644
--- a/metadata/cache/app-text/dvipdfmx-20100328
+++ b/metadata/cache/app-text/dvipdfmx-20100328
@@ -1,4 +1,4 @@
-app-text/libpaper media-libs/libpng sys-libs/zlib virtual/tex-base app-text/libpaper || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+app-text/libpaper media-libs/libpng sys-libs/zlib virtual/tex-base app-text/libpaper || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 app-text/libpaper media-libs/libpng sys-libs/zlib virtual/tex-base app-text/libpaper >=app-text/poppler-0.12.3-r3 app-text/poppler-data
 0
 http://project.ktug.or.kr/dvipdfmx/snapshot/latest/dvipdfmx-20100328.tar.gz
diff --git a/metadata/cache/app-text/dvipdfmx-20100328-r1 b/metadata/cache/app-text/dvipdfmx-20100328-r1
index 30f67ab551f2..5022f156c23b 100644
--- a/metadata/cache/app-text/dvipdfmx-20100328-r1
+++ b/metadata/cache/app-text/dvipdfmx-20100328-r1
@@ -1,4 +1,4 @@
-app-text/libpaper media-libs/libpng sys-libs/zlib virtual/tex-base app-text/libpaper || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+app-text/libpaper media-libs/libpng sys-libs/zlib virtual/tex-base app-text/libpaper || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 app-text/libpaper media-libs/libpng sys-libs/zlib virtual/tex-base app-text/libpaper >=app-text/poppler-0.12.3-r3 app-text/poppler-data
 0
 http://project.ktug.or.kr/dvipdfmx/snapshot/latest/dvipdfmx-20100328.tar.gz
diff --git a/metadata/cache/app-text/dvipdfmx-20110311 b/metadata/cache/app-text/dvipdfmx-20110311
index 78c45b33f966..0c80d5eccc9c 100644
--- a/metadata/cache/app-text/dvipdfmx-20110311
+++ b/metadata/cache/app-text/dvipdfmx-20110311
@@ -1,4 +1,4 @@
-app-text/libpaper >=media-libs/libpng-1.2:0 sys-libs/zlib virtual/tex-base app-text/libpaper || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+app-text/libpaper >=media-libs/libpng-1.2:0 sys-libs/zlib virtual/tex-base app-text/libpaper || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 app-text/libpaper >=media-libs/libpng-1.2:0 sys-libs/zlib virtual/tex-base app-text/libpaper >=app-text/poppler-0.12.3-r3 app-text/poppler-data
 0
 http://project.ktug.or.kr/dvipdfmx/snapshot/latest/dvipdfmx-20110311.tar.gz
diff --git a/metadata/cache/app-text/enchant-1.6.0 b/metadata/cache/app-text/enchant-1.6.0
index 7689101a1892..06f315b7e901 100644
--- a/metadata/cache/app-text/enchant-1.6.0
+++ b/metadata/cache/app-text/enchant-1.6.0
@@ -1,4 +1,4 @@
-dev-libs/glib:2 aspell? ( app-text/aspell ) hunspell? ( >=app-text/hunspell-1.2.1 ) zemberek? ( dev-libs/dbus-glib ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-libs/glib:2 aspell? ( app-text/aspell ) hunspell? ( >=app-text/hunspell-1.2.1 ) zemberek? ( dev-libs/dbus-glib ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-libs/glib:2 aspell? ( app-text/aspell ) hunspell? ( >=app-text/hunspell-1.2.1 ) zemberek? ( dev-libs/dbus-glib ) zemberek? ( app-text/zemberek-server )
 0
 http://www.abisource.com/downloads/enchant/1.6.0/enchant-1.6.0.tar.gz
diff --git a/metadata/cache/app-text/evince-2.32.0-r3 b/metadata/cache/app-text/evince-2.32.0-r3
index c4271609e434..8faceb856f91 100644
--- a/metadata/cache/app-text/evince-2.32.0-r3
+++ b/metadata/cache/app-text/evince-2.32.0-r3
@@ -1,4 +1,4 @@
->=app-text/libspectre-0.2.0 >=dev-libs/glib-2.25.11:2 >=dev-libs/libxml2-2.5:2 >=x11-libs/gtk+-2.21.5:2[introspection?] >=x11-libs/libSM-1 || ( >=x11-themes/gnome-icon-theme-2.17.1 >=x11-themes/hicolor-icon-theme-0.10 ) >=x11-libs/cairo-1.9.10 >=app-text/poppler-0.14[cairo] djvu? ( >=app-text/djvu-3.5.17 ) dvi? ( virtual/tex-base t1lib? ( >=media-libs/t1lib-5.0.0 ) ) gnome? ( >=gnome-base/gconf-2:2[introspection?] ) gnome-keyring? ( >=gnome-base/gnome-keyring-2.22.0 ) introspection? ( >=dev-libs/gobject-introspection-0.6 ) nautilus? ( >=gnome-base/nautilus-2.10[introspection?] ) tiff? ( >=media-libs/tiff-3.6:0 ) app-text/scrollkeeper >=app-text/gnome-doc-utils-0.3.2 ~app-text/docbook-xml-dtd-4.1.2 >=dev-util/pkgconfig-0.9 sys-devel/gettext >=dev-util/intltool-0.35 >=dev-util/gtk-doc-am-1.13 doc? ( >=dev-util/gtk-doc-1.13 ) >=sys-apps/sed-4 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=app-text/libspectre-0.2.0 >=dev-libs/glib-2.25.11:2 >=dev-libs/libxml2-2.5:2 >=x11-libs/gtk+-2.21.5:2[introspection?] >=x11-libs/libSM-1 || ( >=x11-themes/gnome-icon-theme-2.17.1 >=x11-themes/hicolor-icon-theme-0.10 ) >=x11-libs/cairo-1.9.10 >=app-text/poppler-0.14[cairo] djvu? ( >=app-text/djvu-3.5.17 ) dvi? ( virtual/tex-base t1lib? ( >=media-libs/t1lib-5.0.0 ) ) gnome? ( >=gnome-base/gconf-2:2[introspection?] ) gnome-keyring? ( >=gnome-base/gnome-keyring-2.22.0 ) introspection? ( >=dev-libs/gobject-introspection-0.6 ) nautilus? ( >=gnome-base/nautilus-2.10[introspection?] ) tiff? ( >=media-libs/tiff-3.6:0 ) app-text/scrollkeeper >=app-text/gnome-doc-utils-0.3.2 ~app-text/docbook-xml-dtd-4.1.2 >=dev-util/pkgconfig-0.9 sys-devel/gettext >=dev-util/intltool-0.35 >=dev-util/gtk-doc-am-1.13 doc? ( >=dev-util/gtk-doc-1.13 ) >=sys-apps/sed-4 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=app-text/libspectre-0.2.0 >=dev-libs/glib-2.25.11:2 >=dev-libs/libxml2-2.5:2 >=x11-libs/gtk+-2.21.5:2[introspection?] >=x11-libs/libSM-1 || ( >=x11-themes/gnome-icon-theme-2.17.1 >=x11-themes/hicolor-icon-theme-0.10 ) >=x11-libs/cairo-1.9.10 >=app-text/poppler-0.14[cairo] djvu? ( >=app-text/djvu-3.5.17 ) dvi? ( virtual/tex-base t1lib? ( >=media-libs/t1lib-5.0.0 ) ) gnome? ( >=gnome-base/gconf-2:2[introspection?] ) gnome-keyring? ( >=gnome-base/gnome-keyring-2.22.0 ) introspection? ( >=dev-libs/gobject-introspection-0.6 ) nautilus? ( >=gnome-base/nautilus-2.10[introspection?] ) tiff? ( >=media-libs/tiff-3.6:0 )
 0
 mirror://gnome/sources/evince/2.32/evince-2.32.0.tar.bz2
diff --git a/metadata/cache/app-text/evince-2.32.0-r4 b/metadata/cache/app-text/evince-2.32.0-r4
index 66d9702fc45a..6cce1bb0cd92 100644
--- a/metadata/cache/app-text/evince-2.32.0-r4
+++ b/metadata/cache/app-text/evince-2.32.0-r4
@@ -1,4 +1,4 @@
->=app-text/libspectre-0.2.0 >=dev-libs/glib-2.25.11:2 >=dev-libs/libxml2-2.5:2 >=x11-libs/gtk+-2.21.5:2[introspection?] >=x11-libs/libSM-1 || ( >=x11-themes/gnome-icon-theme-2.17.1 >=x11-themes/hicolor-icon-theme-0.10 ) >=x11-libs/cairo-1.9.10 >=app-text/poppler-0.14[cairo] djvu? ( >=app-text/djvu-3.5.17 ) dvi? ( virtual/tex-base t1lib? ( >=media-libs/t1lib-5.0.0 ) ) gnome? ( >=gnome-base/gconf-2:2[introspection?] ) gnome-keyring? ( >=gnome-base/gnome-keyring-2.22.0 ) introspection? ( >=dev-libs/gobject-introspection-0.6 ) nautilus? ( >=gnome-base/nautilus-2.10[introspection?] ) tiff? ( >=media-libs/tiff-3.6:0 ) app-text/scrollkeeper >=app-text/gnome-doc-utils-0.3.2 ~app-text/docbook-xml-dtd-4.1.2 >=dev-util/pkgconfig-0.9 sys-devel/gettext >=dev-util/intltool-0.35 >=dev-util/gtk-doc-am-1.13 >=sys-apps/sed-4 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=app-text/libspectre-0.2.0 >=dev-libs/glib-2.25.11:2 >=dev-libs/libxml2-2.5:2 >=x11-libs/gtk+-2.21.5:2[introspection?] >=x11-libs/libSM-1 || ( >=x11-themes/gnome-icon-theme-2.17.1 >=x11-themes/hicolor-icon-theme-0.10 ) >=x11-libs/cairo-1.9.10 >=app-text/poppler-0.14[cairo] djvu? ( >=app-text/djvu-3.5.17 ) dvi? ( virtual/tex-base t1lib? ( >=media-libs/t1lib-5.0.0 ) ) gnome? ( >=gnome-base/gconf-2:2[introspection?] ) gnome-keyring? ( >=gnome-base/gnome-keyring-2.22.0 ) introspection? ( >=dev-libs/gobject-introspection-0.6 ) nautilus? ( >=gnome-base/nautilus-2.10[introspection?] ) tiff? ( >=media-libs/tiff-3.6:0 ) app-text/scrollkeeper >=app-text/gnome-doc-utils-0.3.2 ~app-text/docbook-xml-dtd-4.1.2 >=dev-util/pkgconfig-0.9 sys-devel/gettext >=dev-util/intltool-0.35 >=dev-util/gtk-doc-am-1.13 >=sys-apps/sed-4 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=app-text/libspectre-0.2.0 >=dev-libs/glib-2.25.11:2 >=dev-libs/libxml2-2.5:2 >=x11-libs/gtk+-2.21.5:2[introspection?] >=x11-libs/libSM-1 || ( >=x11-themes/gnome-icon-theme-2.17.1 >=x11-themes/hicolor-icon-theme-0.10 ) >=x11-libs/cairo-1.9.10 >=app-text/poppler-0.14[cairo] djvu? ( >=app-text/djvu-3.5.17 ) dvi? ( virtual/tex-base t1lib? ( >=media-libs/t1lib-5.0.0 ) ) gnome? ( >=gnome-base/gconf-2:2[introspection?] ) gnome-keyring? ( >=gnome-base/gnome-keyring-2.22.0 ) introspection? ( >=dev-libs/gobject-introspection-0.6 ) nautilus? ( >=gnome-base/nautilus-2.10[introspection?] ) tiff? ( >=media-libs/tiff-3.6:0 )
 0
 mirror://gnome/sources/evince/2.32/evince-2.32.0.tar.bz2
diff --git a/metadata/cache/app-text/ghostscript-gpl-9.04-r4 b/metadata/cache/app-text/ghostscript-gpl-9.04-r4
index ef3e3c04a72d..255326dcb0b6 100644
--- a/metadata/cache/app-text/ghostscript-gpl-9.04-r4
+++ b/metadata/cache/app-text/ghostscript-gpl-9.04-r4
@@ -1,4 +1,4 @@
-app-text/libpaper media-libs/fontconfig >=media-libs/freetype-2.4.2:2 media-libs/lcms:0 media-libs/libpng:0 media-libs/tiff:0 >=sys-libs/zlib-1.2.3 virtual/jpeg !bindist? ( djvu? ( app-text/djvu ) ) cups? ( >=net-print/cups-1.3.8 ) dbus? ( sys-apps/dbus ) gtk? ( x11-libs/gtk+:2 ) idn? ( net-dns/libidn ) jpeg2k? ( media-libs/jasper ) X? ( x11-libs/libXt x11-libs/libXext ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+app-text/libpaper media-libs/fontconfig >=media-libs/freetype-2.4.2:2 media-libs/lcms:0 media-libs/libpng:0 media-libs/tiff:0 >=sys-libs/zlib-1.2.3 virtual/jpeg !bindist? ( djvu? ( app-text/djvu ) ) cups? ( >=net-print/cups-1.3.8 ) dbus? ( sys-apps/dbus ) gtk? ( x11-libs/gtk+:2 ) idn? ( net-dns/libidn ) jpeg2k? ( media-libs/jasper ) X? ( x11-libs/libXt x11-libs/libXext ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 app-text/libpaper media-libs/fontconfig >=media-libs/freetype-2.4.2:2 media-libs/lcms:0 media-libs/libpng:0 media-libs/tiff:0 >=sys-libs/zlib-1.2.3 virtual/jpeg !bindist? ( djvu? ( app-text/djvu ) ) cups? ( >=net-print/cups-1.3.8 ) dbus? ( sys-apps/dbus ) gtk? ( x11-libs/gtk+:2 ) idn? ( net-dns/libidn ) jpeg2k? ( media-libs/jasper ) X? ( x11-libs/libXt x11-libs/libXext ) >=app-text/poppler-data-0.4.4 >=media-fonts/urw-fonts-2.4.9 linguas_ja? ( media-fonts/kochi-substitute ) linguas_ko? ( media-fonts/baekmuk-fonts ) linguas_zh_CN? ( media-fonts/arphicfonts ) linguas_zh_TW? ( media-fonts/arphicfonts ) !!media-fonts/gnu-gs-fonts-std !!media-fonts/gnu-gs-fonts-other
 0
 mirror://sourceforge/ghostscript/ghostscript-9.04.tar.bz2 mirror://gentoo/ghostscript-gpl-9.04-patchset-3.tar.bz2 !bindist? ( djvu? ( mirror://sourceforge/djvu/gsdjvu-1.5.tar.gz ) )
diff --git a/metadata/cache/app-text/ghostscript-gpl-9.04-r5 b/metadata/cache/app-text/ghostscript-gpl-9.04-r5
index b91e5ba3a30c..4d717b3371c3 100644
--- a/metadata/cache/app-text/ghostscript-gpl-9.04-r5
+++ b/metadata/cache/app-text/ghostscript-gpl-9.04-r5
@@ -1,4 +1,4 @@
-app-text/libpaper media-libs/fontconfig >=media-libs/freetype-2.4.2:2 media-libs/lcms:0 media-libs/libpng:0 media-libs/tiff:0 >=sys-libs/zlib-1.2.3 virtual/jpeg !bindist? ( djvu? ( app-text/djvu ) ) cups? ( >=net-print/cups-1.3.8 ) dbus? ( sys-apps/dbus ) gtk? ( x11-libs/gtk+:2 ) idn? ( net-dns/libidn ) jpeg2k? ( media-libs/jasper ) X? ( x11-libs/libXt x11-libs/libXext ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+app-text/libpaper media-libs/fontconfig >=media-libs/freetype-2.4.2:2 media-libs/lcms:0 media-libs/libpng:0 media-libs/tiff:0 >=sys-libs/zlib-1.2.3 virtual/jpeg !bindist? ( djvu? ( app-text/djvu ) ) cups? ( >=net-print/cups-1.3.8 ) dbus? ( sys-apps/dbus ) gtk? ( x11-libs/gtk+:2 ) idn? ( net-dns/libidn ) jpeg2k? ( media-libs/jasper ) X? ( x11-libs/libXt x11-libs/libXext ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 app-text/libpaper media-libs/fontconfig >=media-libs/freetype-2.4.2:2 media-libs/lcms:0 media-libs/libpng:0 media-libs/tiff:0 >=sys-libs/zlib-1.2.3 virtual/jpeg !bindist? ( djvu? ( app-text/djvu ) ) cups? ( >=net-print/cups-1.3.8 ) dbus? ( sys-apps/dbus ) gtk? ( x11-libs/gtk+:2 ) idn? ( net-dns/libidn ) jpeg2k? ( media-libs/jasper ) X? ( x11-libs/libXt x11-libs/libXext ) >=app-text/poppler-data-0.4.4 >=media-fonts/urw-fonts-2.4.9 linguas_ja? ( media-fonts/kochi-substitute ) linguas_ko? ( media-fonts/baekmuk-fonts ) linguas_zh_CN? ( media-fonts/arphicfonts ) linguas_zh_TW? ( media-fonts/arphicfonts ) !!media-fonts/gnu-gs-fonts-std !!media-fonts/gnu-gs-fonts-other
 0
 mirror://sourceforge/ghostscript/ghostscript-9.04.tar.bz2 mirror://gentoo/ghostscript-gpl-9.04-patchset-4.tar.bz2 !bindist? ( djvu? ( mirror://sourceforge/djvu/gsdjvu-1.5.tar.gz ) )
diff --git a/metadata/cache/app-text/ghostscript-gpl-9.04-r6 b/metadata/cache/app-text/ghostscript-gpl-9.04-r6
index fbba73e11e5d..9089f13abdb0 100644
--- a/metadata/cache/app-text/ghostscript-gpl-9.04-r6
+++ b/metadata/cache/app-text/ghostscript-gpl-9.04-r6
@@ -1,4 +1,4 @@
-app-text/libpaper media-libs/fontconfig >=media-libs/freetype-2.4.2:2 media-libs/jbig2dec media-libs/lcms:0 media-libs/libpng:0 media-libs/tiff:0 >=sys-libs/zlib-1.2.3 virtual/jpeg !bindist? ( djvu? ( app-text/djvu ) ) cups? ( >=net-print/cups-1.3.8 ) dbus? ( sys-apps/dbus ) gtk? ( x11-libs/gtk+:2 ) idn? ( net-dns/libidn ) jpeg2k? ( media-libs/jasper ) X? ( x11-libs/libXt x11-libs/libXext ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+app-text/libpaper media-libs/fontconfig >=media-libs/freetype-2.4.2:2 media-libs/jbig2dec media-libs/lcms:0 media-libs/libpng:0 media-libs/tiff:0 >=sys-libs/zlib-1.2.3 virtual/jpeg !bindist? ( djvu? ( app-text/djvu ) ) cups? ( >=net-print/cups-1.3.8 ) dbus? ( sys-apps/dbus ) gtk? ( x11-libs/gtk+:2 ) idn? ( net-dns/libidn ) jpeg2k? ( media-libs/jasper ) X? ( x11-libs/libXt x11-libs/libXext ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 app-text/libpaper media-libs/fontconfig >=media-libs/freetype-2.4.2:2 media-libs/jbig2dec media-libs/lcms:0 media-libs/libpng:0 media-libs/tiff:0 >=sys-libs/zlib-1.2.3 virtual/jpeg !bindist? ( djvu? ( app-text/djvu ) ) cups? ( >=net-print/cups-1.3.8 ) dbus? ( sys-apps/dbus ) gtk? ( x11-libs/gtk+:2 ) idn? ( net-dns/libidn ) jpeg2k? ( media-libs/jasper ) X? ( x11-libs/libXt x11-libs/libXext ) >=app-text/poppler-data-0.4.4 >=media-fonts/urw-fonts-2.4.9 linguas_ja? ( media-fonts/kochi-substitute ) linguas_ko? ( media-fonts/baekmuk-fonts ) linguas_zh_CN? ( media-fonts/arphicfonts ) linguas_zh_TW? ( media-fonts/arphicfonts ) !!media-fonts/gnu-gs-fonts-std !!media-fonts/gnu-gs-fonts-other
 0
 mirror://sourceforge/ghostscript/ghostscript-9.04.tar.bz2 mirror://gentoo/ghostscript-gpl-9.04-patchset-4.tar.bz2 !bindist? ( djvu? ( mirror://sourceforge/djvu/gsdjvu-1.5.tar.gz ) )
diff --git a/metadata/cache/app-text/ghostscript-gpl-9.05 b/metadata/cache/app-text/ghostscript-gpl-9.05
index fc62d01071a9..279c826fed3b 100644
--- a/metadata/cache/app-text/ghostscript-gpl-9.05
+++ b/metadata/cache/app-text/ghostscript-gpl-9.05
@@ -1,4 +1,4 @@
-app-text/libpaper media-libs/fontconfig >=media-libs/freetype-2.4.2:2 media-libs/jbig2dec media-libs/lcms:2 media-libs/libpng:0 media-libs/tiff:0 >=sys-libs/zlib-1.2.3 virtual/jpeg !bindist? ( djvu? ( app-text/djvu ) ) cups? ( >=net-print/cups-1.3.8 ) dbus? ( sys-apps/dbus ) gtk? ( x11-libs/gtk+:2 ) idn? ( net-dns/libidn ) jpeg2k? ( media-libs/jasper ) X? ( x11-libs/libXt x11-libs/libXext ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+app-text/libpaper media-libs/fontconfig >=media-libs/freetype-2.4.2:2 media-libs/jbig2dec media-libs/lcms:2 media-libs/libpng:0 media-libs/tiff:0 >=sys-libs/zlib-1.2.3 virtual/jpeg !bindist? ( djvu? ( app-text/djvu ) ) cups? ( >=net-print/cups-1.3.8 ) dbus? ( sys-apps/dbus ) gtk? ( x11-libs/gtk+:2 ) idn? ( net-dns/libidn ) jpeg2k? ( media-libs/jasper ) X? ( x11-libs/libXt x11-libs/libXext ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 app-text/libpaper media-libs/fontconfig >=media-libs/freetype-2.4.2:2 media-libs/jbig2dec media-libs/lcms:2 media-libs/libpng:0 media-libs/tiff:0 >=sys-libs/zlib-1.2.3 virtual/jpeg !bindist? ( djvu? ( app-text/djvu ) ) cups? ( >=net-print/cups-1.3.8 ) dbus? ( sys-apps/dbus ) gtk? ( x11-libs/gtk+:2 ) idn? ( net-dns/libidn ) jpeg2k? ( media-libs/jasper ) X? ( x11-libs/libXt x11-libs/libXext ) >=app-text/poppler-data-0.4.4 >=media-fonts/urw-fonts-2.4.9 linguas_ja? ( media-fonts/kochi-substitute ) linguas_ko? ( media-fonts/baekmuk-fonts ) linguas_zh_CN? ( media-fonts/arphicfonts ) linguas_zh_TW? ( media-fonts/arphicfonts ) !!media-fonts/gnu-gs-fonts-std !!media-fonts/gnu-gs-fonts-other
 0
 mirror://sourceforge/ghostscript/ghostscript-9.05.tar.bz2 mirror://gentoo/ghostscript-gpl-9.05-patchset-1.tar.bz2 !bindist? ( djvu? ( mirror://sourceforge/djvu/gsdjvu-1.5.tar.gz ) )
diff --git a/metadata/cache/app-text/gnome-doc-utils-0.20.9 b/metadata/cache/app-text/gnome-doc-utils-0.20.9
new file mode 100644
index 000000000000..186f33538b09
--- /dev/null
+++ b/metadata/cache/app-text/gnome-doc-utils-0.20.9
@@ -0,0 +1,22 @@
+>=dev-libs/libxml2-2.6.12[python] >=dev-libs/libxslt-1.1.8 >=sys-apps/gawk-3 sys-devel/gettext >=dev-util/intltool-0.35 >=dev-util/pkgconfig-0.9 app-text/docbook-xml-dtd:4.4 app-text/scrollkeeper-dtd app-arch/xz-utils >=sys-apps/sed-4 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
+>=dev-libs/libxml2-2.6.12[python] >=dev-libs/libxslt-1.1.8 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
+0
+mirror://gnome/sources/gnome-doc-utils/0.20/gnome-doc-utils-0.20.9.tar.xz
+
+http://live.gnome.org/GnomeDocUtils
+GPL-2 LGPL-2.1
+A collection of documentation utilities for the Gnome project
+~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+eutils fdo-mime gnome.org gnome2 gnome2-utils libtool multilib python toolchain-funcs user versionator
+
+
+
+
+4
+
+compile configure install postinst postrm preinst prepare setup test unpack
+
+
+
+
+
diff --git a/metadata/cache/app-text/gonzui-1.2-r2 b/metadata/cache/app-text/gonzui-1.2-r2
index a419c2e04c81..5629dfa1ad70 100644
--- a/metadata/cache/app-text/gonzui-1.2-r2
+++ b/metadata/cache/app-text/gonzui-1.2-r2
@@ -1,4 +1,4 @@
-test? ( ruby_targets_ruby18? ( >=dev-ruby/ruby-bdb-0.5.2[ruby_targets_ruby18] dev-ruby/ruby-progressbar[ruby_targets_ruby18] ) ) >=sys-libs/db-4.2 ocaml? ( dev-lang/ocaml ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool ruby_targets_ruby18? ( dev-lang/ruby:1.8 )
+test? ( ruby_targets_ruby18? ( >=dev-ruby/ruby-bdb-0.5.2[ruby_targets_ruby18] dev-ruby/ruby-progressbar[ruby_targets_ruby18] ) ) >=sys-libs/db-4.2 ocaml? ( dev-lang/ocaml ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool ruby_targets_ruby18? ( dev-lang/ruby:1.8 )
 ruby_targets_ruby18? ( >=dev-ruby/ruby-bdb-0.5.2[ruby_targets_ruby18] dev-ruby/ruby-progressbar[ruby_targets_ruby18] ) >=sys-libs/db-4.2 ocaml? ( dev-lang/ocaml ) bzip2? ( app-arch/bzip2 ) cvs? ( dev-vcs/cvs ) gzip? ( app-arch/gzip ) lha? ( app-arch/lha ) perl? ( dev-perl/PPI ) rpm? ( app-arch/rpm ) subversion? ( dev-vcs/subversion ) zip? ( app-arch/unzip ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 )
 0
 mirror://sourceforge/gonzui/gonzui-1.2.tar.gz
diff --git a/metadata/cache/app-text/gtranslator-1.9.13 b/metadata/cache/app-text/gtranslator-1.9.13
index 2b5568f837df..abc8bbca766b 100644
--- a/metadata/cache/app-text/gtranslator-1.9.13
+++ b/metadata/cache/app-text/gtranslator-1.9.13
@@ -1,4 +1,4 @@
->=dev-libs/glib-2.25.10:2 >=dev-libs/gdl-2.26:1 >=dev-libs/libunique-1:1 >=dev-libs/libxml2-2.4.12 gnome-base/gsettings-desktop-schemas gnome-extra/libgda:4 >=x11-libs/gtk+-2.21.5:2 >=x11-libs/gtksourceview-2.4:2.0 gnome? ( gnome-extra/gnome-utils >=gnome-extra/gucharmap-2 ) http? ( >=dev-libs/json-glib-0.7.6 ) spell? ( >=app-text/gtkspell-2.0.2:2 ) >=app-text/scrollkeeper-0.1.4 >=dev-util/intltool-0.40 >=sys-devel/gettext-0.17 dev-util/pkgconfig app-text/gnome-doc-utils app-text/docbook-xml-dtd:4.1.2 gnome-base/gnome-common dev-util/gtk-doc-am doc? ( >=dev-util/gtk-doc-1 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+>=dev-libs/glib-2.25.10:2 >=dev-libs/gdl-2.26:1 >=dev-libs/libunique-1:1 >=dev-libs/libxml2-2.4.12 gnome-base/gsettings-desktop-schemas gnome-extra/libgda:4 >=x11-libs/gtk+-2.21.5:2 >=x11-libs/gtksourceview-2.4:2.0 gnome? ( gnome-extra/gnome-utils >=gnome-extra/gucharmap-2 ) http? ( >=dev-libs/json-glib-0.7.6 ) spell? ( >=app-text/gtkspell-2.0.2:2 ) >=app-text/scrollkeeper-0.1.4 >=dev-util/intltool-0.40 >=sys-devel/gettext-0.17 dev-util/pkgconfig app-text/gnome-doc-utils app-text/docbook-xml-dtd:4.1.2 gnome-base/gnome-common dev-util/gtk-doc-am doc? ( >=dev-util/gtk-doc-1 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 >=dev-libs/glib-2.25.10:2 >=dev-libs/gdl-2.26:1 >=dev-libs/libunique-1:1 >=dev-libs/libxml2-2.4.12 gnome-base/gsettings-desktop-schemas gnome-extra/libgda:4 >=x11-libs/gtk+-2.21.5:2 >=x11-libs/gtksourceview-2.4:2.0 gnome? ( gnome-extra/gnome-utils >=gnome-extra/gucharmap-2 ) http? ( >=dev-libs/json-glib-0.7.6 ) spell? ( >=app-text/gtkspell-2.0.2:2 )
 0
 mirror://gnome/sources/gtranslator/1.9/gtranslator-1.9.13.tar.bz2
diff --git a/metadata/cache/app-text/gtranslator-2.90.7 b/metadata/cache/app-text/gtranslator-2.90.7
index c0f604681496..a8dd331d756f 100644
--- a/metadata/cache/app-text/gtranslator-2.90.7
+++ b/metadata/cache/app-text/gtranslator-2.90.7
@@ -1,4 +1,4 @@
->=dev-libs/glib-2.28.0:2 >=x11-libs/gtk+-3.0.3:3 >=x11-libs/gtksourceview-3.0.0:3.0 >=dev-libs/gdl-2.91.91:3 >=dev-libs/libxml2-2.4.12:2 >=dev-libs/json-glib-0.12.0 >=dev-libs/libpeas-1.0.0[gtk] >=gnome-extra/libgda-4.2.0:4 >=app-text/iso-codes-0.35 gnome-base/gsettings-desktop-schemas gnome? ( gnome-extra/gnome-utils x11-libs/gtk+:3[introspection] ) spell? ( app-text/gtkspell:3 ) >=app-text/scrollkeeper-0.1.4 >=dev-util/intltool-0.40 >=sys-devel/gettext-0.17 dev-util/pkgconfig app-text/gnome-doc-utils app-text/docbook-xml-dtd:4.1.2 doc? ( >=dev-util/gtk-doc-1 ) gnome-base/gnome-common || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 gnome? ( =dev-lang/python-2* )
+>=dev-libs/glib-2.28.0:2 >=x11-libs/gtk+-3.0.3:3 >=x11-libs/gtksourceview-3.0.0:3.0 >=dev-libs/gdl-2.91.91:3 >=dev-libs/libxml2-2.4.12:2 >=dev-libs/json-glib-0.12.0 >=dev-libs/libpeas-1.0.0[gtk] >=gnome-extra/libgda-4.2.0:4 >=app-text/iso-codes-0.35 gnome-base/gsettings-desktop-schemas gnome? ( gnome-extra/gnome-utils x11-libs/gtk+:3[introspection] ) spell? ( app-text/gtkspell:3 ) >=app-text/scrollkeeper-0.1.4 >=dev-util/intltool-0.40 >=sys-devel/gettext-0.17 dev-util/pkgconfig app-text/gnome-doc-utils app-text/docbook-xml-dtd:4.1.2 doc? ( >=dev-util/gtk-doc-1 ) gnome-base/gnome-common || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 gnome? ( =dev-lang/python-2* )
 >=dev-libs/glib-2.28.0:2 >=x11-libs/gtk+-3.0.3:3 >=x11-libs/gtksourceview-3.0.0:3.0 >=dev-libs/gdl-2.91.91:3 >=dev-libs/libxml2-2.4.12:2 >=dev-libs/json-glib-0.12.0 >=dev-libs/libpeas-1.0.0[gtk] >=gnome-extra/libgda-4.2.0:4 >=app-text/iso-codes-0.35 gnome-base/gsettings-desktop-schemas gnome? ( gnome-extra/gnome-utils x11-libs/gtk+:3[introspection] ) spell? ( app-text/gtkspell:3 ) gnome? ( >=dev-libs/libpeas-1.0.0[gtk,python] || ( dev-python/pygobject:2[introspection] dev-python/pygobject:3 ) gnome-extra/gucharmap:2.90[introspection] ) gnome? ( =dev-lang/python-2* )
 0
 mirror://gnome/sources/gtranslator/2.90/gtranslator-2.90.7.tar.bz2 mirror://gentoo/introspection.m4.bz2
diff --git a/metadata/cache/app-text/gv-3.7.1-r1 b/metadata/cache/app-text/gv-3.7.1-r1
index f5d65eedd6ff..b6f132ff7186 100644
--- a/metadata/cache/app-text/gv-3.7.1-r1
+++ b/metadata/cache/app-text/gv-3.7.1-r1
@@ -1,4 +1,4 @@
-x11-libs/libX11 x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt x11-libs/libXmu x11-libs/libXpm x11-libs/libXaw3d app-text/ghostscript-gpl xinerama? ( x11-libs/libXinerama ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+x11-libs/libX11 x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt x11-libs/libXmu x11-libs/libXpm x11-libs/libXaw3d app-text/ghostscript-gpl xinerama? ( x11-libs/libXinerama ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 x11-libs/libX11 x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt x11-libs/libXmu x11-libs/libXpm x11-libs/libXaw3d app-text/ghostscript-gpl xinerama? ( x11-libs/libXinerama )
 0
 mirror://gnu/gv/gv-3.7.1.tar.gz
diff --git a/metadata/cache/app-text/htmltidy-20090325-r1 b/metadata/cache/app-text/htmltidy-20090325-r1
index 7721bf115bd3..4b1521fa0b6a 100644
--- a/metadata/cache/app-text/htmltidy-20090325-r1
+++ b/metadata/cache/app-text/htmltidy-20090325-r1
@@ -1,4 +1,4 @@
-doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 mirror://gentoo/tidy-20090325.tar.bz2 mirror://gentoo/tidy-20090325-doc.tar.bz2
diff --git a/metadata/cache/app-text/hunspell-1.3.2-r3 b/metadata/cache/app-text/hunspell-1.3.2-r3
index 9dac917bbd3a..d1fb836b7fa0 100644
--- a/metadata/cache/app-text/hunspell-1.3.2-r3
+++ b/metadata/cache/app-text/hunspell-1.3.2-r3
@@ -1,4 +1,4 @@
-ncurses? ( sys-libs/ncurses ) readline? ( sys-libs/readline ) sys-devel/gettext || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+ncurses? ( sys-libs/ncurses ) readline? ( sys-libs/readline ) sys-devel/gettext || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 ncurses? ( sys-libs/ncurses ) readline? ( sys-libs/readline )
 0
 mirror://sourceforge/hunspell/hunspell-1.3.2.tar.gz
diff --git a/metadata/cache/app-text/libgxps-0.2.0 b/metadata/cache/app-text/libgxps-0.2.0
index 734f22d82cf2..335c89884708 100644
--- a/metadata/cache/app-text/libgxps-0.2.0
+++ b/metadata/cache/app-text/libgxps-0.2.0
@@ -1,4 +1,4 @@
->=app-arch/libarchive-2.8 >=dev-libs/glib-2.24:2 media-libs/freetype:2 media-libs/libpng:0 >=x11-libs/cairo-1.10[svg] introspection? ( >=dev-libs/gobject-introspection-0.10.1 ) jpeg? ( virtual/jpeg ) lcms? ( media-libs/lcms:2 ) tiff? ( media-libs/tiff[zlib] ) app-text/docbook-xsl-stylesheets dev-libs/libxslt dev-util/pkgconfig doc? ( app-text/docbook-xml-dtd:4.1.2 >=dev-util/gtk-doc-1.14 ) dev-util/gtk-doc-am || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
+>=app-arch/libarchive-2.8 >=dev-libs/glib-2.24:2 media-libs/freetype:2 media-libs/libpng:0 >=x11-libs/cairo-1.10[svg] introspection? ( >=dev-libs/gobject-introspection-0.10.1 ) jpeg? ( virtual/jpeg ) lcms? ( media-libs/lcms:2 ) tiff? ( media-libs/tiff[zlib] ) app-text/docbook-xsl-stylesheets dev-libs/libxslt dev-util/pkgconfig doc? ( app-text/docbook-xml-dtd:4.1.2 >=dev-util/gtk-doc-1.14 ) dev-util/gtk-doc-am || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
 >=app-arch/libarchive-2.8 >=dev-libs/glib-2.24:2 media-libs/freetype:2 media-libs/libpng:0 >=x11-libs/cairo-1.10[svg] introspection? ( >=dev-libs/gobject-introspection-0.10.1 ) jpeg? ( virtual/jpeg ) lcms? ( media-libs/lcms:2 ) tiff? ( media-libs/tiff[zlib] )
 0
 mirror://gnome/sources/libgxps/0.2/libgxps-0.2.0.tar.xz
diff --git a/metadata/cache/app-text/libpaper-1.1.24-r1 b/metadata/cache/app-text/libpaper-1.1.24-r1
index 6e0c645f76e1..c2299b0ba01e 100644
--- a/metadata/cache/app-text/libpaper-1.1.24-r1
+++ b/metadata/cache/app-text/libpaper-1.1.24-r1
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 mirror://debian/pool/main/libp/libpaper/libpaper_1.1.24.tar.gz
diff --git a/metadata/cache/app-text/libspectre-0.2.6 b/metadata/cache/app-text/libspectre-0.2.6
index d8401dfe0f78..e28b1859d008 100644
--- a/metadata/cache/app-text/libspectre-0.2.6
+++ b/metadata/cache/app-text/libspectre-0.2.6
@@ -1,4 +1,4 @@
->=app-text/ghostscript-gpl-8.62 dev-util/pkgconfig doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=app-text/ghostscript-gpl-8.62 dev-util/pkgconfig doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=app-text/ghostscript-gpl-8.62
 0
 http://libspectre.freedesktop.org/releases/libspectre-0.2.6.tar.gz
diff --git a/metadata/cache/app-text/libwpd-0.9.3 b/metadata/cache/app-text/libwpd-0.9.3
index 22db433a46ee..fea85ee80405 100644
--- a/metadata/cache/app-text/libwpd-0.9.3
+++ b/metadata/cache/app-text/libwpd-0.9.3
@@ -1,4 +1,4 @@
-dev-util/pkgconfig doc? ( app-doc/doxygen ) test? ( dev-util/cppunit ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-util/pkgconfig doc? ( app-doc/doxygen ) test? ( dev-util/cppunit ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 !<app-text/libwpd-0.8.14-r1
 0.9
 mirror://sourceforge/libwpd/libwpd-0.9.3.tar.bz2
diff --git a/metadata/cache/app-text/libwpd-0.9.4 b/metadata/cache/app-text/libwpd-0.9.4
index a583e548f860..52d73f70ad9f 100644
--- a/metadata/cache/app-text/libwpd-0.9.4
+++ b/metadata/cache/app-text/libwpd-0.9.4
@@ -1,4 +1,4 @@
-dev-util/pkgconfig doc? ( app-doc/doxygen ) test? ( dev-util/cppunit ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-util/pkgconfig doc? ( app-doc/doxygen ) test? ( dev-util/cppunit ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 !<app-text/libwpd-0.8.14-r1
 0.9
 mirror://sourceforge/libwpd/libwpd-0.9.4.tar.bz2
diff --git a/metadata/cache/app-text/libxmlpatch-0.3.3 b/metadata/cache/app-text/libxmlpatch-0.3.3
index 3afebb26f343..35ed734e4e6b 100644
--- a/metadata/cache/app-text/libxmlpatch-0.3.3
+++ b/metadata/cache/app-text/libxmlpatch-0.3.3
@@ -1,4 +1,4 @@
-dev-libs/glib:2 dev-libs/libxml2 test? ( dev-libs/check ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-libs/glib:2 dev-libs/libxml2 test? ( dev-libs/check ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-libs/glib:2 dev-libs/libxml2
 0
 mirror://sourceforge/xmlpatch/libxmlpatch-0.3.3.tar.gz
diff --git a/metadata/cache/app-text/mecab-0.98 b/metadata/cache/app-text/mecab-0.98
index b3cf42005a6e..e43b9c9e4325 100644
--- a/metadata/cache/app-text/mecab-0.98
+++ b/metadata/cache/app-text/mecab-0.98
@@ -1,4 +1,4 @@
-dev-lang/perl virtual/libiconv || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-lang/perl virtual/libiconv || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-lang/perl virtual/libiconv
 0
 mirror://sourceforge/mecab/mecab-0.98.tar.gz
diff --git a/metadata/cache/app-text/mecab-0.991 b/metadata/cache/app-text/mecab-0.991
index a57da49e9cdc..c002b142bdf0 100644
--- a/metadata/cache/app-text/mecab-0.991
+++ b/metadata/cache/app-text/mecab-0.991
@@ -1,4 +1,4 @@
-dev-lang/perl virtual/libiconv || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-lang/perl virtual/libiconv || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 http://mecab.googlecode.com/files/mecab-0.991.tar.gz
diff --git a/metadata/cache/app-text/migemo-0.40-r5 b/metadata/cache/app-text/migemo-0.40-r5
index 55ece8427d1a..7d09af0a4a6d 100644
--- a/metadata/cache/app-text/migemo-0.40-r5
+++ b/metadata/cache/app-text/migemo-0.40-r5
@@ -1,4 +1,4 @@
-ruby_targets_ruby18? ( dev-ruby/ruby-romkan[ruby_targets_ruby18] dev-ruby/ruby-bsearch[ruby_targets_ruby18] ) ruby_targets_ree18? ( dev-ruby/ruby-romkan[ruby_targets_ree18] dev-ruby/ruby-bsearch[ruby_targets_ree18] ) app-dicts/migemo-dict[-unicode] emacs? ( virtual/emacs app-emacs/apel ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 )
+ruby_targets_ruby18? ( dev-ruby/ruby-romkan[ruby_targets_ruby18] dev-ruby/ruby-bsearch[ruby_targets_ruby18] ) ruby_targets_ree18? ( dev-ruby/ruby-romkan[ruby_targets_ree18] dev-ruby/ruby-bsearch[ruby_targets_ree18] ) app-dicts/migemo-dict[-unicode] emacs? ( virtual/emacs app-emacs/apel ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 )
 ruby_targets_ruby18? ( dev-ruby/ruby-romkan[ruby_targets_ruby18] dev-ruby/ruby-bsearch[ruby_targets_ruby18] ) ruby_targets_ree18? ( dev-ruby/ruby-romkan[ruby_targets_ree18] dev-ruby/ruby-bsearch[ruby_targets_ree18] ) app-dicts/migemo-dict[-unicode] emacs? ( virtual/emacs app-emacs/apel ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 )
 0
 http://0xcc.net/migemo/stable/migemo-0.40.tar.gz
diff --git a/metadata/cache/app-text/pspdftool-0.03 b/metadata/cache/app-text/pspdftool-0.03
index 2448e77ecc74..b368df20c8a2 100644
--- a/metadata/cache/app-text/pspdftool-0.03
+++ b/metadata/cache/app-text/pspdftool-0.03
@@ -1,4 +1,4 @@
-zlib? ( sys-libs/zlib ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+zlib? ( sys-libs/zlib ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 zlib? ( sys-libs/zlib )
 0
 mirror://sourceforge/pspdftool/pspdftool-0.03.tar.bz2
diff --git a/metadata/cache/app-text/pspdftool-9999 b/metadata/cache/app-text/pspdftool-9999
index 4d9ba8b6a1e1..58c6f6110a4e 100644
--- a/metadata/cache/app-text/pspdftool-9999
+++ b/metadata/cache/app-text/pspdftool-9999
@@ -1,4 +1,4 @@
-zlib? ( sys-libs/zlib ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/subversion net-misc/rsync
+zlib? ( sys-libs/zlib ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/subversion net-misc/rsync
 zlib? ( sys-libs/zlib )
 0
 
diff --git a/metadata/cache/app-text/recode-3.6_p17-r2 b/metadata/cache/app-text/recode-3.6_p17-r2
index bdeadd1c4e15..c46d1dcb1c76 100644
--- a/metadata/cache/app-text/recode-3.6_p17-r2
+++ b/metadata/cache/app-text/recode-3.6_p17-r2
@@ -1,4 +1,4 @@
-sys-devel/flex nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+sys-devel/flex nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 mirror://gnu/recode/recode-3.6.tar.gz mirror://debian/pool/main/r/recode/recode_3.6-17.diff.gz
diff --git a/metadata/cache/app-text/sablotron-1.0.3 b/metadata/cache/app-text/sablotron-1.0.3
index 9e3c8f8905f5..51a8e9d55f6e 100644
--- a/metadata/cache/app-text/sablotron-1.0.3
+++ b/metadata/cache/app-text/sablotron-1.0.3
@@ -1,4 +1,4 @@
->=dev-libs/expat-1.95.6-r1 >=dev-perl/XML-Parser-2.3 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-libs/expat-1.95.6-r1 >=dev-perl/XML-Parser-2.3 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=dev-libs/expat-1.95.6-r1
 0
 http://download-1.gingerall.cz/download/sablot/Sablot-1.0.3.tar.gz
diff --git a/metadata/cache/app-text/sgml-common-0.6.3-r5 b/metadata/cache/app-text/sgml-common-0.6.3-r5
index a5bed9e1cdd1..eb7f15ec21db 100644
--- a/metadata/cache/app-text/sgml-common-0.6.3-r5
+++ b/metadata/cache/app-text/sgml-common-0.6.3-r5
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 mirror://kde/devel/docbook/SOURCES/sgml-common-0.6.3.tgz
diff --git a/metadata/cache/app-text/teckit-2.5.1 b/metadata/cache/app-text/teckit-2.5.1
index 0f8f12ce8b4a..bb0c333ef9c1 100644
--- a/metadata/cache/app-text/teckit-2.5.1
+++ b/metadata/cache/app-text/teckit-2.5.1
@@ -1,4 +1,4 @@
-sys-libs/zlib dev-libs/expat || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+sys-libs/zlib dev-libs/expat || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 sys-libs/zlib dev-libs/expat
 0
 http://scripts.sil.org/svn-view/teckit/TAGS/TECkit_2_5_1.tar.gz
diff --git a/metadata/cache/app-text/texi2html-5.0-r1 b/metadata/cache/app-text/texi2html-5.0-r1
index 2a51910e5a2e..534ce9ab22b6 100644
--- a/metadata/cache/app-text/texi2html-5.0-r1
+++ b/metadata/cache/app-text/texi2html-5.0-r1
@@ -6,7 +6,7 @@ mirror://nongnu/texi2html/texi2html-5.0.tar.bz2
 http://www.nongnu.org/texi2html/
 CCPL-ShareAlike-1.0 FDL-1.3 GPL-2
 Perl script that converts Texinfo to HTML
-~amd64 ~mips ~x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+~amd64 ~hppa ~mips ~x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 
 unicode
 
diff --git a/metadata/cache/app-text/texlive-core-2011-r6 b/metadata/cache/app-text/texlive-core-2011-r6
index 559c701f2a89..2e9dccdcd71a 100644
--- a/metadata/cache/app-text/texlive-core-2011-r6
+++ b/metadata/cache/app-text/texlive-core-2011-r6
@@ -6,7 +6,7 @@ mirror://gentoo/texlive-20110705-source.tar.xz mirror://gentoo/texlive-core-patc
 http://tug.org/texlive/
 GPL-2 LPPL-1.3c TeX
 A complete TeX distribution
-~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
+~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd
 eutils flag-o-matic libtool multilib texlive-common toolchain-funcs user
 cjk X doc source tk xetex
 
diff --git a/metadata/cache/app-text/unac-1.8.0 b/metadata/cache/app-text/unac-1.8.0
index 738440e62414..4d4082ac31d3 100644
--- a/metadata/cache/app-text/unac-1.8.0
+++ b/metadata/cache/app-text/unac-1.8.0
@@ -1,4 +1,4 @@
-virtual/libiconv test? ( dev-lang/perl ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+virtual/libiconv test? ( dev-lang/perl ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 virtual/libiconv
 0
 mirror://debian/pool/main/u/unac/unac_1.8.0.orig.tar.gz
diff --git a/metadata/cache/app-text/unpaper-9999 b/metadata/cache/app-text/unpaper-9999
index 874a26af97e6..6f49bac329dd 100644
--- a/metadata/cache/app-text/unpaper-9999
+++ b/metadata/cache/app-text/unpaper-9999
@@ -1,4 +1,4 @@
-test? ( media-libs/netpbm[png] ) dev-libs/libxslt app-text/docbook-xsl-ns-stylesheets dev-vcs/git || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+test? ( media-libs/netpbm[png] ) dev-libs/libxslt app-text/docbook-xsl-ns-stylesheets dev-vcs/git || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 
diff --git a/metadata/cache/app-text/unrtf-0.21.2 b/metadata/cache/app-text/unrtf-0.21.2
index a6e2126055d0..ede43aacc9b6 100644
--- a/metadata/cache/app-text/unrtf-0.21.2
+++ b/metadata/cache/app-text/unrtf-0.21.2
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 mirror://gnu/unrtf/unrtf-0.21.2.tar.gz
diff --git a/metadata/cache/app-text/uudeview-0.5.20-r1 b/metadata/cache/app-text/uudeview-0.5.20-r1
index 9d07d4ef0ad5..ff02b014d48d 100644
--- a/metadata/cache/app-text/uudeview-0.5.20-r1
+++ b/metadata/cache/app-text/uudeview-0.5.20-r1
@@ -1,4 +1,4 @@
-tk? ( dev-lang/tk ) sys-devel/autoconf || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+tk? ( dev-lang/tk ) sys-devel/autoconf || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 tk? ( dev-lang/tk )
 0
 http://www.fpx.de/fp/Software/UUDeview/download/uudeview-0.5.20.tar.gz
diff --git a/metadata/cache/app-text/vilistextum-2.6.9 b/metadata/cache/app-text/vilistextum-2.6.9
index 3139a1a81856..73f21d17b096 100644
--- a/metadata/cache/app-text/vilistextum-2.6.9
+++ b/metadata/cache/app-text/vilistextum-2.6.9
@@ -1,4 +1,4 @@
-virtual/libiconv || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+virtual/libiconv || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 http://bhaak.dyndns.org/vilistextum/vilistextum-2.6.9.tar.bz2
diff --git a/metadata/cache/app-text/wv-1.2.9-r1 b/metadata/cache/app-text/wv-1.2.9-r1
index cb74efe464c9..886fa9de989b 100644
--- a/metadata/cache/app-text/wv-1.2.9-r1
+++ b/metadata/cache/app-text/wv-1.2.9-r1
@@ -1,4 +1,4 @@
->=dev-libs/glib-2 >=gnome-extra/libgsf-1.13 sys-libs/zlib media-libs/libpng dev-libs/libxml2 tools? ( app-text/texlive-core dev-texlive/texlive-latex ) wmf? ( >=media-libs/libwmf-0.2.2 ) >=dev-util/pkgconfig-0.9 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-libs/glib-2 >=gnome-extra/libgsf-1.13 sys-libs/zlib media-libs/libpng dev-libs/libxml2 tools? ( app-text/texlive-core dev-texlive/texlive-latex ) wmf? ( >=media-libs/libwmf-0.2.2 ) >=dev-util/pkgconfig-0.9 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=dev-libs/glib-2 >=gnome-extra/libgsf-1.13 sys-libs/zlib media-libs/libpng dev-libs/libxml2 tools? ( app-text/texlive-core dev-texlive/texlive-latex ) wmf? ( >=media-libs/libwmf-0.2.2 )
 0
 http://abiword.org/downloads/wv/1.2.9/wv-1.2.9.tar.gz
diff --git a/metadata/cache/app-text/xindy-2.4 b/metadata/cache/app-text/xindy-2.4
index 126fd67c1bed..51f4bfc9dff0 100644
--- a/metadata/cache/app-text/xindy-2.4
+++ b/metadata/cache/app-text/xindy-2.4
@@ -1,4 +1,4 @@
-virtual/latex-base >=dev-lisp/clisp-2.44.1-r1 dev-texlive/texlive-langcyrillic dev-lang/perl sys-devel/flex || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+virtual/latex-base >=dev-lisp/clisp-2.44.1-r1 dev-texlive/texlive-langcyrillic dev-lang/perl sys-devel/flex || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 virtual/latex-base >=dev-lisp/clisp-2.44.1-r1 dev-texlive/texlive-langcyrillic
 0
 http://www.xindy.org/xindy-2.4.tar.gz
diff --git a/metadata/cache/app-text/xlhtml-0.5.1_p6 b/metadata/cache/app-text/xlhtml-0.5.1_p6
index 1b77cbfdf6b1..7e2975c6a36b 100644
--- a/metadata/cache/app-text/xlhtml-0.5.1_p6
+++ b/metadata/cache/app-text/xlhtml-0.5.1_p6
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 mirror://debian/pool/main/x/xlhtml/xlhtml_0.5.1.orig.tar.gz mirror://debian/pool/main/x/xlhtml/xlhtml_0.5.1-6.diff.gz
diff --git a/metadata/cache/app-text/xmlstarlet-1.0.2 b/metadata/cache/app-text/xmlstarlet-1.0.2
index 077e1eb90b3b..d735c39bbfac 100644
--- a/metadata/cache/app-text/xmlstarlet-1.0.2
+++ b/metadata/cache/app-text/xmlstarlet-1.0.2
@@ -1,4 +1,4 @@
->=dev-libs/libxml2-2.6.12 >=dev-libs/libxslt-1.1.9 dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-libs/libxml2-2.6.12 >=dev-libs/libxslt-1.1.9 dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=dev-libs/libxml2-2.6.12 >=dev-libs/libxslt-1.1.9
 0
 http://xmlstar.sourceforge.net/downloads/xmlstarlet-1.0.2.tar.gz
diff --git a/metadata/cache/app-text/xmlstarlet-1.0.6 b/metadata/cache/app-text/xmlstarlet-1.0.6
index 9fa37d268ad4..1739d5f001ad 100644
--- a/metadata/cache/app-text/xmlstarlet-1.0.6
+++ b/metadata/cache/app-text/xmlstarlet-1.0.6
@@ -1,4 +1,4 @@
->=dev-libs/libxml2-2.6.23 >=dev-libs/libxslt-1.1.9 dev-libs/libgcrypt virtual/libiconv sys-apps/sed dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-libs/libxml2-2.6.23 >=dev-libs/libxslt-1.1.9 dev-libs/libgcrypt virtual/libiconv sys-apps/sed dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=dev-libs/libxml2-2.6.23 >=dev-libs/libxslt-1.1.9 dev-libs/libgcrypt virtual/libiconv
 0
 mirror://sourceforge/xmlstar/xmlstarlet-1.0.6.tar.gz
diff --git a/metadata/cache/app-text/xournal-0.4.5_p20111022 b/metadata/cache/app-text/xournal-0.4.5_p20111022
index 40a78b00e43f..2ff2168f718c 100644
--- a/metadata/cache/app-text/xournal-0.4.5_p20111022
+++ b/metadata/cache/app-text/xournal-0.4.5_p20111022
@@ -1,4 +1,4 @@
-app-text/poppler[cairo] dev-libs/atk dev-libs/glib gnome-base/libgnomecanvas media-libs/freetype media-libs/fontconfig sys-libs/zlib x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/pango dev-util/pkgconfig app-arch/xz-utils >=sys-apps/sed-4 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+app-text/poppler[cairo] dev-libs/atk dev-libs/glib gnome-base/libgnomecanvas media-libs/freetype media-libs/fontconfig sys-libs/zlib x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/pango dev-util/pkgconfig app-arch/xz-utils >=sys-apps/sed-4 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 app-text/poppler[cairo] dev-libs/atk dev-libs/glib gnome-base/libgnomecanvas media-libs/freetype media-libs/fontconfig sys-libs/zlib x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/pango pdf? ( app-text/poppler[utils] app-text/ghostscript-gpl )
 0
 http://dev.gentoo.org/~dilfridge/distfiles/xournal-0.4.5_p20111022.tar.xz http://dev.gentoo.org/~dilfridge/distfiles/xournal-0.4.5_p20111022-sjg-image-rev7.patch.gz
diff --git a/metadata/cache/app-text/xournal-0.4.5_p20111022-r1 b/metadata/cache/app-text/xournal-0.4.5_p20111022-r1
index 887b11043e53..cedbd4965d17 100644
--- a/metadata/cache/app-text/xournal-0.4.5_p20111022-r1
+++ b/metadata/cache/app-text/xournal-0.4.5_p20111022-r1
@@ -1,4 +1,4 @@
-app-text/poppler[cairo] dev-libs/atk dev-libs/glib gnome-base/libgnomecanvas media-libs/freetype media-libs/fontconfig sys-libs/zlib x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/pango dev-util/pkgconfig app-arch/xz-utils >=sys-apps/sed-4 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+app-text/poppler[cairo] dev-libs/atk dev-libs/glib gnome-base/libgnomecanvas media-libs/freetype media-libs/fontconfig sys-libs/zlib x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/pango dev-util/pkgconfig app-arch/xz-utils >=sys-apps/sed-4 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 app-text/poppler[cairo] dev-libs/atk dev-libs/glib gnome-base/libgnomecanvas media-libs/freetype media-libs/fontconfig sys-libs/zlib x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/pango pdf? ( app-text/poppler[utils] app-text/ghostscript-gpl )
 0
 http://dev.gentoo.org/~dilfridge/distfiles/xournal-0.4.5_p20111022.tar.xz http://dev.gentoo.org/~dilfridge/distfiles/xournal-0.4.5_p20111022-sjg-image-rev7.patch.gz
diff --git a/metadata/cache/app-text/xournal-0.4.5_p20111022-r2 b/metadata/cache/app-text/xournal-0.4.5_p20111022-r2
index 8219b701baab..821d05c8ad7c 100644
--- a/metadata/cache/app-text/xournal-0.4.5_p20111022-r2
+++ b/metadata/cache/app-text/xournal-0.4.5_p20111022-r2
@@ -1,4 +1,4 @@
-app-text/poppler[cairo] dev-libs/atk dev-libs/glib gnome-base/libgnomecanvas media-libs/freetype media-libs/fontconfig sys-libs/zlib x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/pango dev-util/pkgconfig app-arch/xz-utils >=sys-apps/sed-4 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+app-text/poppler[cairo] dev-libs/atk dev-libs/glib gnome-base/libgnomecanvas media-libs/freetype media-libs/fontconfig sys-libs/zlib x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/pango dev-util/pkgconfig app-arch/xz-utils >=sys-apps/sed-4 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 app-text/poppler[cairo] dev-libs/atk dev-libs/glib gnome-base/libgnomecanvas media-libs/freetype media-libs/fontconfig sys-libs/zlib x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/pango pdf? ( app-text/poppler[utils] app-text/ghostscript-gpl )
 0
 http://dev.gentoo.org/~dilfridge/distfiles/xournal-0.4.5_p20111022.tar.xz http://dev.gentoo.org/~dilfridge/distfiles/xournal-0.4.5_p20111022-r2-patchset.tar.xz
diff --git a/metadata/cache/dev-cpp/atkmm-2.22.5 b/metadata/cache/dev-cpp/atkmm-2.22.5
index 3d1170dc684f..4935a7765a14 100644
--- a/metadata/cache/dev-cpp/atkmm-2.22.5
+++ b/metadata/cache/dev-cpp/atkmm-2.22.5
@@ -1,4 +1,4 @@
->=dev-cpp/glibmm-2.24[doc?] >=dev-libs/atk-1.12 dev-libs/libsigc++:2 !<dev-cpp/gtkmm-2.22.0 dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+>=dev-cpp/glibmm-2.24[doc?] >=dev-libs/atk-1.12 dev-libs/libsigc++:2 !<dev-cpp/gtkmm-2.22.0 dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 >=dev-cpp/glibmm-2.24[doc?] >=dev-libs/atk-1.12 dev-libs/libsigc++:2 !<dev-cpp/gtkmm-2.22.0
 0
 mirror://gnome/sources/atkmm/2.22/atkmm-2.22.5.tar.bz2
diff --git a/metadata/cache/dev-cpp/clucene-0.9.21b-r1 b/metadata/cache/dev-cpp/clucene-0.9.21b-r1
index 7464095a54ac..5a9a94a10fd5 100644
--- a/metadata/cache/dev-cpp/clucene-0.9.21b-r1
+++ b/metadata/cache/dev-cpp/clucene-0.9.21b-r1
@@ -1,4 +1,4 @@
-doc? ( >=app-doc/doxygen-1.4.2 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+doc? ( >=app-doc/doxygen-1.4.2 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 1
 mirror://sourceforge/clucene/clucene-core-0.9.21b.tar.bz2
diff --git a/metadata/cache/dev-cpp/commoncpp2-1.8.0 b/metadata/cache/dev-cpp/commoncpp2-1.8.0
index fef5719d3281..62b9cea5bf6b 100644
--- a/metadata/cache/dev-cpp/commoncpp2-1.8.0
+++ b/metadata/cache/dev-cpp/commoncpp2-1.8.0
@@ -1,4 +1,4 @@
-doc? ( >=app-doc/doxygen-1.3.6 ) gnutls? ( dev-libs/libgcrypt net-libs/gnutls ) !gnutls? ( dev-libs/openssl ) sys-libs/zlib || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+doc? ( >=app-doc/doxygen-1.3.6 ) gnutls? ( dev-libs/libgcrypt net-libs/gnutls ) !gnutls? ( dev-libs/openssl ) sys-libs/zlib || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 gnutls? ( dev-libs/libgcrypt net-libs/gnutls ) !gnutls? ( dev-libs/openssl ) sys-libs/zlib
 0
 mirror://gnu/commoncpp/commoncpp2-1.8.0.tar.gz
diff --git a/metadata/cache/dev-cpp/gconfmm-2.28.2-r1 b/metadata/cache/dev-cpp/gconfmm-2.28.2-r1
index 574b0c985754..9121e6f19cfb 100644
--- a/metadata/cache/dev-cpp/gconfmm-2.28.2-r1
+++ b/metadata/cache/dev-cpp/gconfmm-2.28.2-r1
@@ -1,4 +1,4 @@
->=dev-util/pkgconfig-0.12.0 doc? ( >=dev-cpp/mm-common-0.9.3 ) >=gnome-base/gconf-2.4:2 >=dev-cpp/glibmm-2.12:2[doc?] >=dev-cpp/gtkmm-2.4:2.4 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+>=dev-util/pkgconfig-0.12.0 doc? ( >=dev-cpp/mm-common-0.9.3 ) >=gnome-base/gconf-2.4:2 >=dev-cpp/glibmm-2.12:2[doc?] >=dev-cpp/gtkmm-2.4:2.4 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 >=gnome-base/gconf-2.4:2 >=dev-cpp/glibmm-2.12:2[doc?] >=dev-cpp/gtkmm-2.4:2.4
 0
 mirror://gnome/sources/gconfmm/2.28/gconfmm-2.28.2.tar.bz2
diff --git a/metadata/cache/dev-cpp/gtest-1.4.0 b/metadata/cache/dev-cpp/gtest-1.4.0
index a127518a89d7..65458da067a7 100644
--- a/metadata/cache/dev-cpp/gtest-1.4.0
+++ b/metadata/cache/dev-cpp/gtest-1.4.0
@@ -1,4 +1,4 @@
-dev-lang/python || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-lang/python || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 http://googletest.googlecode.com/files/gtest-1.4.0.tar.bz2
diff --git a/metadata/cache/dev-cpp/gtest-1.5.0 b/metadata/cache/dev-cpp/gtest-1.5.0
index 03978190d5e4..9325e0245777 100644
--- a/metadata/cache/dev-cpp/gtest-1.5.0
+++ b/metadata/cache/dev-cpp/gtest-1.5.0
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool =dev-lang/python-2*
+|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool =dev-lang/python-2*
 =dev-lang/python-2*
 0
 http://googletest.googlecode.com/files/gtest-1.5.0.tar.bz2
diff --git a/metadata/cache/dev-cpp/gtkmm-2.24.0 b/metadata/cache/dev-cpp/gtkmm-2.24.0
index 663eace87649..284019dc01a1 100644
--- a/metadata/cache/dev-cpp/gtkmm-2.24.0
+++ b/metadata/cache/dev-cpp/gtkmm-2.24.0
@@ -1,4 +1,4 @@
->=dev-cpp/glibmm-2.24:2 >=x11-libs/gtk+-2.24:2 >=dev-cpp/atkmm-2.22.2 >=dev-cpp/cairomm-1.2.2 >=dev-cpp/pangomm-2.27.1:1.4 dev-libs/libsigc++:2 dev-util/pkgconfig doc? ( >=dev-cpp/mm-common-0.9.3 media-gfx/graphviz dev-libs/libxslt app-doc/doxygen ) >=sys-apps/sed-4 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-cpp/glibmm-2.24:2 >=x11-libs/gtk+-2.24:2 >=dev-cpp/atkmm-2.22.2 >=dev-cpp/cairomm-1.2.2 >=dev-cpp/pangomm-2.27.1:1.4 dev-libs/libsigc++:2 dev-util/pkgconfig doc? ( >=dev-cpp/mm-common-0.9.3 media-gfx/graphviz dev-libs/libxslt app-doc/doxygen ) >=sys-apps/sed-4 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=dev-cpp/glibmm-2.24:2 >=x11-libs/gtk+-2.24:2 >=dev-cpp/atkmm-2.22.2 >=dev-cpp/cairomm-1.2.2 >=dev-cpp/pangomm-2.27.1:1.4 dev-libs/libsigc++:2
 2.4
 mirror://gnome/sources/gtkmm/2.24/gtkmm-2.24.0.tar.bz2
diff --git a/metadata/cache/dev-cpp/libassa-3.5.0 b/metadata/cache/dev-cpp/libassa-3.5.0
index 24af64dcc405..bb45a8da309e 100644
--- a/metadata/cache/dev-cpp/libassa-3.5.0
+++ b/metadata/cache/dev-cpp/libassa-3.5.0
@@ -1,4 +1,4 @@
-doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 mirror://sourceforge/libassa/libassa-3.5.0.tar.gz
diff --git a/metadata/cache/dev-cpp/libcmis-0.1.0 b/metadata/cache/dev-cpp/libcmis-0.1.0
index e7f9bd51a9d6..3446d19549b2 100644
--- a/metadata/cache/dev-cpp/libcmis-0.1.0
+++ b/metadata/cache/dev-cpp/libcmis-0.1.0
@@ -1,4 +1,4 @@
-dev-libs/boost dev-libs/libxml2 net-misc/curl test? ( dev-util/cppunit ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-libs/boost dev-libs/libxml2 net-misc/curl test? ( dev-util/cppunit ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-libs/boost dev-libs/libxml2 net-misc/curl
 0
 mirror://sourceforge/libcmis/libcmis-0.1.0.tar.gz
diff --git a/metadata/cache/dev-cpp/libcmis-9999 b/metadata/cache/dev-cpp/libcmis-9999
index 15d010727e73..de0534639d12 100644
--- a/metadata/cache/dev-cpp/libcmis-9999
+++ b/metadata/cache/dev-cpp/libcmis-9999
@@ -1,4 +1,4 @@
-dev-libs/boost dev-libs/libxml2 net-misc/curl test? ( dev-util/cppunit ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
+dev-libs/boost dev-libs/libxml2 net-misc/curl test? ( dev-util/cppunit ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
 dev-libs/boost dev-libs/libxml2 net-misc/curl
 0
 
diff --git a/metadata/cache/dev-db/ctdb-1.0.114_p1 b/metadata/cache/dev-db/ctdb-1.0.114_p1
index 13cd5ba3c31b..e95fc5098fda 100644
--- a/metadata/cache/dev-db/ctdb-1.0.114_p1
+++ b/metadata/cache/dev-db/ctdb-1.0.114_p1
@@ -1,4 +1,4 @@
-dev-libs/popt test? ( sys-apps/iproute2 sys-process/procps ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=app-arch/rpm2targz-9.0.0.3g
+dev-libs/popt test? ( sys-apps/iproute2 sys-process/procps ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=app-arch/rpm2targz-9.0.0.3g
 dev-libs/popt
 0
 http://ctdb.samba.org/packages/redhat/RHEL5/ctdb-1.0.114-1.src.rpm http://ctdb.samba.org/packages/redhat/RHEL5/old/ctdb-1.0.114-1.src.rpm
diff --git a/metadata/cache/dev-db/ctdb-1.0.73 b/metadata/cache/dev-db/ctdb-1.0.73
index a58349dc4f97..bc57fa2eceb0 100644
--- a/metadata/cache/dev-db/ctdb-1.0.73
+++ b/metadata/cache/dev-db/ctdb-1.0.73
@@ -1,4 +1,4 @@
-dev-libs/popt || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-libs/popt || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-libs/popt
 0
 http://ctdb.samba.org/packages/redhat/RHEL5/ctdb-1.0.73.tgz
diff --git a/metadata/cache/dev-db/ctdb-1.0.88 b/metadata/cache/dev-db/ctdb-1.0.88
index 3c61dfdb17fb..eda8befc4710 100644
--- a/metadata/cache/dev-db/ctdb-1.0.88
+++ b/metadata/cache/dev-db/ctdb-1.0.88
@@ -1,4 +1,4 @@
-dev-libs/popt || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-libs/popt || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-libs/popt
 0
 http://ctdb.samba.org/packages/redhat/RHEL5/ctdb-1.0.88.tgz
diff --git a/metadata/cache/dev-db/drizzle-7.2010.12.06 b/metadata/cache/dev-db/drizzle-7.2010.12.06
index 7035129dbe6e..b4e0d04ea62b 100644
--- a/metadata/cache/dev-db/drizzle-7.2010.12.06
+++ b/metadata/cache/dev-db/drizzle-7.2010.12.06
@@ -1,4 +1,4 @@
-tcmalloc? ( dev-util/google-perftools ) sys-libs/readline sys-apps/util-linux dev-libs/libpcre >=dev-libs/libevent-1.4 >=dev-libs/protobuf-2.1.0 gearman? ( >=sys-cluster/gearmand-0.12 ) pam? ( sys-libs/pam ) curl? ( net-misc/curl ) memcache? ( >=dev-libs/libmemcached-0.39 ) md5? ( >=dev-libs/libgcrypt-1.4.2 ) haildb? ( >=dev-db/haildb-2.3.1 ) >=dev-libs/boost-1.32 ldap? ( net-nds/openldap ) !dev-db/libdrizzle sys-devel/gettext dev-util/intltool dev-util/gperf sys-devel/flex doc? ( app-doc/doxygen ) >=dev-util/boost-build-1.32 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+tcmalloc? ( dev-util/google-perftools ) sys-libs/readline sys-apps/util-linux dev-libs/libpcre >=dev-libs/libevent-1.4 >=dev-libs/protobuf-2.1.0 gearman? ( >=sys-cluster/gearmand-0.12 ) pam? ( sys-libs/pam ) curl? ( net-misc/curl ) memcache? ( >=dev-libs/libmemcached-0.39 ) md5? ( >=dev-libs/libgcrypt-1.4.2 ) haildb? ( >=dev-db/haildb-2.3.1 ) >=dev-libs/boost-1.32 ldap? ( net-nds/openldap ) !dev-db/libdrizzle sys-devel/gettext dev-util/intltool dev-util/gperf sys-devel/flex doc? ( app-doc/doxygen ) >=dev-util/boost-build-1.32 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 tcmalloc? ( dev-util/google-perftools ) sys-libs/readline sys-apps/util-linux dev-libs/libpcre >=dev-libs/libevent-1.4 >=dev-libs/protobuf-2.1.0 gearman? ( >=sys-cluster/gearmand-0.12 ) pam? ( sys-libs/pam ) curl? ( net-misc/curl ) memcache? ( >=dev-libs/libmemcached-0.39 ) md5? ( >=dev-libs/libgcrypt-1.4.2 ) haildb? ( >=dev-db/haildb-2.3.1 ) >=dev-libs/boost-1.32 ldap? ( net-nds/openldap ) !dev-db/libdrizzle
 0
 http://launchpad.net/drizzle/elliott/2010-12-20/+download/drizzle7-2010.12.06.tar.gz
diff --git a/metadata/cache/dev-db/drizzle-7.2011.02.09 b/metadata/cache/dev-db/drizzle-7.2011.02.09
index 4db79b1627d2..b52743acbe0a 100644
--- a/metadata/cache/dev-db/drizzle-7.2011.02.09
+++ b/metadata/cache/dev-db/drizzle-7.2011.02.09
@@ -1,4 +1,4 @@
-tcmalloc? ( dev-util/google-perftools ) sys-libs/readline sys-apps/util-linux dev-libs/libpcre >=dev-libs/libevent-1.4 >=dev-libs/protobuf-2.1.0 gearman? ( >=sys-cluster/gearmand-0.12 ) pam? ( sys-libs/pam ) curl? ( net-misc/curl ) memcache? ( >=dev-libs/libmemcached-0.39 ) md5? ( >=dev-libs/libgcrypt-1.4.2 ) haildb? ( >=dev-db/haildb-2.3.2 ) >=dev-libs/boost-1.32 ldap? ( net-nds/openldap ) !dev-db/libdrizzle sys-devel/gettext dev-util/intltool dev-util/gperf sys-devel/flex doc? ( app-doc/doxygen ) >=dev-util/boost-build-1.32 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+tcmalloc? ( dev-util/google-perftools ) sys-libs/readline sys-apps/util-linux dev-libs/libpcre >=dev-libs/libevent-1.4 >=dev-libs/protobuf-2.1.0 gearman? ( >=sys-cluster/gearmand-0.12 ) pam? ( sys-libs/pam ) curl? ( net-misc/curl ) memcache? ( >=dev-libs/libmemcached-0.39 ) md5? ( >=dev-libs/libgcrypt-1.4.2 ) haildb? ( >=dev-db/haildb-2.3.2 ) >=dev-libs/boost-1.32 ldap? ( net-nds/openldap ) !dev-db/libdrizzle sys-devel/gettext dev-util/intltool dev-util/gperf sys-devel/flex doc? ( app-doc/doxygen ) >=dev-util/boost-build-1.32 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 tcmalloc? ( dev-util/google-perftools ) sys-libs/readline sys-apps/util-linux dev-libs/libpcre >=dev-libs/libevent-1.4 >=dev-libs/protobuf-2.1.0 gearman? ( >=sys-cluster/gearmand-0.12 ) pam? ( sys-libs/pam ) curl? ( net-misc/curl ) memcache? ( >=dev-libs/libmemcached-0.39 ) md5? ( >=dev-libs/libgcrypt-1.4.2 ) haildb? ( >=dev-db/haildb-2.3.2 ) >=dev-libs/boost-1.32 ldap? ( net-nds/openldap ) !dev-db/libdrizzle
 0
 http://launchpad.net/drizzle/elliott/2011-01-31/+download/drizzle7-2011.02.09.tar.gz
diff --git a/metadata/cache/dev-db/drizzle-7.2011.03.11 b/metadata/cache/dev-db/drizzle-7.2011.03.11
index 1e591ecd30e4..dc965f17891f 100644
--- a/metadata/cache/dev-db/drizzle-7.2011.03.11
+++ b/metadata/cache/dev-db/drizzle-7.2011.03.11
@@ -1,4 +1,4 @@
-tcmalloc? ( dev-util/google-perftools ) sys-libs/readline sys-apps/util-linux dev-libs/libpcre >=dev-libs/libevent-1.4 >=dev-libs/protobuf-2.1.0 gearman? ( >=sys-cluster/gearmand-0.12 ) pam? ( sys-libs/pam ) curl? ( net-misc/curl ) memcache? ( >=dev-libs/libmemcached-0.39 ) md5? ( >=dev-libs/libgcrypt-1.4.2 ) haildb? ( >=dev-db/haildb-2.3.2 ) >=dev-libs/boost-1.32 ldap? ( net-nds/openldap ) !dev-db/libdrizzle sys-devel/gettext dev-util/intltool dev-util/gperf sys-devel/flex doc? ( app-doc/doxygen ) >=dev-util/boost-build-1.32 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+tcmalloc? ( dev-util/google-perftools ) sys-libs/readline sys-apps/util-linux dev-libs/libpcre >=dev-libs/libevent-1.4 >=dev-libs/protobuf-2.1.0 gearman? ( >=sys-cluster/gearmand-0.12 ) pam? ( sys-libs/pam ) curl? ( net-misc/curl ) memcache? ( >=dev-libs/libmemcached-0.39 ) md5? ( >=dev-libs/libgcrypt-1.4.2 ) haildb? ( >=dev-db/haildb-2.3.2 ) >=dev-libs/boost-1.32 ldap? ( net-nds/openldap ) !dev-db/libdrizzle sys-devel/gettext dev-util/intltool dev-util/gperf sys-devel/flex doc? ( app-doc/doxygen ) >=dev-util/boost-build-1.32 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 tcmalloc? ( dev-util/google-perftools ) sys-libs/readline sys-apps/util-linux dev-libs/libpcre >=dev-libs/libevent-1.4 >=dev-libs/protobuf-2.1.0 gearman? ( >=sys-cluster/gearmand-0.12 ) pam? ( sys-libs/pam ) curl? ( net-misc/curl ) memcache? ( >=dev-libs/libmemcached-0.39 ) md5? ( >=dev-libs/libgcrypt-1.4.2 ) haildb? ( >=dev-db/haildb-2.3.2 ) >=dev-libs/boost-1.32 ldap? ( net-nds/openldap ) !dev-db/libdrizzle
 0
 http://launchpad.net/drizzle/elliott/2011-02-28/+download/drizzle7-2011.03.11.tar.gz
diff --git a/metadata/cache/dev-db/firebird-2.5.1.26351.0 b/metadata/cache/dev-db/firebird-2.5.1.26351.0
index 7f996a32bf19..4d6eca66c789 100644
--- a/metadata/cache/dev-db/firebird-2.5.1.26351.0
+++ b/metadata/cache/dev-db/firebird-2.5.1.26351.0
@@ -1,4 +1,4 @@
-dev-libs/libedit dev-libs/icu >=dev-util/btyacc-3.0-r2 doc? ( app-arch/unzip ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-libs/libedit dev-libs/icu >=dev-util/btyacc-3.0-r2 doc? ( app-arch/unzip ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-libs/libedit dev-libs/icu xinetd? ( virtual/inetd ) !sys-cluster/ganglia
 0
 mirror://sourceforge/firebird/Firebird-2.5.1.26351-0.tar.bz2 doc? ( ftp://ftpc.inprise.com/pub/interbase/techpubs/ib_b60_doc.zip )
diff --git a/metadata/cache/dev-db/freetds-0.82-r3 b/metadata/cache/dev-db/freetds-0.82-r3
index 699779b1d348..4ca40f52b86c 100644
--- a/metadata/cache/dev-db/freetds-0.82-r3
+++ b/metadata/cache/dev-db/freetds-0.82-r3
@@ -1,4 +1,4 @@
-iodbc? ( dev-db/libiodbc ) odbc? ( dev-db/unixODBC ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+iodbc? ( dev-db/libiodbc ) odbc? ( dev-db/unixODBC ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 iodbc? ( dev-db/libiodbc ) odbc? ( dev-db/unixODBC )
 0
 http://ibiblio.org/pub/Linux/ALPHA/freetds/stable/freetds-0.82.tar.gz
diff --git a/metadata/cache/dev-db/freetds-0.91 b/metadata/cache/dev-db/freetds-0.91
index 558c36074562..9ffb0c2ec080 100644
--- a/metadata/cache/dev-db/freetds-0.91
+++ b/metadata/cache/dev-db/freetds-0.91
@@ -1,4 +1,4 @@
-iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) odbc? ( dev-db/unixODBC ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) odbc? ( dev-db/unixODBC ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) odbc? ( dev-db/unixODBC )
 0
 http://ibiblio.org/pub/Linux/ALPHA/freetds/stable/freetds-0.91.tar.gz
diff --git a/metadata/cache/dev-db/lib_mysqludf_preg-1.0.1 b/metadata/cache/dev-db/lib_mysqludf_preg-1.0.1
index a87bb0d56b4a..b8756fa68621 100644
--- a/metadata/cache/dev-db/lib_mysqludf_preg-1.0.1
+++ b/metadata/cache/dev-db/lib_mysqludf_preg-1.0.1
@@ -1,4 +1,4 @@
->=virtual/mysql-5.1 dev-libs/libpcre || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=virtual/mysql-5.1 dev-libs/libpcre || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=virtual/mysql-5.1 dev-libs/libpcre
 0
 http://www.mysqludf.org/lib_mysqludf_preg/lib_mysqludf_preg-1.0.1.tar.gz
diff --git a/metadata/cache/dev-db/lib_mysqludf_stem-0.9.1 b/metadata/cache/dev-db/lib_mysqludf_stem-0.9.1
index f184d5930bd8..56e4c2c7abdd 100644
--- a/metadata/cache/dev-db/lib_mysqludf_stem-0.9.1
+++ b/metadata/cache/dev-db/lib_mysqludf_stem-0.9.1
@@ -1,4 +1,4 @@
->=virtual/mysql-5.1 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=virtual/mysql-5.1 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=virtual/mysql-5.1
 0
 http://www.mysqludf.org/lib_mysqludf_stem/lib_mysqludf_stem-0.9.1.tar.gz
diff --git a/metadata/cache/dev-db/lib_mysqludf_str-0.3 b/metadata/cache/dev-db/lib_mysqludf_str-0.3
index 8c6bed1d15c4..51376f0d1636 100644
--- a/metadata/cache/dev-db/lib_mysqludf_str-0.3
+++ b/metadata/cache/dev-db/lib_mysqludf_str-0.3
@@ -1,4 +1,4 @@
->=virtual/mysql-5.1 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=virtual/mysql-5.1 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=virtual/mysql-5.1
 0
 http://www.mysqludf.org/lib_mysqludf_str/lib_mysqludf_str-0.3.tar.gz
diff --git a/metadata/cache/dev-db/lib_mysqludf_ta-0.1 b/metadata/cache/dev-db/lib_mysqludf_ta-0.1
index c8f482a68ece..4e21782a5fd3 100644
--- a/metadata/cache/dev-db/lib_mysqludf_ta-0.1
+++ b/metadata/cache/dev-db/lib_mysqludf_ta-0.1
@@ -1,4 +1,4 @@
->=virtual/mysql-5.1 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=virtual/mysql-5.1 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=virtual/mysql-5.1
 0
 https://github.com/joaocosta/lib_mysqludf_ta/tarball/a8e623c -> joaocosta-lib_mysqludf_ta-a8e623c.tar.gz
diff --git a/metadata/cache/dev-db/lib_mysqludf_xql-1.0.0 b/metadata/cache/dev-db/lib_mysqludf_xql-1.0.0
index e420dafa9395..ce54235d7202 100644
--- a/metadata/cache/dev-db/lib_mysqludf_xql-1.0.0
+++ b/metadata/cache/dev-db/lib_mysqludf_xql-1.0.0
@@ -1,4 +1,4 @@
->=virtual/mysql-5.1 dev-libs/libxml2 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=virtual/mysql-5.1 dev-libs/libxml2 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=virtual/mysql-5.1 dev-libs/libxml2
 0
 http://www.mysqludf.org/lib_mysqludf_xql/lib_mysqludf_xql-1.0.0.tar.gz
diff --git a/metadata/cache/dev-db/libdbi-0.8.4 b/metadata/cache/dev-db/libdbi-0.8.4
index 6ced0790ae7a..ea96dd8bfe40 100644
--- a/metadata/cache/dev-db/libdbi-0.8.4
+++ b/metadata/cache/dev-db/libdbi-0.8.4
@@ -1,4 +1,4 @@
->=sys-apps/sed-4 dev-util/pkgconfig doc? ( app-text/openjade ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=sys-apps/sed-4 dev-util/pkgconfig doc? ( app-text/openjade ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 mirror://sourceforge/libdbi/libdbi-0.8.4.tar.gz
diff --git a/metadata/cache/dev-db/libdbi-drivers-0.8.3-r1 b/metadata/cache/dev-db/libdbi-drivers-0.8.3-r1
index 73c01ec74bef..9032c24bceca 100644
--- a/metadata/cache/dev-db/libdbi-drivers-0.8.3-r1
+++ b/metadata/cache/dev-db/libdbi-drivers-0.8.3-r1
@@ -1,4 +1,4 @@
->=dev-db/libdbi-0.8.3 mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-base ) sqlite? ( <dev-db/sqlite-3 ) sqlite3? ( >=dev-db/sqlite-3 ) !bindist? ( firebird? ( dev-db/firebird ) ) doc? ( app-text/openjade ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-db/libdbi-0.8.3 mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-base ) sqlite? ( <dev-db/sqlite-3 ) sqlite3? ( >=dev-db/sqlite-3 ) !bindist? ( firebird? ( dev-db/firebird ) ) doc? ( app-text/openjade ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=dev-db/libdbi-0.8.3 mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-base ) sqlite? ( <dev-db/sqlite-3 ) sqlite3? ( >=dev-db/sqlite-3 ) !bindist? ( firebird? ( dev-db/firebird ) ) doc? ( app-text/openjade )
 0
 mirror://sourceforge/libdbi-drivers/libdbi-drivers-0.8.3-1.tar.gz
diff --git a/metadata/cache/dev-db/libdbi-drivers-0.8.3-r2 b/metadata/cache/dev-db/libdbi-drivers-0.8.3-r2
index 1b39dc9d1e9b..77fd96b3dc05 100644
--- a/metadata/cache/dev-db/libdbi-drivers-0.8.3-r2
+++ b/metadata/cache/dev-db/libdbi-drivers-0.8.3-r2
@@ -1,4 +1,4 @@
->=dev-db/libdbi-0.8.3 mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-base ) sqlite? ( <dev-db/sqlite-3 ) sqlite3? ( >=dev-db/sqlite-3 ) !bindist? ( firebird? ( dev-db/firebird ) ) doc? ( app-text/openjade ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-db/libdbi-0.8.3 mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-base ) sqlite? ( <dev-db/sqlite-3 ) sqlite3? ( >=dev-db/sqlite-3 ) !bindist? ( firebird? ( dev-db/firebird ) ) doc? ( app-text/openjade ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=dev-db/libdbi-0.8.3 mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-base ) sqlite? ( <dev-db/sqlite-3 ) sqlite3? ( >=dev-db/sqlite-3 ) !bindist? ( firebird? ( dev-db/firebird ) )
 0
 mirror://sourceforge/libdbi-drivers/libdbi-drivers-0.8.3-1.tar.gz
diff --git a/metadata/cache/dev-db/mariadb-5.1.42 b/metadata/cache/dev-db/mariadb-5.1.42
index f3bfc25efec2..f938de7ec245 100644
--- a/metadata/cache/dev-db/mariadb-5.1.42
+++ b/metadata/cache/dev-db/mariadb-5.1.42
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) sys-devel/gnuconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/readline-4.1 >=sys-libs/zlib-1.2.3 libevent? ( >=dev-libs/libevent-1.4 ) !dev-db/mysql !dev-db/mysql-community !dev-db/mysql-cluster virtual/yacc >=dev-util/cmake-2.4.3
+|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) sys-devel/gnuconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/readline-4.1 >=sys-libs/zlib-1.2.3 libevent? ( >=dev-libs/libevent-1.4 ) !dev-db/mysql !dev-db/mysql-community !dev-db/mysql-cluster virtual/yacc >=dev-util/cmake-2.4.3
 !media-sound/amarok[embedded] ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/readline-4.1 >=sys-libs/zlib-1.2.3 libevent? ( >=dev-libs/libevent-1.4 ) !dev-db/mysql !dev-db/mysql-community !dev-db/mysql-cluster !minimal? ( !prefix? ( dev-db/mysql-init-scripts ) ) selinux? ( sec-policy/selinux-mysql )
 0
 http://ftp.osuosl.org/pub/mariadb/mariadb-5.1.42/kvm-tarbake-jaunty-x86/mariadb-5.1.42.tar.gz http://ftp.rediris.es/mirror/MariaDB/mariadb-5.1.42/kvm-tarbake-jaunty-x86/mariadb-5.1.42.tar.gz http://maria.llarian.net/download/mariadb-5.1.42/kvm-tarbake-jaunty-x86/mariadb-5.1.42.tar.gz http://launchpad.net/maria/5.1/ongoing/+download/mariadb-5.1.42.tar.gz http://mirrors.fe.up.pt/pub/mariadb/mariadb-5.1.42/kvm-tarbake-jaunty-x86/mariadb-5.1.42.tar.gz http://ftp-stud.hs-esslingen.de/pub/Mirrors/mariadb/mariadb-5.1.42/kvm-tarbake-jaunty-x86/mariadb-5.1.42.tar.gz mirror://gentoo/mysql-extras-20100324-0235Z.tar.bz2 http://g3nt8.org/patches/mysql-extras-20100324-0235Z.tar.bz2 http://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20100324-0235Z.tar.bz2
diff --git a/metadata/cache/dev-db/mariadb-5.1.42-r1 b/metadata/cache/dev-db/mariadb-5.1.42-r1
index f3bfc25efec2..f938de7ec245 100644
--- a/metadata/cache/dev-db/mariadb-5.1.42-r1
+++ b/metadata/cache/dev-db/mariadb-5.1.42-r1
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) sys-devel/gnuconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/readline-4.1 >=sys-libs/zlib-1.2.3 libevent? ( >=dev-libs/libevent-1.4 ) !dev-db/mysql !dev-db/mysql-community !dev-db/mysql-cluster virtual/yacc >=dev-util/cmake-2.4.3
+|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) sys-devel/gnuconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/readline-4.1 >=sys-libs/zlib-1.2.3 libevent? ( >=dev-libs/libevent-1.4 ) !dev-db/mysql !dev-db/mysql-community !dev-db/mysql-cluster virtual/yacc >=dev-util/cmake-2.4.3
 !media-sound/amarok[embedded] ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/readline-4.1 >=sys-libs/zlib-1.2.3 libevent? ( >=dev-libs/libevent-1.4 ) !dev-db/mysql !dev-db/mysql-community !dev-db/mysql-cluster !minimal? ( !prefix? ( dev-db/mysql-init-scripts ) ) selinux? ( sec-policy/selinux-mysql )
 0
 http://ftp.osuosl.org/pub/mariadb/mariadb-5.1.42/kvm-tarbake-jaunty-x86/mariadb-5.1.42.tar.gz http://ftp.rediris.es/mirror/MariaDB/mariadb-5.1.42/kvm-tarbake-jaunty-x86/mariadb-5.1.42.tar.gz http://maria.llarian.net/download/mariadb-5.1.42/kvm-tarbake-jaunty-x86/mariadb-5.1.42.tar.gz http://launchpad.net/maria/5.1/ongoing/+download/mariadb-5.1.42.tar.gz http://mirrors.fe.up.pt/pub/mariadb/mariadb-5.1.42/kvm-tarbake-jaunty-x86/mariadb-5.1.42.tar.gz http://ftp-stud.hs-esslingen.de/pub/Mirrors/mariadb/mariadb-5.1.42/kvm-tarbake-jaunty-x86/mariadb-5.1.42.tar.gz mirror://gentoo/mysql-extras-20100324-0235Z.tar.bz2 http://g3nt8.org/patches/mysql-extras-20100324-0235Z.tar.bz2 http://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20100324-0235Z.tar.bz2
diff --git a/metadata/cache/dev-db/mariadb-5.1.50 b/metadata/cache/dev-db/mariadb-5.1.50
index 2c617208900a..6d0dd85be1cf 100644
--- a/metadata/cache/dev-db/mariadb-5.1.50
+++ b/metadata/cache/dev-db/mariadb-5.1.50
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) >=sys-devel/libtool-2.2.10 sys-devel/gnuconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/readline-4.1 >=sys-libs/zlib-1.2.3 libevent? ( >=dev-libs/libevent-1.4 ) !dev-db/mysql !dev-db/mysql-community !dev-db/mysql-cluster virtual/yacc >=dev-util/cmake-2.4.3
+|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) >=sys-devel/libtool-2.2.10 sys-devel/gnuconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/readline-4.1 >=sys-libs/zlib-1.2.3 libevent? ( >=dev-libs/libevent-1.4 ) !dev-db/mysql !dev-db/mysql-community !dev-db/mysql-cluster virtual/yacc >=dev-util/cmake-2.4.3
 ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/readline-4.1 >=sys-libs/zlib-1.2.3 libevent? ( >=dev-libs/libevent-1.4 ) !dev-db/mysql !dev-db/mysql-community !dev-db/mysql-cluster !minimal? ( !prefix? ( dev-db/mysql-init-scripts ) ) selinux? ( sec-policy/selinux-mysql )
 0
 http://ftp.osuosl.org/pub/mariadb/mariadb-5.1.50/kvm-tarbake-jaunty-x86/mariadb-5.1.50.tar.gz http://ftp.rediris.es/mirror/MariaDB/mariadb-5.1.50/kvm-tarbake-jaunty-x86/mariadb-5.1.50.tar.gz http://maria.llarian.net/download/mariadb-5.1.50/kvm-tarbake-jaunty-x86/mariadb-5.1.50.tar.gz http://launchpad.net/maria/5.1/ongoing/+download/mariadb-5.1.50.tar.gz http://mirrors.fe.up.pt/pub/mariadb/mariadb-5.1.50/kvm-tarbake-jaunty-x86/mariadb-5.1.50.tar.gz http://ftp-stud.hs-esslingen.de/pub/Mirrors/mariadb/mariadb-5.1.50/kvm-tarbake-jaunty-x86/mariadb-5.1.50.tar.gz mirror://gentoo/mysql-extras-20101006-0004Z.tar.bz2 http://g3nt8.org/patches/mysql-extras-20101006-0004Z.tar.bz2 http://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20101006-0004Z.tar.bz2
diff --git a/metadata/cache/dev-db/mariadb-5.1.55 b/metadata/cache/dev-db/mariadb-5.1.55
index 4964a675b255..5aeec808b823 100644
--- a/metadata/cache/dev-db/mariadb-5.1.55
+++ b/metadata/cache/dev-db/mariadb-5.1.55
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) sys-devel/gnuconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/readline-4.1 >=sys-libs/zlib-1.2.3 libevent? ( >=dev-libs/libevent-1.4 ) !dev-db/mysql !dev-db/mysql-community !dev-db/mysql-cluster virtual/yacc static? ( || ( sys-libs/ncurses[static-libs] <=sys-libs/ncurses-5.7-r3 ) ) >=dev-util/cmake-2.4.3
+|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) sys-devel/gnuconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/readline-4.1 >=sys-libs/zlib-1.2.3 libevent? ( >=dev-libs/libevent-1.4 ) !dev-db/mysql !dev-db/mysql-community !dev-db/mysql-cluster virtual/yacc static? ( || ( sys-libs/ncurses[static-libs] <=sys-libs/ncurses-5.7-r3 ) ) >=dev-util/cmake-2.4.3
 ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/readline-4.1 >=sys-libs/zlib-1.2.3 libevent? ( >=dev-libs/libevent-1.4 ) !dev-db/mysql !dev-db/mysql-community !dev-db/mysql-cluster !minimal? ( !prefix? ( dev-db/mysql-init-scripts ) ) selinux? ( sec-policy/selinux-mysql )
 0
 http://ftp.osuosl.org/pub/mariadb/mariadb-5.1.55/kvm-tarbake-jaunty-x86/mariadb-5.1.55.tar.gz http://ftp.rediris.es/mirror/MariaDB/mariadb-5.1.55/kvm-tarbake-jaunty-x86/mariadb-5.1.55.tar.gz http://maria.llarian.net/download/mariadb-5.1.55/kvm-tarbake-jaunty-x86/mariadb-5.1.55.tar.gz http://launchpad.net/maria/5.1/ongoing/+download/mariadb-5.1.55.tar.gz http://mirrors.fe.up.pt/pub/mariadb/mariadb-5.1.55/kvm-tarbake-jaunty-x86/mariadb-5.1.55.tar.gz http://ftp-stud.hs-esslingen.de/pub/Mirrors/mariadb/mariadb-5.1.55/kvm-tarbake-jaunty-x86/mariadb-5.1.55.tar.gz mirror://gentoo/mysql-extras-20110426-1046Z.tar.bz2 http://g3nt8.org/patches/mysql-extras-20110426-1046Z.tar.bz2 http://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20110426-1046Z.tar.bz2 http://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20110426-1046Z.tar.bz2
diff --git a/metadata/cache/dev-db/mariadb-5.2.9 b/metadata/cache/dev-db/mariadb-5.2.9
index b9954ec4c87e..4d35d27f128f 100644
--- a/metadata/cache/dev-db/mariadb-5.2.9
+++ b/metadata/cache/dev-db/mariadb-5.2.9
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) sys-devel/gnuconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/readline-4.1 >=sys-libs/zlib-1.2.3 libevent? ( >=dev-libs/libevent-1.4 ) !dev-db/mysql !dev-db/mysql-community !dev-db/mysql-cluster virtual/yacc static? ( || ( sys-libs/ncurses[static-libs] <=sys-libs/ncurses-5.7-r3 ) ) >=dev-util/cmake-2.4.3 oqgraph? ( >=dev-libs/boost-1.40.0 ) sphinx? ( app-misc/sphinx )
+|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) sys-devel/gnuconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/readline-4.1 >=sys-libs/zlib-1.2.3 libevent? ( >=dev-libs/libevent-1.4 ) !dev-db/mysql !dev-db/mysql-community !dev-db/mysql-cluster virtual/yacc static? ( || ( sys-libs/ncurses[static-libs] <=sys-libs/ncurses-5.7-r3 ) ) >=dev-util/cmake-2.4.3 oqgraph? ( >=dev-libs/boost-1.40.0 ) sphinx? ( app-misc/sphinx )
 ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/readline-4.1 >=sys-libs/zlib-1.2.3 libevent? ( >=dev-libs/libevent-1.4 ) !dev-db/mysql !dev-db/mysql-community !dev-db/mysql-cluster !minimal? ( !prefix? ( dev-db/mysql-init-scripts ) ) selinux? ( sec-policy/selinux-mysql )
 0
 http://ftp.osuosl.org/pub/mariadb/mariadb-5.2.9/kvm-tarbake-jaunty-x86/mariadb-5.2.9.tar.gz http://ftp.rediris.es/mirror/MariaDB/mariadb-5.2.9/kvm-tarbake-jaunty-x86/mariadb-5.2.9.tar.gz http://maria.llarian.net/download/mariadb-5.2.9/kvm-tarbake-jaunty-x86/mariadb-5.2.9.tar.gz http://launchpad.net/maria/5.2/ongoing/+download/mariadb-5.2.9.tar.gz http://mirrors.fe.up.pt/pub/mariadb/mariadb-5.2.9/kvm-tarbake-jaunty-x86/mariadb-5.2.9.tar.gz http://ftp-stud.hs-esslingen.de/pub/Mirrors/mariadb/mariadb-5.2.9/kvm-tarbake-jaunty-x86/mariadb-5.2.9.tar.gz mirror://gentoo/mysql-extras-20110819-0415Z.tar.bz2 http://g3nt8.org/patches/mysql-extras-20110819-0415Z.tar.bz2 http://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20110819-0415Z.tar.bz2 http://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20110819-0415Z.tar.bz2
diff --git a/metadata/cache/dev-db/myodbc-5.1.6 b/metadata/cache/dev-db/myodbc-5.1.6
index f82fc398c764..f36bb3bc5fcd 100644
--- a/metadata/cache/dev-db/myodbc-5.1.6
+++ b/metadata/cache/dev-db/myodbc-5.1.6
@@ -1,4 +1,4 @@
->=virtual/mysql-4.0 dev-db/unixODBC qt4? ( >=x11-libs/qt-gui-4 ) doc? ( dev-lang/perl ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=virtual/mysql-4.0 dev-db/unixODBC qt4? ( >=x11-libs/qt-gui-4 ) doc? ( dev-lang/perl ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=virtual/mysql-4.0 dev-db/unixODBC qt4? ( >=x11-libs/qt-gui-4 )
 5.1
 mirror://mysql/Downloads/Connector-ODBC/5.1/mysql-connector-odbc-5.1.6.tar.gz
diff --git a/metadata/cache/dev-db/mysql-5.0.91 b/metadata/cache/dev-db/mysql-5.0.91
index d37c17e2ca22..f0a18e4244fa 100644
--- a/metadata/cache/dev-db/mysql-5.0.91
+++ b/metadata/cache/dev-db/mysql-5.0.91
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) sys-devel/gnuconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/readline-4.1 >=sys-libs/zlib-1.2.3 !dev-db/mysql-community !dev-db/mysql-cluster !dev-db/mariadb virtual/yacc static? ( || ( sys-libs/ncurses[static-libs] <=sys-libs/ncurses-5.7-r3 ) ) berkdb? ( sys-apps/ed )
+|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) sys-devel/gnuconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/readline-4.1 >=sys-libs/zlib-1.2.3 !dev-db/mysql-community !dev-db/mysql-cluster !dev-db/mariadb virtual/yacc static? ( || ( sys-libs/ncurses[static-libs] <=sys-libs/ncurses-5.7-r3 ) ) berkdb? ( sys-apps/ed )
 ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/readline-4.1 >=sys-libs/zlib-1.2.3 !dev-db/mysql-community !dev-db/mysql-cluster !dev-db/mariadb !minimal? ( !prefix? ( dev-db/mysql-init-scripts ) ) selinux? ( sec-policy/selinux-mysql )
 0
 http://downloads.mysql.com/archives/mysql-5.0/mysql-5.0.91.tar.gz mirror://mysql/Downloads/MySQL-5.0/mysql-5.0.91.tar.gz mirror://gentoo/mysql-extras-20100809-0452Z.tar.bz2 http://g3nt8.org/patches/mysql-extras-20100809-0452Z.tar.bz2 http://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20100809-0452Z.tar.bz2
diff --git a/metadata/cache/dev-db/mysql-5.0.92 b/metadata/cache/dev-db/mysql-5.0.92
index b1f6deab8567..0e8b89fcae57 100644
--- a/metadata/cache/dev-db/mysql-5.0.92
+++ b/metadata/cache/dev-db/mysql-5.0.92
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) sys-devel/gnuconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/readline-4.1 >=sys-libs/zlib-1.2.3 !dev-db/mysql-community !dev-db/mysql-cluster !dev-db/mariadb virtual/yacc berkdb? ( sys-apps/ed )
+|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) sys-devel/gnuconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/readline-4.1 >=sys-libs/zlib-1.2.3 !dev-db/mysql-community !dev-db/mysql-cluster !dev-db/mariadb virtual/yacc berkdb? ( sys-apps/ed )
 ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/readline-4.1 >=sys-libs/zlib-1.2.3 !dev-db/mysql-community !dev-db/mysql-cluster !dev-db/mariadb !minimal? ( !prefix? ( dev-db/mysql-init-scripts ) ) selinux? ( sec-policy/selinux-mysql )
 0
 http://downloads.mysql.com/archives/mysql-5.0/mysql-5.0.92.tar.gz mirror://mysql/Downloads/MySQL-5.0/mysql-5.0.92.tar.gz mirror://gentoo/mysql-extras-20110713-0702Z.tar.bz2 http://g3nt8.org/patches/mysql-extras-20110713-0702Z.tar.bz2 http://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20110713-0702Z.tar.bz2
diff --git a/metadata/cache/dev-db/mysql-5.1.51 b/metadata/cache/dev-db/mysql-5.1.51
index ff466c314762..7fb4293fd321 100644
--- a/metadata/cache/dev-db/mysql-5.1.51
+++ b/metadata/cache/dev-db/mysql-5.1.51
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) >=sys-devel/libtool-2.2.10 sys-devel/gnuconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/readline-4.1 >=sys-libs/zlib-1.2.3 !dev-db/mysql-community !dev-db/mysql-cluster !dev-db/mariadb virtual/yacc >=dev-util/cmake-2.4.3
+|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) >=sys-devel/libtool-2.2.10 sys-devel/gnuconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/readline-4.1 >=sys-libs/zlib-1.2.3 !dev-db/mysql-community !dev-db/mysql-cluster !dev-db/mariadb virtual/yacc >=dev-util/cmake-2.4.3
 ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/readline-4.1 >=sys-libs/zlib-1.2.3 !dev-db/mysql-community !dev-db/mysql-cluster !dev-db/mariadb !minimal? ( !prefix? ( dev-db/mysql-init-scripts ) ) selinux? ( sec-policy/selinux-mysql )
 0
 http://downloads.mysql.com/archives/mysql-5.1/mysql-5.1.51.tar.gz mirror://mysql/Downloads/MySQL-5.1/mysql-5.1.51.tar.gz mirror://gentoo/mysql-extras-20101006-0004Z.tar.bz2 http://g3nt8.org/patches/mysql-extras-20101006-0004Z.tar.bz2 http://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20101006-0004Z.tar.bz2 pbxt? ( http://www.primebase.org/download/pbxt-1.0.11-6-pre-ga.tar.gz mirror://sourceforge/pbxt/pbxt-1.0.11-6-pre-ga.tar.gz ) xtradb? ( http://www.percona.com//percona-builds//Percona-Server/Percona-Server-5.1.45-10/source/percona-xtradb-1.0.6-10.tar.gz http://www.percona.com//percona-builds//xtradb/5.1.45-10/source/percona-xtradb-1.0.6-10.tar.gz http://www.percona.com//mysql/xtradb/5.1.45-10/source/percona-xtradb-1.0.6-10.tar.gz )
diff --git a/metadata/cache/dev-db/mysql-5.1.52 b/metadata/cache/dev-db/mysql-5.1.52
index 02b8ec736143..0b076bbd3e7d 100644
--- a/metadata/cache/dev-db/mysql-5.1.52
+++ b/metadata/cache/dev-db/mysql-5.1.52
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) >=sys-devel/libtool-2.2.10 sys-devel/gnuconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/readline-4.1 >=sys-libs/zlib-1.2.3 !dev-db/mysql-community !dev-db/mysql-cluster !dev-db/mariadb virtual/yacc >=dev-util/cmake-2.4.3
+|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) >=sys-devel/libtool-2.2.10 sys-devel/gnuconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/readline-4.1 >=sys-libs/zlib-1.2.3 !dev-db/mysql-community !dev-db/mysql-cluster !dev-db/mariadb virtual/yacc >=dev-util/cmake-2.4.3
 ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/readline-4.1 >=sys-libs/zlib-1.2.3 !dev-db/mysql-community !dev-db/mysql-cluster !dev-db/mariadb !minimal? ( !prefix? ( dev-db/mysql-init-scripts ) ) selinux? ( sec-policy/selinux-mysql )
 0
 http://downloads.mysql.com/archives/mysql-5.1/mysql-5.1.52.tar.gz mirror://mysql/Downloads/MySQL-5.1/mysql-5.1.52.tar.gz mirror://gentoo/mysql-extras-20101104-1842Z.tar.bz2 http://g3nt8.org/patches/mysql-extras-20101104-1842Z.tar.bz2 http://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20101104-1842Z.tar.bz2 pbxt? ( http://www.primebase.org/download/pbxt-1.0.11-6-pre-ga.tar.gz mirror://sourceforge/pbxt/pbxt-1.0.11-6-pre-ga.tar.gz ) xtradb? ( http://www.percona.com//percona-builds//Percona-Server/Percona-Server-5.1.45-10/source/percona-xtradb-1.0.6-10.tar.gz http://www.percona.com//percona-builds//xtradb/5.1.45-10/source/percona-xtradb-1.0.6-10.tar.gz http://www.percona.com//mysql/xtradb/5.1.45-10/source/percona-xtradb-1.0.6-10.tar.gz )
diff --git a/metadata/cache/dev-db/mysql-5.1.52-r1 b/metadata/cache/dev-db/mysql-5.1.52-r1
index bfca059c0f0b..a8e74b4b3b97 100644
--- a/metadata/cache/dev-db/mysql-5.1.52-r1
+++ b/metadata/cache/dev-db/mysql-5.1.52-r1
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) >=sys-devel/libtool-2.2.10 sys-devel/gnuconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/readline-4.1 >=sys-libs/zlib-1.2.3 !dev-db/mysql-community !dev-db/mysql-cluster !dev-db/mariadb virtual/yacc >=dev-util/cmake-2.4.3
+|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) >=sys-devel/libtool-2.2.10 sys-devel/gnuconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/readline-4.1 >=sys-libs/zlib-1.2.3 !dev-db/mysql-community !dev-db/mysql-cluster !dev-db/mariadb virtual/yacc >=dev-util/cmake-2.4.3
 ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/readline-4.1 >=sys-libs/zlib-1.2.3 !dev-db/mysql-community !dev-db/mysql-cluster !dev-db/mariadb !minimal? ( !prefix? ( dev-db/mysql-init-scripts ) ) selinux? ( sec-policy/selinux-mysql )
 0
 http://downloads.mysql.com/archives/mysql-5.1/mysql-5.1.52.tar.gz mirror://mysql/Downloads/MySQL-5.1/mysql-5.1.52.tar.gz mirror://gentoo/mysql-extras-20101128-2122Z.tar.bz2 http://g3nt8.org/patches/mysql-extras-20101128-2122Z.tar.bz2 http://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20101128-2122Z.tar.bz2 pbxt? ( http://www.primebase.org/download/pbxt-1.0.11-6-pre-ga.tar.gz mirror://sourceforge/pbxt/pbxt-1.0.11-6-pre-ga.tar.gz ) xtradb? ( http://www.percona.com//percona-builds//Percona-Server/Percona-Server-5.1.45-10/source/percona-xtradb-1.0.6-10.tar.gz http://www.percona.com//percona-builds//xtradb/5.1.45-10/source/percona-xtradb-1.0.6-10.tar.gz http://www.percona.com//mysql/xtradb/5.1.45-10/source/percona-xtradb-1.0.6-10.tar.gz )
diff --git a/metadata/cache/dev-db/mysql-5.1.53 b/metadata/cache/dev-db/mysql-5.1.53
index 21f4ddc31f1d..c729190276b5 100644
--- a/metadata/cache/dev-db/mysql-5.1.53
+++ b/metadata/cache/dev-db/mysql-5.1.53
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) >=sys-devel/libtool-2.2.10 sys-devel/gnuconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/readline-4.1 >=sys-libs/zlib-1.2.3 !dev-db/mysql-community !dev-db/mysql-cluster !dev-db/mariadb virtual/yacc >=dev-util/cmake-2.4.3
+|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) >=sys-devel/libtool-2.2.10 sys-devel/gnuconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/readline-4.1 >=sys-libs/zlib-1.2.3 !dev-db/mysql-community !dev-db/mysql-cluster !dev-db/mariadb virtual/yacc >=dev-util/cmake-2.4.3
 ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/readline-4.1 >=sys-libs/zlib-1.2.3 !dev-db/mysql-community !dev-db/mysql-cluster !dev-db/mariadb !minimal? ( !prefix? ( dev-db/mysql-init-scripts ) ) selinux? ( sec-policy/selinux-mysql )
 0
 http://downloads.mysql.com/archives/mysql-5.1/mysql-5.1.53.tar.gz mirror://mysql/Downloads/MySQL-5.1/mysql-5.1.53.tar.gz mirror://gentoo/mysql-extras-20101128-2122Z.tar.bz2 http://g3nt8.org/patches/mysql-extras-20101128-2122Z.tar.bz2 http://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20101128-2122Z.tar.bz2 pbxt? ( http://www.primebase.org/download/pbxt-1.0.11-6-pre-ga.tar.gz mirror://sourceforge/pbxt/pbxt-1.0.11-6-pre-ga.tar.gz ) xtradb? ( http://www.percona.com//percona-builds//Percona-Server/Percona-Server-5.1.45-10/source/percona-xtradb-1.0.6-10.tar.gz http://www.percona.com//percona-builds//xtradb/5.1.45-10/source/percona-xtradb-1.0.6-10.tar.gz http://www.percona.com//mysql/xtradb/5.1.45-10/source/percona-xtradb-1.0.6-10.tar.gz )
diff --git a/metadata/cache/dev-db/mysql-5.1.56 b/metadata/cache/dev-db/mysql-5.1.56
index 990bd8350587..f7c58294a56f 100644
--- a/metadata/cache/dev-db/mysql-5.1.56
+++ b/metadata/cache/dev-db/mysql-5.1.56
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) >=sys-devel/libtool-2.2.10 sys-devel/gnuconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/readline-4.1 >=sys-libs/zlib-1.2.3 !dev-db/mysql-community !dev-db/mysql-cluster !dev-db/mariadb virtual/yacc >=dev-util/cmake-2.4.3
+|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) >=sys-devel/libtool-2.2.10 sys-devel/gnuconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/readline-4.1 >=sys-libs/zlib-1.2.3 !dev-db/mysql-community !dev-db/mysql-cluster !dev-db/mariadb virtual/yacc >=dev-util/cmake-2.4.3
 ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/readline-4.1 >=sys-libs/zlib-1.2.3 !dev-db/mysql-community !dev-db/mysql-cluster !dev-db/mariadb !minimal? ( !prefix? ( dev-db/mysql-init-scripts ) ) selinux? ( sec-policy/selinux-mysql )
 0
 http://downloads.mysql.com/archives/mysql-5.1/mysql-5.1.56.tar.gz mirror://mysql/Downloads/MySQL-5.1/mysql-5.1.56.tar.gz mirror://gentoo/mysql-extras-20110426-1046Z.tar.bz2 http://g3nt8.org/patches/mysql-extras-20110426-1046Z.tar.bz2 http://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20110426-1046Z.tar.bz2 pbxt? ( http://www.primebase.org/download/pbxt-1.0.11-6-pre-ga.tar.gz mirror://sourceforge/pbxt/pbxt-1.0.11-6-pre-ga.tar.gz ) xtradb? ( http://www.percona.com//percona-builds//Percona-Server/Percona-Server-5.1.45-10/source/percona-xtradb-1.0.6-10.tar.gz http://www.percona.com//percona-builds//xtradb/5.1.45-10/source/percona-xtradb-1.0.6-10.tar.gz http://www.percona.com//mysql/xtradb/5.1.45-10/source/percona-xtradb-1.0.6-10.tar.gz )
diff --git a/metadata/cache/dev-db/mysql-5.1.56-r1 b/metadata/cache/dev-db/mysql-5.1.56-r1
index c2327aeb3abc..0f2587e59a65 100644
--- a/metadata/cache/dev-db/mysql-5.1.56-r1
+++ b/metadata/cache/dev-db/mysql-5.1.56-r1
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) >=sys-devel/libtool-2.2.10 sys-devel/gnuconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/readline-4.1 >=sys-libs/zlib-1.2.3 !dev-db/mysql-community !dev-db/mysql-cluster !dev-db/mariadb virtual/yacc static? ( || ( sys-libs/ncurses[static-libs] <=sys-libs/ncurses-5.7-r3 ) ) >=dev-util/cmake-2.4.3
+|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) >=sys-devel/libtool-2.2.10 sys-devel/gnuconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/readline-4.1 >=sys-libs/zlib-1.2.3 !dev-db/mysql-community !dev-db/mysql-cluster !dev-db/mariadb virtual/yacc static? ( || ( sys-libs/ncurses[static-libs] <=sys-libs/ncurses-5.7-r3 ) ) >=dev-util/cmake-2.4.3
 ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/readline-4.1 >=sys-libs/zlib-1.2.3 !dev-db/mysql-community !dev-db/mysql-cluster !dev-db/mariadb !minimal? ( !prefix? ( dev-db/mysql-init-scripts ) ) selinux? ( sec-policy/selinux-mysql )
 0
 http://downloads.mysql.com/archives/mysql-5.1/mysql-5.1.56.tar.gz mirror://mysql/Downloads/MySQL-5.1/mysql-5.1.56.tar.gz mirror://gentoo/mysql-extras-20110713-0702Z.tar.bz2 http://g3nt8.org/patches/mysql-extras-20110713-0702Z.tar.bz2 http://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20110713-0702Z.tar.bz2 http://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20110713-0702Z.tar.bz2 pbxt? ( http://www.primebase.org/download/pbxt-1.0.11-6-pre-ga.tar.gz mirror://sourceforge/pbxt/pbxt-1.0.11-6-pre-ga.tar.gz ) xtradb? ( http://www.percona.com//percona-builds//Percona-Server/Percona-Server-5.1.45-10/source/percona-xtradb-1.0.6-10.tar.gz http://www.percona.com//percona-builds//xtradb/5.1.45-10/source/percona-xtradb-1.0.6-10.tar.gz http://www.percona.com//mysql/xtradb/5.1.45-10/source/percona-xtradb-1.0.6-10.tar.gz )
diff --git a/metadata/cache/dev-db/mysql-5.1.57 b/metadata/cache/dev-db/mysql-5.1.57
index 9321e38d4148..1e024763e7f1 100644
--- a/metadata/cache/dev-db/mysql-5.1.57
+++ b/metadata/cache/dev-db/mysql-5.1.57
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) >=sys-devel/libtool-2.2.10 sys-devel/gnuconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/readline-4.1 >=sys-libs/zlib-1.2.3 !dev-db/mysql-community !dev-db/mysql-cluster !dev-db/mariadb virtual/yacc static? ( || ( sys-libs/ncurses[static-libs] <=sys-libs/ncurses-5.7-r3 ) ) >=dev-util/cmake-2.4.3
+|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) >=sys-devel/libtool-2.2.10 sys-devel/gnuconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/readline-4.1 >=sys-libs/zlib-1.2.3 !dev-db/mysql-community !dev-db/mysql-cluster !dev-db/mariadb virtual/yacc static? ( || ( sys-libs/ncurses[static-libs] <=sys-libs/ncurses-5.7-r3 ) ) >=dev-util/cmake-2.4.3
 ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/readline-4.1 >=sys-libs/zlib-1.2.3 !dev-db/mysql-community !dev-db/mysql-cluster !dev-db/mariadb !minimal? ( !prefix? ( dev-db/mysql-init-scripts ) ) selinux? ( sec-policy/selinux-mysql )
 0
 http://downloads.mysql.com/archives/mysql-5.1/mysql-5.1.57.tar.gz mirror://mysql/Downloads/MySQL-5.1/mysql-5.1.57.tar.gz mirror://gentoo/mysql-extras-20110713-0702Z.tar.bz2 http://g3nt8.org/patches/mysql-extras-20110713-0702Z.tar.bz2 http://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20110713-0702Z.tar.bz2 http://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20110713-0702Z.tar.bz2 pbxt? ( http://www.primebase.org/download/pbxt-1.0.11-6-pre-ga.tar.gz mirror://sourceforge/pbxt/pbxt-1.0.11-6-pre-ga.tar.gz ) xtradb? ( http://www.percona.com//percona-builds//Percona-Server/Percona-Server-5.1.45-10/source/percona-xtradb-1.0.6-10.tar.gz http://www.percona.com//percona-builds//xtradb/5.1.45-10/source/percona-xtradb-1.0.6-10.tar.gz http://www.percona.com//mysql/xtradb/5.1.45-10/source/percona-xtradb-1.0.6-10.tar.gz )
diff --git a/metadata/cache/dev-db/mysql-5.1.58-r1 b/metadata/cache/dev-db/mysql-5.1.58-r1
index 613622abc21c..a7381d82ef99 100644
--- a/metadata/cache/dev-db/mysql-5.1.58-r1
+++ b/metadata/cache/dev-db/mysql-5.1.58-r1
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) >=sys-devel/libtool-2.2.10 sys-devel/gnuconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/readline-4.1 >=sys-libs/zlib-1.2.3 !dev-db/mysql-community !dev-db/mysql-cluster !dev-db/mariadb virtual/yacc static? ( || ( sys-libs/ncurses[static-libs] <=sys-libs/ncurses-5.7-r3 ) ) >=dev-util/cmake-2.4.3
+|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) >=sys-devel/libtool-2.2.10 sys-devel/gnuconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/readline-4.1 >=sys-libs/zlib-1.2.3 !dev-db/mysql-community !dev-db/mysql-cluster !dev-db/mariadb virtual/yacc static? ( || ( sys-libs/ncurses[static-libs] <=sys-libs/ncurses-5.7-r3 ) ) >=dev-util/cmake-2.4.3
 ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/readline-4.1 >=sys-libs/zlib-1.2.3 !dev-db/mysql-community !dev-db/mysql-cluster !dev-db/mariadb !minimal? ( !prefix? ( dev-db/mysql-init-scripts ) ) selinux? ( sec-policy/selinux-mysql )
 0
 http://downloads.mysql.com/archives/mysql-5.1/mysql-5.1.58.tar.gz mirror://mysql/Downloads/MySQL-5.1/mysql-5.1.58.tar.gz mirror://gentoo/mysql-extras-20110721-0450Z.tar.bz2 http://g3nt8.org/patches/mysql-extras-20110721-0450Z.tar.bz2 http://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20110721-0450Z.tar.bz2 http://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20110721-0450Z.tar.bz2 pbxt? ( http://www.primebase.org/download/pbxt-1.0.11-6-pre-ga.tar.gz mirror://sourceforge/pbxt/pbxt-1.0.11-6-pre-ga.tar.gz ) xtradb? ( http://www.percona.com//percona-builds//Percona-Server/Percona-Server-5.1.45-10/source/percona-xtradb-1.0.6-10.tar.gz http://www.percona.com//percona-builds//xtradb/5.1.45-10/source/percona-xtradb-1.0.6-10.tar.gz http://www.percona.com//mysql/xtradb/5.1.45-10/source/percona-xtradb-1.0.6-10.tar.gz )
diff --git a/metadata/cache/dev-db/mysql-5.1.59 b/metadata/cache/dev-db/mysql-5.1.59
index aaa35efac2b7..2f5a9756ac89 100644
--- a/metadata/cache/dev-db/mysql-5.1.59
+++ b/metadata/cache/dev-db/mysql-5.1.59
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) >=sys-devel/libtool-2.2.10 sys-devel/gnuconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/readline-4.1 >=sys-libs/zlib-1.2.3 !dev-db/mysql-community !dev-db/mysql-cluster !dev-db/mariadb virtual/yacc static? ( || ( sys-libs/ncurses[static-libs] <=sys-libs/ncurses-5.7-r3 ) ) >=dev-util/cmake-2.4.3
+|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) >=sys-devel/libtool-2.2.10 sys-devel/gnuconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/readline-4.1 >=sys-libs/zlib-1.2.3 !dev-db/mysql-community !dev-db/mysql-cluster !dev-db/mariadb virtual/yacc static? ( || ( sys-libs/ncurses[static-libs] <=sys-libs/ncurses-5.7-r3 ) ) >=dev-util/cmake-2.4.3
 ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/readline-4.1 >=sys-libs/zlib-1.2.3 !dev-db/mysql-community !dev-db/mysql-cluster !dev-db/mariadb !minimal? ( !prefix? ( dev-db/mysql-init-scripts ) ) selinux? ( sec-policy/selinux-mysql )
 0
 http://downloads.mysql.com/archives/mysql-5.1/mysql-5.1.59.tar.gz mirror://mysql/Downloads/MySQL-5.1/mysql-5.1.59.tar.gz mirror://gentoo/mysql-extras-20110721-0450Z.tar.bz2 http://g3nt8.org/patches/mysql-extras-20110721-0450Z.tar.bz2 http://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20110721-0450Z.tar.bz2 http://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20110721-0450Z.tar.bz2 pbxt? ( http://www.primebase.org/download/pbxt-1.0.11-6-pre-ga.tar.gz mirror://sourceforge/pbxt/pbxt-1.0.11-6-pre-ga.tar.gz ) xtradb? ( http://www.percona.com//percona-builds//Percona-Server/Percona-Server-5.1.45-10/source/percona-xtradb-1.0.6-10.tar.gz http://www.percona.com//percona-builds//xtradb/5.1.45-10/source/percona-xtradb-1.0.6-10.tar.gz http://www.percona.com//mysql/xtradb/5.1.45-10/source/percona-xtradb-1.0.6-10.tar.gz )
diff --git a/metadata/cache/dev-db/mysql-5.1.61 b/metadata/cache/dev-db/mysql-5.1.61
index 06965790d11d..9716834b4344 100644
--- a/metadata/cache/dev-db/mysql-5.1.61
+++ b/metadata/cache/dev-db/mysql-5.1.61
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) >=sys-devel/libtool-2.2.10 sys-devel/gnuconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/readline-4.1 >=sys-libs/zlib-1.2.3 !dev-db/mysql-community !dev-db/mysql-cluster !dev-db/mariadb virtual/yacc static? ( || ( sys-libs/ncurses[static-libs] <=sys-libs/ncurses-5.7-r3 ) ) >=dev-util/cmake-2.4.3
+|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) >=sys-devel/libtool-2.2.10 sys-devel/gnuconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/readline-4.1 >=sys-libs/zlib-1.2.3 !dev-db/mysql-community !dev-db/mysql-cluster !dev-db/mariadb virtual/yacc static? ( || ( sys-libs/ncurses[static-libs] <=sys-libs/ncurses-5.7-r3 ) ) >=dev-util/cmake-2.4.3
 ssl? ( >=dev-libs/openssl-0.9.6d ) kernel_linux? ( sys-process/procps ) >=sys-apps/sed-4 >=sys-apps/texinfo-4.7-r1 >=sys-libs/readline-4.1 >=sys-libs/zlib-1.2.3 !dev-db/mysql-community !dev-db/mysql-cluster !dev-db/mariadb !minimal? ( !prefix? ( dev-db/mysql-init-scripts ) ) selinux? ( sec-policy/selinux-mysql )
 0
 http://downloads.mysql.com/archives/mysql-5.1/mysql-5.1.61.tar.gz mirror://mysql/Downloads/MySQL-5.1/mysql-5.1.61.tar.gz mirror://gentoo/mysql-extras-20111118-2347Z.tar.bz2 http://g3nt8.org/patches/mysql-extras-20111118-2347Z.tar.bz2 http://dev.gentoo.org/~robbat2/distfiles/mysql-extras-20111118-2347Z.tar.bz2 http://dev.gentoo.org/~jmbsvicetto/distfiles/mysql-extras-20111118-2347Z.tar.bz2 pbxt? ( http://www.primebase.org/download/pbxt-1.0.11-6-pre-ga.tar.gz mirror://sourceforge/pbxt/pbxt-1.0.11-6-pre-ga.tar.gz ) xtradb? ( http://www.percona.com//percona-builds//Percona-Server/Percona-Server-5.1.45-10/source/percona-xtradb-1.0.6-10.tar.gz http://www.percona.com//percona-builds//xtradb/5.1.45-10/source/percona-xtradb-1.0.6-10.tar.gz http://www.percona.com//mysql/xtradb/5.1.45-10/source/percona-xtradb-1.0.6-10.tar.gz )
diff --git a/metadata/cache/dev-db/mysql-udf-http-1.0 b/metadata/cache/dev-db/mysql-udf-http-1.0
index 956f1aa5d041..5b15d6fc2204 100644
--- a/metadata/cache/dev-db/mysql-udf-http-1.0
+++ b/metadata/cache/dev-db/mysql-udf-http-1.0
@@ -1,4 +1,4 @@
->=virtual/mysql-5.1 net-misc/curl || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=virtual/mysql-5.1 net-misc/curl || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=virtual/mysql-5.1 net-misc/curl
 0
 http://mysql-udf-http.googlecode.com/files/mysql-udf-http-1.0.tar.gz
diff --git a/metadata/cache/dev-db/mysql-workbench-5.2.35 b/metadata/cache/dev-db/mysql-workbench-5.2.35
index e895d871099a..f515ed58b3cc 100644
--- a/metadata/cache/dev-db/mysql-workbench-5.2.35
+++ b/metadata/cache/dev-db/mysql-workbench-5.2.35
@@ -1,4 +1,4 @@
-dev-db/sqlite:3 >=x11-libs/gtk+-2.6:2 dev-libs/glib:2 gnome-base/libglade:2.0 dev-libs/libsigc++:2 dev-libs/boost >=dev-cpp/ctemplate-0.95 >=dev-libs/libxml2-2.6.2:2 >=dev-cpp/glibmm-2.14:2 >=dev-cpp/gtkmm-2.14:2.4 dev-libs/libzip >=virtual/mysql-5.1 dev-libs/libpcre virtual/opengl >=dev-lang/lua-5.1[deprecated] x11-libs/pango || ( sys-libs/e2fsprogs-libs dev-libs/ossp-uuid ) >=x11-libs/cairo-1.5.12[svg] dev-python/pexpect dev-python/paramiko doc? ( dev-python/pysqlite:2 ) nls? ( sys-devel/gettext ) readline? ( sys-libs/readline ) dev-util/pkgconfig >=sys-apps/sed-4 =dev-lang/python-2* || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-db/sqlite:3 >=x11-libs/gtk+-2.6:2 dev-libs/glib:2 gnome-base/libglade:2.0 dev-libs/libsigc++:2 dev-libs/boost >=dev-cpp/ctemplate-0.95 >=dev-libs/libxml2-2.6.2:2 >=dev-cpp/glibmm-2.14:2 >=dev-cpp/gtkmm-2.14:2.4 dev-libs/libzip >=virtual/mysql-5.1 dev-libs/libpcre virtual/opengl >=dev-lang/lua-5.1[deprecated] x11-libs/pango || ( sys-libs/e2fsprogs-libs dev-libs/ossp-uuid ) >=x11-libs/cairo-1.5.12[svg] dev-python/pexpect dev-python/paramiko doc? ( dev-python/pysqlite:2 ) nls? ( sys-devel/gettext ) readline? ( sys-libs/readline ) dev-util/pkgconfig >=sys-apps/sed-4 =dev-lang/python-2* || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-db/sqlite:3 >=x11-libs/gtk+-2.6:2 dev-libs/glib:2 gnome-base/libglade:2.0 dev-libs/libsigc++:2 dev-libs/boost >=dev-cpp/ctemplate-0.95 >=dev-libs/libxml2-2.6.2:2 >=dev-cpp/glibmm-2.14:2 >=dev-cpp/gtkmm-2.14:2.4 dev-libs/libzip >=virtual/mysql-5.1 dev-libs/libpcre virtual/opengl >=dev-lang/lua-5.1[deprecated] x11-libs/pango || ( sys-libs/e2fsprogs-libs dev-libs/ossp-uuid ) >=x11-libs/cairo-1.5.12[svg] dev-python/pexpect dev-python/paramiko doc? ( dev-python/pysqlite:2 ) nls? ( sys-devel/gettext ) readline? ( sys-libs/readline ) app-admin/sudo sys-apps/net-tools =dev-lang/python-2*
 0
 mirror://mysql/Downloads/MySQLGUITools/mysql-workbench-gpl-5.2.35-src.tar.gz
diff --git a/metadata/cache/dev-db/pgadmin3-1.12.3-r1 b/metadata/cache/dev-db/pgadmin3-1.12.3-r1
index 9a0911c86c08..68ee81570098 100644
--- a/metadata/cache/dev-db/pgadmin3-1.12.3-r1
+++ b/metadata/cache/dev-db/pgadmin3-1.12.3-r1
@@ -1,4 +1,4 @@
-x11-libs/wxGTK:2.8[X] >=dev-db/postgresql-base-8.4.0 >=dev-libs/libxml2-2.5 >=dev-libs/libxslt-1.1 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+x11-libs/wxGTK:2.8[X] >=dev-db/postgresql-base-8.4.0 >=dev-libs/libxml2-2.5 >=dev-libs/libxslt-1.1 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 x11-libs/wxGTK:2.8[X] >=dev-db/postgresql-base-8.4.0 >=dev-libs/libxml2-2.5 >=dev-libs/libxslt-1.1
 0
 mirror://postgresql/pgadmin3/release/v1.12.3/src/pgadmin3-1.12.3.tar.gz
diff --git a/metadata/cache/dev-db/pgadmin3-1.14.0 b/metadata/cache/dev-db/pgadmin3-1.14.0
index f14ba4b6716a..1769eda1f223 100644
--- a/metadata/cache/dev-db/pgadmin3-1.14.0
+++ b/metadata/cache/dev-db/pgadmin3-1.14.0
@@ -1,4 +1,4 @@
-x11-libs/wxGTK:2.8[X,debug=] >=dev-db/postgresql-base-8.4.0 >=dev-libs/libxml2-2.6.18 >=dev-libs/libxslt-1.1 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+x11-libs/wxGTK:2.8[X,debug=] >=dev-db/postgresql-base-8.4.0 >=dev-libs/libxml2-2.6.18 >=dev-libs/libxslt-1.1 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 x11-libs/wxGTK:2.8[X,debug=] >=dev-db/postgresql-base-8.4.0 >=dev-libs/libxml2-2.6.18 >=dev-libs/libxslt-1.1
 0
 mirror://postgresql/pgadmin3/release/v1.14.0/src/pgadmin3-1.14.0.tar.gz
diff --git a/metadata/cache/dev-db/pgadmin3-1.14.1 b/metadata/cache/dev-db/pgadmin3-1.14.1
index 0bb29b333681..fc014fe04825 100644
--- a/metadata/cache/dev-db/pgadmin3-1.14.1
+++ b/metadata/cache/dev-db/pgadmin3-1.14.1
@@ -1,4 +1,4 @@
-x11-libs/wxGTK:2.8[X,debug=] >=dev-db/postgresql-base-8.4.0 >=dev-libs/libxml2-2.6.18 >=dev-libs/libxslt-1.1 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+x11-libs/wxGTK:2.8[X,debug=] >=dev-db/postgresql-base-8.4.0 >=dev-libs/libxml2-2.6.18 >=dev-libs/libxslt-1.1 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 x11-libs/wxGTK:2.8[X,debug=] >=dev-db/postgresql-base-8.4.0 >=dev-libs/libxml2-2.6.18 >=dev-libs/libxslt-1.1
 0
 mirror://postgresql/pgadmin3/release/v1.14.1/src/pgadmin3-1.14.1.tar.gz
diff --git a/metadata/cache/dev-db/pgadmin3-1.14.1-r1 b/metadata/cache/dev-db/pgadmin3-1.14.1-r1
index 71375648facb..32e38a01edd3 100644
--- a/metadata/cache/dev-db/pgadmin3-1.14.1-r1
+++ b/metadata/cache/dev-db/pgadmin3-1.14.1-r1
@@ -1,4 +1,4 @@
-x11-libs/wxGTK:2.8[X,debug=] >=dev-db/postgresql-base-8.4.0 >=dev-libs/libxml2-2.6.18 >=dev-libs/libxslt-1.1 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+x11-libs/wxGTK:2.8[X,debug=] >=dev-db/postgresql-base-8.4.0 >=dev-libs/libxml2-2.6.18 >=dev-libs/libxslt-1.1 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 x11-libs/wxGTK:2.8[X,debug=] >=dev-db/postgresql-base-8.4.0 >=dev-libs/libxml2-2.6.18 >=dev-libs/libxslt-1.1
 0
 mirror://postgresql/pgadmin3/release/v1.14.1/src/pgadmin3-1.14.1.tar.gz
diff --git a/metadata/cache/dev-db/pgpool2-3.0.4 b/metadata/cache/dev-db/pgpool2-3.0.4
index 340d74fde04a..4cd0b67af5f0 100644
--- a/metadata/cache/dev-db/pgpool2-3.0.4
+++ b/metadata/cache/dev-db/pgpool2-3.0.4
@@ -1,4 +1,4 @@
-sys-devel/bison !!dev-db/pgpool || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+sys-devel/bison !!dev-db/pgpool || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-db/postgresql-base pam? ( sys-auth/pambase ) ssl? ( dev-libs/openssl )
 0
 http://pgfoundry.org/frs/download.php/3076/pgpool-II-3.0.4.tar.gz
diff --git a/metadata/cache/dev-db/pgpool2-9999 b/metadata/cache/dev-db/pgpool2-9999
index f3ee77cf0086..25e09a75a568 100644
--- a/metadata/cache/dev-db/pgpool2-9999
+++ b/metadata/cache/dev-db/pgpool2-9999
@@ -1,4 +1,4 @@
-sys-devel/bison !!dev-db/pgpool || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/cvs
+sys-devel/bison !!dev-db/pgpool || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/cvs
 dev-db/postgresql-base pam? ( sys-auth/pambase ) ssl? ( dev-libs/openssl )
 0
 
diff --git a/metadata/cache/dev-db/recutils-1.5 b/metadata/cache/dev-db/recutils-1.5
index cddc8e21a276..36fbec8c8337 100644
--- a/metadata/cache/dev-db/recutils-1.5
+++ b/metadata/cache/dev-db/recutils-1.5
@@ -1,4 +1,4 @@
-sys-libs/readline crypt? ( dev-libs/libgcrypt dev-libs/libgpg-error ) curl? ( net-misc/curl ) emacs? ( app-emacs/org-mode virtual/emacs ) mdb? ( app-office/mdbtools dev-libs/glib:2 ) nls? ( virtual/libintl ) dev-util/pkgconfig nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+sys-libs/readline crypt? ( dev-libs/libgcrypt dev-libs/libgpg-error ) curl? ( net-misc/curl ) emacs? ( app-emacs/org-mode virtual/emacs ) mdb? ( app-office/mdbtools dev-libs/glib:2 ) nls? ( virtual/libintl ) dev-util/pkgconfig nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 sys-libs/readline crypt? ( dev-libs/libgcrypt dev-libs/libgpg-error ) curl? ( net-misc/curl ) emacs? ( app-emacs/org-mode virtual/emacs ) mdb? ( app-office/mdbtools dev-libs/glib:2 ) nls? ( virtual/libintl )
 0
 mirror://gnu/recutils/recutils-1.5.tar.gz
diff --git a/metadata/cache/dev-db/redis-2.2.12 b/metadata/cache/dev-db/redis-2.2.12
index 117c17e1935b..3d0c942b1e54 100644
--- a/metadata/cache/dev-db/redis-2.2.12
+++ b/metadata/cache/dev-db/redis-2.2.12
@@ -1,4 +1,4 @@
->=sys-devel/autoconf-2.63 tcmalloc? ( dev-util/google-perftools ) test? ( dev-lang/tcl ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=sys-devel/autoconf-2.63 tcmalloc? ( dev-util/google-perftools ) test? ( dev-lang/tcl ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 http://redis.googlecode.com/files/redis-2.2.12.tar.gz
diff --git a/metadata/cache/dev-db/redis-2.4.4-r1 b/metadata/cache/dev-db/redis-2.4.4-r1
index 1e9259ad006b..de59bda3dc87 100644
--- a/metadata/cache/dev-db/redis-2.4.4-r1
+++ b/metadata/cache/dev-db/redis-2.4.4-r1
@@ -1,4 +1,4 @@
->=sys-devel/autoconf-2.63 tcmalloc? ( dev-util/google-perftools ) jemalloc? ( dev-libs/jemalloc ) test? ( dev-lang/tcl ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=sys-devel/autoconf-2.63 tcmalloc? ( dev-util/google-perftools ) jemalloc? ( dev-libs/jemalloc ) test? ( dev-lang/tcl ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 http://redis.googlecode.com/files/redis-2.4.4.tar.gz
diff --git a/metadata/cache/dev-db/redis-2.4.7 b/metadata/cache/dev-db/redis-2.4.7
index cf1964835af1..4905cba119fa 100644
--- a/metadata/cache/dev-db/redis-2.4.7
+++ b/metadata/cache/dev-db/redis-2.4.7
@@ -1,4 +1,4 @@
->=sys-devel/autoconf-2.63 tcmalloc? ( dev-util/google-perftools ) jemalloc? ( dev-libs/jemalloc ) test? ( dev-lang/tcl ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=sys-devel/autoconf-2.63 tcmalloc? ( dev-util/google-perftools ) jemalloc? ( dev-libs/jemalloc ) test? ( dev-lang/tcl ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 http://redis.googlecode.com/files/redis-2.4.7.tar.gz
diff --git a/metadata/cache/dev-db/redis-2.4.8 b/metadata/cache/dev-db/redis-2.4.8
index fda49ffbe126..a31c4f11e957 100644
--- a/metadata/cache/dev-db/redis-2.4.8
+++ b/metadata/cache/dev-db/redis-2.4.8
@@ -1,4 +1,4 @@
->=sys-devel/autoconf-2.63 tcmalloc? ( dev-util/google-perftools ) jemalloc? ( dev-libs/jemalloc ) test? ( dev-lang/tcl ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=sys-devel/autoconf-2.63 tcmalloc? ( dev-util/google-perftools ) jemalloc? ( dev-libs/jemalloc ) test? ( dev-lang/tcl ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 http://redis.googlecode.com/files/redis-2.4.8.tar.gz
diff --git a/metadata/cache/dev-db/sqlite-3.7.10 b/metadata/cache/dev-db/sqlite-3.7.10
index 6fc0e56717f9..0600c4aa5f20 100644
--- a/metadata/cache/dev-db/sqlite-3.7.10
+++ b/metadata/cache/dev-db/sqlite-3.7.10
@@ -1,4 +1,4 @@
-icu? ( dev-libs/icu ) readline? ( sys-libs/readline ) tcl? ( dev-lang/tcl ) doc? ( app-arch/unzip ) tcl? ( app-arch/unzip ) test? ( app-arch/unzip dev-lang/tcl ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+icu? ( dev-libs/icu ) readline? ( sys-libs/readline ) tcl? ( dev-lang/tcl ) doc? ( app-arch/unzip ) tcl? ( app-arch/unzip ) test? ( app-arch/unzip dev-lang/tcl ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 icu? ( dev-libs/icu ) readline? ( sys-libs/readline ) tcl? ( dev-lang/tcl )
 3
 doc? ( http://sqlite.org/sqlite-doc-3071000.zip ) tcl? ( http://sqlite.org/sqlite-src-3071000.zip ) !tcl? ( test? ( http://sqlite.org/sqlite-src-3071000.zip ) !test? ( http://sqlite.org/sqlite-autoconf-3071000.tar.gz ) )
diff --git a/metadata/cache/dev-db/sqlite-3.7.11 b/metadata/cache/dev-db/sqlite-3.7.11
index 0018a519e8d1..3092fbb35537 100644
--- a/metadata/cache/dev-db/sqlite-3.7.11
+++ b/metadata/cache/dev-db/sqlite-3.7.11
@@ -1,4 +1,4 @@
-icu? ( dev-libs/icu ) readline? ( sys-libs/readline ) tcl? ( dev-lang/tcl ) doc? ( app-arch/unzip ) tcl? ( app-arch/unzip ) test? ( app-arch/unzip dev-lang/tcl ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+icu? ( dev-libs/icu ) readline? ( sys-libs/readline ) tcl? ( dev-lang/tcl ) doc? ( app-arch/unzip ) tcl? ( app-arch/unzip ) test? ( app-arch/unzip dev-lang/tcl ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 icu? ( dev-libs/icu ) readline? ( sys-libs/readline ) tcl? ( dev-lang/tcl )
 3
 doc? ( http://sqlite.org/sqlite-doc-3071100.zip ) tcl? ( http://sqlite.org/sqlite-src-3071100.zip ) !tcl? ( test? ( http://sqlite.org/sqlite-src-3071100.zip ) !test? ( http://sqlite.org/sqlite-autoconf-3071100.tar.gz ) )
diff --git a/metadata/cache/dev-db/sqlite-3.7.7.1 b/metadata/cache/dev-db/sqlite-3.7.7.1
index 092784515088..1d838df48fa0 100644
--- a/metadata/cache/dev-db/sqlite-3.7.7.1
+++ b/metadata/cache/dev-db/sqlite-3.7.7.1
@@ -1,4 +1,4 @@
-icu? ( dev-libs/icu ) readline? ( sys-libs/readline ) tcl? ( dev-lang/tcl ) doc? ( app-arch/unzip ) tcl? ( app-arch/unzip ) test? ( app-arch/unzip dev-lang/tcl ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+icu? ( dev-libs/icu ) readline? ( sys-libs/readline ) tcl? ( dev-lang/tcl ) doc? ( app-arch/unzip ) tcl? ( app-arch/unzip ) test? ( app-arch/unzip dev-lang/tcl ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 icu? ( dev-libs/icu ) readline? ( sys-libs/readline ) tcl? ( dev-lang/tcl )
 3
 doc? ( http://sqlite.org/sqlite-doc-3070701.zip ) tcl? ( http://sqlite.org/sqlite-src-3070701.zip ) !tcl? ( test? ( http://sqlite.org/sqlite-src-3070701.zip ) !test? ( http://sqlite.org/sqlite-autoconf-3070701.tar.gz ) )
diff --git a/metadata/cache/dev-db/sqlite-3.7.7.1-r1 b/metadata/cache/dev-db/sqlite-3.7.7.1-r1
index a07b2db209e3..b1c0f94140b2 100644
--- a/metadata/cache/dev-db/sqlite-3.7.7.1-r1
+++ b/metadata/cache/dev-db/sqlite-3.7.7.1-r1
@@ -1,4 +1,4 @@
-icu? ( dev-libs/icu ) readline? ( sys-libs/readline ) tcl? ( dev-lang/tcl ) doc? ( app-arch/unzip ) tcl? ( app-arch/unzip ) test? ( app-arch/unzip dev-lang/tcl ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+icu? ( dev-libs/icu ) readline? ( sys-libs/readline ) tcl? ( dev-lang/tcl ) doc? ( app-arch/unzip ) tcl? ( app-arch/unzip ) test? ( app-arch/unzip dev-lang/tcl ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 icu? ( dev-libs/icu ) readline? ( sys-libs/readline ) tcl? ( dev-lang/tcl )
 3
 doc? ( http://sqlite.org/sqlite-doc-3070701.zip ) tcl? ( http://sqlite.org/sqlite-src-3070701.zip ) !tcl? ( test? ( http://sqlite.org/sqlite-src-3070701.zip ) !test? ( http://sqlite.org/sqlite-autoconf-3070701.tar.gz ) )
diff --git a/metadata/cache/dev-db/sqlite-3.7.8 b/metadata/cache/dev-db/sqlite-3.7.8
index 2138f2fa5952..f5ae071036ae 100644
--- a/metadata/cache/dev-db/sqlite-3.7.8
+++ b/metadata/cache/dev-db/sqlite-3.7.8
@@ -1,4 +1,4 @@
-icu? ( dev-libs/icu ) readline? ( sys-libs/readline ) tcl? ( dev-lang/tcl ) doc? ( app-arch/unzip ) tcl? ( app-arch/unzip ) test? ( app-arch/unzip dev-lang/tcl ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+icu? ( dev-libs/icu ) readline? ( sys-libs/readline ) tcl? ( dev-lang/tcl ) doc? ( app-arch/unzip ) tcl? ( app-arch/unzip ) test? ( app-arch/unzip dev-lang/tcl ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 icu? ( dev-libs/icu ) readline? ( sys-libs/readline ) tcl? ( dev-lang/tcl )
 3
 doc? ( http://sqlite.org/sqlite-doc-3070800.zip ) tcl? ( http://sqlite.org/sqlite-src-3070800.zip ) !tcl? ( test? ( http://sqlite.org/sqlite-src-3070800.zip ) !test? ( http://sqlite.org/sqlite-autoconf-3070800.tar.gz ) )
diff --git a/metadata/cache/dev-db/sqlite-3.7.9 b/metadata/cache/dev-db/sqlite-3.7.9
index 08a72586be17..29dba707b26c 100644
--- a/metadata/cache/dev-db/sqlite-3.7.9
+++ b/metadata/cache/dev-db/sqlite-3.7.9
@@ -1,4 +1,4 @@
-icu? ( dev-libs/icu ) readline? ( sys-libs/readline ) tcl? ( dev-lang/tcl ) doc? ( app-arch/unzip ) tcl? ( app-arch/unzip ) test? ( app-arch/unzip dev-lang/tcl ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+icu? ( dev-libs/icu ) readline? ( sys-libs/readline ) tcl? ( dev-lang/tcl ) doc? ( app-arch/unzip ) tcl? ( app-arch/unzip ) test? ( app-arch/unzip dev-lang/tcl ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 icu? ( dev-libs/icu ) readline? ( sys-libs/readline ) tcl? ( dev-lang/tcl )
 3
 doc? ( http://sqlite.org/sqlite-doc-3070900.zip ) tcl? ( http://sqlite.org/sqlite-src-3070900.zip ) !tcl? ( test? ( http://sqlite.org/sqlite-src-3070900.zip ) !test? ( http://sqlite.org/sqlite-autoconf-3070900.tar.gz ) )
diff --git a/metadata/cache/dev-db/tokyocabinet-1.4.47 b/metadata/cache/dev-db/tokyocabinet-1.4.47
index 2644c4ce2340..77317e0ea227 100644
--- a/metadata/cache/dev-db/tokyocabinet-1.4.47
+++ b/metadata/cache/dev-db/tokyocabinet-1.4.47
@@ -1,4 +1,4 @@
-sys-libs/zlib app-arch/bzip2 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+sys-libs/zlib app-arch/bzip2 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 sys-libs/zlib app-arch/bzip2
 0
 http://fallabs.com/tokyocabinet/tokyocabinet-1.4.47.tar.gz
diff --git a/metadata/cache/dev-db/virtuoso-odbc-6.1.2 b/metadata/cache/dev-db/virtuoso-odbc-6.1.2
index ad25ba91a3a3..4dd64763bbfc 100644
--- a/metadata/cache/dev-db/virtuoso-odbc-6.1.2
+++ b/metadata/cache/dev-db/virtuoso-odbc-6.1.2
@@ -1,4 +1,4 @@
->=dev-libs/openssl-0.9.7i:0 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/libtool-2.2.6a
+>=dev-libs/openssl-0.9.7i:0 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/libtool-2.2.6a
 >=dev-libs/openssl-0.9.7i:0
 0
 mirror://sourceforge/virtuoso/virtuoso-opensource-6.1.2.tar.gz mirror://gentoo/VOS-genpatches-6.1.2.tar.bz2
diff --git a/metadata/cache/dev-db/virtuoso-odbc-6.1.3 b/metadata/cache/dev-db/virtuoso-odbc-6.1.3
index 8e855ad586c4..5050f5449e5a 100644
--- a/metadata/cache/dev-db/virtuoso-odbc-6.1.3
+++ b/metadata/cache/dev-db/virtuoso-odbc-6.1.3
@@ -1,4 +1,4 @@
->=dev-libs/openssl-0.9.7i:0 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/libtool-2.2.6a
+>=dev-libs/openssl-0.9.7i:0 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/libtool-2.2.6a
 >=dev-libs/openssl-0.9.7i:0
 0
 mirror://sourceforge/virtuoso/virtuoso-opensource-6.1.3.tar.gz mirror://gentoo/VOS-genpatches-6.1.3.tar.bz2
diff --git a/metadata/cache/dev-db/virtuoso-odbc-6.1.4 b/metadata/cache/dev-db/virtuoso-odbc-6.1.4
index 8a242716348a..052a1bc4e4f3 100644
--- a/metadata/cache/dev-db/virtuoso-odbc-6.1.4
+++ b/metadata/cache/dev-db/virtuoso-odbc-6.1.4
@@ -1,4 +1,4 @@
->=dev-libs/openssl-0.9.7i:0 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/libtool-2.2.6a
+>=dev-libs/openssl-0.9.7i:0 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/libtool-2.2.6a
 >=dev-libs/openssl-0.9.7i:0
 0
 mirror://sourceforge/virtuoso/virtuoso-opensource-6.1.4.tar.gz mirror://gentoo/VOS-genpatches-6.1.4.tar.bz2
diff --git a/metadata/cache/dev-db/virtuoso-server-6.1.2 b/metadata/cache/dev-db/virtuoso-server-6.1.2
index b80a5e92c233..bc2991c04b5a 100644
--- a/metadata/cache/dev-db/virtuoso-server-6.1.2
+++ b/metadata/cache/dev-db/virtuoso-server-6.1.2
@@ -1,4 +1,4 @@
-dev-libs/libxml2:2 >=dev-libs/openssl-0.9.7i:0 <sys-libs/zlib-1.2.5.1-r1:0 kerberos? ( app-crypt/mit-krb5 ) ldap? ( net-nds/openldap ) readline? ( sys-libs/readline:0 ) <sys-apps/gawk-4.0.0 >=sys-devel/bison-2.3 >=sys-devel/flex-2.5.33 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/libtool-2.2.6a
+dev-libs/libxml2:2 >=dev-libs/openssl-0.9.7i:0 <sys-libs/zlib-1.2.5.1-r1:0 kerberos? ( app-crypt/mit-krb5 ) ldap? ( net-nds/openldap ) readline? ( sys-libs/readline:0 ) <sys-apps/gawk-4.0.0 >=sys-devel/bison-2.3 >=sys-devel/flex-2.5.33 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/libtool-2.2.6a
 dev-libs/libxml2:2 >=dev-libs/openssl-0.9.7i:0 <sys-libs/zlib-1.2.5.1-r1:0 kerberos? ( app-crypt/mit-krb5 ) ldap? ( net-nds/openldap ) readline? ( sys-libs/readline:0 ) >=dev-db/virtuoso-odbc-6.1.2:0
 0
 mirror://sourceforge/virtuoso/virtuoso-opensource-6.1.2.tar.gz mirror://gentoo/VOS-genpatches-6.1.2.tar.bz2
diff --git a/metadata/cache/dev-db/virtuoso-server-6.1.3 b/metadata/cache/dev-db/virtuoso-server-6.1.3
index 66f2948b6d82..4091a890c479 100644
--- a/metadata/cache/dev-db/virtuoso-server-6.1.3
+++ b/metadata/cache/dev-db/virtuoso-server-6.1.3
@@ -1,4 +1,4 @@
-dev-libs/libxml2:2 >=dev-libs/openssl-0.9.7i:0 <sys-libs/zlib-1.2.5.1-r1:0 kerberos? ( app-crypt/mit-krb5 ) ldap? ( net-nds/openldap ) readline? ( sys-libs/readline:0 ) <sys-apps/gawk-4.0.0 >=sys-devel/bison-2.3 >=sys-devel/flex-2.5.33 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/libtool-2.2.6a
+dev-libs/libxml2:2 >=dev-libs/openssl-0.9.7i:0 <sys-libs/zlib-1.2.5.1-r1:0 kerberos? ( app-crypt/mit-krb5 ) ldap? ( net-nds/openldap ) readline? ( sys-libs/readline:0 ) <sys-apps/gawk-4.0.0 >=sys-devel/bison-2.3 >=sys-devel/flex-2.5.33 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/libtool-2.2.6a
 dev-libs/libxml2:2 >=dev-libs/openssl-0.9.7i:0 <sys-libs/zlib-1.2.5.1-r1:0 kerberos? ( app-crypt/mit-krb5 ) ldap? ( net-nds/openldap ) readline? ( sys-libs/readline:0 ) >=dev-db/virtuoso-odbc-6.1.3:0
 0
 mirror://sourceforge/virtuoso/virtuoso-opensource-6.1.3.tar.gz mirror://gentoo/VOS-genpatches-6.1.3.tar.bz2
diff --git a/metadata/cache/dev-db/virtuoso-server-6.1.3-r2 b/metadata/cache/dev-db/virtuoso-server-6.1.3-r2
index bddbb210538a..97f72cd24d04 100644
--- a/metadata/cache/dev-db/virtuoso-server-6.1.3-r2
+++ b/metadata/cache/dev-db/virtuoso-server-6.1.3-r2
@@ -1,4 +1,4 @@
-dev-libs/libxml2:2 >=dev-libs/openssl-0.9.7i:0 <sys-libs/zlib-1.2.5.1-r1:0 kerberos? ( app-crypt/mit-krb5 ) ldap? ( net-nds/openldap ) readline? ( sys-libs/readline:0 ) <sys-apps/gawk-4.0.0 >=sys-devel/bison-2.3 >=sys-devel/flex-2.5.33 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/libtool-2.2.6a
+dev-libs/libxml2:2 >=dev-libs/openssl-0.9.7i:0 <sys-libs/zlib-1.2.5.1-r1:0 kerberos? ( app-crypt/mit-krb5 ) ldap? ( net-nds/openldap ) readline? ( sys-libs/readline:0 ) <sys-apps/gawk-4.0.0 >=sys-devel/bison-2.3 >=sys-devel/flex-2.5.33 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/libtool-2.2.6a
 dev-libs/libxml2:2 >=dev-libs/openssl-0.9.7i:0 <sys-libs/zlib-1.2.5.1-r1:0 kerberos? ( app-crypt/mit-krb5 ) ldap? ( net-nds/openldap ) readline? ( sys-libs/readline:0 ) >=dev-db/virtuoso-odbc-6.1.3:0
 0
 mirror://sourceforge/virtuoso/virtuoso-opensource-6.1.3.tar.gz mirror://gentoo/VOS-genpatches-6.1.3.tar.bz2
diff --git a/metadata/cache/dev-db/virtuoso-server-6.1.4 b/metadata/cache/dev-db/virtuoso-server-6.1.4
index dcedf9c42115..f8d5099ef433 100644
--- a/metadata/cache/dev-db/virtuoso-server-6.1.4
+++ b/metadata/cache/dev-db/virtuoso-server-6.1.4
@@ -1,4 +1,4 @@
-dev-libs/libxml2:2 >=dev-libs/openssl-0.9.7i:0 >=sys-libs/zlib-1.2.5.1-r2:0[minizip] kerberos? ( app-crypt/mit-krb5 ) ldap? ( net-nds/openldap ) readline? ( sys-libs/readline:0 ) sys-apps/gawk >=sys-devel/bison-2.3 >=sys-devel/flex-2.5.33 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/libtool-2.2.6a
+dev-libs/libxml2:2 >=dev-libs/openssl-0.9.7i:0 >=sys-libs/zlib-1.2.5.1-r2:0[minizip] kerberos? ( app-crypt/mit-krb5 ) ldap? ( net-nds/openldap ) readline? ( sys-libs/readline:0 ) sys-apps/gawk >=sys-devel/bison-2.3 >=sys-devel/flex-2.5.33 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/libtool-2.2.6a
 dev-libs/libxml2:2 >=dev-libs/openssl-0.9.7i:0 >=sys-libs/zlib-1.2.5.1-r2:0[minizip] kerberos? ( app-crypt/mit-krb5 ) ldap? ( net-nds/openldap ) readline? ( sys-libs/readline:0 ) ~dev-db/virtuoso-odbc-6.1.4:0
 0
 mirror://sourceforge/virtuoso/virtuoso-opensource-6.1.4.tar.gz mirror://gentoo/VOS-genpatches-6.1.4.tar.bz2
diff --git a/metadata/cache/dev-dotnet/evolution-sharp-0.21.1-r1 b/metadata/cache/dev-dotnet/evolution-sharp-0.21.1-r1
index d142c3853af6..c2e5f43d8fe6 100644
--- a/metadata/cache/dev-dotnet/evolution-sharp-0.21.1-r1
+++ b/metadata/cache/dev-dotnet/evolution-sharp-0.21.1-r1
@@ -1,4 +1,4 @@
->=gnome-extra/evolution-data-server-2.24 >=dev-dotnet/glib-sharp-2.12 >=dev-lang/mono-2 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=dev-dotnet/gtk-sharp-gapi-2.12 dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=gnome-extra/evolution-data-server-2.24 >=dev-dotnet/glib-sharp-2.12 >=dev-lang/mono-2 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) >=dev-dotnet/gtk-sharp-gapi-2.12 dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=gnome-extra/evolution-data-server-2.24 >=dev-dotnet/glib-sharp-2.12 >=dev-lang/mono-2
 0
 mirror://gnome/sources/evolution-sharp/0.21/evolution-sharp-0.21.1.tar.bz2
diff --git a/metadata/cache/dev-dotnet/gio-sharp-0.3 b/metadata/cache/dev-dotnet/gio-sharp-0.3
index efd133d0e67a..cbcbcca3cc15 100644
--- a/metadata/cache/dev-dotnet/gio-sharp-0.3
+++ b/metadata/cache/dev-dotnet/gio-sharp-0.3
@@ -1,4 +1,4 @@
->=dev-dotnet/glib-sharp-2.12 >=dev-dotnet/gtk-sharp-gapi-2.12 >=dev-libs/glib-2.22:2 dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-dotnet/glib-sharp-2.12 >=dev-dotnet/gtk-sharp-gapi-2.12 >=dev-libs/glib-2.22:2 dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=dev-dotnet/glib-sharp-2.12 >=dev-dotnet/gtk-sharp-gapi-2.12 >=dev-libs/glib-2.22:2
 0
 http://github.com/mono/gio-sharp/tarball/0.3 -> gio-sharp-0.3.tar.gz
diff --git a/metadata/cache/dev-dotnet/gkeyfile-sharp-0.1 b/metadata/cache/dev-dotnet/gkeyfile-sharp-0.1
index c3bd211c55c7..14543aed5c5c 100644
--- a/metadata/cache/dev-dotnet/gkeyfile-sharp-0.1
+++ b/metadata/cache/dev-dotnet/gkeyfile-sharp-0.1
@@ -1,4 +1,4 @@
->=dev-dotnet/glib-sharp-2.12.9 >=dev-dotnet/gtk-sharp-gapi-1.9 dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-dotnet/glib-sharp-2.12.9 >=dev-dotnet/gtk-sharp-gapi-1.9 dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=dev-dotnet/glib-sharp-2.12.9 >=dev-dotnet/gtk-sharp-gapi-1.9
 0
 http://github.com/mono/gkeyfile-sharp/tarball/GKEYFILE_SHARP_0_1 -> gkeyfile-sharp-0.1.tar.gz
diff --git a/metadata/cache/dev-dotnet/gluezilla-2.6-r1 b/metadata/cache/dev-dotnet/gluezilla-2.6-r1
index 2276a05a57eb..3e7ede7afc85 100644
--- a/metadata/cache/dev-dotnet/gluezilla-2.6-r1
+++ b/metadata/cache/dev-dotnet/gluezilla-2.6-r1
@@ -1,4 +1,4 @@
-net-libs/xulrunner:1.9 x11-libs/gtk+:2 >=dev-lang/mono-2.6 >=dev-util/pkgconfig-0.23 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+net-libs/xulrunner:1.9 x11-libs/gtk+:2 >=dev-lang/mono-2.6 >=dev-util/pkgconfig-0.23 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 net-libs/xulrunner:1.9 x11-libs/gtk+:2 >=dev-lang/mono-2.6
 0
 http://download.mono-project.com/sources/gluezilla/gluezilla-2.6.tar.bz2
diff --git a/metadata/cache/dev-dotnet/gtk-sharp-beans-2.14.0 b/metadata/cache/dev-dotnet/gtk-sharp-beans-2.14.0
index e06458d038d1..732a77ab104a 100644
--- a/metadata/cache/dev-dotnet/gtk-sharp-beans-2.14.0
+++ b/metadata/cache/dev-dotnet/gtk-sharp-beans-2.14.0
@@ -1,4 +1,4 @@
-dev-dotnet/gio-sharp >=dev-dotnet/glib-sharp-2.12 >=dev-dotnet/gtk-sharp-2.12 >=dev-dotnet/gtk-sharp-gapi-2.12 dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-dotnet/gio-sharp >=dev-dotnet/glib-sharp-2.12 >=dev-dotnet/gtk-sharp-2.12 >=dev-dotnet/gtk-sharp-gapi-2.12 dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-dotnet/gio-sharp >=dev-dotnet/glib-sharp-2.12 >=dev-dotnet/gtk-sharp-2.12 >=dev-dotnet/gtk-sharp-gapi-2.12
 0
 http://github.com/mono/gtk-sharp-beans/tarball/2.14.0 -> gtk-sharp-beans-2.14.0.tar.gz
diff --git a/metadata/cache/dev-dotnet/notify-sharp-0.4.0_pre20090305 b/metadata/cache/dev-dotnet/notify-sharp-0.4.0_pre20090305
index 4eda3b3bd244..748bdcd277f9 100644
--- a/metadata/cache/dev-dotnet/notify-sharp-0.4.0_pre20090305
+++ b/metadata/cache/dev-dotnet/notify-sharp-0.4.0_pre20090305
@@ -1,4 +1,4 @@
->=dev-lang/mono-1.1.13 >=dev-dotnet/gtk-sharp-2.10.1 >=dev-dotnet/dbus-sharp-0.6 >=dev-dotnet/dbus-sharp-glib-0.4 >=x11-libs/libnotify-0.4.5 doc? ( virtual/monodoc ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-lang/mono-1.1.13 >=dev-dotnet/gtk-sharp-2.10.1 >=dev-dotnet/dbus-sharp-0.6 >=dev-dotnet/dbus-sharp-glib-0.4 >=x11-libs/libnotify-0.4.5 doc? ( virtual/monodoc ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=dev-lang/mono-1.1.13 >=dev-dotnet/gtk-sharp-2.10.1 >=dev-dotnet/dbus-sharp-0.6 >=dev-dotnet/dbus-sharp-glib-0.4 >=x11-libs/libnotify-0.4.5
 0
 mirror://gentoo/notify-sharp-20090305.tar.bz2
diff --git a/metadata/cache/dev-embedded/avra-1.3.0 b/metadata/cache/dev-embedded/avra-1.3.0
index dd55ccf0a4ca..28e0ed62c36a 100644
--- a/metadata/cache/dev-embedded/avra-1.3.0
+++ b/metadata/cache/dev-embedded/avra-1.3.0
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 mirror://sourceforge/avra/avra-1.3.0.tar.bz2
diff --git a/metadata/cache/dev-embedded/gnome-avrdude-0.1 b/metadata/cache/dev-embedded/gnome-avrdude-0.1
index c264d6ca3dda..c5a47b751908 100644
--- a/metadata/cache/dev-embedded/gnome-avrdude-0.1
+++ b/metadata/cache/dev-embedded/gnome-avrdude-0.1
@@ -1,4 +1,4 @@
->=dev-libs/glib-2 x11-libs/gtk+:2 gnome-base/gconf gnome-base/libgnome gnome-base/libgnomeui gnome-base/libglade x11-libs/pango dev-util/pkgconfig >=sys-apps/sed-4 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-libs/glib-2 x11-libs/gtk+:2 gnome-base/gconf gnome-base/libgnome gnome-base/libgnomeui gnome-base/libglade x11-libs/pango dev-util/pkgconfig >=sys-apps/sed-4 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=dev-libs/glib-2 x11-libs/gtk+:2 gnome-base/gconf gnome-base/libgnome gnome-base/libgnomeui gnome-base/libglade x11-libs/pango dev-embedded/avrdude
 0
 mirror://sourceforge/gnome-avrdude/gnome-avrdude-0.1.tar.gz
diff --git a/metadata/cache/dev-embedded/gnusim8085-1.3.7 b/metadata/cache/dev-embedded/gnusim8085-1.3.7
index f0fac932e718..9bc7d9a1f385 100644
--- a/metadata/cache/dev-embedded/gnusim8085-1.3.7
+++ b/metadata/cache/dev-embedded/gnusim8085-1.3.7
@@ -1,4 +1,4 @@
->=x11-libs/gtk+-2.12:2 x11-libs/gdk-pixbuf:2 dev-libs/glib:2 x11-libs/gtksourceview:2.0 x11-libs/pango dev-util/pkgconfig nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=x11-libs/gtk+-2.12:2 x11-libs/gdk-pixbuf:2 dev-libs/glib:2 x11-libs/gtksourceview:2.0 x11-libs/pango dev-util/pkgconfig nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=x11-libs/gtk+-2.12:2 x11-libs/gdk-pixbuf:2 dev-libs/glib:2 x11-libs/gtksourceview:2.0 x11-libs/pango
 0
 http://launchpad.net/gnusim8085/trunk/1.3.7/+download/gnusim8085-1.3.7.tar.gz
diff --git a/metadata/cache/dev-embedded/gpsim-lcd-0.2.10 b/metadata/cache/dev-embedded/gpsim-lcd-0.2.10
index e64045fe0acb..520192d1b9db 100644
--- a/metadata/cache/dev-embedded/gpsim-lcd-0.2.10
+++ b/metadata/cache/dev-embedded/gpsim-lcd-0.2.10
@@ -1,4 +1,4 @@
->=dev-embedded/gpsim-0.22.0 x11-libs/gtk+:2 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-embedded/gpsim-0.22.0 x11-libs/gtk+:2 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=dev-embedded/gpsim-0.22.0 x11-libs/gtk+:2
 0
 mirror://sourceforge/gpsim/lcd-0.2.10.tar.gz
diff --git a/metadata/cache/dev-embedded/libftdi-9999 b/metadata/cache/dev-embedded/libftdi-9999
index 180f0c1f00a7..571da5c02c6e 100644
--- a/metadata/cache/dev-embedded/libftdi-9999
+++ b/metadata/cache/dev-embedded/libftdi-9999
@@ -1,4 +1,4 @@
-virtual/libusb:0 cxx? ( dev-libs/boost ) python? ( dev-lang/python ) doc? ( app-doc/doxygen ) dev-vcs/git || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+virtual/libusb:0 cxx? ( dev-libs/boost ) python? ( dev-lang/python ) doc? ( app-doc/doxygen ) dev-vcs/git || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 virtual/libusb:0 cxx? ( dev-libs/boost ) python? ( dev-lang/python )
 0
 
diff --git a/metadata/cache/dev-embedded/libftdi-9999.1.0 b/metadata/cache/dev-embedded/libftdi-9999.1.0
index ecd12a03f3bd..197005b99631 100644
--- a/metadata/cache/dev-embedded/libftdi-9999.1.0
+++ b/metadata/cache/dev-embedded/libftdi-9999.1.0
@@ -1,4 +1,4 @@
-virtual/libusb:1 cxx? ( dev-libs/boost ) python? ( dev-lang/python ) doc? ( app-doc/doxygen ) dev-vcs/git || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+virtual/libusb:1 cxx? ( dev-libs/boost ) python? ( dev-lang/python ) doc? ( app-doc/doxygen ) dev-vcs/git || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 virtual/libusb:1 cxx? ( dev-libs/boost ) python? ( dev-lang/python )
 0
 
diff --git a/metadata/cache/dev-embedded/openocd-9999 b/metadata/cache/dev-embedded/openocd-9999
index 99cc6c9fa27b..2872e2c53ad2 100644
--- a/metadata/cache/dev-embedded/openocd-9999
+++ b/metadata/cache/dev-embedded/openocd-9999
@@ -1,4 +1,4 @@
-dev-lang/jimtcl usb? ( dev-libs/libusb ) presto? ( dev-embedded/libftd2xx ) ftd2xx? ( dev-embedded/libftd2xx ) ftdi? ( dev-embedded/libftdi ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
+dev-lang/jimtcl usb? ( dev-libs/libusb ) presto? ( dev-embedded/libftd2xx ) ftd2xx? ( dev-embedded/libftd2xx ) ftdi? ( dev-embedded/libftdi ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
 dev-lang/jimtcl usb? ( dev-libs/libusb ) presto? ( dev-embedded/libftd2xx ) ftd2xx? ( dev-embedded/libftd2xx ) ftdi? ( dev-embedded/libftdi )
 0
 
diff --git a/metadata/cache/dev-embedded/scratchbox2-2.0-r1 b/metadata/cache/dev-embedded/scratchbox2-2.0-r1
index 272c80ffc27b..a264f49eb534 100644
--- a/metadata/cache/dev-embedded/scratchbox2-2.0-r1
+++ b/metadata/cache/dev-embedded/scratchbox2-2.0-r1
@@ -1,4 +1,4 @@
->=dev-lang/lua-5.1.4 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-lang/lua-5.1.4 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=dev-lang/lua-5.1.4
 0
 http://cgit.freedesktop.org/sbox2/snapshot/sbox2-2.0.tar.bz2
diff --git a/metadata/cache/dev-embedded/sdcc-9999 b/metadata/cache/dev-embedded/sdcc-9999
index 48ada77595d0..6bb086af2ecc 100644
--- a/metadata/cache/dev-embedded/sdcc-9999
+++ b/metadata/cache/dev-embedded/sdcc-9999
@@ -1,4 +1,4 @@
-sys-libs/ncurses sys-libs/readline >=dev-embedded/gputils-0.13.7 boehm-gc? ( dev-libs/boehm-gc ) !dev-embedded/sdcc-svn doc? ( >=app-office/lyx-1.3.4 dev-tex/latex2html ) dev-vcs/subversion net-misc/rsync || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+sys-libs/ncurses sys-libs/readline >=dev-embedded/gputils-0.13.7 boehm-gc? ( dev-libs/boehm-gc ) !dev-embedded/sdcc-svn doc? ( >=app-office/lyx-1.3.4 dev-tex/latex2html ) dev-vcs/subversion net-misc/rsync || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 sys-libs/ncurses sys-libs/readline >=dev-embedded/gputils-0.13.7 boehm-gc? ( dev-libs/boehm-gc ) !dev-embedded/sdcc-svn
 0
 
diff --git a/metadata/cache/dev-embedded/srecord-1.58 b/metadata/cache/dev-embedded/srecord-1.58
index 1c364fd504e0..b34cb4c0ffbf 100644
--- a/metadata/cache/dev-embedded/srecord-1.58
+++ b/metadata/cache/dev-embedded/srecord-1.58
@@ -1,4 +1,4 @@
-dev-libs/libgcrypt dev-libs/boost sys-apps/groff test? ( app-arch/sharutils ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-libs/libgcrypt dev-libs/boost sys-apps/groff test? ( app-arch/sharutils ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-libs/libgcrypt
 0
 mirror://sourceforge/srecord/srecord-1.58.tar.gz
diff --git a/metadata/cache/dev-embedded/srecord-1.59 b/metadata/cache/dev-embedded/srecord-1.59
index 8dbc0a69fff4..5bda5d87ad0a 100644
--- a/metadata/cache/dev-embedded/srecord-1.59
+++ b/metadata/cache/dev-embedded/srecord-1.59
@@ -1,4 +1,4 @@
-dev-libs/libgcrypt dev-libs/boost sys-apps/groff test? ( app-arch/sharutils ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-libs/libgcrypt dev-libs/boost sys-apps/groff test? ( app-arch/sharutils ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-libs/libgcrypt
 0
 mirror://sourceforge/srecord/srecord-1.59.tar.gz
diff --git a/metadata/cache/dev-embedded/urjtag-9999 b/metadata/cache/dev-embedded/urjtag-9999
index 70f5abe0a84e..a69eec3ea903 100644
--- a/metadata/cache/dev-embedded/urjtag-9999
+++ b/metadata/cache/dev-embedded/urjtag-9999
@@ -1,4 +1,4 @@
-ftdi? ( dev-embedded/libftdi ) readline? ( sys-libs/readline ) usb? ( virtual/libusb:1 ) dev-vcs/git || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+ftdi? ( dev-embedded/libftdi ) readline? ( sys-libs/readline ) usb? ( virtual/libusb:1 ) dev-vcs/git || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 ftdi? ( dev-embedded/libftdi ) readline? ( sys-libs/readline ) usb? ( virtual/libusb:1 ) !dev-embedded/jtag
 0
 
diff --git a/metadata/cache/dev-games/KXL-1.1.7-r2 b/metadata/cache/dev-games/KXL-1.1.7-r2
index 6eb7d8699c18..92ae072c2622 100644
--- a/metadata/cache/dev-games/KXL-1.1.7-r2
+++ b/metadata/cache/dev-games/KXL-1.1.7-r2
@@ -1,4 +1,4 @@
-x11-libs/libX11 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+x11-libs/libX11 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 x11-libs/libX11
 0
 http://kxl.hn.org/download/KXL-1.1.7.tar.gz
diff --git a/metadata/cache/dev-games/cegui-0.6.2b b/metadata/cache/dev-games/cegui-0.6.2b
index ab7a20e3f87a..6ddb9437f95e 100644
--- a/metadata/cache/dev-games/cegui-0.6.2b
+++ b/metadata/cache/dev-games/cegui-0.6.2b
@@ -1,4 +1,4 @@
-dev-libs/libpcre media-libs/freetype:2 devil? ( media-libs/devil ) directfb? ( dev-libs/DirectFB ) expat? ( dev-libs/expat ) irrlicht? ( dev-games/irrlicht ) lua? ( dev-lang/lua dev-lua/toluapp ) opengl? ( virtual/opengl media-libs/freeglut media-libs/glew ) xerces-c? ( dev-libs/xerces-c ) xml? ( dev-libs/libxml2 ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-libs/libpcre media-libs/freetype:2 devil? ( media-libs/devil ) directfb? ( dev-libs/DirectFB ) expat? ( dev-libs/expat ) irrlicht? ( dev-games/irrlicht ) lua? ( dev-lang/lua dev-lua/toluapp ) opengl? ( virtual/opengl media-libs/freeglut media-libs/glew ) xerces-c? ( dev-libs/xerces-c ) xml? ( dev-libs/libxml2 ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-libs/libpcre media-libs/freetype:2 devil? ( media-libs/devil ) directfb? ( dev-libs/DirectFB ) expat? ( dev-libs/expat ) irrlicht? ( dev-games/irrlicht ) lua? ( dev-lang/lua dev-lua/toluapp ) opengl? ( virtual/opengl media-libs/freeglut media-libs/glew ) xerces-c? ( dev-libs/xerces-c ) xml? ( dev-libs/libxml2 )
 0
 mirror://sourceforge/crayzedsgui/CEGUI-0.6.2b.tar.gz doc? ( mirror://sourceforge/crayzedsgui/CEGUI-0.6.2-DOCS.tar.gz )
diff --git a/metadata/cache/dev-games/crystalspace-1.4.0 b/metadata/cache/dev-games/crystalspace-1.4.0
index ef14132de0d5..a7b1dca5593a 100644
--- a/metadata/cache/dev-games/crystalspace-1.4.0
+++ b/metadata/cache/dev-games/crystalspace-1.4.0
@@ -1,4 +1,4 @@
-virtual/opengl media-libs/openal x11-libs/libXt x11-libs/libXxf86vm cg? ( media-gfx/nvidia-cg-toolkit ) ode? ( dev-games/ode ) cal3d? ( >=media-libs/cal3d-0.11 ) jpeg? ( virtual/jpeg ) bullet? ( sci-physics/bullet ) sdl? ( media-libs/libsdl ) vorbis? ( media-libs/libvorbis ) speex? ( media-libs/libogg media-libs/speex ) truetype? ( >=media-libs/freetype-2.1 ) alsa? ( media-libs/alsa-lib ) mng? ( media-libs/libmng ) png? ( media-libs/libpng ) wxwidgets? ( x11-libs/wxGTK:2.8[X,opengl] ) cegui? ( >=dev-games/cegui-0.5.0 ) 3ds? ( media-libs/lib3ds ) java? ( >=virtual/jdk-1.5 dev-java/ant-core ) dev-util/ftjam dev-lang/swig dev-util/pkgconfig java? ( >=dev-java/java-config-2.1.9-r1 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+virtual/opengl media-libs/openal x11-libs/libXt x11-libs/libXxf86vm cg? ( media-gfx/nvidia-cg-toolkit ) ode? ( dev-games/ode ) cal3d? ( >=media-libs/cal3d-0.11 ) jpeg? ( virtual/jpeg ) bullet? ( sci-physics/bullet ) sdl? ( media-libs/libsdl ) vorbis? ( media-libs/libvorbis ) speex? ( media-libs/libogg media-libs/speex ) truetype? ( >=media-libs/freetype-2.1 ) alsa? ( media-libs/alsa-lib ) mng? ( media-libs/libmng ) png? ( media-libs/libpng ) wxwidgets? ( x11-libs/wxGTK:2.8[X,opengl] ) cegui? ( >=dev-games/cegui-0.5.0 ) 3ds? ( media-libs/lib3ds ) java? ( >=virtual/jdk-1.5 dev-java/ant-core ) dev-util/ftjam dev-lang/swig dev-util/pkgconfig java? ( >=dev-java/java-config-2.1.9-r1 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 virtual/opengl media-libs/openal x11-libs/libXt x11-libs/libXxf86vm cg? ( media-gfx/nvidia-cg-toolkit ) ode? ( dev-games/ode ) cal3d? ( >=media-libs/cal3d-0.11 ) jpeg? ( virtual/jpeg ) bullet? ( sci-physics/bullet ) sdl? ( media-libs/libsdl ) vorbis? ( media-libs/libvorbis ) speex? ( media-libs/libogg media-libs/speex ) truetype? ( >=media-libs/freetype-2.1 ) alsa? ( media-libs/alsa-lib ) mng? ( media-libs/libmng ) png? ( media-libs/libpng ) wxwidgets? ( x11-libs/wxGTK:2.8[X,opengl] ) cegui? ( >=dev-games/cegui-0.5.0 ) 3ds? ( media-libs/lib3ds ) java? ( >=virtual/jre-1.5 ) java? ( >=dev-java/java-config-2.1.9-r1 )
 0
 mirror://sourceforge/crystal/crystalspace-src-1.4.0.tar.bz2
diff --git a/metadata/cache/dev-games/guichan-0.8.2 b/metadata/cache/dev-games/guichan-0.8.2
index af5e4832bea6..ba2280001b7f 100644
--- a/metadata/cache/dev-games/guichan-0.8.2
+++ b/metadata/cache/dev-games/guichan-0.8.2
@@ -1,4 +1,4 @@
-allegro? ( <media-libs/allegro-5 ) opengl? ( virtual/opengl ) sdl? ( media-libs/libsdl media-libs/sdl-image ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+allegro? ( <media-libs/allegro-5 ) opengl? ( virtual/opengl ) sdl? ( media-libs/libsdl media-libs/sdl-image ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 allegro? ( <media-libs/allegro-5 ) opengl? ( virtual/opengl ) sdl? ( media-libs/libsdl media-libs/sdl-image )
 0
 http://guichan.googlecode.com/files/guichan-0.8.2.tar.gz
diff --git a/metadata/cache/dev-games/libgrapple-0.9.8 b/metadata/cache/dev-games/libgrapple-0.9.8
index dde667b5d8f4..1f12be766d07 100644
--- a/metadata/cache/dev-games/libgrapple-0.9.8
+++ b/metadata/cache/dev-games/libgrapple-0.9.8
@@ -1,4 +1,4 @@
-ssl? ( dev-libs/openssl ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+ssl? ( dev-libs/openssl ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 ssl? ( dev-libs/openssl )
 0
 http://osfiles.linuxgamepublishing.com/libgrapple-0.9.8.tbz
diff --git a/metadata/cache/dev-games/neoengine-0.8.2-r1 b/metadata/cache/dev-games/neoengine-0.8.2-r1
index f2ca610c2bd8..5b2ef7b09684 100644
--- a/metadata/cache/dev-games/neoengine-0.8.2-r1
+++ b/metadata/cache/dev-games/neoengine-0.8.2-r1
@@ -1,4 +1,4 @@
-virtual/opengl media-libs/alsa-lib media-libs/libpng virtual/jpeg doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+virtual/opengl media-libs/alsa-lib media-libs/libpng virtual/jpeg doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 virtual/opengl media-libs/alsa-lib media-libs/libpng virtual/jpeg
 0
 mirror://sourceforge/neoengine/neoengine-0.8.2.tar.bz2
diff --git a/metadata/cache/dev-games/neotools-0.8.2-r1 b/metadata/cache/dev-games/neotools-0.8.2-r1
index cd77312883bf..d9674b0e7754 100644
--- a/metadata/cache/dev-games/neotools-0.8.2-r1
+++ b/metadata/cache/dev-games/neotools-0.8.2-r1
@@ -1,4 +1,4 @@
->=dev-games/neoengine-0.8.2 app-arch/bzip2 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-games/neoengine-0.8.2 app-arch/bzip2 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=dev-games/neoengine-0.8.2 app-arch/bzip2
 0
 mirror://sourceforge/neoengine/neotools-0.8.2.tar.bz2
diff --git a/metadata/cache/dev-games/ogre-1.6.5 b/metadata/cache/dev-games/ogre-1.6.5
index d6801d7991c5..0607d9b8295a 100644
--- a/metadata/cache/dev-games/ogre-1.6.5
+++ b/metadata/cache/dev-games/ogre-1.6.5
@@ -1,4 +1,4 @@
-dev-libs/zziplib media-libs/freetype:2 virtual/opengl x11-libs/libXt x11-libs/libXaw x11-libs/libXrandr x11-libs/libX11 cg? ( media-gfx/nvidia-cg-toolkit ) devil? ( media-libs/devil ) gtk? ( x11-libs/gtk+:2 ) cegui? ( >=dev-games/cegui-0.5 !>dev-games/cegui-0.6.3 ) threads? ( || ( >=dev-libs/boost-1.34.1 dev-libs/boost[threads] ) ) !dev-games/ogre x11-proto/xf86vidmodeproto dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-libs/zziplib media-libs/freetype:2 virtual/opengl x11-libs/libXt x11-libs/libXaw x11-libs/libXrandr x11-libs/libX11 cg? ( media-gfx/nvidia-cg-toolkit ) devil? ( media-libs/devil ) gtk? ( x11-libs/gtk+:2 ) cegui? ( >=dev-games/cegui-0.5 !>dev-games/cegui-0.6.3 ) threads? ( || ( >=dev-libs/boost-1.34.1 dev-libs/boost[threads] ) ) !dev-games/ogre x11-proto/xf86vidmodeproto dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-libs/zziplib media-libs/freetype:2 virtual/opengl x11-libs/libXt x11-libs/libXaw x11-libs/libXrandr x11-libs/libX11 cg? ( media-gfx/nvidia-cg-toolkit ) devil? ( media-libs/devil ) gtk? ( x11-libs/gtk+:2 ) cegui? ( >=dev-games/cegui-0.5 !>dev-games/cegui-0.6.3 ) threads? ( || ( >=dev-libs/boost-1.34.1 dev-libs/boost[threads] ) )
 0
 mirror://sourceforge/ogre/ogre-v1-6-5.tar.bz2
diff --git a/metadata/cache/dev-games/ois-1.2.0 b/metadata/cache/dev-games/ois-1.2.0
index 5094e687bde9..a68ad7766d60 100644
--- a/metadata/cache/dev-games/ois-1.2.0
+++ b/metadata/cache/dev-games/ois-1.2.0
@@ -1,4 +1,4 @@
-x11-libs/libXaw x11-libs/libX11 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+x11-libs/libXaw x11-libs/libX11 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 x11-libs/libXaw x11-libs/libX11
 0
 mirror://sourceforge/wgois/ois_1.2.0.tar.gz
diff --git a/metadata/cache/dev-games/ois-1.3 b/metadata/cache/dev-games/ois-1.3
index e3a3992d2f14..24c41bbb993f 100644
--- a/metadata/cache/dev-games/ois-1.3
+++ b/metadata/cache/dev-games/ois-1.3
@@ -1,4 +1,4 @@
-x11-libs/libXaw x11-libs/libX11 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+x11-libs/libXaw x11-libs/libX11 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 mirror://sourceforge/wgois/ois_v1-3.tar.gz
diff --git a/metadata/cache/dev-haskell/alex-2.3.5 b/metadata/cache/dev-haskell/alex-2.3.5
index 9e994bcd9317..917ec4b78669 100644
--- a/metadata/cache/dev-haskell/alex-2.3.5
+++ b/metadata/cache/dev-haskell/alex-2.3.5
@@ -1,4 +1,4 @@
->=dev-haskell/cabal-1.2 >=dev-lang/ghc-6.8.2 doc? ( ~app-text/docbook-xml-dtd-4.2 app-text/docbook-xsl-stylesheets >=dev-libs/libxslt-1.1.2 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=dev-haskell/cabal-1.1.4
+>=dev-haskell/cabal-1.2 >=dev-lang/ghc-6.8.2 doc? ( ~app-text/docbook-xml-dtd-4.2 app-text/docbook-xsl-stylesheets >=dev-libs/libxslt-1.1.2 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=dev-haskell/cabal-1.1.4
 
 0
 http://hackage.haskell.org/packages/archive/alex/2.3.5/alex-2.3.5.tar.gz
diff --git a/metadata/cache/dev-haskell/happy-1.18.6 b/metadata/cache/dev-haskell/happy-1.18.6
index 6682be9a00de..c8a1a8386e08 100644
--- a/metadata/cache/dev-haskell/happy-1.18.6
+++ b/metadata/cache/dev-haskell/happy-1.18.6
@@ -1,4 +1,4 @@
->=dev-haskell/cabal-1.2.3 >=dev-haskell/mtl-1.0 >=dev-lang/ghc-6.8.2 dev-lang/perl doc? ( ~app-text/docbook-xml-dtd-4.2 app-text/docbook-xsl-stylesheets ) >=dev-haskell/cabal-1.1.4 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-haskell/cabal-1.2.3 >=dev-haskell/mtl-1.0 >=dev-lang/ghc-6.8.2 dev-lang/perl doc? ( ~app-text/docbook-xml-dtd-4.2 app-text/docbook-xsl-stylesheets ) >=dev-haskell/cabal-1.1.4 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 http://hackage.haskell.org/packages/archive/happy/1.18.6/happy-1.18.6.tar.gz
diff --git a/metadata/cache/dev-haskell/network-2.3.0.11 b/metadata/cache/dev-haskell/network-2.3.0.11
index 4f9a3e101d0b..946b216a07a7 100644
--- a/metadata/cache/dev-haskell/network-2.3.0.11
+++ b/metadata/cache/dev-haskell/network-2.3.0.11
@@ -1,4 +1,4 @@
-dev-haskell/parsec[profile?] >=dev-lang/ghc-6.8.2 >=dev-haskell/cabal-1.8 test? ( <dev-haskell/hunit-1.3[profile?] <dev-haskell/test-framework-0.6[profile?] <dev-haskell/test-framework-hunit-0.3[profile?] ) doc? ( dev-haskell/haddock ) hscolour? ( dev-haskell/hscolour ) >=dev-haskell/cabal-1.1.4 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-haskell/parsec[profile?] >=dev-lang/ghc-6.8.2 >=dev-haskell/cabal-1.8 test? ( <dev-haskell/hunit-1.3[profile?] <dev-haskell/test-framework-0.6[profile?] <dev-haskell/test-framework-hunit-0.3[profile?] ) doc? ( dev-haskell/haddock ) hscolour? ( dev-haskell/hscolour ) >=dev-haskell/cabal-1.1.4 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-haskell/parsec[profile?] >=dev-lang/ghc-6.8.2 dev-lang/ghc
 0
 http://hackage.haskell.org/packages/archive/network/2.3.0.11/network-2.3.0.11.tar.gz
diff --git a/metadata/cache/dev-haskell/network-2.3.0.2 b/metadata/cache/dev-haskell/network-2.3.0.2
index f296ae5cdf11..c2a0243de45a 100644
--- a/metadata/cache/dev-haskell/network-2.3.0.2
+++ b/metadata/cache/dev-haskell/network-2.3.0.2
@@ -1,4 +1,4 @@
-dev-haskell/parsec >=dev-lang/ghc-6.8.2 >=dev-haskell/cabal-1.6 doc? ( dev-haskell/haddock ) hscolour? ( dev-haskell/hscolour ) >=dev-haskell/cabal-1.1.4 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-haskell/parsec >=dev-lang/ghc-6.8.2 >=dev-haskell/cabal-1.6 doc? ( dev-haskell/haddock ) hscolour? ( dev-haskell/hscolour ) >=dev-haskell/cabal-1.1.4 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-haskell/parsec >=dev-lang/ghc-6.8.2 dev-lang/ghc
 0
 http://hackage.haskell.org/packages/archive/network/2.3.0.2/network-2.3.0.2.tar.gz
diff --git a/metadata/cache/dev-haskell/network-2.3.0.7 b/metadata/cache/dev-haskell/network-2.3.0.7
index d5bc83f4b97c..ec6068ae3de4 100644
--- a/metadata/cache/dev-haskell/network-2.3.0.7
+++ b/metadata/cache/dev-haskell/network-2.3.0.7
@@ -1,4 +1,4 @@
-dev-haskell/parsec >=dev-lang/ghc-6.8.2 >=dev-haskell/cabal-1.8 test? ( <dev-haskell/hunit-1.3 <dev-haskell/test-framework-0.5 <dev-haskell/test-framework-hunit-0.3 ) doc? ( dev-haskell/haddock ) hscolour? ( dev-haskell/hscolour ) >=dev-haskell/cabal-1.1.4 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-haskell/parsec >=dev-lang/ghc-6.8.2 >=dev-haskell/cabal-1.8 test? ( <dev-haskell/hunit-1.3 <dev-haskell/test-framework-0.5 <dev-haskell/test-framework-hunit-0.3 ) doc? ( dev-haskell/haddock ) hscolour? ( dev-haskell/hscolour ) >=dev-haskell/cabal-1.1.4 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-haskell/parsec >=dev-lang/ghc-6.8.2 dev-lang/ghc
 0
 http://hackage.haskell.org/packages/archive/network/2.3.0.7/network-2.3.0.7.tar.gz
diff --git a/metadata/cache/dev-java/cacao-0.99.4 b/metadata/cache/dev-java/cacao-0.99.4
index b51e34a38ac7..90677e5606cc 100644
--- a/metadata/cache/dev-java/cacao-0.99.4
+++ b/metadata/cache/dev-java/cacao-0.99.4
@@ -1,4 +1,4 @@
-dev-java/gnu-classpath:0.98 || ( dev-java/eclipse-ecj dev-java/ecj-gcj ) test? ( dev-java/junit:4 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool ) >=dev-java/java-config-2.1.9-r1 =dev-java/java-config-2*
+dev-java/gnu-classpath:0.98 || ( dev-java/eclipse-ecj dev-java/ecj-gcj ) test? ( dev-java/junit:4 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool ) >=dev-java/java-config-2.1.9-r1 =dev-java/java-config-2*
 dev-java/gnu-classpath:0.98 || ( dev-java/eclipse-ecj dev-java/ecj-gcj ) >=dev-java/java-config-2.1.9-r1 =dev-java/java-config-2*
 0
 http://www.complang.tuwien.ac.at/cacaojvm/download/cacao-0.99.4/cacao-0.99.4.tar.bz2
diff --git a/metadata/cache/dev-java/commons-daemon-1.0.2 b/metadata/cache/dev-java/commons-daemon-1.0.2
index 6162ab47b8b4..68254336b6a1 100644
--- a/metadata/cache/dev-java/commons-daemon-1.0.2
+++ b/metadata/cache/dev-java/commons-daemon-1.0.2
@@ -1,4 +1,4 @@
->=virtual/jdk-1.4 >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip ) >=dev-java/ant-core-1.7.0 >=dev-java/javatoolkit-0.3.0-r2 >=dev-lang/python-2.4 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=virtual/jdk-1.4 >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip ) >=dev-java/ant-core-1.7.0 >=dev-java/javatoolkit-0.3.0-r2 >=dev-lang/python-2.4 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=virtual/jre-1.4 >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip )
 0
 mirror://apache/commons/daemon/source/commons-daemon-1.0.2-src.tar.gz
diff --git a/metadata/cache/dev-java/commons-daemon-1.0.4 b/metadata/cache/dev-java/commons-daemon-1.0.4
index 48ad5a916f46..164efb0af45d 100644
--- a/metadata/cache/dev-java/commons-daemon-1.0.4
+++ b/metadata/cache/dev-java/commons-daemon-1.0.4
@@ -1,4 +1,4 @@
->=virtual/jdk-1.4 >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip ) >=dev-java/ant-core-1.7.0 >=dev-java/javatoolkit-0.3.0-r2 >=dev-lang/python-2.4 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=virtual/jdk-1.4 >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip ) >=dev-java/ant-core-1.7.0 >=dev-java/javatoolkit-0.3.0-r2 >=dev-lang/python-2.4 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=virtual/jre-1.4 >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip )
 0
 mirror://apache/commons/daemon/source/commons-daemon-1.0.4-src.tar.gz
diff --git a/metadata/cache/dev-java/commons-daemon-1.0.7 b/metadata/cache/dev-java/commons-daemon-1.0.7
index 958517560797..93090a99e7a0 100644
--- a/metadata/cache/dev-java/commons-daemon-1.0.7
+++ b/metadata/cache/dev-java/commons-daemon-1.0.7
@@ -1,4 +1,4 @@
-kernel_linux? ( sys-libs/libcap ) >=virtual/jdk-1.4 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip ) >=dev-java/ant-core-1.7.0 >=dev-java/javatoolkit-0.3.0-r2 >=dev-lang/python-2.4
+kernel_linux? ( sys-libs/libcap ) >=virtual/jdk-1.4 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip ) >=dev-java/ant-core-1.7.0 >=dev-java/javatoolkit-0.3.0-r2 >=dev-lang/python-2.4
 kernel_linux? ( sys-libs/libcap ) >=virtual/jre-1.4 >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip )
 0
 mirror://apache/commons/daemon/source/commons-daemon-1.0.7-src.tar.gz
diff --git a/metadata/cache/dev-java/commons-daemon-1.0.8 b/metadata/cache/dev-java/commons-daemon-1.0.8
index 087cd98d6a39..f42f78131c65 100644
--- a/metadata/cache/dev-java/commons-daemon-1.0.8
+++ b/metadata/cache/dev-java/commons-daemon-1.0.8
@@ -1,4 +1,4 @@
-kernel_linux? ( sys-libs/libcap ) >=virtual/jdk-1.4 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip ) >=dev-java/ant-core-1.7.0 >=dev-java/javatoolkit-0.3.0-r2 >=dev-lang/python-2.4
+kernel_linux? ( sys-libs/libcap ) >=virtual/jdk-1.4 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip ) >=dev-java/ant-core-1.7.0 >=dev-java/javatoolkit-0.3.0-r2 >=dev-lang/python-2.4
 kernel_linux? ( sys-libs/libcap ) >=virtual/jre-1.4 >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip )
 0
 mirror://apache/commons/daemon/source/commons-daemon-1.0.8-src.tar.gz
diff --git a/metadata/cache/dev-java/commons-daemon-1.0.9 b/metadata/cache/dev-java/commons-daemon-1.0.9
index f5d0cefea6ae..db47b064a6f6 100644
--- a/metadata/cache/dev-java/commons-daemon-1.0.9
+++ b/metadata/cache/dev-java/commons-daemon-1.0.9
@@ -1,4 +1,4 @@
-kernel_linux? ( sys-libs/libcap ) >=virtual/jdk-1.4 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip ) >=dev-java/ant-core-1.7.0 >=dev-java/javatoolkit-0.3.0-r2 >=dev-lang/python-2.4
+kernel_linux? ( sys-libs/libcap ) >=virtual/jdk-1.4 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip ) >=dev-java/ant-core-1.7.0 >=dev-java/javatoolkit-0.3.0-r2 >=dev-lang/python-2.4
 kernel_linux? ( sys-libs/libcap ) >=virtual/jre-1.4 >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip )
 0
 mirror://apache/commons/daemon/source/commons-daemon-1.0.9-src.tar.gz
diff --git a/metadata/cache/dev-java/gjdoc-0.7.9-r1 b/metadata/cache/dev-java/gjdoc-0.7.9-r1
index 5532da711022..ab3190341e6d 100644
--- a/metadata/cache/dev-java/gjdoc-0.7.9-r1
+++ b/metadata/cache/dev-java/gjdoc-0.7.9-r1
@@ -1,4 +1,4 @@
->=virtual/jre-1.4 >=dev-java/antlr-2.7.1:0[java] >=virtual/jdk-1.4 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip )
+>=virtual/jre-1.4 >=dev-java/antlr-2.7.1:0[java] >=virtual/jdk-1.4 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip )
 >=virtual/jre-1.4 >=dev-java/antlr-2.7.1:0[java] >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip )
 0
 mirror://gnu/classpath/gjdoc-0.7.9.tar.gz
diff --git a/metadata/cache/dev-java/gjdoc-0.7.9-r2 b/metadata/cache/dev-java/gjdoc-0.7.9-r2
index cf79f2820fbd..12f6846dfebb 100644
--- a/metadata/cache/dev-java/gjdoc-0.7.9-r2
+++ b/metadata/cache/dev-java/gjdoc-0.7.9-r2
@@ -1,4 +1,4 @@
->=virtual/jre-1.4 >=dev-java/antlr-2.7.1:0[java] >=virtual/jdk-1.4 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip )
+>=virtual/jre-1.4 >=dev-java/antlr-2.7.1:0[java] >=virtual/jdk-1.4 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip )
 >=virtual/jre-1.4 >=dev-java/antlr-2.7.1:0[java] >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip )
 0
 mirror://gnu/classpath/gjdoc-0.7.9.tar.gz
diff --git a/metadata/cache/dev-java/icedtea-6.1.10.5 b/metadata/cache/dev-java/icedtea-6.1.10.5
index a4bcd2b79ea7..e185fd12060b 100644
--- a/metadata/cache/dev-java/icedtea-6.1.10.5
+++ b/metadata/cache/dev-java/icedtea-6.1.10.5
@@ -1,4 +1,4 @@
->=media-libs/giflib-4.1.6 >=media-libs/libpng-1.2 >=sys-libs/zlib-1.2.3 virtual/jpeg javascript? ( dev-java/rhino:1.6 ) nss? ( >=dev-libs/nss-3.12.5-r1 ) pulseaudio? ( >=media-sound/pulseaudio-0.9.11 ) systemtap? ( >=dev-util/systemtap-1 ) >=media-libs/alsa-lib-1.0 >=net-print/cups-1.2.12 dev-libs/glib >=media-libs/freetype-2.3.5 >=x11-libs/gtk+-2.8:2 >=x11-libs/libX11-1.1.3 >=x11-libs/libXext-1.1.1 >=x11-libs/libXi-1.1.3 >=x11-libs/libXrender-0.9.4 >=x11-libs/libXtst-1.0.3 || ( >=dev-java/gcj-jdk-4.3 dev-java/icedtea-bin:6 dev-java/icedtea:6 ) app-arch/cpio app-arch/unzip app-arch/zip app-misc/ca-certificates >=dev-java/ant-core-1.7.1-r2 dev-java/ant-nodeps >=dev-java/xalan-2.7.0:0 >=dev-java/xerces-2.9.1:2 dev-lang/perl dev-libs/openssl dev-util/pkgconfig sys-apps/lsb-release || ( >=sys-devel/autoconf-2.65:2.5 <sys-devel/autoconf-2.64:2.5 ) >=x11-libs/libXau-1.0.3 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXinerama-1.0.2 >=x11-libs/libXp-1.0.0 x11-proto/inputproto >=x11-proto/xextproto-7.1.1 x11-proto/xineramaproto x11-proto/xproto jbootstrap? ( || ( <dev-java/eclipse-ecj-3.7 dev-java/ecj-gcj ) ) pax_kernel? ( sys-apps/paxctl ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=dev-java/java-config-2.1.9-r1 =dev-java/java-config-2* test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+>=media-libs/giflib-4.1.6 >=media-libs/libpng-1.2 >=sys-libs/zlib-1.2.3 virtual/jpeg javascript? ( dev-java/rhino:1.6 ) nss? ( >=dev-libs/nss-3.12.5-r1 ) pulseaudio? ( >=media-sound/pulseaudio-0.9.11 ) systemtap? ( >=dev-util/systemtap-1 ) >=media-libs/alsa-lib-1.0 >=net-print/cups-1.2.12 dev-libs/glib >=media-libs/freetype-2.3.5 >=x11-libs/gtk+-2.8:2 >=x11-libs/libX11-1.1.3 >=x11-libs/libXext-1.1.1 >=x11-libs/libXi-1.1.3 >=x11-libs/libXrender-0.9.4 >=x11-libs/libXtst-1.0.3 || ( >=dev-java/gcj-jdk-4.3 dev-java/icedtea-bin:6 dev-java/icedtea:6 ) app-arch/cpio app-arch/unzip app-arch/zip app-misc/ca-certificates >=dev-java/ant-core-1.7.1-r2 dev-java/ant-nodeps >=dev-java/xalan-2.7.0:0 >=dev-java/xerces-2.9.1:2 dev-lang/perl dev-libs/openssl dev-util/pkgconfig sys-apps/lsb-release || ( >=sys-devel/autoconf-2.65:2.5 <sys-devel/autoconf-2.64:2.5 ) >=x11-libs/libXau-1.0.3 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXinerama-1.0.2 >=x11-libs/libXp-1.0.0 x11-proto/inputproto >=x11-proto/xextproto-7.1.1 x11-proto/xineramaproto x11-proto/xproto jbootstrap? ( || ( <dev-java/eclipse-ecj-3.7 dev-java/ecj-gcj ) ) pax_kernel? ( sys-apps/paxctl ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=dev-java/java-config-2.1.9-r1 =dev-java/java-config-2* test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 >=media-libs/giflib-4.1.6 >=media-libs/libpng-1.2 >=sys-libs/zlib-1.2.3 virtual/jpeg javascript? ( dev-java/rhino:1.6 ) nss? ( >=dev-libs/nss-3.12.5-r1 ) pulseaudio? ( >=media-sound/pulseaudio-0.9.11 ) systemtap? ( >=dev-util/systemtap-1 ) !dev-java/icedtea6 X? ( dev-libs/glib >=media-libs/freetype-2.3.5 >=x11-libs/gtk+-2.8:2 >=x11-libs/libX11-1.1.3 >=x11-libs/libXext-1.1.1 >=x11-libs/libXi-1.1.3 >=x11-libs/libXrender-0.9.4 >=x11-libs/libXtst-1.0.3 media-fonts/dejavu cjk? ( media-fonts/arphicfonts media-fonts/baekmuk-fonts !ppc? ( !ppc64? ( media-fonts/lklug ) ) media-fonts/lohit-fonts media-fonts/sazanami ) ) alsa? ( >=media-libs/alsa-lib-1.0 ) cups? ( >=net-print/cups-1.2.12 ) >=dev-java/java-config-2.1.9-r1 =dev-java/java-config-2*
 6
 http://icedtea.classpath.org/download/source/icedtea6-1.10.5.tar.gz http://download.java.net/openjdk/jdk6/promoted/b22/openjdk-6-src-b22-28_feb_2011.tar.gz http://icedtea.classpath.org/download/drops/jdk6-jaxws-b20.zip http://icedtea.classpath.org/download/drops/jdk6-jaf-b20.zip http://icedtea.classpath.org/download/drops/jaxp144_01.zip hs20? ( http://hg.openjdk.java.net/hsx/hsx20/master/archive/f0f676c5a2c6.tar.gz ) !amd64? ( !sparc? ( !x86? ( http://icedtea.classpath.org/download/drops/cacao/c7bf150bfa46.tar.gz ) ) )
diff --git a/metadata/cache/dev-java/icedtea-6.1.10.6 b/metadata/cache/dev-java/icedtea-6.1.10.6
index a47d1a8ad2dd..22257f16e88d 100644
--- a/metadata/cache/dev-java/icedtea-6.1.10.6
+++ b/metadata/cache/dev-java/icedtea-6.1.10.6
@@ -1,4 +1,4 @@
->=media-libs/giflib-4.1.6 >=media-libs/libpng-1.2 >=sys-libs/zlib-1.2.3 virtual/jpeg javascript? ( dev-java/rhino:1.6 ) nss? ( >=dev-libs/nss-3.12.5-r1 ) pulseaudio? ( >=media-sound/pulseaudio-0.9.11 ) systemtap? ( >=dev-util/systemtap-1 ) >=media-libs/alsa-lib-1.0 >=net-print/cups-1.2.12 dev-libs/glib >=media-libs/freetype-2.3.5 >=x11-libs/gtk+-2.8:2 >=x11-libs/libX11-1.1.3 >=x11-libs/libXext-1.1.1 >=x11-libs/libXi-1.1.3 >=x11-libs/libXrender-0.9.4 >=x11-libs/libXtst-1.0.3 || ( >=dev-java/gcj-jdk-4.3 dev-java/icedtea-bin:6 dev-java/icedtea:6 ) app-arch/cpio app-arch/unzip app-arch/zip app-misc/ca-certificates >=dev-java/ant-core-1.7.1-r2 dev-java/ant-nodeps >=dev-java/xalan-2.7.0:0 >=dev-java/xerces-2.9.1:2 dev-lang/perl dev-libs/openssl dev-util/pkgconfig sys-apps/lsb-release || ( >=sys-devel/autoconf-2.65:2.5 <sys-devel/autoconf-2.64:2.5 ) >=x11-libs/libXau-1.0.3 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXinerama-1.0.2 >=x11-libs/libXp-1.0.0 x11-proto/inputproto >=x11-proto/xextproto-7.1.1 x11-proto/xineramaproto x11-proto/xproto jbootstrap? ( || ( <dev-java/eclipse-ecj-3.7 dev-java/ecj-gcj ) ) pax_kernel? ( sys-apps/paxctl ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=dev-java/java-config-2.1.9-r1 =dev-java/java-config-2* test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+>=media-libs/giflib-4.1.6 >=media-libs/libpng-1.2 >=sys-libs/zlib-1.2.3 virtual/jpeg javascript? ( dev-java/rhino:1.6 ) nss? ( >=dev-libs/nss-3.12.5-r1 ) pulseaudio? ( >=media-sound/pulseaudio-0.9.11 ) systemtap? ( >=dev-util/systemtap-1 ) >=media-libs/alsa-lib-1.0 >=net-print/cups-1.2.12 dev-libs/glib >=media-libs/freetype-2.3.5 >=x11-libs/gtk+-2.8:2 >=x11-libs/libX11-1.1.3 >=x11-libs/libXext-1.1.1 >=x11-libs/libXi-1.1.3 >=x11-libs/libXrender-0.9.4 >=x11-libs/libXtst-1.0.3 || ( >=dev-java/gcj-jdk-4.3 dev-java/icedtea-bin:6 dev-java/icedtea:6 ) app-arch/cpio app-arch/unzip app-arch/zip app-misc/ca-certificates >=dev-java/ant-core-1.7.1-r2 dev-java/ant-nodeps >=dev-java/xalan-2.7.0:0 >=dev-java/xerces-2.9.1:2 dev-lang/perl dev-libs/openssl dev-util/pkgconfig sys-apps/lsb-release || ( >=sys-devel/autoconf-2.65:2.5 <sys-devel/autoconf-2.64:2.5 ) >=x11-libs/libXau-1.0.3 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXinerama-1.0.2 >=x11-libs/libXp-1.0.0 x11-proto/inputproto >=x11-proto/xextproto-7.1.1 x11-proto/xineramaproto x11-proto/xproto jbootstrap? ( || ( <dev-java/eclipse-ecj-3.7 dev-java/ecj-gcj ) ) pax_kernel? ( sys-apps/paxctl ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=dev-java/java-config-2.1.9-r1 =dev-java/java-config-2* test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 >=media-libs/giflib-4.1.6 >=media-libs/libpng-1.2 >=sys-libs/zlib-1.2.3 virtual/jpeg javascript? ( dev-java/rhino:1.6 ) nss? ( >=dev-libs/nss-3.12.5-r1 ) pulseaudio? ( >=media-sound/pulseaudio-0.9.11 ) systemtap? ( >=dev-util/systemtap-1 ) !dev-java/icedtea6 X? ( dev-libs/glib >=media-libs/freetype-2.3.5 >=x11-libs/gtk+-2.8:2 >=x11-libs/libX11-1.1.3 >=x11-libs/libXext-1.1.1 >=x11-libs/libXi-1.1.3 >=x11-libs/libXrender-0.9.4 >=x11-libs/libXtst-1.0.3 media-fonts/dejavu cjk? ( media-fonts/arphicfonts media-fonts/baekmuk-fonts !ppc? ( !ppc64? ( media-fonts/lklug ) ) media-fonts/lohit-fonts media-fonts/sazanami ) ) alsa? ( >=media-libs/alsa-lib-1.0 ) cups? ( >=net-print/cups-1.2.12 ) >=dev-java/java-config-2.1.9-r1 =dev-java/java-config-2*
 6
 http://icedtea.classpath.org/download/source/icedtea6-1.10.6.tar.gz http://download.java.net/openjdk/jdk6/promoted/b22/openjdk-6-src-b22-28_feb_2011.tar.gz http://icedtea.classpath.org/download/drops/jdk6-jaxws-b20.zip http://icedtea.classpath.org/download/drops/jdk6-jaf-b20.zip http://icedtea.classpath.org/download/drops/jaxp144_01.zip hs20? ( http://hg.openjdk.java.net/hsx/hsx20/master/archive/f0f676c5a2c6.tar.gz ) !amd64? ( !sparc? ( !x86? ( http://icedtea.classpath.org/download/drops/cacao/c7bf150bfa46.tar.gz ) ) )
diff --git a/metadata/cache/dev-java/icedtea-6.1.11 b/metadata/cache/dev-java/icedtea-6.1.11
index bb163855b864..51e5352ecfe1 100644
--- a/metadata/cache/dev-java/icedtea-6.1.11
+++ b/metadata/cache/dev-java/icedtea-6.1.11
@@ -1,4 +1,4 @@
->=media-libs/giflib-4.1.6 >=media-libs/libpng-1.2 >=sys-libs/zlib-1.2.3 virtual/jpeg javascript? ( dev-java/rhino:1.6 ) nss? ( >=dev-libs/nss-3.12.5-r1 ) pulseaudio? ( >=media-sound/pulseaudio-0.9.11 ) systemtap? ( >=dev-util/systemtap-1 ) >=media-libs/alsa-lib-1.0 >=net-print/cups-1.2.12 dev-libs/glib >=media-libs/freetype-2.3.5 >=x11-libs/gtk+-2.8:2 >=x11-libs/libX11-1.1.3 >=x11-libs/libXext-1.1.1 >=x11-libs/libXi-1.1.3 >=x11-libs/libXrender-0.9.4 >=x11-libs/libXtst-1.0.3 || ( >=dev-java/gcj-jdk-4.3 dev-java/icedtea-bin:6 dev-java/icedtea:6 ) app-arch/cpio app-arch/unzip app-arch/zip app-misc/ca-certificates >=dev-java/ant-core-1.8.1 dev-java/ant-nodeps dev-lang/perl >=dev-libs/libxslt-1.1.26 dev-libs/openssl dev-util/pkgconfig sys-apps/lsb-release || ( >=sys-devel/autoconf-2.65:2.5 <sys-devel/autoconf-2.64:2.5 ) >=x11-libs/libXau-1.0.3 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXinerama-1.0.2 >=x11-libs/libXp-1.0.0 x11-proto/inputproto >=x11-proto/xextproto-7.1.1 x11-proto/xineramaproto x11-proto/xproto jbootstrap? ( || ( <dev-java/eclipse-ecj-3.7 dev-java/ecj-gcj ) ) pax_kernel? ( sys-apps/paxctl ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=dev-java/java-config-2.1.9-r1 =dev-java/java-config-2* test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+>=media-libs/giflib-4.1.6 >=media-libs/libpng-1.2 >=sys-libs/zlib-1.2.3 virtual/jpeg javascript? ( dev-java/rhino:1.6 ) nss? ( >=dev-libs/nss-3.12.5-r1 ) pulseaudio? ( >=media-sound/pulseaudio-0.9.11 ) systemtap? ( >=dev-util/systemtap-1 ) >=media-libs/alsa-lib-1.0 >=net-print/cups-1.2.12 dev-libs/glib >=media-libs/freetype-2.3.5 >=x11-libs/gtk+-2.8:2 >=x11-libs/libX11-1.1.3 >=x11-libs/libXext-1.1.1 >=x11-libs/libXi-1.1.3 >=x11-libs/libXrender-0.9.4 >=x11-libs/libXtst-1.0.3 || ( >=dev-java/gcj-jdk-4.3 dev-java/icedtea-bin:6 dev-java/icedtea:6 ) app-arch/cpio app-arch/unzip app-arch/zip app-misc/ca-certificates >=dev-java/ant-core-1.8.1 dev-java/ant-nodeps dev-lang/perl >=dev-libs/libxslt-1.1.26 dev-libs/openssl dev-util/pkgconfig sys-apps/lsb-release || ( >=sys-devel/autoconf-2.65:2.5 <sys-devel/autoconf-2.64:2.5 ) >=x11-libs/libXau-1.0.3 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXinerama-1.0.2 >=x11-libs/libXp-1.0.0 x11-proto/inputproto >=x11-proto/xextproto-7.1.1 x11-proto/xineramaproto x11-proto/xproto jbootstrap? ( || ( <dev-java/eclipse-ecj-3.7 dev-java/ecj-gcj ) ) pax_kernel? ( sys-apps/paxctl ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=dev-java/java-config-2.1.9-r1 =dev-java/java-config-2* test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 >=media-libs/giflib-4.1.6 >=media-libs/libpng-1.2 >=sys-libs/zlib-1.2.3 virtual/jpeg javascript? ( dev-java/rhino:1.6 ) nss? ( >=dev-libs/nss-3.12.5-r1 ) pulseaudio? ( >=media-sound/pulseaudio-0.9.11 ) systemtap? ( >=dev-util/systemtap-1 ) !dev-java/icedtea6 X? ( dev-libs/glib >=media-libs/freetype-2.3.5 >=x11-libs/gtk+-2.8:2 >=x11-libs/libX11-1.1.3 >=x11-libs/libXext-1.1.1 >=x11-libs/libXi-1.1.3 >=x11-libs/libXrender-0.9.4 >=x11-libs/libXtst-1.0.3 media-fonts/dejavu cjk? ( media-fonts/arphicfonts media-fonts/baekmuk-fonts !ppc? ( !ppc64? ( media-fonts/lklug ) ) media-fonts/lohit-fonts media-fonts/sazanami ) ) alsa? ( >=media-libs/alsa-lib-1.0 ) cups? ( >=net-print/cups-1.2.12 ) >=dev-java/java-config-2.1.9-r1 =dev-java/java-config-2*
 6
 http://icedtea.classpath.org/download/source/icedtea6-1.11.tar.gz http://download.java.net/openjdk/jdk6/promoted/b24/openjdk-6-src-b24-14_nov_2011.tar.gz http://icedtea.classpath.org/download/drops/jdk6-jaxws2_1_6-2011_06_13.zip http://icedtea.classpath.org/download/drops/jdk6-jaf-b20.zip http://icedtea.classpath.org/download/drops/jaxp144_03.zip !amd64? ( !sparc? ( !x86? ( http://icedtea.classpath.org/download/drops/cacao/cff92704c4e0.tar.gz ) ) )
diff --git a/metadata/cache/dev-java/icedtea-6.1.11.1 b/metadata/cache/dev-java/icedtea-6.1.11.1
index 00af3e6fe11e..ff071f88d785 100644
--- a/metadata/cache/dev-java/icedtea-6.1.11.1
+++ b/metadata/cache/dev-java/icedtea-6.1.11.1
@@ -1,4 +1,4 @@
->=media-libs/giflib-4.1.6 >=media-libs/libpng-1.2 >=sys-libs/zlib-1.2.3 virtual/jpeg javascript? ( dev-java/rhino:1.6 ) nss? ( >=dev-libs/nss-3.12.5-r1 ) pulseaudio? ( >=media-sound/pulseaudio-0.9.11 ) systemtap? ( >=dev-util/systemtap-1 ) >=media-libs/alsa-lib-1.0 >=net-print/cups-1.2.12 dev-libs/glib >=media-libs/freetype-2.3.5 >=x11-libs/gtk+-2.8:2 >=x11-libs/libX11-1.1.3 >=x11-libs/libXext-1.1.1 >=x11-libs/libXi-1.1.3 >=x11-libs/libXrender-0.9.4 >=x11-libs/libXtst-1.0.3 || ( >=dev-java/gcj-jdk-4.3 dev-java/icedtea-bin:6 dev-java/icedtea:6 ) app-arch/cpio app-arch/unzip app-arch/zip app-misc/ca-certificates >=dev-java/ant-core-1.8.1 dev-java/ant-nodeps dev-lang/perl >=dev-libs/libxslt-1.1.26 dev-libs/openssl dev-util/pkgconfig sys-apps/lsb-release || ( >=sys-devel/autoconf-2.65:2.5 <sys-devel/autoconf-2.64:2.5 ) >=x11-libs/libXau-1.0.3 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXinerama-1.0.2 >=x11-libs/libXp-1.0.0 x11-proto/inputproto >=x11-proto/xextproto-7.1.1 x11-proto/xineramaproto x11-proto/xproto jbootstrap? ( || ( <dev-java/eclipse-ecj-3.7 dev-java/ecj-gcj ) ) pax_kernel? ( sys-apps/paxctl ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=dev-java/java-config-2.1.9-r1 =dev-java/java-config-2* test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+>=media-libs/giflib-4.1.6 >=media-libs/libpng-1.2 >=sys-libs/zlib-1.2.3 virtual/jpeg javascript? ( dev-java/rhino:1.6 ) nss? ( >=dev-libs/nss-3.12.5-r1 ) pulseaudio? ( >=media-sound/pulseaudio-0.9.11 ) systemtap? ( >=dev-util/systemtap-1 ) >=media-libs/alsa-lib-1.0 >=net-print/cups-1.2.12 dev-libs/glib >=media-libs/freetype-2.3.5 >=x11-libs/gtk+-2.8:2 >=x11-libs/libX11-1.1.3 >=x11-libs/libXext-1.1.1 >=x11-libs/libXi-1.1.3 >=x11-libs/libXrender-0.9.4 >=x11-libs/libXtst-1.0.3 || ( >=dev-java/gcj-jdk-4.3 dev-java/icedtea-bin:6 dev-java/icedtea:6 ) app-arch/cpio app-arch/unzip app-arch/zip app-misc/ca-certificates >=dev-java/ant-core-1.8.1 dev-java/ant-nodeps dev-lang/perl >=dev-libs/libxslt-1.1.26 dev-libs/openssl dev-util/pkgconfig sys-apps/lsb-release || ( >=sys-devel/autoconf-2.65:2.5 <sys-devel/autoconf-2.64:2.5 ) >=x11-libs/libXau-1.0.3 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXinerama-1.0.2 >=x11-libs/libXp-1.0.0 x11-proto/inputproto >=x11-proto/xextproto-7.1.1 x11-proto/xineramaproto x11-proto/xproto jbootstrap? ( || ( <dev-java/eclipse-ecj-3.7 dev-java/ecj-gcj ) ) pax_kernel? ( sys-apps/paxctl ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=dev-java/java-config-2.1.9-r1 =dev-java/java-config-2* test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 >=media-libs/giflib-4.1.6 >=media-libs/libpng-1.2 >=sys-libs/zlib-1.2.3 virtual/jpeg javascript? ( dev-java/rhino:1.6 ) nss? ( >=dev-libs/nss-3.12.5-r1 ) pulseaudio? ( >=media-sound/pulseaudio-0.9.11 ) systemtap? ( >=dev-util/systemtap-1 ) !dev-java/icedtea6 X? ( dev-libs/glib >=media-libs/freetype-2.3.5 >=x11-libs/gtk+-2.8:2 >=x11-libs/libX11-1.1.3 >=x11-libs/libXext-1.1.1 >=x11-libs/libXi-1.1.3 >=x11-libs/libXrender-0.9.4 >=x11-libs/libXtst-1.0.3 media-fonts/dejavu cjk? ( media-fonts/arphicfonts media-fonts/baekmuk-fonts !ppc? ( !ppc64? ( media-fonts/lklug ) ) media-fonts/lohit-fonts media-fonts/sazanami ) ) alsa? ( >=media-libs/alsa-lib-1.0 ) cups? ( >=net-print/cups-1.2.12 ) >=dev-java/java-config-2.1.9-r1 =dev-java/java-config-2*
 6
 http://icedtea.classpath.org/download/source/icedtea6-1.11.1.tar.gz http://download.java.net/openjdk/jdk6/promoted/b24/openjdk-6-src-b24-14_nov_2011.tar.gz http://icedtea.classpath.org/download/drops/jdk6-jaxws2_1_6-2011_06_13.zip http://icedtea.classpath.org/download/drops/jdk6-jaf-b20.zip http://icedtea.classpath.org/download/drops/jaxp144_03.zip !amd64? ( !sparc? ( !x86? ( http://icedtea.classpath.org/download/drops/cacao/cff92704c4e0.tar.gz ) ) )
diff --git a/metadata/cache/dev-java/icedtea-7.2.0.1 b/metadata/cache/dev-java/icedtea-7.2.0.1
index be3db2139b8f..7937c5c8b28d 100644
--- a/metadata/cache/dev-java/icedtea-7.2.0.1
+++ b/metadata/cache/dev-java/icedtea-7.2.0.1
@@ -1,4 +1,4 @@
->=media-libs/giflib-4.1.6 media-libs/lcms:2 >=media-libs/libpng-1.2 >=sys-libs/zlib-1.2.3 virtual/jpeg javascript? ( dev-java/rhino:1.6 ) nss? ( >=dev-libs/nss-3.12.5-r1 ) pulseaudio? ( >=media-sound/pulseaudio-0.9.11 ) systemtap? ( >=dev-util/systemtap-1 ) >=media-libs/alsa-lib-1.0 >=net-print/cups-1.2.12 >=dev-libs/atk-1.30.0 >=dev-libs/glib-2.26 media-libs/fontconfig >=media-libs/freetype-2.3.5 >=x11-libs/cairo-1.8.8 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-2.8:2 >=x11-libs/libX11-1.1.3 >=x11-libs/libXext-1.1.1 >=x11-libs/libXi-1.1.3 >=x11-libs/libXrender-0.9.4 >=x11-libs/libXtst-1.0.3 >=x11-libs/pango-1.24.5 || ( >=dev-java/gcj-jdk-4.3 dev-java/icedtea-bin:7 dev-java/icedtea-bin:6 dev-java/icedtea:7 dev-java/icedtea:6 ) app-arch/cpio app-arch/unzip app-arch/zip app-misc/ca-certificates >=dev-java/ant-core-1.8.1 dev-java/ant-nodeps dev-lang/perl >=dev-libs/libxslt-1.1.26 dev-libs/openssl dev-util/pkgconfig sys-apps/attr sys-apps/lsb-release || ( >=sys-devel/autoconf-2.65:2.5 <sys-devel/autoconf-2.64:2.5 ) >=x11-libs/libXau-1.0.3 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXinerama-1.0.2 >=x11-libs/libXp-1.0.0 x11-proto/inputproto >=x11-proto/xextproto-7.1.1 x11-proto/xineramaproto x11-proto/xproto pax_kernel? ( sys-apps/paxctl ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=dev-java/java-config-2.1.9-r1 =dev-java/java-config-2* test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+>=media-libs/giflib-4.1.6 media-libs/lcms:2 >=media-libs/libpng-1.2 >=sys-libs/zlib-1.2.3 virtual/jpeg javascript? ( dev-java/rhino:1.6 ) nss? ( >=dev-libs/nss-3.12.5-r1 ) pulseaudio? ( >=media-sound/pulseaudio-0.9.11 ) systemtap? ( >=dev-util/systemtap-1 ) >=media-libs/alsa-lib-1.0 >=net-print/cups-1.2.12 >=dev-libs/atk-1.30.0 >=dev-libs/glib-2.26 media-libs/fontconfig >=media-libs/freetype-2.3.5 >=x11-libs/cairo-1.8.8 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-2.8:2 >=x11-libs/libX11-1.1.3 >=x11-libs/libXext-1.1.1 >=x11-libs/libXi-1.1.3 >=x11-libs/libXrender-0.9.4 >=x11-libs/libXtst-1.0.3 >=x11-libs/pango-1.24.5 || ( >=dev-java/gcj-jdk-4.3 dev-java/icedtea-bin:7 dev-java/icedtea-bin:6 dev-java/icedtea:7 dev-java/icedtea:6 ) app-arch/cpio app-arch/unzip app-arch/zip app-misc/ca-certificates >=dev-java/ant-core-1.8.1 dev-java/ant-nodeps dev-lang/perl >=dev-libs/libxslt-1.1.26 dev-libs/openssl dev-util/pkgconfig sys-apps/attr sys-apps/lsb-release || ( >=sys-devel/autoconf-2.65:2.5 <sys-devel/autoconf-2.64:2.5 ) >=x11-libs/libXau-1.0.3 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXinerama-1.0.2 >=x11-libs/libXp-1.0.0 x11-proto/inputproto >=x11-proto/xextproto-7.1.1 x11-proto/xineramaproto x11-proto/xproto pax_kernel? ( sys-apps/paxctl ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=dev-java/java-config-2.1.9-r1 =dev-java/java-config-2* test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 >=media-libs/giflib-4.1.6 media-libs/lcms:2 >=media-libs/libpng-1.2 >=sys-libs/zlib-1.2.3 virtual/jpeg javascript? ( dev-java/rhino:1.6 ) nss? ( >=dev-libs/nss-3.12.5-r1 ) pulseaudio? ( >=media-sound/pulseaudio-0.9.11 ) systemtap? ( >=dev-util/systemtap-1 ) !dev-java/icedtea:0 X? ( >=net-print/cups-1.2.12 >=dev-libs/atk-1.30.0 >=dev-libs/glib-2.26 media-libs/fontconfig >=media-libs/freetype-2.3.5 >=x11-libs/cairo-1.8.8 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-2.8:2 >=x11-libs/libX11-1.1.3 >=x11-libs/libXext-1.1.1 >=x11-libs/libXi-1.1.3 >=x11-libs/libXrender-0.9.4 >=x11-libs/libXtst-1.0.3 >=x11-libs/pango-1.24.5 media-fonts/dejavu cjk? ( media-fonts/arphicfonts media-fonts/baekmuk-fonts media-fonts/lklug media-fonts/lohit-fonts media-fonts/sazanami ) ) alsa? ( >=media-libs/alsa-lib-1.0 ) cups? ( >=net-print/cups-1.2.12 ) >=dev-java/java-config-2.1.9-r1 =dev-java/java-config-2*
 7
 http://icedtea.classpath.org/download/source/icedtea-2.0.1.tar.gz http://icedtea.classpath.org/hg/release/icedtea7-forest-2.0/archive/4b063ca7483f.tar.gz http://icedtea.classpath.org/hg/release/icedtea7-forest-2.0/corba/archive/d37539e7e838.tar.gz http://icedtea.classpath.org/hg/release/icedtea7-forest-2.0/jaxp/archive/ae891cd6ba73.tar.gz http://icedtea.classpath.org/hg/release/icedtea7-forest-2.0/jaxws/archive/1107cfa36f53.tar.gz http://icedtea.classpath.org/hg/release/icedtea7-forest-2.0/jdk/archive/891fb0050add.tar.gz http://icedtea.classpath.org/hg/release/icedtea7-forest-2.0/hotspot/archive/9dfaed4a95e2.tar.gz http://icedtea.classpath.org/hg/release/icedtea7-forest-2.0/langtools/archive/f0faea84413f.tar.gz !amd64? ( !sparc? ( !x86? ( http://icedtea.classpath.org/download/drops/jamvm/jamvm-310c491ddc14e92a6ffff27030a1a1821e6395a8.tar.gz ) ) )
diff --git a/metadata/cache/dev-java/icedtea-7.2.1 b/metadata/cache/dev-java/icedtea-7.2.1
index 66b32b4d8a37..59a1df1f0245 100644
--- a/metadata/cache/dev-java/icedtea-7.2.1
+++ b/metadata/cache/dev-java/icedtea-7.2.1
@@ -1,4 +1,4 @@
->=media-libs/giflib-4.1.6 media-libs/lcms:2 >=media-libs/libpng-1.2 >=sys-libs/zlib-1.2.3 virtual/jpeg javascript? ( dev-java/rhino:1.6 ) nss? ( >=dev-libs/nss-3.12.5-r1 ) pulseaudio? ( >=media-sound/pulseaudio-0.9.11 ) systemtap? ( >=dev-util/systemtap-1 ) >=media-libs/alsa-lib-1.0 >=net-print/cups-1.2.12 >=dev-libs/atk-1.30.0 >=dev-libs/glib-2.26 media-libs/fontconfig >=media-libs/freetype-2.3.5 >=x11-libs/cairo-1.8.8 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-2.8:2 >=x11-libs/libX11-1.1.3 >=x11-libs/libXext-1.1.1 >=x11-libs/libXi-1.1.3 >=x11-libs/libXrender-0.9.4 >=x11-libs/libXtst-1.0.3 >=x11-libs/pango-1.24.5 || ( >=dev-java/gcj-jdk-4.3 dev-java/icedtea-bin:7 dev-java/icedtea-bin:6 dev-java/icedtea:7 dev-java/icedtea:6 ) app-arch/cpio app-arch/unzip app-arch/zip app-misc/ca-certificates >=dev-java/ant-core-1.8.1 dev-java/ant-nodeps dev-lang/perl >=dev-libs/libxslt-1.1.26 dev-libs/openssl dev-util/pkgconfig sys-apps/attr sys-apps/lsb-release || ( >=sys-devel/autoconf-2.65:2.5 <sys-devel/autoconf-2.64:2.5 ) >=x11-libs/libXau-1.0.3 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXinerama-1.0.2 >=x11-libs/libXp-1.0.0 x11-proto/inputproto >=x11-proto/xextproto-7.1.1 x11-proto/xineramaproto x11-proto/xproto pax_kernel? ( sys-apps/paxctl ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=dev-java/java-config-2.1.9-r1 =dev-java/java-config-2* test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+>=media-libs/giflib-4.1.6 media-libs/lcms:2 >=media-libs/libpng-1.2 >=sys-libs/zlib-1.2.3 virtual/jpeg javascript? ( dev-java/rhino:1.6 ) nss? ( >=dev-libs/nss-3.12.5-r1 ) pulseaudio? ( >=media-sound/pulseaudio-0.9.11 ) systemtap? ( >=dev-util/systemtap-1 ) >=media-libs/alsa-lib-1.0 >=net-print/cups-1.2.12 >=dev-libs/atk-1.30.0 >=dev-libs/glib-2.26 media-libs/fontconfig >=media-libs/freetype-2.3.5 >=x11-libs/cairo-1.8.8 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-2.8:2 >=x11-libs/libX11-1.1.3 >=x11-libs/libXext-1.1.1 >=x11-libs/libXi-1.1.3 >=x11-libs/libXrender-0.9.4 >=x11-libs/libXtst-1.0.3 >=x11-libs/pango-1.24.5 || ( >=dev-java/gcj-jdk-4.3 dev-java/icedtea-bin:7 dev-java/icedtea-bin:6 dev-java/icedtea:7 dev-java/icedtea:6 ) app-arch/cpio app-arch/unzip app-arch/zip app-misc/ca-certificates >=dev-java/ant-core-1.8.1 dev-java/ant-nodeps dev-lang/perl >=dev-libs/libxslt-1.1.26 dev-libs/openssl dev-util/pkgconfig sys-apps/attr sys-apps/lsb-release || ( >=sys-devel/autoconf-2.65:2.5 <sys-devel/autoconf-2.64:2.5 ) >=x11-libs/libXau-1.0.3 >=x11-libs/libXdmcp-1.0.2 >=x11-libs/libXinerama-1.0.2 >=x11-libs/libXp-1.0.0 x11-proto/inputproto >=x11-proto/xextproto-7.1.1 x11-proto/xineramaproto x11-proto/xproto pax_kernel? ( sys-apps/paxctl ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=dev-java/java-config-2.1.9-r1 =dev-java/java-config-2* test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 >=media-libs/giflib-4.1.6 media-libs/lcms:2 >=media-libs/libpng-1.2 >=sys-libs/zlib-1.2.3 virtual/jpeg javascript? ( dev-java/rhino:1.6 ) nss? ( >=dev-libs/nss-3.12.5-r1 ) pulseaudio? ( >=media-sound/pulseaudio-0.9.11 ) systemtap? ( >=dev-util/systemtap-1 ) !dev-java/icedtea:0 X? ( >=net-print/cups-1.2.12 >=dev-libs/atk-1.30.0 >=dev-libs/glib-2.26 media-libs/fontconfig >=media-libs/freetype-2.3.5 >=x11-libs/cairo-1.8.8 x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-2.8:2 >=x11-libs/libX11-1.1.3 >=x11-libs/libXext-1.1.1 >=x11-libs/libXi-1.1.3 >=x11-libs/libXrender-0.9.4 >=x11-libs/libXtst-1.0.3 >=x11-libs/pango-1.24.5 media-fonts/dejavu cjk? ( media-fonts/arphicfonts media-fonts/baekmuk-fonts media-fonts/lklug media-fonts/lohit-fonts media-fonts/sazanami ) ) alsa? ( >=media-libs/alsa-lib-1.0 ) cups? ( >=net-print/cups-1.2.12 ) >=dev-java/java-config-2.1.9-r1 =dev-java/java-config-2*
 7
 http://icedtea.classpath.org/download/source/icedtea-2.1.tar.gz http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/archive/22cc03983e20.tar.gz http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/corba/archive/5617f6c5cc94.tar.gz http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jaxp/archive/1cf75c0e2c96.tar.gz http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jaxws/archive/7edfbfe974f2.tar.gz http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/jdk/archive/50f6f276a06c.tar.gz http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/hotspot/archive/0e651e004747.tar.gz http://icedtea.classpath.org/hg/release/icedtea7-forest-2.1/langtools/archive/b534c4c6cd9b.tar.gz !amd64? ( !sparc? ( !x86? ( http://icedtea.classpath.org/download/drops/jamvm/jamvm-4617da717ecb05654ea5bb9572338061106a414d.tar.gz ) ) )
diff --git a/metadata/cache/dev-java/icedtea-web-1.1.4 b/metadata/cache/dev-java/icedtea-web-1.1.4
index acb545bbca2f..36550ee5545e 100644
--- a/metadata/cache/dev-java/icedtea-web-1.1.4
+++ b/metadata/cache/dev-java/icedtea-web-1.1.4
@@ -1,4 +1,4 @@
-dev-java/icedtea:6 javascript? ( dev-java/rhino:1.6 ) nsplugin? ( || ( net-misc/npapi-sdk >=net-libs/xulrunner-1.9.1 ) ) test? ( >=dev-java/junit-4.8:4 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=dev-java/java-config-2.1.9-r1 =dev-java/java-config-2*
+dev-java/icedtea:6 javascript? ( dev-java/rhino:1.6 ) nsplugin? ( || ( net-misc/npapi-sdk >=net-libs/xulrunner-1.9.1 ) ) test? ( >=dev-java/junit-4.8:4 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=dev-java/java-config-2.1.9-r1 =dev-java/java-config-2*
 dev-java/icedtea:6 >=dev-java/java-config-2.1.9-r1 =dev-java/java-config-2*
 6
 http://icedtea.classpath.org/download/source/icedtea-web-1.1.4.tar.gz
diff --git a/metadata/cache/dev-java/icedtea-web-1.1.4-r7 b/metadata/cache/dev-java/icedtea-web-1.1.4-r7
index fdbea3bd58d6..73d82538edd6 100644
--- a/metadata/cache/dev-java/icedtea-web-1.1.4-r7
+++ b/metadata/cache/dev-java/icedtea-web-1.1.4-r7
@@ -1,4 +1,4 @@
-dev-java/icedtea:7 javascript? ( dev-java/rhino:1.6 ) nsplugin? ( || ( net-misc/npapi-sdk >=net-libs/xulrunner-1.9.1 ) ) test? ( >=dev-java/junit-4.8:4 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=dev-java/java-config-2.1.9-r1 =dev-java/java-config-2*
+dev-java/icedtea:7 javascript? ( dev-java/rhino:1.6 ) nsplugin? ( || ( net-misc/npapi-sdk >=net-libs/xulrunner-1.9.1 ) ) test? ( >=dev-java/junit-4.8:4 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=dev-java/java-config-2.1.9-r1 =dev-java/java-config-2*
 dev-java/icedtea:7 >=dev-java/java-config-2.1.9-r1 =dev-java/java-config-2*
 7
 http://icedtea.classpath.org/download/source/icedtea-web-1.1.4.tar.gz
diff --git a/metadata/cache/dev-java/icedtea-web-1.1.4-r8 b/metadata/cache/dev-java/icedtea-web-1.1.4-r8
index fdbea3bd58d6..73d82538edd6 100644
--- a/metadata/cache/dev-java/icedtea-web-1.1.4-r8
+++ b/metadata/cache/dev-java/icedtea-web-1.1.4-r8
@@ -1,4 +1,4 @@
-dev-java/icedtea:7 javascript? ( dev-java/rhino:1.6 ) nsplugin? ( || ( net-misc/npapi-sdk >=net-libs/xulrunner-1.9.1 ) ) test? ( >=dev-java/junit-4.8:4 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=dev-java/java-config-2.1.9-r1 =dev-java/java-config-2*
+dev-java/icedtea:7 javascript? ( dev-java/rhino:1.6 ) nsplugin? ( || ( net-misc/npapi-sdk >=net-libs/xulrunner-1.9.1 ) ) test? ( >=dev-java/junit-4.8:4 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=dev-java/java-config-2.1.9-r1 =dev-java/java-config-2*
 dev-java/icedtea:7 >=dev-java/java-config-2.1.9-r1 =dev-java/java-config-2*
 7
 http://icedtea.classpath.org/download/source/icedtea-web-1.1.4.tar.gz
diff --git a/metadata/cache/dev-java/icedtea-web-1.2 b/metadata/cache/dev-java/icedtea-web-1.2
index 152bd7e72cc3..23ab9ac4f0e8 100644
--- a/metadata/cache/dev-java/icedtea-web-1.2
+++ b/metadata/cache/dev-java/icedtea-web-1.2
@@ -1,4 +1,4 @@
-dev-java/icedtea:6 javascript? ( dev-java/rhino:1.6 ) nsplugin? ( || ( net-misc/npapi-sdk >=net-libs/xulrunner-1.9.1 ) ) test? ( >=dev-java/junit-4.8:4 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=dev-java/java-config-2.1.9-r1 =dev-java/java-config-2*
+dev-java/icedtea:6 javascript? ( dev-java/rhino:1.6 ) nsplugin? ( || ( net-misc/npapi-sdk >=net-libs/xulrunner-1.9.1 ) ) test? ( >=dev-java/junit-4.8:4 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=dev-java/java-config-2.1.9-r1 =dev-java/java-config-2*
 dev-java/icedtea:6 >=dev-java/java-config-2.1.9-r1 =dev-java/java-config-2*
 6
 http://icedtea.classpath.org/download/source/icedtea-web-1.2.tar.gz
diff --git a/metadata/cache/dev-java/icedtea-web-1.2-r7 b/metadata/cache/dev-java/icedtea-web-1.2-r7
index dbb849f6c464..9be9a09c0cbd 100644
--- a/metadata/cache/dev-java/icedtea-web-1.2-r7
+++ b/metadata/cache/dev-java/icedtea-web-1.2-r7
@@ -1,4 +1,4 @@
-dev-java/icedtea:7 javascript? ( dev-java/rhino:1.6 ) nsplugin? ( || ( net-misc/npapi-sdk >=net-libs/xulrunner-1.9.1 ) ) test? ( >=dev-java/junit-4.8:4 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=dev-java/java-config-2.1.9-r1 =dev-java/java-config-2*
+dev-java/icedtea:7 javascript? ( dev-java/rhino:1.6 ) nsplugin? ( || ( net-misc/npapi-sdk >=net-libs/xulrunner-1.9.1 ) ) test? ( >=dev-java/junit-4.8:4 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=dev-java/java-config-2.1.9-r1 =dev-java/java-config-2*
 dev-java/icedtea:7 >=dev-java/java-config-2.1.9-r1 =dev-java/java-config-2*
 7
 http://icedtea.classpath.org/download/source/icedtea-web-1.2.tar.gz
diff --git a/metadata/cache/dev-java/jamvm-1.5.4-r1 b/metadata/cache/dev-java/jamvm-1.5.4-r1
index 77484568f1c0..6c51e0ad3701 100644
--- a/metadata/cache/dev-java/jamvm-1.5.4-r1
+++ b/metadata/cache/dev-java/jamvm-1.5.4-r1
@@ -1,4 +1,4 @@
-dev-java/gnu-classpath:0.98 libffi? ( virtual/libffi ) amd64? ( virtual/libffi ) =dev-java/java-config-2* || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-java/gnu-classpath:0.98 libffi? ( virtual/libffi ) amd64? ( virtual/libffi ) =dev-java/java-config-2* || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-java/gnu-classpath:0.98 libffi? ( virtual/libffi ) amd64? ( virtual/libffi ) =dev-java/java-config-2*
 0
 mirror://sourceforge/jamvm/jamvm-1.5.4.tar.gz
diff --git a/metadata/cache/dev-java/jicmp-1.0.2 b/metadata/cache/dev-java/jicmp-1.0.2
index eb14b2f9cfa5..dc802f8dcc8a 100644
--- a/metadata/cache/dev-java/jicmp-1.0.2
+++ b/metadata/cache/dev-java/jicmp-1.0.2
@@ -1,4 +1,4 @@
->=virtual/jdk-1.5 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip )
+>=virtual/jdk-1.5 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip )
 >=virtual/jre-1.5 >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip )
 0
 mirror://sourceforge/opennms/jicmp-1.0.2.tar.gz
diff --git a/metadata/cache/dev-java/rxtx-2.2_pre2 b/metadata/cache/dev-java/rxtx-2.2_pre2
index 97a632b1fc77..2eb56d4ee812 100644
--- a/metadata/cache/dev-java/rxtx-2.2_pre2
+++ b/metadata/cache/dev-java/rxtx-2.2_pre2
@@ -1,4 +1,4 @@
->=virtual/jdk-1.4 app-arch/unzip dev-java/ant-core lfd? ( sys-apps/xinetd ) source? ( app-arch/zip ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=dev-java/java-config-2.1.9-r1
+>=virtual/jdk-1.4 app-arch/unzip dev-java/ant-core lfd? ( sys-apps/xinetd ) source? ( app-arch/zip ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=dev-java/java-config-2.1.9-r1
 >=virtual/jre-1.4 >=dev-java/java-config-2.1.9-r1
 2
 ftp://ftp.qbang.org/pub/rxtx/rxtx-2.2pre2.zip
diff --git a/metadata/cache/dev-java/tijmp-0.8 b/metadata/cache/dev-java/tijmp-0.8
index 0da4f37e222e..298d217ede29 100644
--- a/metadata/cache/dev-java/tijmp-0.8
+++ b/metadata/cache/dev-java/tijmp-0.8
@@ -1,4 +1,4 @@
->=virtual/jdk-1.6 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=dev-java/java-config-2.1.9-r1
+>=virtual/jdk-1.6 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=dev-java/java-config-2.1.9-r1
 >=virtual/jre-1.6 >=dev-java/java-config-2.1.9-r1
 0
 http://www.khelekore.org/jmp/tijmp/tijmp-0.8.tar.gz
diff --git a/metadata/cache/dev-lang/R-2.14.1 b/metadata/cache/dev-lang/R-2.14.1
index f4e54593a2da..ac5a2a0b68cd 100644
--- a/metadata/cache/dev-lang/R-2.14.1
+++ b/metadata/cache/dev-lang/R-2.14.1
@@ -1,4 +1,4 @@
-app-arch/bzip2 app-text/ghostscript-gpl dev-libs/libpcre virtual/blas cairo? ( x11-libs/cairo[X] x11-libs/pango ) icu? ( dev-libs/icu ) jpeg? ( virtual/jpeg ) lapack? ( virtual/lapack ) perl? ( dev-lang/perl ) png? ( media-libs/libpng ) readline? ( sys-libs/readline ) tk? ( dev-lang/tk ) X? ( x11-libs/libXmu x11-misc/xdg-utils ) dev-util/pkgconfig doc? ( virtual/latex-base dev-texlive/texlive-fontsrecommended ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+app-arch/bzip2 app-text/ghostscript-gpl dev-libs/libpcre virtual/blas cairo? ( x11-libs/cairo[X] x11-libs/pango ) icu? ( dev-libs/icu ) jpeg? ( virtual/jpeg ) lapack? ( virtual/lapack ) perl? ( dev-lang/perl ) png? ( media-libs/libpng ) readline? ( sys-libs/readline ) tk? ( dev-lang/tk ) X? ( x11-libs/libXmu x11-misc/xdg-utils ) dev-util/pkgconfig doc? ( virtual/latex-base dev-texlive/texlive-fontsrecommended ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 app-arch/bzip2 app-text/ghostscript-gpl dev-libs/libpcre virtual/blas cairo? ( x11-libs/cairo[X] x11-libs/pango ) icu? ( dev-libs/icu ) jpeg? ( virtual/jpeg ) lapack? ( virtual/lapack ) perl? ( dev-lang/perl ) png? ( media-libs/libpng ) readline? ( sys-libs/readline ) tk? ( dev-lang/tk ) X? ( x11-libs/libXmu x11-misc/xdg-utils ) ( || ( <sys-libs/zlib-1.2.5.1-r1 >=sys-libs/zlib-1.2.5.1-r2[minizip] ) ) app-arch/xz-utils java? ( >=virtual/jre-1.5 )
 0
 mirror://cran/src/base/R-2/R-2.14.1.tar.gz bash-completion? ( mirror://gentoo/R.bash_completion.bz2 )
diff --git a/metadata/cache/dev-lang/R-2.14.2 b/metadata/cache/dev-lang/R-2.14.2
index c30eed1d98b6..a251b7d10051 100644
--- a/metadata/cache/dev-lang/R-2.14.2
+++ b/metadata/cache/dev-lang/R-2.14.2
@@ -1,4 +1,4 @@
-app-arch/bzip2 app-text/ghostscript-gpl dev-libs/libpcre virtual/blas virtual/fortran cairo? ( x11-libs/cairo[X] x11-libs/pango ) icu? ( dev-libs/icu ) jpeg? ( virtual/jpeg ) lapack? ( virtual/lapack ) perl? ( dev-lang/perl ) png? ( media-libs/libpng ) readline? ( sys-libs/readline ) tk? ( dev-lang/tk ) X? ( x11-libs/libXmu x11-misc/xdg-utils ) dev-util/pkgconfig doc? ( virtual/latex-base dev-texlive/texlive-fontsrecommended ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+app-arch/bzip2 app-text/ghostscript-gpl dev-libs/libpcre virtual/blas virtual/fortran cairo? ( x11-libs/cairo[X] x11-libs/pango ) icu? ( dev-libs/icu ) jpeg? ( virtual/jpeg ) lapack? ( virtual/lapack ) perl? ( dev-lang/perl ) png? ( media-libs/libpng ) readline? ( sys-libs/readline ) tk? ( dev-lang/tk ) X? ( x11-libs/libXmu x11-misc/xdg-utils ) dev-util/pkgconfig doc? ( virtual/latex-base dev-texlive/texlive-fontsrecommended ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 app-arch/bzip2 app-text/ghostscript-gpl dev-libs/libpcre virtual/blas virtual/fortran cairo? ( x11-libs/cairo[X] x11-libs/pango ) icu? ( dev-libs/icu ) jpeg? ( virtual/jpeg ) lapack? ( virtual/lapack ) perl? ( dev-lang/perl ) png? ( media-libs/libpng ) readline? ( sys-libs/readline ) tk? ( dev-lang/tk ) X? ( x11-libs/libXmu x11-misc/xdg-utils ) ( || ( <sys-libs/zlib-1.2.5.1-r1 >=sys-libs/zlib-1.2.5.1-r2[minizip] ) ) app-arch/xz-utils java? ( >=virtual/jre-1.5 )
 0
 mirror://cran/src/base/R-2/R-2.14.2.tar.gz bash-completion? ( mirror://gentoo/R.bash_completion.bz2 )
diff --git a/metadata/cache/dev-lang/bas-2.2 b/metadata/cache/dev-lang/bas-2.2
index 1df656790936..a26af69ed8dd 100644
--- a/metadata/cache/dev-lang/bas-2.2
+++ b/metadata/cache/dev-lang/bas-2.2
@@ -1,4 +1,4 @@
-sys-libs/ncurses virtual/libintl sys-devel/gettext || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+sys-libs/ncurses virtual/libintl sys-devel/gettext || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 sys-libs/ncurses virtual/libintl
 0
 http://www.moria.de/~michael/bas/bas-2.2.tar.gz
diff --git a/metadata/cache/dev-lang/erlang-13.2.4 b/metadata/cache/dev-lang/erlang-13.2.4
index 2881ef45f872..c03d5c2ee95b 100644
--- a/metadata/cache/dev-lang/erlang-13.2.4
+++ b/metadata/cache/dev-lang/erlang-13.2.4
@@ -1,4 +1,4 @@
->=dev-lang/perl-5.6.1 ssl? ( >=dev-libs/openssl-0.9.7d ) emacs? ( virtual/emacs ) java? ( >=virtual/jdk-1.2 ) odbc? ( dev-db/unixODBC ) wxwidgets? ( x11-libs/wxGTK:2.8[opengl] ) sctp? ( net-misc/lksctp-tools ) tk? ( dev-lang/tk ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-lang/perl-5.6.1 ssl? ( >=dev-libs/openssl-0.9.7d ) emacs? ( virtual/emacs ) java? ( >=virtual/jdk-1.2 ) odbc? ( dev-db/unixODBC ) wxwidgets? ( x11-libs/wxGTK:2.8[opengl] ) sctp? ( net-misc/lksctp-tools ) tk? ( dev-lang/tk ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=dev-lang/perl-5.6.1 ssl? ( >=dev-libs/openssl-0.9.7d ) emacs? ( virtual/emacs ) java? ( >=virtual/jdk-1.2 ) odbc? ( dev-db/unixODBC )
 0
 http://www.erlang.org/download/otp_src_R13B04.tar.gz http://erlang.org/download/otp_doc_man_R13B04.tar.gz doc? ( http://erlang.org/download/otp_doc_html_R13B04.tar.gz )
diff --git a/metadata/cache/dev-lang/ferite-1.0.2 b/metadata/cache/dev-lang/ferite-1.0.2
index 91309eeb3c5d..e6d86dc33b92 100644
--- a/metadata/cache/dev-lang/ferite-1.0.2
+++ b/metadata/cache/dev-lang/ferite-1.0.2
@@ -1,4 +1,4 @@
->=dev-libs/libpcre-5 dev-libs/libxml2 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-libs/libpcre-5 dev-libs/libxml2 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=dev-libs/libpcre-5 dev-libs/libxml2
 1
 mirror://sourceforge/ferite/ferite-1.0.2.tar.gz
diff --git a/metadata/cache/dev-lang/ghc-6.12.3-r2 b/metadata/cache/dev-lang/ghc-6.12.3-r2
index efa48ca08c83..c930483ca316 100644
--- a/metadata/cache/dev-lang/ghc-6.12.3-r2
+++ b/metadata/cache/dev-lang/ghc-6.12.3-r2
@@ -1,4 +1,4 @@
-!dev-lang/ghc-bin !kernel_Darwin? ( >=sys-devel/gcc-2.95.3 ) kernel_linux? ( >=sys-devel/binutils-2.17 ) kernel_SunOS? ( >=sys-devel/binutils-2.17 ) >=dev-lang/perl-5.6.1 >=dev-libs/gmp-4.1 !<dev-haskell/haddock-2.4.2 sys-libs/ncurses[unicode] ghcbootstrap? ( doc? ( ~app-text/docbook-xml-dtd-4.2 app-text/docbook-xsl-stylesheets >=dev-libs/libxslt-1.1.2 ) ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+!dev-lang/ghc-bin !kernel_Darwin? ( >=sys-devel/gcc-2.95.3 ) kernel_linux? ( >=sys-devel/binutils-2.17 ) kernel_SunOS? ( >=sys-devel/binutils-2.17 ) >=dev-lang/perl-5.6.1 >=dev-libs/gmp-4.1 !<dev-haskell/haddock-2.4.2 sys-libs/ncurses[unicode] ghcbootstrap? ( doc? ( ~app-text/docbook-xml-dtd-4.2 app-text/docbook-xsl-stylesheets >=dev-libs/libxslt-1.1.2 ) ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 !dev-lang/ghc-bin !kernel_Darwin? ( >=sys-devel/gcc-2.95.3 ) kernel_linux? ( >=sys-devel/binutils-2.17 ) kernel_SunOS? ( >=sys-devel/binutils-2.17 ) >=dev-lang/perl-5.6.1 >=dev-libs/gmp-4.1 !<dev-haskell/haddock-2.4.2 sys-libs/ncurses[unicode] bash-completion? ( app-admin/eselect )
 0
 !binary? ( http://darcs.haskell.org/download/dist/6.12.3/ghc-6.12.3-src.tar.bz2 ) !ghcbootstrap? ( alpha? ( http://code.haskell.org/~slyfox/ghc-alpha/ghc-bin-6.12.3-alpha-haddock.tbz2 ) x86? ( mirror://gentoo/ghc-bin-6.12.3-x86.tbz2 ) amd64? ( mirror://gentoo/ghc-bin-6.12.3-amd64.tbz2 ) ia64? ( http://code.haskell.org/~slyfox/ghc-ia64/ghc-bin-6.12.3-ia64-haddock.tbz2 ) sparc? ( http://code.haskell.org/~slyfox/ghc-sparc/ghc-bin-6.12.3-sparc.tbz2 ) ppc64? ( mirror://gentoo/ghc-bin-6.12.3-ppc64.tbz2 ) ppc? ( mirror://gentoo/ghc-bin-6.12.3-ppc.tbz2 ) x86-fbsd? ( http://code.haskell.org/~slyfox/ghc-x86-fbsd/ghc-bin-6.12.3-x86-fbsd.tbz2 ) x86-macos? ( http://www.haskell.org/ghc/dist/6.10.1/maeder/ghc-6.10.1-i386-apple-darwin.tar.bz2 ) ppc-macos? ( http://www.haskell.org/ghc/dist/6.10.1/maeder/ghc-6.10.1-powerpc-apple-darwin.tar.bz2 ) x86-solaris? ( http://www.haskell.org/ghc/dist/6.10.4/maeder/ghc-6.10.4-i386-unknown-solaris2.tar.bz2 ) sparc-solaris? ( http://www.haskell.org/ghc/dist/6.10.4/maeder/ghc-6.10.4-sparc-sun-solaris2.tar.bz2 ) )
diff --git a/metadata/cache/dev-lang/ghc-7.0.4 b/metadata/cache/dev-lang/ghc-7.0.4
index 0ed0cf35bbc7..d57630668fee 100644
--- a/metadata/cache/dev-lang/ghc-7.0.4
+++ b/metadata/cache/dev-lang/ghc-7.0.4
@@ -1,4 +1,4 @@
-!kernel_Darwin? ( >=sys-devel/gcc-2.95.3 ) kernel_linux? ( >=sys-devel/binutils-2.17 ) kernel_SunOS? ( >=sys-devel/binutils-2.17 ) >=dev-lang/perl-5.6.1 >=dev-libs/gmp-5 !<dev-haskell/haddock-2.4.2 sys-libs/ncurses[unicode] ghcbootstrap? ( doc? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets >=dev-libs/libxslt-1.1.2 ) ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+!kernel_Darwin? ( >=sys-devel/gcc-2.95.3 ) kernel_linux? ( >=sys-devel/binutils-2.17 ) kernel_SunOS? ( >=sys-devel/binutils-2.17 ) >=dev-lang/perl-5.6.1 >=dev-libs/gmp-5 !<dev-haskell/haddock-2.4.2 sys-libs/ncurses[unicode] ghcbootstrap? ( doc? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets >=dev-libs/libxslt-1.1.2 ) ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 !kernel_Darwin? ( >=sys-devel/gcc-2.95.3 ) kernel_linux? ( >=sys-devel/binutils-2.17 ) kernel_SunOS? ( >=sys-devel/binutils-2.17 ) >=dev-lang/perl-5.6.1 >=dev-libs/gmp-5 !<dev-haskell/haddock-2.4.2 sys-libs/ncurses[unicode] bash-completion? ( app-admin/eselect )
 0
 !binary? ( http://www.haskell.org/ghc/dist/7.0.4/ghc-7.0.4-src.tar.bz2 ) !ghcbootstrap? ( alpha? ( http://code.haskell.org/~slyfox/ghc-alpha/ghc-bin-7.0.4-alpha.tbz2 ) arm? ( http://code.haskell.org/~slyfox/ghc-arm/ghc-bin-7.0.4-arm.tbz2 ) amd64? ( http://code.haskell.org/~slyfox/ghc-amd64/ghc-bin-7.0.4-amd64.tbz2 ) ppc? ( mirror://gentoo/ghc-bin-7.0.4-ppc.tbz2 ) ppc64? ( http://code.haskell.org/~slyfox/ghc-ppc64/ghc-bin-7.0.4-ppc64.tbz2 ) sparc? ( http://code.haskell.org/~slyfox/ghc-sparc/ghc-bin-7.0.4-sparc.tbz2 ) x86? ( http://code.haskell.org/~slyfox/ghc-x86/ghc-bin-7.0.4-x86.tbz2 ) )
diff --git a/metadata/cache/dev-lang/ghc-7.4.1 b/metadata/cache/dev-lang/ghc-7.4.1
index 7b03b0d574e9..8b84c82fba6a 100644
--- a/metadata/cache/dev-lang/ghc-7.4.1
+++ b/metadata/cache/dev-lang/ghc-7.4.1
@@ -1,4 +1,4 @@
-!kernel_Darwin? ( >=sys-devel/gcc-2.95.3 ) kernel_linux? ( >=sys-devel/binutils-2.17 ) kernel_SunOS? ( >=sys-devel/binutils-2.17 ) >=dev-lang/perl-5.6.1 >=dev-libs/gmp-5 !<dev-haskell/haddock-2.4.2 sys-libs/ncurses[unicode] ghcbootstrap? ( >=dev-haskell/alex-2.3 >=dev-haskell/happy-1.18 doc? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets >=dev-libs/libxslt-1.1.2 ) ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+!kernel_Darwin? ( >=sys-devel/gcc-2.95.3 ) kernel_linux? ( >=sys-devel/binutils-2.17 ) kernel_SunOS? ( >=sys-devel/binutils-2.17 ) >=dev-lang/perl-5.6.1 >=dev-libs/gmp-5 !<dev-haskell/haddock-2.4.2 sys-libs/ncurses[unicode] ghcbootstrap? ( >=dev-haskell/alex-2.3 >=dev-haskell/happy-1.18 doc? ( app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets >=dev-libs/libxslt-1.1.2 ) ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 !kernel_Darwin? ( >=sys-devel/gcc-2.95.3 ) kernel_linux? ( >=sys-devel/binutils-2.17 ) kernel_SunOS? ( >=sys-devel/binutils-2.17 ) >=dev-lang/perl-5.6.1 >=dev-libs/gmp-5 !<dev-haskell/haddock-2.4.2 sys-libs/ncurses[unicode]
 0
 !binary? ( http://www.haskell.org/ghc/dist/7.4.1/ghc-7.4.1-src.tar.bz2 ) !ghcbootstrap? ( alpha? ( http://code.haskell.org/~slyfox/ghc-alpha/ghc-bin-7.4.1-alpha.tbz2 ) amd64? ( http://code.haskell.org/~slyfox/ghc-amd64/ghc-bin-7.4.1-amd64.tbz2 ) ppc? ( http://code.haskell.org/~slyfox/ghc-ppc/ghc-bin-7.4.1-ppc.tbz2 ) ppc64? ( http://code.haskell.org/~slyfox/ghc-ppc64/ghc-bin-7.4.1-ppc64.tbz2 ) sparc? ( http://code.haskell.org/~slyfox/ghc-sparc/ghc-bin-7.4.1-sparc.tbz2 ) x86? ( http://code.haskell.org/~slyfox/ghc-x86/ghc-bin-7.4.1-x86.tbz2 ) )
diff --git a/metadata/cache/dev-lang/lua-5.2.0 b/metadata/cache/dev-lang/lua-5.2.0
index fd681b231776..bff007e05dd5 100644
--- a/metadata/cache/dev-lang/lua-5.2.0
+++ b/metadata/cache/dev-lang/lua-5.2.0
@@ -1,4 +1,4 @@
-readline? ( sys-libs/readline ) sys-devel/libtool || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+readline? ( sys-libs/readline ) sys-devel/libtool || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 readline? ( sys-libs/readline )
 0
 http://www.lua.org/ftp/lua-5.2.0.tar.gz
diff --git a/metadata/cache/dev-lang/lua-5.2.0-r1 b/metadata/cache/dev-lang/lua-5.2.0-r1
index fd681b231776..bff007e05dd5 100644
--- a/metadata/cache/dev-lang/lua-5.2.0-r1
+++ b/metadata/cache/dev-lang/lua-5.2.0-r1
@@ -1,4 +1,4 @@
-readline? ( sys-libs/readline ) sys-devel/libtool || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+readline? ( sys-libs/readline ) sys-devel/libtool || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 readline? ( sys-libs/readline )
 0
 http://www.lua.org/ftp/lua-5.2.0.tar.gz
diff --git a/metadata/cache/dev-lang/maude-2.5.0 b/metadata/cache/dev-lang/maude-2.5.0
index 52a97d359974..78765eba966c 100644
--- a/metadata/cache/dev-lang/maude-2.5.0
+++ b/metadata/cache/dev-lang/maude-2.5.0
@@ -1,4 +1,4 @@
->=dev-libs/gmp-4.1.3 dev-libs/libsigsegv dev-libs/libtecla sci-libs/buddy sys-devel/bison sys-devel/flex || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-libs/gmp-4.1.3 dev-libs/libsigsegv dev-libs/libtecla sci-libs/buddy sys-devel/bison sys-devel/flex || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=dev-libs/gmp-4.1.3 dev-libs/libsigsegv dev-libs/libtecla sci-libs/buddy
 0
 http://maude.cs.uiuc.edu/download/current/Maude-2.5.tar.gz mirror://gentoo/maude-2.5.0-extras.tar.bz2
diff --git a/metadata/cache/dev-lang/maude-2.6 b/metadata/cache/dev-lang/maude-2.6
index 1bf354500c65..822a3056c709 100644
--- a/metadata/cache/dev-lang/maude-2.6
+++ b/metadata/cache/dev-lang/maude-2.6
@@ -1,4 +1,4 @@
->=dev-libs/gmp-4.1.3 dev-libs/libsigsegv dev-libs/libtecla sci-libs/buddy sys-devel/bison sys-devel/flex || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-libs/gmp-4.1.3 dev-libs/libsigsegv dev-libs/libtecla sci-libs/buddy sys-devel/bison sys-devel/flex || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=dev-libs/gmp-4.1.3 dev-libs/libsigsegv dev-libs/libtecla sci-libs/buddy
 0
 http://maude.cs.uiuc.edu/download/current/Maude-2.6.tar.gz http://dev.gentoo.org/~jlec/distfiles/maude-2.6-extras.tar.xz
diff --git a/metadata/cache/dev-lang/mercury-11.01 b/metadata/cache/dev-lang/mercury-11.01
index 1e63c21b0e48..918ccadb9b29 100644
--- a/metadata/cache/dev-lang/mercury-11.01
+++ b/metadata/cache/dev-lang/mercury-11.01
@@ -1,4 +1,4 @@
-!dev-libs/mpatrol !dev-util/mono-debugger readline? ( sys-libs/readline ) erlang? ( dev-lang/erlang ) java? ( >=virtual/jdk-1.5 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool java? ( >=dev-java/java-config-2.1.9-r1 )
+!dev-libs/mpatrol !dev-util/mono-debugger readline? ( sys-libs/readline ) erlang? ( dev-lang/erlang ) java? ( >=virtual/jdk-1.5 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool java? ( >=dev-java/java-config-2.1.9-r1 )
 !dev-libs/mpatrol !dev-util/mono-debugger readline? ( sys-libs/readline ) erlang? ( dev-lang/erlang ) java? ( >=virtual/jdk-1.5 ) emacs? ( virtual/emacs ) java? ( >=dev-java/java-config-2.1.9-r1 )
 0
 http://www.mercury.csse.unimelb.edu.au/download/files/mercury-compiler-11.01.tar.gz mirror://gentoo/mercury-11.01-gentoo-patchset-1.tar.gz test? ( http://www.mercury.csse.unimelb.edu.au/download/files/mercury-tests-11.01.tar.gz )
diff --git a/metadata/cache/dev-lang/mercury-11.07 b/metadata/cache/dev-lang/mercury-11.07
index 6f0a0068f651..5cfe8ccbb798 100644
--- a/metadata/cache/dev-lang/mercury-11.07
+++ b/metadata/cache/dev-lang/mercury-11.07
@@ -1,4 +1,4 @@
-!dev-libs/mpatrol !dev-util/mono-debugger readline? ( sys-libs/readline ) erlang? ( dev-lang/erlang ) java? ( >=virtual/jdk-1.5 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool java? ( >=dev-java/java-config-2.1.9-r1 )
+!dev-libs/mpatrol !dev-util/mono-debugger readline? ( sys-libs/readline ) erlang? ( dev-lang/erlang ) java? ( >=virtual/jdk-1.5 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool java? ( >=dev-java/java-config-2.1.9-r1 )
 !dev-libs/mpatrol !dev-util/mono-debugger readline? ( sys-libs/readline ) erlang? ( dev-lang/erlang ) java? ( >=virtual/jdk-1.5 ) emacs? ( virtual/emacs ) java? ( >=dev-java/java-config-2.1.9-r1 )
 0
 http://www.mercury.csse.unimelb.edu.au/download/files/mercury-compiler-11.07.tar.gz mirror://gentoo/mercury-11.07-gentoo-patchset-0.tar.gz test? ( http://www.mercury.csse.unimelb.edu.au/download/files/mercury-tests-11.07.tar.gz )
diff --git a/metadata/cache/dev-lang/mercury-11.07.1 b/metadata/cache/dev-lang/mercury-11.07.1
index 69f403a8a1f6..da5498378096 100644
--- a/metadata/cache/dev-lang/mercury-11.07.1
+++ b/metadata/cache/dev-lang/mercury-11.07.1
@@ -1,4 +1,4 @@
-!dev-libs/mpatrol !dev-util/mono-debugger readline? ( sys-libs/readline ) erlang? ( dev-lang/erlang ) java? ( >=virtual/jdk-1.5 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool java? ( >=dev-java/java-config-2.1.9-r1 )
+!dev-libs/mpatrol !dev-util/mono-debugger readline? ( sys-libs/readline ) erlang? ( dev-lang/erlang ) java? ( >=virtual/jdk-1.5 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool java? ( >=dev-java/java-config-2.1.9-r1 )
 !dev-libs/mpatrol !dev-util/mono-debugger readline? ( sys-libs/readline ) erlang? ( dev-lang/erlang ) java? ( >=virtual/jdk-1.5 ) emacs? ( virtual/emacs ) java? ( >=dev-java/java-config-2.1.9-r1 )
 0
 http://www.mercury.csse.unimelb.edu.au/download/files/mercury-compiler-11.07.1.tar.gz mirror://gentoo/mercury-11.07.1-gentoo-patchset-1.tar.gz test? ( http://www.mercury.csse.unimelb.edu.au/download/files/mercury-tests-11.07.1.tar.gz )
diff --git a/metadata/cache/dev-lang/orc-0.4.10 b/metadata/cache/dev-lang/orc-0.4.10
index 0fc2f15d8bdc..ce70399190fe 100644
--- a/metadata/cache/dev-lang/orc-0.4.10
+++ b/metadata/cache/dev-lang/orc-0.4.10
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 http://code.entropywave.com/download/orc/orc-0.4.10.tar.gz
diff --git a/metadata/cache/dev-lang/orc-0.4.11 b/metadata/cache/dev-lang/orc-0.4.11
index 6ed4f5d23d9e..5de22d793d6a 100644
--- a/metadata/cache/dev-lang/orc-0.4.11
+++ b/metadata/cache/dev-lang/orc-0.4.11
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 http://code.entropywave.com/download/orc/orc-0.4.11.tar.gz
diff --git a/metadata/cache/dev-lang/orc-0.4.14 b/metadata/cache/dev-lang/orc-0.4.14
index 1c73d8626eb2..6f6c0b0b1ef2 100644
--- a/metadata/cache/dev-lang/orc-0.4.14
+++ b/metadata/cache/dev-lang/orc-0.4.14
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 http://code.entropywave.com/download/orc/orc-0.4.14.tar.gz
diff --git a/metadata/cache/dev-lang/orc-0.4.16 b/metadata/cache/dev-lang/orc-0.4.16
index 98642d79c0be..a0e79dcd893f 100644
--- a/metadata/cache/dev-lang/orc-0.4.16
+++ b/metadata/cache/dev-lang/orc-0.4.16
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 http://code.entropywave.com/download/orc/orc-0.4.16.tar.gz
diff --git a/metadata/cache/dev-lang/orc-0.4.9 b/metadata/cache/dev-lang/orc-0.4.9
index e0a4bc1b205a..beb046925aaf 100644
--- a/metadata/cache/dev-lang/orc-0.4.9
+++ b/metadata/cache/dev-lang/orc-0.4.9
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 http://code.entropywave.com/download/orc/orc-0.4.9.tar.gz
diff --git a/metadata/cache/dev-lang/parrot-4.2.0 b/metadata/cache/dev-lang/parrot-4.2.0
new file mode 100644
index 000000000000..0ebe5e0700eb
--- /dev/null
+++ b/metadata/cache/dev-lang/parrot-4.2.0
@@ -0,0 +1,22 @@
+dev-lang/perl[doc?] sys-libs/readline opengl? ( media-libs/freeglut ) nls? ( sys-devel/gettext ) unicode? ( >=dev-libs/icu-2.6 ) gdbm? ( >=sys-libs/gdbm-1.8.3-r1 ) gmp? ( >=dev-libs/gmp-4.1.4 ) ssl? ( dev-libs/openssl ) pcre? ( dev-libs/libpcre )
+sys-libs/readline opengl? ( media-libs/freeglut ) nls? ( sys-devel/gettext ) unicode? ( >=dev-libs/icu-2.6 ) gdbm? ( >=sys-libs/gdbm-1.8.3-r1 ) gmp? ( >=dev-libs/gmp-4.1.4 ) ssl? ( dev-libs/openssl ) pcre? ( dev-libs/libpcre )
+0
+ftp://ftp.parrot.org/pub/parrot/releases/devel/4.2.0/parrot-4.2.0.tar.bz2
+test
+http://www.parrot.org/
+Artistic-2
+Virtual machine designed to efficiently compile and execute bytecode for dynamic languages
+~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+eutils multilib toolchain-funcs user
+opengl nls doc examples gdbm gmp ssl +unicode pcre
+
+
+
+3
+
+compile configure install prepare test
+
+
+
+
+
diff --git a/metadata/cache/dev-lang/pcc-1.0.0 b/metadata/cache/dev-lang/pcc-1.0.0
index 0331cf4f40ba..0f1cba0f953d 100644
--- a/metadata/cache/dev-lang/pcc-1.0.0
+++ b/metadata/cache/dev-lang/pcc-1.0.0
@@ -1,4 +1,4 @@
->=dev-libs/pcc-libs-1.0.0 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-libs/pcc-libs-1.0.0 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=dev-libs/pcc-libs-1.0.0
 0
 ftp://pcc.ludd.ltu.se/pub/pcc-releases/pcc-1.0.0.tgz
diff --git a/metadata/cache/dev-lang/pcc-1.0.0_pre100604 b/metadata/cache/dev-lang/pcc-1.0.0_pre100604
index 292e951d8de0..ebfe314976d8 100644
--- a/metadata/cache/dev-lang/pcc-1.0.0_pre100604
+++ b/metadata/cache/dev-lang/pcc-1.0.0_pre100604
@@ -1,4 +1,4 @@
->=dev-libs/pcc-libs-1.0.0_pre100604 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-libs/pcc-libs-1.0.0_pre100604 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=dev-libs/pcc-libs-1.0.0_pre100604
 0
 http://pcc.ludd.ltu.se/ftp/pub/pcc/pcc-100604.tgz
diff --git a/metadata/cache/dev-lang/pcc-1.0.0_pre100830 b/metadata/cache/dev-lang/pcc-1.0.0_pre100830
index 87621514f290..1a724870c96e 100644
--- a/metadata/cache/dev-lang/pcc-1.0.0_pre100830
+++ b/metadata/cache/dev-lang/pcc-1.0.0_pre100830
@@ -1,4 +1,4 @@
->=dev-libs/pcc-libs-1.0.0_pre100830 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-libs/pcc-libs-1.0.0_pre100830 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=dev-libs/pcc-libs-1.0.0_pre100830
 0
 http://pcc.ludd.ltu.se/ftp/pub/pcc/pcc-100830.tgz
diff --git a/metadata/cache/dev-lang/pcc-1.0.0_pre101124 b/metadata/cache/dev-lang/pcc-1.0.0_pre101124
index 6cbc29175b9f..59ad97419a91 100644
--- a/metadata/cache/dev-lang/pcc-1.0.0_pre101124
+++ b/metadata/cache/dev-lang/pcc-1.0.0_pre101124
@@ -1,4 +1,4 @@
->=dev-libs/pcc-libs-1.0.0_pre101124 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-libs/pcc-libs-1.0.0_pre101124 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=dev-libs/pcc-libs-1.0.0_pre101124
 0
 http://pcc.ludd.ltu.se/ftp/pub/pcc/pcc-101124.tgz
diff --git a/metadata/cache/dev-lang/pcc-1.0.0_pre20110116 b/metadata/cache/dev-lang/pcc-1.0.0_pre20110116
index a9e725c0a968..780b642dd75a 100644
--- a/metadata/cache/dev-lang/pcc-1.0.0_pre20110116
+++ b/metadata/cache/dev-lang/pcc-1.0.0_pre20110116
@@ -1,4 +1,4 @@
->=dev-libs/pcc-libs-1.0.0_pre20110116 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-libs/pcc-libs-1.0.0_pre20110116 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=dev-libs/pcc-libs-1.0.0_pre20110116
 0
 http://pcc.ludd.ltu.se/ftp/pub/pcc/pcc-20110116.tgz
diff --git a/metadata/cache/dev-lang/php-5.3.10 b/metadata/cache/dev-lang/php-5.3.10
index e3edf5587c1d..1569c29292c9 100644
--- a/metadata/cache/dev-lang/php-5.3.10
+++ b/metadata/cache/dev-lang/php-5.3.10
@@ -1,4 +1,4 @@
-!dev-lang/php:5 >=app-admin/eselect-php-0.6.2 >=dev-libs/libpcre-8.12[unicode] <dev-libs/libpcre-8.30 apache2? ( www-servers/apache[threads=] ) berkdb? ( =sys-libs/db-4* ) bzip2? ( app-arch/bzip2 ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) cjk? ( !gd? ( virtual/jpeg media-libs/libpng sys-libs/zlib ) ) crypt? ( >=dev-libs/libmcrypt-2.4 ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( app-text/enchant ) exif? ( !gd? ( virtual/jpeg media-libs/libpng sys-libs/zlib ) ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg media-libs/libpng sys-libs/zlib ) gdbm? ( >=sys-libs/gdbm-1.8.0 ) gmp? ( >=dev-libs/gmp-4.1.2 ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[ssl=] ) intl? ( dev-libs/icu ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) kolab? ( >=net-libs/c-client-2004g-r1 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) mssql? ( dev-db/freetds[mssql] ) !mysqlnd? ( mysql? ( virtual/mysql ) mysqli? ( >=virtual/mysql-4.1 ) ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql-base ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline ) recode? ( app-text/recode ) sharedmem? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( =dev-db/sqlite-2* pdo? ( >=dev-db/sqlite-3.7.7.1 ) ) sqlite3? ( >=dev-db/sqlite-3.7.7.1 ) ssl? ( >=dev-libs/openssl-0.9.7 ) sybase-ct? ( dev-db/freetds ) tidy? ( app-text/htmltidy ) truetype? ( =media-libs/freetype-2* >=media-libs/t1lib-5.0.0 !gd? ( virtual/jpeg media-libs/libpng sys-libs/zlib ) ) unicode? ( dev-libs/oniguruma ) wddx? ( >=dev-libs/libxml2-2.6.8 ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm virtual/jpeg media-libs/libpng sys-libs/zlib ) xsl? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib ) zlib? ( sys-libs/zlib ) virtual/mta enchant? ( !dev-php5/pecl-enchant ) fileinfo? ( !<dev-php5/pecl-fileinfo-1.0.4-r2 ) filter? ( !dev-php5/pecl-filter ) json? ( !dev-php5/pecl-json ) phar? ( !dev-php5/pecl-phar ) zip? ( !dev-php5/pecl-zip ) sys-devel/flex >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 apache2? ( =www-servers/apache-2* ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+!dev-lang/php:5 >=app-admin/eselect-php-0.6.2 >=dev-libs/libpcre-8.12[unicode] <dev-libs/libpcre-8.30 apache2? ( www-servers/apache[threads=] ) berkdb? ( =sys-libs/db-4* ) bzip2? ( app-arch/bzip2 ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) cjk? ( !gd? ( virtual/jpeg media-libs/libpng sys-libs/zlib ) ) crypt? ( >=dev-libs/libmcrypt-2.4 ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( app-text/enchant ) exif? ( !gd? ( virtual/jpeg media-libs/libpng sys-libs/zlib ) ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg media-libs/libpng sys-libs/zlib ) gdbm? ( >=sys-libs/gdbm-1.8.0 ) gmp? ( >=dev-libs/gmp-4.1.2 ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[ssl=] ) intl? ( dev-libs/icu ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) kolab? ( >=net-libs/c-client-2004g-r1 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) mssql? ( dev-db/freetds[mssql] ) !mysqlnd? ( mysql? ( virtual/mysql ) mysqli? ( >=virtual/mysql-4.1 ) ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql-base ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline ) recode? ( app-text/recode ) sharedmem? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( =dev-db/sqlite-2* pdo? ( >=dev-db/sqlite-3.7.7.1 ) ) sqlite3? ( >=dev-db/sqlite-3.7.7.1 ) ssl? ( >=dev-libs/openssl-0.9.7 ) sybase-ct? ( dev-db/freetds ) tidy? ( app-text/htmltidy ) truetype? ( =media-libs/freetype-2* >=media-libs/t1lib-5.0.0 !gd? ( virtual/jpeg media-libs/libpng sys-libs/zlib ) ) unicode? ( dev-libs/oniguruma ) wddx? ( >=dev-libs/libxml2-2.6.8 ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm virtual/jpeg media-libs/libpng sys-libs/zlib ) xsl? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib ) zlib? ( sys-libs/zlib ) virtual/mta enchant? ( !dev-php5/pecl-enchant ) fileinfo? ( !<dev-php5/pecl-fileinfo-1.0.4-r2 ) filter? ( !dev-php5/pecl-filter ) json? ( !dev-php5/pecl-json ) phar? ( !dev-php5/pecl-phar ) zip? ( !dev-php5/pecl-zip ) sys-devel/flex >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 apache2? ( =www-servers/apache-2* ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 !dev-lang/php:5 >=app-admin/eselect-php-0.6.2 >=dev-libs/libpcre-8.12[unicode] <dev-libs/libpcre-8.30 apache2? ( www-servers/apache[threads=] ) berkdb? ( =sys-libs/db-4* ) bzip2? ( app-arch/bzip2 ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) cjk? ( !gd? ( virtual/jpeg media-libs/libpng sys-libs/zlib ) ) crypt? ( >=dev-libs/libmcrypt-2.4 ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( app-text/enchant ) exif? ( !gd? ( virtual/jpeg media-libs/libpng sys-libs/zlib ) ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg media-libs/libpng sys-libs/zlib ) gdbm? ( >=sys-libs/gdbm-1.8.0 ) gmp? ( >=dev-libs/gmp-4.1.2 ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[ssl=] ) intl? ( dev-libs/icu ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) kolab? ( >=net-libs/c-client-2004g-r1 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) mssql? ( dev-db/freetds[mssql] ) !mysqlnd? ( mysql? ( virtual/mysql ) mysqli? ( >=virtual/mysql-4.1 ) ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql-base ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline ) recode? ( app-text/recode ) sharedmem? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( =dev-db/sqlite-2* pdo? ( >=dev-db/sqlite-3.7.7.1 ) ) sqlite3? ( >=dev-db/sqlite-3.7.7.1 ) ssl? ( >=dev-libs/openssl-0.9.7 ) sybase-ct? ( dev-db/freetds ) tidy? ( app-text/htmltidy ) truetype? ( =media-libs/freetype-2* >=media-libs/t1lib-5.0.0 !gd? ( virtual/jpeg media-libs/libpng sys-libs/zlib ) ) unicode? ( dev-libs/oniguruma ) wddx? ( >=dev-libs/libxml2-2.6.8 ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm virtual/jpeg media-libs/libpng sys-libs/zlib ) xsl? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib ) zlib? ( sys-libs/zlib ) virtual/mta enchant? ( !dev-php5/pecl-enchant ) fileinfo? ( !<dev-php5/pecl-fileinfo-1.0.4-r2 ) filter? ( !dev-php5/pecl-filter ) json? ( !dev-php5/pecl-json ) phar? ( !dev-php5/pecl-phar ) zip? ( !dev-php5/pecl-zip ) apache2? ( =www-servers/apache-2* )
 5.3
 http://www.php.net/distributions/php-5.3.10.tar.bz2 mirror://gentoo/php-patchset-5.3.10-r0.tar.bz2 suhosin? ( http://download.suhosin.org/suhosin-patch-5.3.9-0.9.10.patch.gz )
diff --git a/metadata/cache/dev-lang/php-5.3.10-r2 b/metadata/cache/dev-lang/php-5.3.10-r2
index 6bf1940e9459..5e5649afb3a3 100644
--- a/metadata/cache/dev-lang/php-5.3.10-r2
+++ b/metadata/cache/dev-lang/php-5.3.10-r2
@@ -1,4 +1,4 @@
-!dev-lang/php:5 >=app-admin/eselect-php-0.6.2 >=dev-libs/libpcre-8.12[unicode] apache2? ( www-servers/apache[threads=] ) berkdb? ( =sys-libs/db-4* ) bzip2? ( app-arch/bzip2 ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) cjk? ( !gd? ( virtual/jpeg media-libs/libpng sys-libs/zlib ) ) crypt? ( >=dev-libs/libmcrypt-2.4 ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( app-text/enchant ) exif? ( !gd? ( virtual/jpeg media-libs/libpng sys-libs/zlib ) ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg media-libs/libpng sys-libs/zlib ) gdbm? ( >=sys-libs/gdbm-1.8.0 ) gmp? ( >=dev-libs/gmp-4.1.2 ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[ssl=] ) intl? ( dev-libs/icu ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) kolab? ( >=net-libs/c-client-2004g-r1 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) mssql? ( dev-db/freetds[mssql] ) !mysqlnd? ( mysql? ( virtual/mysql ) mysqli? ( >=virtual/mysql-4.1 ) ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql-base ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline ) recode? ( app-text/recode ) sharedmem? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( =dev-db/sqlite-2* pdo? ( >=dev-db/sqlite-3.7.7.1 ) ) sqlite3? ( >=dev-db/sqlite-3.7.7.1 ) ssl? ( >=dev-libs/openssl-0.9.7 ) sybase-ct? ( dev-db/freetds ) tidy? ( app-text/htmltidy ) truetype? ( =media-libs/freetype-2* >=media-libs/t1lib-5.0.0 !gd? ( virtual/jpeg media-libs/libpng sys-libs/zlib ) ) unicode? ( dev-libs/oniguruma ) wddx? ( >=dev-libs/libxml2-2.6.8 ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm virtual/jpeg media-libs/libpng sys-libs/zlib ) xsl? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib ) zlib? ( sys-libs/zlib ) virtual/mta enchant? ( !dev-php5/pecl-enchant ) fileinfo? ( !<dev-php5/pecl-fileinfo-1.0.4-r2 ) filter? ( !dev-php5/pecl-filter ) json? ( !dev-php5/pecl-json ) phar? ( !dev-php5/pecl-phar ) zip? ( !dev-php5/pecl-zip ) sys-devel/flex >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 apache2? ( =www-servers/apache-2* ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+!dev-lang/php:5 >=app-admin/eselect-php-0.6.2 >=dev-libs/libpcre-8.12[unicode] apache2? ( www-servers/apache[threads=] ) berkdb? ( =sys-libs/db-4* ) bzip2? ( app-arch/bzip2 ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) cjk? ( !gd? ( virtual/jpeg media-libs/libpng sys-libs/zlib ) ) crypt? ( >=dev-libs/libmcrypt-2.4 ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( app-text/enchant ) exif? ( !gd? ( virtual/jpeg media-libs/libpng sys-libs/zlib ) ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg media-libs/libpng sys-libs/zlib ) gdbm? ( >=sys-libs/gdbm-1.8.0 ) gmp? ( >=dev-libs/gmp-4.1.2 ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[ssl=] ) intl? ( dev-libs/icu ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) kolab? ( >=net-libs/c-client-2004g-r1 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) mssql? ( dev-db/freetds[mssql] ) !mysqlnd? ( mysql? ( virtual/mysql ) mysqli? ( >=virtual/mysql-4.1 ) ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql-base ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline ) recode? ( app-text/recode ) sharedmem? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( =dev-db/sqlite-2* pdo? ( >=dev-db/sqlite-3.7.7.1 ) ) sqlite3? ( >=dev-db/sqlite-3.7.7.1 ) ssl? ( >=dev-libs/openssl-0.9.7 ) sybase-ct? ( dev-db/freetds ) tidy? ( app-text/htmltidy ) truetype? ( =media-libs/freetype-2* >=media-libs/t1lib-5.0.0 !gd? ( virtual/jpeg media-libs/libpng sys-libs/zlib ) ) unicode? ( dev-libs/oniguruma ) wddx? ( >=dev-libs/libxml2-2.6.8 ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm virtual/jpeg media-libs/libpng sys-libs/zlib ) xsl? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib ) zlib? ( sys-libs/zlib ) virtual/mta enchant? ( !dev-php5/pecl-enchant ) fileinfo? ( !<dev-php5/pecl-fileinfo-1.0.4-r2 ) filter? ( !dev-php5/pecl-filter ) json? ( !dev-php5/pecl-json ) phar? ( !dev-php5/pecl-phar ) zip? ( !dev-php5/pecl-zip ) sys-devel/flex >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 apache2? ( =www-servers/apache-2* ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 !dev-lang/php:5 >=app-admin/eselect-php-0.6.2 >=dev-libs/libpcre-8.12[unicode] apache2? ( www-servers/apache[threads=] ) berkdb? ( =sys-libs/db-4* ) bzip2? ( app-arch/bzip2 ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) cjk? ( !gd? ( virtual/jpeg media-libs/libpng sys-libs/zlib ) ) crypt? ( >=dev-libs/libmcrypt-2.4 ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( app-text/enchant ) exif? ( !gd? ( virtual/jpeg media-libs/libpng sys-libs/zlib ) ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg media-libs/libpng sys-libs/zlib ) gdbm? ( >=sys-libs/gdbm-1.8.0 ) gmp? ( >=dev-libs/gmp-4.1.2 ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[ssl=] ) intl? ( dev-libs/icu ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) kolab? ( >=net-libs/c-client-2004g-r1 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) mssql? ( dev-db/freetds[mssql] ) !mysqlnd? ( mysql? ( virtual/mysql ) mysqli? ( >=virtual/mysql-4.1 ) ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql-base ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline ) recode? ( app-text/recode ) sharedmem? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) spell? ( >=app-text/aspell-0.50 ) sqlite? ( =dev-db/sqlite-2* pdo? ( >=dev-db/sqlite-3.7.7.1 ) ) sqlite3? ( >=dev-db/sqlite-3.7.7.1 ) ssl? ( >=dev-libs/openssl-0.9.7 ) sybase-ct? ( dev-db/freetds ) tidy? ( app-text/htmltidy ) truetype? ( =media-libs/freetype-2* >=media-libs/t1lib-5.0.0 !gd? ( virtual/jpeg media-libs/libpng sys-libs/zlib ) ) unicode? ( dev-libs/oniguruma ) wddx? ( >=dev-libs/libxml2-2.6.8 ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm virtual/jpeg media-libs/libpng sys-libs/zlib ) xsl? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib ) zlib? ( sys-libs/zlib ) virtual/mta enchant? ( !dev-php5/pecl-enchant ) fileinfo? ( !<dev-php5/pecl-fileinfo-1.0.4-r2 ) filter? ( !dev-php5/pecl-filter ) json? ( !dev-php5/pecl-json ) phar? ( !dev-php5/pecl-phar ) zip? ( !dev-php5/pecl-zip ) apache2? ( =www-servers/apache-2* )
 5.3
 http://www.php.net/distributions/php-5.3.10.tar.bz2 http://dev.gentoo.org/~olemarkus/php/php-patchset-5.3.10-r2.tar.bz2 suhosin? ( http://download.suhosin.org/suhosin-patch-5.3.9-0.9.10.patch.gz )
diff --git a/metadata/cache/dev-lang/php-5.4.0 b/metadata/cache/dev-lang/php-5.4.0
index 13e13a41a225..bfd24b7f47fd 100644
--- a/metadata/cache/dev-lang/php-5.4.0
+++ b/metadata/cache/dev-lang/php-5.4.0
@@ -1,4 +1,4 @@
->=app-admin/eselect-php-0.6.2 >=dev-libs/libpcre-8.12[unicode] apache2? ( www-servers/apache[threads=] ) berkdb? ( =sys-libs/db-4* ) bzip2? ( app-arch/bzip2 ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) cjk? ( !gd? ( virtual/jpeg media-libs/libpng sys-libs/zlib ) ) crypt? ( >=dev-libs/libmcrypt-2.4 ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( app-text/enchant ) exif? ( !gd? ( virtual/jpeg media-libs/libpng sys-libs/zlib ) ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg media-libs/libpng sys-libs/zlib ) gdbm? ( >=sys-libs/gdbm-1.8.0 ) gmp? ( >=dev-libs/gmp-4.1.2 ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[ssl=] ) intl? ( dev-libs/icu ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) kolab? ( >=net-libs/c-client-2004g-r1 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) mssql? ( dev-db/freetds[mssql] ) !mysqlnd? ( mysql? ( virtual/mysql ) mysqli? ( >=virtual/mysql-4.1 ) ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql-base ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline ) recode? ( app-text/recode ) sharedmem? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) spell? ( >=app-text/aspell-0.50 ) sqlite3? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( >=dev-libs/openssl-0.9.7 ) sybase-ct? ( dev-db/freetds ) tidy? ( app-text/htmltidy ) truetype? ( =media-libs/freetype-2* >=media-libs/t1lib-5.0.0 !gd? ( virtual/jpeg media-libs/libpng sys-libs/zlib ) ) unicode? ( dev-libs/oniguruma ) wddx? ( >=dev-libs/libxml2-2.6.8 ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm virtual/jpeg media-libs/libpng sys-libs/zlib ) xsl? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib ) zlib? ( sys-libs/zlib ) virtual/mta sys-devel/flex >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 apache2? ( =www-servers/apache-2* ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=app-admin/eselect-php-0.6.2 >=dev-libs/libpcre-8.12[unicode] apache2? ( www-servers/apache[threads=] ) berkdb? ( =sys-libs/db-4* ) bzip2? ( app-arch/bzip2 ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) cjk? ( !gd? ( virtual/jpeg media-libs/libpng sys-libs/zlib ) ) crypt? ( >=dev-libs/libmcrypt-2.4 ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( app-text/enchant ) exif? ( !gd? ( virtual/jpeg media-libs/libpng sys-libs/zlib ) ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg media-libs/libpng sys-libs/zlib ) gdbm? ( >=sys-libs/gdbm-1.8.0 ) gmp? ( >=dev-libs/gmp-4.1.2 ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[ssl=] ) intl? ( dev-libs/icu ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) kolab? ( >=net-libs/c-client-2004g-r1 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) mssql? ( dev-db/freetds[mssql] ) !mysqlnd? ( mysql? ( virtual/mysql ) mysqli? ( >=virtual/mysql-4.1 ) ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql-base ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline ) recode? ( app-text/recode ) sharedmem? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) spell? ( >=app-text/aspell-0.50 ) sqlite3? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( >=dev-libs/openssl-0.9.7 ) sybase-ct? ( dev-db/freetds ) tidy? ( app-text/htmltidy ) truetype? ( =media-libs/freetype-2* >=media-libs/t1lib-5.0.0 !gd? ( virtual/jpeg media-libs/libpng sys-libs/zlib ) ) unicode? ( dev-libs/oniguruma ) wddx? ( >=dev-libs/libxml2-2.6.8 ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm virtual/jpeg media-libs/libpng sys-libs/zlib ) xsl? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib ) zlib? ( sys-libs/zlib ) virtual/mta sys-devel/flex >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 apache2? ( =www-servers/apache-2* ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=app-admin/eselect-php-0.6.2 >=dev-libs/libpcre-8.12[unicode] apache2? ( www-servers/apache[threads=] ) berkdb? ( =sys-libs/db-4* ) bzip2? ( app-arch/bzip2 ) cdb? ( || ( dev-db/cdb dev-db/tinycdb ) ) cjk? ( !gd? ( virtual/jpeg media-libs/libpng sys-libs/zlib ) ) crypt? ( >=dev-libs/libmcrypt-2.4 ) curl? ( >=net-misc/curl-7.10.5 ) enchant? ( app-text/enchant ) exif? ( !gd? ( virtual/jpeg media-libs/libpng sys-libs/zlib ) ) firebird? ( dev-db/firebird ) gd? ( virtual/jpeg media-libs/libpng sys-libs/zlib ) gdbm? ( >=sys-libs/gdbm-1.8.0 ) gmp? ( >=dev-libs/gmp-4.1.2 ) iconv? ( virtual/libiconv ) imap? ( virtual/imap-c-client[ssl=] ) intl? ( dev-libs/icu ) iodbc? ( dev-db/libiodbc ) kerberos? ( virtual/krb5 ) kolab? ( >=net-libs/c-client-2004g-r1 ) ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) mssql? ( dev-db/freetds[mssql] ) !mysqlnd? ( mysql? ( virtual/mysql ) mysqli? ( >=virtual/mysql-4.1 ) ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) postgres? ( dev-db/postgresql-base ) qdbm? ( dev-db/qdbm ) readline? ( sys-libs/readline ) recode? ( app-text/recode ) sharedmem? ( dev-libs/mm ) simplexml? ( >=dev-libs/libxml2-2.6.8 ) snmp? ( >=net-analyzer/net-snmp-5.2 ) soap? ( >=dev-libs/libxml2-2.6.8 ) spell? ( >=app-text/aspell-0.50 ) sqlite3? ( >=dev-db/sqlite-3.7.6.3 ) ssl? ( >=dev-libs/openssl-0.9.7 ) sybase-ct? ( dev-db/freetds ) tidy? ( app-text/htmltidy ) truetype? ( =media-libs/freetype-2* >=media-libs/t1lib-5.0.0 !gd? ( virtual/jpeg media-libs/libpng sys-libs/zlib ) ) unicode? ( dev-libs/oniguruma ) wddx? ( >=dev-libs/libxml2-2.6.8 ) xml? ( >=dev-libs/libxml2-2.6.8 ) xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) xmlreader? ( >=dev-libs/libxml2-2.6.8 ) xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) xpm? ( x11-libs/libXpm virtual/jpeg media-libs/libpng sys-libs/zlib ) xsl? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) zip? ( sys-libs/zlib ) zlib? ( sys-libs/zlib ) virtual/mta apache2? ( =www-servers/apache-2* )
 5.4
 http://www.php.net/distributions/php-5.4.0.tar.bz2 http://dev.gentoo.org/~olemarkus/php/php-patchset-5.4-1.tar.bz2
diff --git a/metadata/cache/dev-lang/polyml-5.4.1 b/metadata/cache/dev-lang/polyml-5.4.1
index 57e13fef1c38..ef6f81bb7f0b 100644
--- a/metadata/cache/dev-lang/polyml-5.4.1
+++ b/metadata/cache/dev-lang/polyml-5.4.1
@@ -1,4 +1,4 @@
-X? ( x11-libs/openmotif ) gmp? ( >=dev-libs/gmp-5 ) threads? ( >=sys-libs/glibc-2.13 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+X? ( x11-libs/openmotif ) gmp? ( >=dev-libs/gmp-5 ) threads? ( >=sys-libs/glibc-2.13 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 X? ( x11-libs/openmotif ) gmp? ( >=dev-libs/gmp-5 ) threads? ( >=sys-libs/glibc-2.13 )
 0
 mirror://sourceforge/polyml/polyml.5.4.1.tar.gz
diff --git a/metadata/cache/dev-lang/python-2.5.4-r4 b/metadata/cache/dev-lang/python-2.5.4-r4
index 40dce32ffa79..550f12394c62 100644
--- a/metadata/cache/dev-lang/python-2.5.4-r4
+++ b/metadata/cache/dev-lang/python-2.5.4-r4
@@ -1,4 +1,4 @@
->=app-admin/eselect-python-20091230 >=sys-libs/zlib-1.1.3 virtual/libffi virtual/libintl !build? ( berkdb? ( || ( sys-libs/db:4.5 sys-libs/db:4.4 sys-libs/db:4.3 sys-libs/db:4.2 ) ) gdbm? ( sys-libs/gdbm ) ncurses? ( >=sys-libs/ncurses-5.2 readline? ( >=sys-libs/readline-4.1 ) ) sqlite? ( >=dev-db/sqlite-3 ) ssl? ( dev-libs/openssl ) tk? ( >=dev-lang/tk-8.0 ) xml? ( >=dev-libs/expat-2 ) ) doc? ( dev-python/python-docs:2.5 ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=app-admin/eselect-python-20091230
+>=app-admin/eselect-python-20091230 >=sys-libs/zlib-1.1.3 virtual/libffi virtual/libintl !build? ( berkdb? ( || ( sys-libs/db:4.5 sys-libs/db:4.4 sys-libs/db:4.3 sys-libs/db:4.2 ) ) gdbm? ( sys-libs/gdbm ) ncurses? ( >=sys-libs/ncurses-5.2 readline? ( >=sys-libs/readline-4.1 ) ) sqlite? ( >=dev-db/sqlite-3 ) ssl? ( dev-libs/openssl ) tk? ( >=dev-lang/tk-8.0 ) xml? ( >=dev-libs/expat-2 ) ) doc? ( dev-python/python-docs:2.5 ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=app-admin/eselect-python-20091230
 >=app-admin/eselect-python-20091230 >=sys-libs/zlib-1.1.3 virtual/libffi virtual/libintl !build? ( berkdb? ( || ( sys-libs/db:4.5 sys-libs/db:4.4 sys-libs/db:4.3 sys-libs/db:4.2 ) ) gdbm? ( sys-libs/gdbm ) ncurses? ( >=sys-libs/ncurses-5.2 readline? ( >=sys-libs/readline-4.1 ) ) sqlite? ( >=dev-db/sqlite-3 ) ssl? ( dev-libs/openssl ) tk? ( >=dev-lang/tk-8.0 ) xml? ( >=dev-libs/expat-2 ) ) doc? ( dev-python/python-docs:2.5 ) !build? ( app-misc/mime-types ) >=app-admin/eselect-python-20091230
 2.5
 http://www.python.org/ftp/python/2.5.4/Python-2.5.4.tar.bz2 mirror://gentoo/python-gentoo-patches-2.5.4-r3.tar.bz2
diff --git a/metadata/cache/dev-lang/python-3.1.4-r4 b/metadata/cache/dev-lang/python-3.1.4-r4
new file mode 100644
index 000000000000..c719875bb28a
--- /dev/null
+++ b/metadata/cache/dev-lang/python-3.1.4-r4
@@ -0,0 +1,22 @@
+>=app-admin/eselect-python-20091230 app-arch/bzip2 >=sys-libs/zlib-1.1.3 virtual/libffi virtual/libintl !build? ( gdbm? ( sys-libs/gdbm ) ncurses? ( >=sys-libs/ncurses-5.2 readline? ( >=sys-libs/readline-4.1 ) ) sqlite? ( >=dev-db/sqlite-3.3.3:3 ) ssl? ( dev-libs/openssl ) tk? ( >=dev-lang/tk-8.0 dev-tcltk/blt ) xml? ( >=dev-libs/expat-2 ) ) dev-util/pkgconfig !sys-devel/gcc[libffi] >=sys-devel/autoconf-2.68 sys-devel/libtool >=app-admin/eselect-python-20091230
+>=app-admin/eselect-python-20091230 app-arch/bzip2 >=sys-libs/zlib-1.1.3 virtual/libffi virtual/libintl !build? ( gdbm? ( sys-libs/gdbm ) ncurses? ( >=sys-libs/ncurses-5.2 readline? ( >=sys-libs/readline-4.1 ) ) sqlite? ( >=dev-db/sqlite-3.3.3:3 ) ssl? ( dev-libs/openssl ) tk? ( >=dev-lang/tk-8.0 dev-tcltk/blt ) xml? ( >=dev-libs/expat-2 ) ) !build? ( app-misc/mime-types ) doc? ( dev-python/python-docs:3.1 ) >=app-admin/eselect-python-20091230
+3.1
+http://www.python.org/ftp/python/3.1.4/Python-3.1.4.tar.xz mirror://gentoo/python-gentoo-patches-3.1.4.tar.bz2
+
+http://www.python.org/
+PSF-2
+Python is an interpreted, interactive, object-oriented programming language.
+~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd
+autotools eutils flag-o-matic libtool multilib python toolchain-funcs user
+build doc elibc_uclibc examples gdbm ipv6 +ncurses +readline sqlite +ssl +threads tk +wide-unicode wininst +xml
+
+app-admin/python-updater app-admin/python-updater
+
+3
+
+compile configure install postinst postrm preinst prepare setup test
+
+
+
+
+
diff --git a/metadata/cache/dev-lang/python-3.2.2-r1 b/metadata/cache/dev-lang/python-3.2.2-r1
new file mode 100644
index 000000000000..1354d5d82386
--- /dev/null
+++ b/metadata/cache/dev-lang/python-3.2.2-r1
@@ -0,0 +1,22 @@
+>=sys-devel/autoconf-2.65 >=app-admin/eselect-python-20091230 >=sys-libs/zlib-1.1.3 virtual/libffi virtual/libintl !build? ( gdbm? ( sys-libs/gdbm ) ncurses? ( >=sys-libs/ncurses-5.2 readline? ( >=sys-libs/readline-4.1 ) ) sqlite? ( >=dev-db/sqlite-3.3.8:3[extensions] ) ssl? ( dev-libs/openssl ) tk? ( >=dev-lang/tk-8.0 dev-tcltk/blt ) xml? ( >=dev-libs/expat-2 ) ) app-arch/xz-utils dev-util/pkgconfig !sys-devel/gcc[libffi] >=sys-devel/autoconf-2.68 sys-devel/libtool >=app-admin/eselect-python-20091230
+>=app-admin/eselect-python-20091230 >=sys-libs/zlib-1.1.3 virtual/libffi virtual/libintl !build? ( gdbm? ( sys-libs/gdbm ) ncurses? ( >=sys-libs/ncurses-5.2 readline? ( >=sys-libs/readline-4.1 ) ) sqlite? ( >=dev-db/sqlite-3.3.8:3[extensions] ) ssl? ( dev-libs/openssl ) tk? ( >=dev-lang/tk-8.0 dev-tcltk/blt ) xml? ( >=dev-libs/expat-2 ) ) !build? ( app-misc/mime-types ) doc? ( dev-python/python-docs:3.2 ) >=app-admin/eselect-python-20091230
+3.2
+http://www.python.org/ftp/python/3.2.2/Python-3.2.2.tar.xz mirror://gentoo/python-gentoo-patches-3.2.2.tar.bz2
+
+http://www.python.org/
+PSF-2
+Python is an interpreted, interactive, object-oriented programming language.
+~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd
+autotools eutils flag-o-matic libtool multilib python toolchain-funcs user
+build doc elibc_uclibc examples gdbm ipv6 +ncurses +readline sqlite +ssl +threads tk +wide-unicode wininst +xml
+
+app-admin/python-updater app-admin/python-updater
+
+3
+
+compile configure install postinst postrm preinst prepare setup test
+
+
+
+
+
diff --git a/metadata/cache/dev-lang/ruby-1.8.7_p352 b/metadata/cache/dev-lang/ruby-1.8.7_p352
index 97884e3bc1ff..aaf3f482ae9c 100644
--- a/metadata/cache/dev-lang/ruby-1.8.7_p352
+++ b/metadata/cache/dev-lang/ruby-1.8.7_p352
@@ -1,4 +1,4 @@
-berkdb? ( sys-libs/db ) gdbm? ( sys-libs/gdbm ) ssl? ( >=dev-libs/openssl-0.9.8m ) socks5? ( >=net-proxy/dante-1.1.13 ) tk? ( dev-lang/tk[threads=] ) ncurses? ( sys-libs/ncurses ) libedit? ( dev-libs/libedit ) !libedit? ( readline? ( sys-libs/readline ) ) sys-libs/zlib >=app-admin/eselect-ruby-20100603 !=dev-lang/ruby-cvs-1.8* !<dev-ruby/rdoc-2 !dev-ruby/rexml || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+berkdb? ( sys-libs/db ) gdbm? ( sys-libs/gdbm ) ssl? ( >=dev-libs/openssl-0.9.8m ) socks5? ( >=net-proxy/dante-1.1.13 ) tk? ( dev-lang/tk[threads=] ) ncurses? ( sys-libs/ncurses ) libedit? ( dev-libs/libedit ) !libedit? ( readline? ( sys-libs/readline ) ) sys-libs/zlib >=app-admin/eselect-ruby-20100603 !=dev-lang/ruby-cvs-1.8* !<dev-ruby/rdoc-2 !dev-ruby/rexml || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 berkdb? ( sys-libs/db ) gdbm? ( sys-libs/gdbm ) ssl? ( >=dev-libs/openssl-0.9.8m ) socks5? ( >=net-proxy/dante-1.1.13 ) tk? ( dev-lang/tk[threads=] ) ncurses? ( sys-libs/ncurses ) libedit? ( dev-libs/libedit ) !libedit? ( readline? ( sys-libs/readline ) ) sys-libs/zlib >=app-admin/eselect-ruby-20100603 !=dev-lang/ruby-cvs-1.8* !<dev-ruby/rdoc-2 !dev-ruby/rexml
 1.8
 mirror://ruby/1.8/ruby-1.8.7-p352.tar.bz2 http://dev.gentoo.org/~flameeyes/ruby-team/ruby-patches-1.8.7_p352.tar.bz2
diff --git a/metadata/cache/dev-lang/ruby-1.8.7_p357 b/metadata/cache/dev-lang/ruby-1.8.7_p357
index 52e996b7b94b..9388edebe9fe 100644
--- a/metadata/cache/dev-lang/ruby-1.8.7_p357
+++ b/metadata/cache/dev-lang/ruby-1.8.7_p357
@@ -1,4 +1,4 @@
-berkdb? ( sys-libs/db ) gdbm? ( sys-libs/gdbm ) ssl? ( >=dev-libs/openssl-0.9.8m ) socks5? ( >=net-proxy/dante-1.1.13 ) tk? ( dev-lang/tk[threads=] ) ncurses? ( sys-libs/ncurses ) libedit? ( dev-libs/libedit ) !libedit? ( readline? ( sys-libs/readline ) ) sys-libs/zlib >=app-admin/eselect-ruby-20100603 !<dev-ruby/rdoc-2 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+berkdb? ( sys-libs/db ) gdbm? ( sys-libs/gdbm ) ssl? ( >=dev-libs/openssl-0.9.8m ) socks5? ( >=net-proxy/dante-1.1.13 ) tk? ( dev-lang/tk[threads=] ) ncurses? ( sys-libs/ncurses ) libedit? ( dev-libs/libedit ) !libedit? ( readline? ( sys-libs/readline ) ) sys-libs/zlib >=app-admin/eselect-ruby-20100603 !<dev-ruby/rdoc-2 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 berkdb? ( sys-libs/db ) gdbm? ( sys-libs/gdbm ) ssl? ( >=dev-libs/openssl-0.9.8m ) socks5? ( >=net-proxy/dante-1.1.13 ) tk? ( dev-lang/tk[threads=] ) ncurses? ( sys-libs/ncurses ) libedit? ( dev-libs/libedit ) !libedit? ( readline? ( sys-libs/readline ) ) sys-libs/zlib >=app-admin/eselect-ruby-20100603 !<dev-ruby/rdoc-2
 1.8
 mirror://ruby/1.8/ruby-1.8.7-p357.tar.bz2 http://dev.gentoo.org/~flameeyes/ruby-team/ruby-patches-1.8.7_p357.tar.bz2
diff --git a/metadata/cache/dev-lang/ruby-1.9.3_p0 b/metadata/cache/dev-lang/ruby-1.9.3_p0
index bab59d652d68..20e60ac5693a 100644
--- a/metadata/cache/dev-lang/ruby-1.9.3_p0
+++ b/metadata/cache/dev-lang/ruby-1.9.3_p0
@@ -1,4 +1,4 @@
-berkdb? ( sys-libs/db ) gdbm? ( sys-libs/gdbm ) ssl? ( dev-libs/openssl ) socks5? ( >=net-proxy/dante-1.1.13 ) tk? ( dev-lang/tk[threads] ) ncurses? ( sys-libs/ncurses ) readline? ( sys-libs/readline ) yaml? ( dev-libs/libyaml ) virtual/libffi sys-libs/zlib >=app-admin/eselect-ruby-20100402 !<dev-ruby/rdoc-3.9.4 !<dev-ruby/rubygems-1.8.10-r1 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+berkdb? ( sys-libs/db ) gdbm? ( sys-libs/gdbm ) ssl? ( dev-libs/openssl ) socks5? ( >=net-proxy/dante-1.1.13 ) tk? ( dev-lang/tk[threads] ) ncurses? ( sys-libs/ncurses ) readline? ( sys-libs/readline ) yaml? ( dev-libs/libyaml ) virtual/libffi sys-libs/zlib >=app-admin/eselect-ruby-20100402 !<dev-ruby/rdoc-3.9.4 !<dev-ruby/rubygems-1.8.10-r1 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 berkdb? ( sys-libs/db ) gdbm? ( sys-libs/gdbm ) ssl? ( dev-libs/openssl ) socks5? ( >=net-proxy/dante-1.1.13 ) tk? ( dev-lang/tk[threads] ) ncurses? ( sys-libs/ncurses ) readline? ( sys-libs/readline ) yaml? ( dev-libs/libyaml ) virtual/libffi sys-libs/zlib >=app-admin/eselect-ruby-20100402 !<dev-ruby/rdoc-3.9.4 !<dev-ruby/rubygems-1.8.10-r1
 1.9
 mirror://ruby/1.9/ruby-1.9.3-p0.tar.bz2 http://dev.gentoo.org/~flameeyes/ruby-team/ruby-patches-1.9.3_p0.tar.bz2
diff --git a/metadata/cache/dev-lang/ruby-1.9.3_p125 b/metadata/cache/dev-lang/ruby-1.9.3_p125
index 14ce21cfc400..03e2fd59274e 100644
--- a/metadata/cache/dev-lang/ruby-1.9.3_p125
+++ b/metadata/cache/dev-lang/ruby-1.9.3_p125
@@ -1,4 +1,4 @@
-berkdb? ( sys-libs/db ) gdbm? ( sys-libs/gdbm ) ssl? ( dev-libs/openssl ) socks5? ( >=net-proxy/dante-1.1.13 ) tk? ( dev-lang/tk[threads] ) ncurses? ( sys-libs/ncurses ) readline? ( sys-libs/readline ) yaml? ( dev-libs/libyaml ) virtual/libffi sys-libs/zlib >=app-admin/eselect-ruby-20100402 !<dev-ruby/rdoc-3.9.4 !<dev-ruby/rubygems-1.8.10-r1 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+berkdb? ( sys-libs/db ) gdbm? ( sys-libs/gdbm ) ssl? ( dev-libs/openssl ) socks5? ( >=net-proxy/dante-1.1.13 ) tk? ( dev-lang/tk[threads] ) ncurses? ( sys-libs/ncurses ) readline? ( sys-libs/readline ) yaml? ( dev-libs/libyaml ) virtual/libffi sys-libs/zlib >=app-admin/eselect-ruby-20100402 !<dev-ruby/rdoc-3.9.4 !<dev-ruby/rubygems-1.8.10-r1 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 berkdb? ( sys-libs/db ) gdbm? ( sys-libs/gdbm ) ssl? ( dev-libs/openssl ) socks5? ( >=net-proxy/dante-1.1.13 ) tk? ( dev-lang/tk[threads] ) ncurses? ( sys-libs/ncurses ) readline? ( sys-libs/readline ) yaml? ( dev-libs/libyaml ) virtual/libffi sys-libs/zlib >=app-admin/eselect-ruby-20100402 !<dev-ruby/rdoc-3.9.4 !<dev-ruby/rubygems-1.8.10-r1
 1.9
 mirror://ruby/1.9/ruby-1.9.3-p125.tar.bz2 http://dev.gentoo.org/~flameeyes/ruby-team/ruby-patches-1.9.3_p125.tar.bz2
diff --git a/metadata/cache/dev-lang/ruby-enterprise-1.8.7.2010.02-r1 b/metadata/cache/dev-lang/ruby-enterprise-1.8.7.2010.02-r1
index d22a75e44f90..e89f206495f3 100644
--- a/metadata/cache/dev-lang/ruby-enterprise-1.8.7.2010.02-r1
+++ b/metadata/cache/dev-lang/ruby-enterprise-1.8.7.2010.02-r1
@@ -1,4 +1,4 @@
-berkdb? ( sys-libs/db ) gdbm? ( sys-libs/gdbm ) ssl? ( >=dev-libs/openssl-0.9.8m ) tk? ( dev-lang/tk[threads=] ) ncurses? ( sys-libs/ncurses ) libedit? ( dev-libs/libedit ) !libedit? ( readline? ( sys-libs/readline ) ) sys-libs/zlib >=app-admin/eselect-ruby-20100402 tcmalloc? ( dev-util/google-perftools ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+berkdb? ( sys-libs/db ) gdbm? ( sys-libs/gdbm ) ssl? ( >=dev-libs/openssl-0.9.8m ) tk? ( dev-lang/tk[threads=] ) ncurses? ( sys-libs/ncurses ) libedit? ( dev-libs/libedit ) !libedit? ( readline? ( sys-libs/readline ) ) sys-libs/zlib >=app-admin/eselect-ruby-20100402 tcmalloc? ( dev-util/google-perftools ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 berkdb? ( sys-libs/db ) gdbm? ( sys-libs/gdbm ) ssl? ( >=dev-libs/openssl-0.9.8m ) tk? ( dev-lang/tk[threads=] ) ncurses? ( sys-libs/ncurses ) libedit? ( dev-libs/libedit ) !libedit? ( readline? ( sys-libs/readline ) ) sys-libs/zlib >=app-admin/eselect-ruby-20100402 tcmalloc? ( dev-util/google-perftools )
 1.8
 mirror://rubyforge/emm-ruby/ruby-enterprise-1.8.7-2010.02.tar.gz http://dev.gentoo.org/~flameeyes/ruby-team/ruby-enterprise-patches-1.8.7.2010.02-r1.tar.bz2
diff --git a/metadata/cache/dev-lang/ruby-enterprise-1.8.7.2011.03 b/metadata/cache/dev-lang/ruby-enterprise-1.8.7.2011.03
index 18b52c41fc26..5d988a4cac30 100644
--- a/metadata/cache/dev-lang/ruby-enterprise-1.8.7.2011.03
+++ b/metadata/cache/dev-lang/ruby-enterprise-1.8.7.2011.03
@@ -1,4 +1,4 @@
-berkdb? ( sys-libs/db ) gdbm? ( sys-libs/gdbm ) ssl? ( >=dev-libs/openssl-0.9.8m ) tk? ( dev-lang/tk[threads=] ) ncurses? ( sys-libs/ncurses ) libedit? ( dev-libs/libedit ) !libedit? ( readline? ( sys-libs/readline ) ) sys-libs/zlib >=app-admin/eselect-ruby-20100402 tcmalloc? ( dev-util/google-perftools ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+berkdb? ( sys-libs/db ) gdbm? ( sys-libs/gdbm ) ssl? ( >=dev-libs/openssl-0.9.8m ) tk? ( dev-lang/tk[threads=] ) ncurses? ( sys-libs/ncurses ) libedit? ( dev-libs/libedit ) !libedit? ( readline? ( sys-libs/readline ) ) sys-libs/zlib >=app-admin/eselect-ruby-20100402 tcmalloc? ( dev-util/google-perftools ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 berkdb? ( sys-libs/db ) gdbm? ( sys-libs/gdbm ) ssl? ( >=dev-libs/openssl-0.9.8m ) tk? ( dev-lang/tk[threads=] ) ncurses? ( sys-libs/ncurses ) libedit? ( dev-libs/libedit ) !libedit? ( readline? ( sys-libs/readline ) ) sys-libs/zlib >=app-admin/eselect-ruby-20100402 tcmalloc? ( dev-util/google-perftools )
 1.8
 http://rubyenterpriseedition.googlecode.com/files/ruby-enterprise-1.8.7-2011.03.tar.gz http://dev.gentoo.org/~flameeyes/ruby-team/ruby-enterprise-patches-1.8.7.2011.03.tar.bz2
diff --git a/metadata/cache/dev-lang/ruby-enterprise-1.8.7.2012.02 b/metadata/cache/dev-lang/ruby-enterprise-1.8.7.2012.02
index 3b68a01eccb1..afdfb11e8144 100644
--- a/metadata/cache/dev-lang/ruby-enterprise-1.8.7.2012.02
+++ b/metadata/cache/dev-lang/ruby-enterprise-1.8.7.2012.02
@@ -1,4 +1,4 @@
-berkdb? ( sys-libs/db ) gdbm? ( sys-libs/gdbm ) ssl? ( >=dev-libs/openssl-0.9.8m ) tk? ( dev-lang/tk[threads=] ) ncurses? ( sys-libs/ncurses ) libedit? ( dev-libs/libedit ) !libedit? ( readline? ( sys-libs/readline ) ) sys-libs/zlib >=app-admin/eselect-ruby-20100402 tcmalloc? ( dev-util/google-perftools ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+berkdb? ( sys-libs/db ) gdbm? ( sys-libs/gdbm ) ssl? ( >=dev-libs/openssl-0.9.8m ) tk? ( dev-lang/tk[threads=] ) ncurses? ( sys-libs/ncurses ) libedit? ( dev-libs/libedit ) !libedit? ( readline? ( sys-libs/readline ) ) sys-libs/zlib >=app-admin/eselect-ruby-20100402 tcmalloc? ( dev-util/google-perftools ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 berkdb? ( sys-libs/db ) gdbm? ( sys-libs/gdbm ) ssl? ( >=dev-libs/openssl-0.9.8m ) tk? ( dev-lang/tk[threads=] ) ncurses? ( sys-libs/ncurses ) libedit? ( dev-libs/libedit ) !libedit? ( readline? ( sys-libs/readline ) ) sys-libs/zlib >=app-admin/eselect-ruby-20100402 tcmalloc? ( dev-util/google-perftools )
 1.8
 http://rubyenterpriseedition.googlecode.com/files/ruby-enterprise-1.8.7-2012.02.tar.gz http://dev.gentoo.org/~flameeyes/ruby-team/ruby-enterprise-patches-1.8.7.2012.02.tar.bz2
diff --git a/metadata/cache/dev-lang/spidermonkey-1.8.5-r1 b/metadata/cache/dev-lang/spidermonkey-1.8.5-r1
index bb25f68e1cc2..f7beaa8cdcae 100644
--- a/metadata/cache/dev-lang/spidermonkey-1.8.5-r1
+++ b/metadata/cache/dev-lang/spidermonkey-1.8.5-r1
@@ -1,4 +1,4 @@
->=dev-libs/nspr-4.7.0 app-arch/zip =dev-lang/python-2*[threads] dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) =sys-devel/autoconf-2.1* sys-devel/libtool
+>=dev-libs/nspr-4.7.0 app-arch/zip =dev-lang/python-2*[threads] dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) =sys-devel/autoconf-2.1* sys-devel/libtool
 >=dev-libs/nspr-4.7.0
 0
 https://ftp.mozilla.org/pub/mozilla.org/js/js185-1.0.0.tar.gz
diff --git a/metadata/cache/dev-lang/squirrel-2.2.4-r1 b/metadata/cache/dev-lang/squirrel-2.2.4-r1
index 8b1af882316f..a1086e3f585a 100644
--- a/metadata/cache/dev-lang/squirrel-2.2.4-r1
+++ b/metadata/cache/dev-lang/squirrel-2.2.4-r1
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 !app-text/ispell
 0
 mirror://sourceforge/squirrel/squirrel2/squirrel_2.2.4_stable/squirrel_2.2.4_stable.tar.gz
diff --git a/metadata/cache/dev-lang/tcl-8.5.10-r1 b/metadata/cache/dev-lang/tcl-8.5.10-r1
index 50f1522cd65a..0326c3616364 100644
--- a/metadata/cache/dev-lang/tcl-8.5.10-r1
+++ b/metadata/cache/dev-lang/tcl-8.5.10-r1
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 mirror://sourceforge/tcl/tcl8.5.10-src.tar.gz
diff --git a/metadata/cache/dev-lang/tcl-8.5.11 b/metadata/cache/dev-lang/tcl-8.5.11
index 67f3898b4a69..26c6febb1a5c 100644
--- a/metadata/cache/dev-lang/tcl-8.5.11
+++ b/metadata/cache/dev-lang/tcl-8.5.11
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 mirror://sourceforge/tcl/tcl8.5.11-src.tar.gz
diff --git a/metadata/cache/dev-lang/tcl-8.5.8-r1 b/metadata/cache/dev-lang/tcl-8.5.8-r1
index 73ff548303b1..12147c8473ef 100644
--- a/metadata/cache/dev-lang/tcl-8.5.8-r1
+++ b/metadata/cache/dev-lang/tcl-8.5.8-r1
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 mirror://sourceforge/tcl/tcl8.5.8-src.tar.gz
diff --git a/metadata/cache/dev-lang/tcl-8.5.8-r2 b/metadata/cache/dev-lang/tcl-8.5.8-r2
index 2f653f7573a8..0de543e9557f 100644
--- a/metadata/cache/dev-lang/tcl-8.5.8-r2
+++ b/metadata/cache/dev-lang/tcl-8.5.8-r2
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 mirror://sourceforge/tcl/tcl8.5.8-src.tar.gz
diff --git a/metadata/cache/dev-lang/tcl-8.5.9 b/metadata/cache/dev-lang/tcl-8.5.9
index 115a5f6b7fe9..f5775e365d9f 100644
--- a/metadata/cache/dev-lang/tcl-8.5.9
+++ b/metadata/cache/dev-lang/tcl-8.5.9
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 mirror://sourceforge/tcl/tcl8.5.9-src.tar.gz
diff --git a/metadata/cache/dev-lang/tk-8.5.10-r1 b/metadata/cache/dev-lang/tk-8.5.10-r1
index f3c69107705f..4a9e2a102fd5 100644
--- a/metadata/cache/dev-lang/tk-8.5.10-r1
+++ b/metadata/cache/dev-lang/tk-8.5.10-r1
@@ -1,4 +1,4 @@
-!aqua? ( x11-libs/libX11 x11-libs/libXt truetype? ( x11-libs/libXft ) xscreensaver? ( x11-libs/libXScrnSaver ) ) ~dev-lang/tcl-8.5.10 !aqua? ( x11-proto/xproto ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+!aqua? ( x11-libs/libX11 x11-libs/libXt truetype? ( x11-libs/libXft ) xscreensaver? ( x11-libs/libXScrnSaver ) ) ~dev-lang/tcl-8.5.10 !aqua? ( x11-proto/xproto ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 !aqua? ( x11-libs/libX11 x11-libs/libXt truetype? ( x11-libs/libXft ) xscreensaver? ( x11-libs/libXScrnSaver ) ) ~dev-lang/tcl-8.5.10
 0
 mirror://sourceforge/tcl/tk8.5.10-src.tar.gz
diff --git a/metadata/cache/dev-lang/tk-8.5.11 b/metadata/cache/dev-lang/tk-8.5.11
index aaaf8f6f3cc3..af0720a7038e 100644
--- a/metadata/cache/dev-lang/tk-8.5.11
+++ b/metadata/cache/dev-lang/tk-8.5.11
@@ -1,4 +1,4 @@
-!aqua? ( x11-libs/libX11 x11-libs/libXt truetype? ( x11-libs/libXft ) xscreensaver? ( x11-libs/libXScrnSaver ) ) ~dev-lang/tcl-8.5.11 !aqua? ( x11-proto/xproto ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+!aqua? ( x11-libs/libX11 x11-libs/libXt truetype? ( x11-libs/libXft ) xscreensaver? ( x11-libs/libXScrnSaver ) ) ~dev-lang/tcl-8.5.11 !aqua? ( x11-proto/xproto ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 !aqua? ( x11-libs/libX11 x11-libs/libXt truetype? ( x11-libs/libXft ) xscreensaver? ( x11-libs/libXScrnSaver ) ) ~dev-lang/tcl-8.5.11
 0
 mirror://sourceforge/tcl/tk8.5.11-src.tar.gz
diff --git a/metadata/cache/dev-lang/tk-8.5.8-r1 b/metadata/cache/dev-lang/tk-8.5.8-r1
index 98c299e73507..902831121da1 100644
--- a/metadata/cache/dev-lang/tk-8.5.8-r1
+++ b/metadata/cache/dev-lang/tk-8.5.8-r1
@@ -1,4 +1,4 @@
-!aqua? ( x11-libs/libX11 x11-libs/libXt truetype? ( x11-libs/libXft ) xscreensaver? ( x11-libs/libXScrnSaver ) ) ~dev-lang/tcl-8.5.8 !aqua? ( x11-proto/xproto ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+!aqua? ( x11-libs/libX11 x11-libs/libXt truetype? ( x11-libs/libXft ) xscreensaver? ( x11-libs/libXScrnSaver ) ) ~dev-lang/tcl-8.5.8 !aqua? ( x11-proto/xproto ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 !aqua? ( x11-libs/libX11 x11-libs/libXt truetype? ( x11-libs/libXft ) xscreensaver? ( x11-libs/libXScrnSaver ) ) ~dev-lang/tcl-8.5.8
 0
 mirror://sourceforge/tcl/tk8.5.8-src.tar.gz
diff --git a/metadata/cache/dev-lang/tk-8.5.9-r1 b/metadata/cache/dev-lang/tk-8.5.9-r1
index 8ed13695f213..6508e8aba2b8 100644
--- a/metadata/cache/dev-lang/tk-8.5.9-r1
+++ b/metadata/cache/dev-lang/tk-8.5.9-r1
@@ -1,4 +1,4 @@
-!aqua? ( x11-libs/libX11 x11-libs/libXt truetype? ( x11-libs/libXft ) xscreensaver? ( x11-libs/libXScrnSaver ) ) ~dev-lang/tcl-8.5.9 !aqua? ( x11-proto/xproto ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+!aqua? ( x11-libs/libX11 x11-libs/libXt truetype? ( x11-libs/libXft ) xscreensaver? ( x11-libs/libXScrnSaver ) ) ~dev-lang/tcl-8.5.9 !aqua? ( x11-proto/xproto ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 !aqua? ( x11-libs/libX11 x11-libs/libXt truetype? ( x11-libs/libXft ) xscreensaver? ( x11-libs/libXScrnSaver ) ) ~dev-lang/tcl-8.5.9
 0
 mirror://sourceforge/tcl/tk8.5.9-src.tar.gz
diff --git a/metadata/cache/dev-lang/vala-0.14.2-r1 b/metadata/cache/dev-lang/vala-0.14.2-r1
index 5acb1136526f..dff75b1cbaf0 100644
--- a/metadata/cache/dev-lang/vala-0.14.2-r1
+++ b/metadata/cache/dev-lang/vala-0.14.2-r1
@@ -1,4 +1,4 @@
->=dev-libs/glib-2.16:2 !dev-lang/vala:0 sys-devel/flex || ( sys-devel/bison dev-util/byacc dev-util/yacc ) dev-util/pkgconfig dev-libs/libxslt test? ( dev-libs/dbus-glib >=dev-libs/glib-2.26:2 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
+>=dev-libs/glib-2.16:2 !dev-lang/vala:0 sys-devel/flex || ( sys-devel/bison dev-util/byacc dev-util/yacc ) dev-util/pkgconfig dev-libs/libxslt test? ( dev-libs/dbus-glib >=dev-libs/glib-2.26:2 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
 >=dev-libs/glib-2.16:2
 0.14
 mirror://gnome/sources/vala/0.14/vala-0.14.2.tar.xz
diff --git a/metadata/cache/dev-lang/xsb-3.3.2 b/metadata/cache/dev-lang/xsb-3.3.2
index e15d05553cf9..381201ba85c5 100644
--- a/metadata/cache/dev-lang/xsb-3.3.2
+++ b/metadata/cache/dev-lang/xsb-3.3.2
@@ -1,4 +1,4 @@
-curl? ( net-misc/curl ) iodbc? ( dev-db/libiodbc ) java? ( >=virtual/jdk-1.4 ) mysql? ( virtual/mysql ) odbc? ( dev-db/unixODBC ) pcre? ( dev-libs/libpcre ) xml? ( dev-libs/libxml2 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool java? ( >=dev-java/java-config-2.1.9-r1 )
+curl? ( net-misc/curl ) iodbc? ( dev-db/libiodbc ) java? ( >=virtual/jdk-1.4 ) mysql? ( virtual/mysql ) odbc? ( dev-db/unixODBC ) pcre? ( dev-libs/libpcre ) xml? ( dev-libs/libxml2 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool java? ( >=dev-java/java-config-2.1.9-r1 )
 curl? ( net-misc/curl ) iodbc? ( dev-db/libiodbc ) java? ( >=virtual/jdk-1.4 ) mysql? ( virtual/mysql ) odbc? ( dev-db/unixODBC ) pcre? ( dev-libs/libpcre ) xml? ( dev-libs/libxml2 ) java? ( >=dev-java/java-config-2.1.9-r1 )
 0
 http://xsb.sourceforge.net/downloads/XSB332.tar.gz mirror://gentoo/xsb-3.3.2-gentoo-patchset-3.tar.gz
diff --git a/metadata/cache/dev-lang/xsb-3.3.3 b/metadata/cache/dev-lang/xsb-3.3.3
index 6c043c8f2627..effebba9055a 100644
--- a/metadata/cache/dev-lang/xsb-3.3.3
+++ b/metadata/cache/dev-lang/xsb-3.3.3
@@ -1,4 +1,4 @@
-curl? ( net-misc/curl ) iodbc? ( dev-db/libiodbc ) java? ( >=virtual/jdk-1.4 ) mysql? ( virtual/mysql ) odbc? ( dev-db/unixODBC ) pcre? ( dev-libs/libpcre ) xml? ( dev-libs/libxml2 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool java? ( >=dev-java/java-config-2.1.9-r1 )
+curl? ( net-misc/curl ) iodbc? ( dev-db/libiodbc ) java? ( >=virtual/jdk-1.4 ) mysql? ( virtual/mysql ) odbc? ( dev-db/unixODBC ) pcre? ( dev-libs/libpcre ) xml? ( dev-libs/libxml2 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool java? ( >=dev-java/java-config-2.1.9-r1 )
 curl? ( net-misc/curl ) iodbc? ( dev-db/libiodbc ) java? ( >=virtual/jdk-1.4 ) mysql? ( virtual/mysql ) odbc? ( dev-db/unixODBC ) pcre? ( dev-libs/libpcre ) xml? ( dev-libs/libxml2 ) java? ( >=dev-java/java-config-2.1.9-r1 )
 0
 http://xsb.sourceforge.net/downloads/XSB333.tar.gz mirror://gentoo/xsb-3.3.3-gentoo-patchset-0.tar.gz
diff --git a/metadata/cache/dev-lang/xsb-3.3.5 b/metadata/cache/dev-lang/xsb-3.3.5
index 9c518c6239cd..e86699794f6e 100644
--- a/metadata/cache/dev-lang/xsb-3.3.5
+++ b/metadata/cache/dev-lang/xsb-3.3.5
@@ -1,4 +1,4 @@
-curl? ( net-misc/curl ) iodbc? ( dev-db/libiodbc ) java? ( >=virtual/jdk-1.4 ) mysql? ( virtual/mysql ) odbc? ( dev-db/unixODBC ) pcre? ( dev-libs/libpcre ) xml? ( dev-libs/libxml2 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool java? ( >=dev-java/java-config-2.1.9-r1 )
+curl? ( net-misc/curl ) iodbc? ( dev-db/libiodbc ) java? ( >=virtual/jdk-1.4 ) mysql? ( virtual/mysql ) odbc? ( dev-db/unixODBC ) pcre? ( dev-libs/libpcre ) xml? ( dev-libs/libxml2 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool java? ( >=dev-java/java-config-2.1.9-r1 )
 curl? ( net-misc/curl ) iodbc? ( dev-db/libiodbc ) java? ( >=virtual/jdk-1.4 ) mysql? ( virtual/mysql ) odbc? ( dev-db/unixODBC ) pcre? ( dev-libs/libpcre ) xml? ( dev-libs/libxml2 ) java? ( >=dev-java/java-config-2.1.9-r1 )
 0
 http://xsb.sourceforge.net/downloads/XSB335.tar.gz mirror://gentoo/xsb-3.3.5-gentoo-patchset-0.tar.gz
diff --git a/metadata/cache/dev-libs/OpenSRF-1.0.7 b/metadata/cache/dev-libs/OpenSRF-1.0.7
index c1b07facba69..2757bdafebe0 100644
--- a/metadata/cache/dev-libs/OpenSRF-1.0.7
+++ b/metadata/cache/dev-libs/OpenSRF-1.0.7
@@ -1,4 +1,4 @@
->=www-servers/apache-2.2.9 >=dev-db/libdbi-drivers-0.8.2 >=dev-db/libdbi-0.8.2 net-im/ejabberd dev-libs/libmemcache dev-perl/Cache-Memcached dev-perl/Class-DBI-AbstractSearch sqlite? ( dev-perl/DBD-SQLite ) postgres? ( dev-perl/DBD-Pg ) virtual/perl-Digest-MD5 dev-perl/JSON-XS dev-perl/net-server dev-perl/UNIVERSAL-require dev-perl/Unix-Syslog dev-perl/XML-LibXML =www-servers/apache-2.2* || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-lang/perl[-build]
+>=www-servers/apache-2.2.9 >=dev-db/libdbi-drivers-0.8.2 >=dev-db/libdbi-0.8.2 net-im/ejabberd dev-libs/libmemcache dev-perl/Cache-Memcached dev-perl/Class-DBI-AbstractSearch sqlite? ( dev-perl/DBD-SQLite ) postgres? ( dev-perl/DBD-Pg ) virtual/perl-Digest-MD5 dev-perl/JSON-XS dev-perl/net-server dev-perl/UNIVERSAL-require dev-perl/Unix-Syslog dev-perl/XML-LibXML =www-servers/apache-2.2* || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-lang/perl[-build]
 >=www-servers/apache-2.2.9 >=dev-db/libdbi-drivers-0.8.2 >=dev-db/libdbi-0.8.2 net-im/ejabberd dev-libs/libmemcache dev-perl/Cache-Memcached dev-perl/Class-DBI-AbstractSearch sqlite? ( dev-perl/DBD-SQLite ) postgres? ( dev-perl/DBD-Pg ) virtual/perl-Digest-MD5 dev-perl/JSON-XS dev-perl/net-server dev-perl/UNIVERSAL-require dev-perl/Unix-Syslog dev-perl/XML-LibXML =www-servers/apache-2.2* dev-lang/perl[-build]
 0
 http://open-ils.org/downloads/OpenSRF-1.0.7.tar.gz
diff --git a/metadata/cache/dev-libs/antlr-c-3.3_pre20110403 b/metadata/cache/dev-libs/antlr-c-3.3_pre20110403
index 1e3d6a1fc78b..b7cfd03d2ba7 100644
--- a/metadata/cache/dev-libs/antlr-c-3.3_pre20110403
+++ b/metadata/cache/dev-libs/antlr-c-3.3_pre20110403
@@ -1,4 +1,4 @@
-doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 http://www.antlr.org/download/C/libantlr3c-3.3-SNAPSHOT.tar.gz -> libantlr3c-3.3_pre20110403.tar.gz
diff --git a/metadata/cache/dev-libs/apr-1.4.5 b/metadata/cache/dev-libs/apr-1.4.5
index 5d48b4dbcb79..d9f340d67779 100644
--- a/metadata/cache/dev-libs/apr-1.4.5
+++ b/metadata/cache/dev-libs/apr-1.4.5
@@ -1,4 +1,4 @@
-uuid? ( !elibc_FreeBSD? ( >=sys-apps/util-linux-2.16 ) ) doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+uuid? ( !elibc_FreeBSD? ( >=sys-apps/util-linux-2.16 ) ) doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 uuid? ( !elibc_FreeBSD? ( >=sys-apps/util-linux-2.16 ) )
 1
 mirror://apache/apr/apr-1.4.5.tar.bz2
diff --git a/metadata/cache/dev-libs/apr-1.4.6 b/metadata/cache/dev-libs/apr-1.4.6
index 54581bce7e2a..2b514b9458ba 100644
--- a/metadata/cache/dev-libs/apr-1.4.6
+++ b/metadata/cache/dev-libs/apr-1.4.6
@@ -1,4 +1,4 @@
-uuid? ( !elibc_FreeBSD? ( >=sys-apps/util-linux-2.16 ) ) doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+uuid? ( !elibc_FreeBSD? ( >=sys-apps/util-linux-2.16 ) ) doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 uuid? ( !elibc_FreeBSD? ( >=sys-apps/util-linux-2.16 ) )
 1
 mirror://apache/apr/apr-1.4.6.tar.bz2
diff --git a/metadata/cache/dev-libs/apr-util-1.3.12 b/metadata/cache/dev-libs/apr-util-1.3.12
index 611d51be0ac0..ebeac141795e 100644
--- a/metadata/cache/dev-libs/apr-util-1.3.12
+++ b/metadata/cache/dev-libs/apr-util-1.3.12
@@ -1,4 +1,4 @@
-dev-libs/expat >=dev-libs/apr-1.4.5:1 berkdb? ( >=sys-libs/db-4 ) freetds? ( dev-db/freetds ) gdbm? ( sys-libs/gdbm ) ldap? ( =net-nds/openldap-2* ) mysql? ( =virtual/mysql-5* ) odbc? ( dev-db/unixODBC ) postgres? ( dev-db/postgresql-base ) sqlite? ( dev-db/sqlite:3 ) doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-libs/expat >=dev-libs/apr-1.4.5:1 berkdb? ( >=sys-libs/db-4 ) freetds? ( dev-db/freetds ) gdbm? ( sys-libs/gdbm ) ldap? ( =net-nds/openldap-2* ) mysql? ( =virtual/mysql-5* ) odbc? ( dev-db/unixODBC ) postgres? ( dev-db/postgresql-base ) sqlite? ( dev-db/sqlite:3 ) doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-libs/expat >=dev-libs/apr-1.4.5:1 berkdb? ( >=sys-libs/db-4 ) freetds? ( dev-db/freetds ) gdbm? ( sys-libs/gdbm ) ldap? ( =net-nds/openldap-2* ) mysql? ( =virtual/mysql-5* ) odbc? ( dev-db/unixODBC ) postgres? ( dev-db/postgresql-base ) sqlite? ( dev-db/sqlite:3 )
 1
 mirror://apache/apr/apr-util-1.3.12.tar.bz2
diff --git a/metadata/cache/dev-libs/apr-util-1.4.1 b/metadata/cache/dev-libs/apr-util-1.4.1
index 1dde32cca94f..71c4a6bcf1a2 100644
--- a/metadata/cache/dev-libs/apr-util-1.4.1
+++ b/metadata/cache/dev-libs/apr-util-1.4.1
@@ -1,4 +1,4 @@
-dev-libs/expat >=dev-libs/apr-1.4.5:1 berkdb? ( >=sys-libs/db-4 ) freetds? ( dev-db/freetds ) gdbm? ( sys-libs/gdbm ) ldap? ( =net-nds/openldap-2* ) mysql? ( =virtual/mysql-5* ) nss? ( dev-libs/nss ) odbc? ( dev-db/unixODBC ) openssl? ( dev-libs/openssl ) postgres? ( dev-db/postgresql-base ) sqlite? ( dev-db/sqlite:3 ) doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-libs/expat >=dev-libs/apr-1.4.5:1 berkdb? ( >=sys-libs/db-4 ) freetds? ( dev-db/freetds ) gdbm? ( sys-libs/gdbm ) ldap? ( =net-nds/openldap-2* ) mysql? ( =virtual/mysql-5* ) nss? ( dev-libs/nss ) odbc? ( dev-db/unixODBC ) openssl? ( dev-libs/openssl ) postgres? ( dev-db/postgresql-base ) sqlite? ( dev-db/sqlite:3 ) doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-libs/expat >=dev-libs/apr-1.4.5:1 berkdb? ( >=sys-libs/db-4 ) freetds? ( dev-db/freetds ) gdbm? ( sys-libs/gdbm ) ldap? ( =net-nds/openldap-2* ) mysql? ( =virtual/mysql-5* ) nss? ( dev-libs/nss ) odbc? ( dev-db/unixODBC ) openssl? ( dev-libs/openssl ) postgres? ( dev-db/postgresql-base ) sqlite? ( dev-db/sqlite:3 )
 1
 mirror://apache/apr/apr-util-1.4.1.tar.bz2
diff --git a/metadata/cache/dev-libs/beecrypt-4.2.1 b/metadata/cache/dev-libs/beecrypt-4.2.1
index eed5894d7278..d1917dc5e038 100644
--- a/metadata/cache/dev-libs/beecrypt-4.2.1
+++ b/metadata/cache/dev-libs/beecrypt-4.2.1
@@ -1,4 +1,4 @@
-!<app-arch/rpm-4.2.1 cxx? ( >=dev-libs/icu-2.8 ) java? ( >=virtual/jdk-1.4 ) doc? ( app-doc/doxygen virtual/latex-base dev-texlive/texlive-fontsextra ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool java? ( >=dev-java/java-config-2.1.9-r1 ) python? ( =dev-lang/python-2* )
+!<app-arch/rpm-4.2.1 cxx? ( >=dev-libs/icu-2.8 ) java? ( >=virtual/jdk-1.4 ) doc? ( app-doc/doxygen virtual/latex-base dev-texlive/texlive-fontsextra ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool java? ( >=dev-java/java-config-2.1.9-r1 ) python? ( =dev-lang/python-2* )
 !<app-arch/rpm-4.2.1 cxx? ( >=dev-libs/icu-2.8 ) java? ( >=virtual/jre-1.4 ) java? ( >=dev-java/java-config-2.1.9-r1 ) python? ( =dev-lang/python-2* )
 0
 mirror://sourceforge/beecrypt/beecrypt-4.2.1.tar.gz
diff --git a/metadata/cache/dev-libs/cgilib-0.7 b/metadata/cache/dev-libs/cgilib-0.7
index 1c8a35985276..0cc0a62f2ce9 100644
--- a/metadata/cache/dev-libs/cgilib-0.7
+++ b/metadata/cache/dev-libs/cgilib-0.7
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 http://www.infodrom.org/projects/cgilib/download/cgilib-0.7.tar.gz
diff --git a/metadata/cache/dev-libs/check-0.9.8 b/metadata/cache/dev-libs/check-0.9.8
index eecd276620e5..5c1066be2285 100644
--- a/metadata/cache/dev-libs/check-0.9.8
+++ b/metadata/cache/dev-libs/check-0.9.8
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 mirror://sourceforge/check/check-0.9.8.tar.gz
diff --git a/metadata/cache/dev-libs/check-0.9.8-r1 b/metadata/cache/dev-libs/check-0.9.8-r1
index c73097396dd5..2a0e2c69800f 100644
--- a/metadata/cache/dev-libs/check-0.9.8-r1
+++ b/metadata/cache/dev-libs/check-0.9.8-r1
@@ -1,4 +1,4 @@
-subunit? ( dev-python/subunit ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+subunit? ( dev-python/subunit ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 subunit? ( dev-python/subunit )
 0
 mirror://sourceforge/check/check-0.9.8.tar.gz
diff --git a/metadata/cache/dev-libs/clearsilver-0.10.5-r1 b/metadata/cache/dev-libs/clearsilver-0.10.5-r1
index 2d55eeb9026d..e0ad321d263f 100644
--- a/metadata/cache/dev-libs/clearsilver-0.10.5-r1
+++ b/metadata/cache/dev-libs/clearsilver-0.10.5-r1
@@ -1,4 +1,4 @@
-perl? ( dev-lang/perl ) zlib? ( sys-libs/zlib ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( =dev-lang/python-2* )
+perl? ( dev-lang/perl ) zlib? ( sys-libs/zlib ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( =dev-lang/python-2* )
 perl? ( dev-lang/perl ) zlib? ( sys-libs/zlib ) python? ( =dev-lang/python-2* )
 0
 http://www.clearsilver.net/downloads/clearsilver-0.10.5.tar.gz
diff --git a/metadata/cache/dev-libs/cloog-ppl-0.15.10 b/metadata/cache/dev-libs/cloog-ppl-0.15.10
index 8304cbf5e1d5..425e7e54c3d4 100644
--- a/metadata/cache/dev-libs/cloog-ppl-0.15.10
+++ b/metadata/cache/dev-libs/cloog-ppl-0.15.10
@@ -1,4 +1,4 @@
-dev-libs/ppl dev-libs/gmp || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-libs/ppl dev-libs/gmp || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-libs/ppl dev-libs/gmp
 0
 ftp://gcc.gnu.org/pub/gcc/infrastructure/cloog-ppl-0.15.10.tar.gz
diff --git a/metadata/cache/dev-libs/cyberjack-3.3.5-r2 b/metadata/cache/dev-libs/cyberjack-3.3.5-r2
index 11df6fa18569..4913ff5a7c6b 100644
--- a/metadata/cache/dev-libs/cyberjack-3.3.5-r2
+++ b/metadata/cache/dev-libs/cyberjack-3.3.5-r2
@@ -1,4 +1,4 @@
-virtual/libusb:1 fox? ( >=x11-libs/fox-1.6 ) pcsc-lite? ( sys-apps/pcsc-lite ) pcsc-lite? ( dev-util/pkgconfig ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+virtual/libusb:1 fox? ( >=x11-libs/fox-1.6 ) pcsc-lite? ( sys-apps/pcsc-lite ) pcsc-lite? ( dev-util/pkgconfig ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 virtual/libusb:1 fox? ( >=x11-libs/fox-1.6 ) pcsc-lite? ( sys-apps/pcsc-lite )
 0
 http://support.reiner-sct.de/downloads/LINUX/V3.3.5/ctapi-cyberjack-3.3.5.tar.gz
diff --git a/metadata/cache/dev-libs/cyrus-sasl-2.1.23-r6 b/metadata/cache/dev-libs/cyrus-sasl-2.1.23-r6
index b9d3f022e6a8..3752140d2b42 100644
--- a/metadata/cache/dev-libs/cyrus-sasl-2.1.23-r6
+++ b/metadata/cache/dev-libs/cyrus-sasl-2.1.23-r6
@@ -1,4 +1,4 @@
-authdaemond? ( || ( >=net-mail/courier-imap-3.0.7 >=mail-mta/courier-0.46 ) ) berkdb? ( >=sys-libs/db-3.2 ) gdbm? ( >=sys-libs/gdbm-1.8.0 ) kerberos? ( virtual/krb5 ) openldap? ( >=net-nds/openldap-2.0.25 ) mysql? ( virtual/mysql ) ntlm_unsupported_patch? ( >=net-fs/samba-3.0.9 ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql-base ) ssl? ( >=dev-libs/openssl-0.9.6d ) java? ( >=virtual/jdk-1.4 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool java? ( >=dev-java/java-config-2.1.9-r1 )
+authdaemond? ( || ( >=net-mail/courier-imap-3.0.7 >=mail-mta/courier-0.46 ) ) berkdb? ( >=sys-libs/db-3.2 ) gdbm? ( >=sys-libs/gdbm-1.8.0 ) kerberos? ( virtual/krb5 ) openldap? ( >=net-nds/openldap-2.0.25 ) mysql? ( virtual/mysql ) ntlm_unsupported_patch? ( >=net-fs/samba-3.0.9 ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql-base ) ssl? ( >=dev-libs/openssl-0.9.6d ) java? ( >=virtual/jdk-1.4 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool java? ( >=dev-java/java-config-2.1.9-r1 )
 authdaemond? ( || ( >=net-mail/courier-imap-3.0.7 >=mail-mta/courier-0.46 ) ) berkdb? ( >=sys-libs/db-3.2 ) gdbm? ( >=sys-libs/gdbm-1.8.0 ) kerberos? ( virtual/krb5 ) openldap? ( >=net-nds/openldap-2.0.25 ) mysql? ( virtual/mysql ) ntlm_unsupported_patch? ( >=net-fs/samba-3.0.9 ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql-base ) ssl? ( >=dev-libs/openssl-0.9.6d ) java? ( >=virtual/jdk-1.4 ) java? ( >=dev-java/java-config-2.1.9-r1 )
 2
 ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-sasl-2.1.23.tar.gz ntlm_unsupported_patch? ( mirror://gentoo/cyrus-sasl-2.1.23-ntlm_impl-spnego.patch.gz )
diff --git a/metadata/cache/dev-libs/cyrus-sasl-2.1.25 b/metadata/cache/dev-libs/cyrus-sasl-2.1.25
index 905ec53d0b1b..cf1b1dac90a7 100644
--- a/metadata/cache/dev-libs/cyrus-sasl-2.1.25
+++ b/metadata/cache/dev-libs/cyrus-sasl-2.1.25
@@ -1,4 +1,4 @@
-authdaemond? ( || ( net-mail/courier-imap mail-mta/courier ) ) berkdb? ( >=sys-libs/db-3.2 ) gdbm? ( >=sys-libs/gdbm-1.8.0 ) kerberos? ( virtual/krb5 ) openldap? ( net-nds/openldap ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql-base ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/openssl ) java? ( >=virtual/jdk-1.4 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool java? ( >=dev-java/java-config-2.1.9-r1 )
+authdaemond? ( || ( net-mail/courier-imap mail-mta/courier ) ) berkdb? ( >=sys-libs/db-3.2 ) gdbm? ( >=sys-libs/gdbm-1.8.0 ) kerberos? ( virtual/krb5 ) openldap? ( net-nds/openldap ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql-base ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/openssl ) java? ( >=virtual/jdk-1.4 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool java? ( >=dev-java/java-config-2.1.9-r1 )
 authdaemond? ( || ( net-mail/courier-imap mail-mta/courier ) ) berkdb? ( >=sys-libs/db-3.2 ) gdbm? ( >=sys-libs/gdbm-1.8.0 ) kerberos? ( virtual/krb5 ) openldap? ( net-nds/openldap ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql-base ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/openssl ) java? ( >=virtual/jdk-1.4 ) java? ( >=dev-java/java-config-2.1.9-r1 )
 2
 ftp://ftp.cyrusimap.org/cyrus-sasl/cyrus-sasl-2.1.25.tar.gz
diff --git a/metadata/cache/dev-libs/cyrus-sasl-2.1.25-r1 b/metadata/cache/dev-libs/cyrus-sasl-2.1.25-r1
index 905ec53d0b1b..cf1b1dac90a7 100644
--- a/metadata/cache/dev-libs/cyrus-sasl-2.1.25-r1
+++ b/metadata/cache/dev-libs/cyrus-sasl-2.1.25-r1
@@ -1,4 +1,4 @@
-authdaemond? ( || ( net-mail/courier-imap mail-mta/courier ) ) berkdb? ( >=sys-libs/db-3.2 ) gdbm? ( >=sys-libs/gdbm-1.8.0 ) kerberos? ( virtual/krb5 ) openldap? ( net-nds/openldap ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql-base ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/openssl ) java? ( >=virtual/jdk-1.4 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool java? ( >=dev-java/java-config-2.1.9-r1 )
+authdaemond? ( || ( net-mail/courier-imap mail-mta/courier ) ) berkdb? ( >=sys-libs/db-3.2 ) gdbm? ( >=sys-libs/gdbm-1.8.0 ) kerberos? ( virtual/krb5 ) openldap? ( net-nds/openldap ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql-base ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/openssl ) java? ( >=virtual/jdk-1.4 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool java? ( >=dev-java/java-config-2.1.9-r1 )
 authdaemond? ( || ( net-mail/courier-imap mail-mta/courier ) ) berkdb? ( >=sys-libs/db-3.2 ) gdbm? ( >=sys-libs/gdbm-1.8.0 ) kerberos? ( virtual/krb5 ) openldap? ( net-nds/openldap ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql-base ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/openssl ) java? ( >=virtual/jdk-1.4 ) java? ( >=dev-java/java-config-2.1.9-r1 )
 2
 ftp://ftp.cyrusimap.org/cyrus-sasl/cyrus-sasl-2.1.25.tar.gz
diff --git a/metadata/cache/dev-libs/cyrus-sasl-2.1.25-r2 b/metadata/cache/dev-libs/cyrus-sasl-2.1.25-r2
index 905ec53d0b1b..cf1b1dac90a7 100644
--- a/metadata/cache/dev-libs/cyrus-sasl-2.1.25-r2
+++ b/metadata/cache/dev-libs/cyrus-sasl-2.1.25-r2
@@ -1,4 +1,4 @@
-authdaemond? ( || ( net-mail/courier-imap mail-mta/courier ) ) berkdb? ( >=sys-libs/db-3.2 ) gdbm? ( >=sys-libs/gdbm-1.8.0 ) kerberos? ( virtual/krb5 ) openldap? ( net-nds/openldap ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql-base ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/openssl ) java? ( >=virtual/jdk-1.4 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool java? ( >=dev-java/java-config-2.1.9-r1 )
+authdaemond? ( || ( net-mail/courier-imap mail-mta/courier ) ) berkdb? ( >=sys-libs/db-3.2 ) gdbm? ( >=sys-libs/gdbm-1.8.0 ) kerberos? ( virtual/krb5 ) openldap? ( net-nds/openldap ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql-base ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/openssl ) java? ( >=virtual/jdk-1.4 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool java? ( >=dev-java/java-config-2.1.9-r1 )
 authdaemond? ( || ( net-mail/courier-imap mail-mta/courier ) ) berkdb? ( >=sys-libs/db-3.2 ) gdbm? ( >=sys-libs/gdbm-1.8.0 ) kerberos? ( virtual/krb5 ) openldap? ( net-nds/openldap ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql-base ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/openssl ) java? ( >=virtual/jdk-1.4 ) java? ( >=dev-java/java-config-2.1.9-r1 )
 2
 ftp://ftp.cyrusimap.org/cyrus-sasl/cyrus-sasl-2.1.25.tar.gz
diff --git a/metadata/cache/dev-libs/dbus-c++-0.6.0_p20111126 b/metadata/cache/dev-libs/dbus-c++-0.6.0_p20111126
index e87ca60e1a7e..048a2f11d7ac 100644
--- a/metadata/cache/dev-libs/dbus-c++-0.6.0_p20111126
+++ b/metadata/cache/dev-libs/dbus-c++-0.6.0_p20111126
@@ -1,4 +1,4 @@
-sys-apps/dbus dev-util/cppunit dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+sys-apps/dbus dev-util/cppunit dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 sys-apps/dbus
 0
 http://www.elvanor.net/files/gentoo/dbus-c++-0.6.0_p20111126.tar.bz2
diff --git a/metadata/cache/dev-libs/dbus-c++-0.9.0 b/metadata/cache/dev-libs/dbus-c++-0.9.0
index b442fbfb2f83..a03208f14cee 100644
--- a/metadata/cache/dev-libs/dbus-c++-0.9.0
+++ b/metadata/cache/dev-libs/dbus-c++-0.9.0
@@ -1,4 +1,4 @@
-sys-apps/dbus ecore? ( dev-libs/ecore ) dev-util/cppunit dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+sys-apps/dbus ecore? ( dev-libs/ecore ) dev-util/cppunit dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 sys-apps/dbus ecore? ( dev-libs/ecore )
 0
 http://sourceforge.net/projects/dbus-cplusplus/files/dbus-c++/0.9.0/libdbus-c++-0.9.0.tar.gz
diff --git a/metadata/cache/dev-libs/dbxml-2.5.16-r1 b/metadata/cache/dev-libs/dbxml-2.5.16-r1
index ba2b30df3445..b3ca423305ab 100644
--- a/metadata/cache/dev-libs/dbxml-2.5.16-r1
+++ b/metadata/cache/dev-libs/dbxml-2.5.16-r1
@@ -1,4 +1,4 @@
-sys-libs/db:4.8[cxx,java?] >=dev-libs/xerces-c-3 >=dev-libs/xqilla-2.1.2 sys-libs/zlib perl? ( dev-lang/perl ) python? ( >=dev-python/bsddb3-4.8.0 ) tcl? ( dev-lang/tcl ) java? ( >=virtual/jre-1.5 ) sys-devel/libtool java? ( >=virtual/jdk-1.5 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( =dev-lang/python-2* ) dev-lang/perl[-build] java? ( >=dev-java/java-config-2.1.9-r1 )
+sys-libs/db:4.8[cxx,java?] >=dev-libs/xerces-c-3 >=dev-libs/xqilla-2.1.2 sys-libs/zlib perl? ( dev-lang/perl ) python? ( >=dev-python/bsddb3-4.8.0 ) tcl? ( dev-lang/tcl ) java? ( >=virtual/jre-1.5 ) sys-devel/libtool java? ( >=virtual/jdk-1.5 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( =dev-lang/python-2* ) dev-lang/perl[-build] java? ( >=dev-java/java-config-2.1.9-r1 )
 sys-libs/db:4.8[cxx,java?] >=dev-libs/xerces-c-3 >=dev-libs/xqilla-2.1.2 sys-libs/zlib perl? ( dev-lang/perl ) python? ( >=dev-python/bsddb3-4.8.0 ) tcl? ( dev-lang/tcl ) java? ( >=virtual/jre-1.5 ) python? ( =dev-lang/python-2* ) dev-lang/perl[-build] java? ( >=dev-java/java-config-2.1.9-r1 )
 0
 http://download-east.oracle.com/berkeley-db/dbxml-2.5.16.tar.gz http://download-west.oracle.com/berkeley-db/dbxml-2.5.16.tar.gz http://download-uk.oracle.com/berkeley-db/dbxml-2.5.16.tar.gz
diff --git a/metadata/cache/dev-libs/dbxml-2.5.16-r2 b/metadata/cache/dev-libs/dbxml-2.5.16-r2
index b4a2144786f5..28fb838245dd 100644
--- a/metadata/cache/dev-libs/dbxml-2.5.16-r2
+++ b/metadata/cache/dev-libs/dbxml-2.5.16-r2
@@ -1,4 +1,4 @@
-|| ( sys-libs/db:4.8[cxx,java?] sys-libs/db:4.8[-nocxx,java?] ) >=dev-libs/xerces-c-3 >=dev-libs/xqilla-2.1.2 sys-libs/zlib perl? ( dev-lang/perl ) python? ( >=dev-python/bsddb3-4.8.0 ) tcl? ( dev-lang/tcl ) java? ( >=virtual/jre-1.5 ) sys-devel/libtool java? ( >=virtual/jdk-1.5 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( =dev-lang/python-2* ) dev-lang/perl[-build] java? ( >=dev-java/java-config-2.1.9-r1 )
+|| ( sys-libs/db:4.8[cxx,java?] sys-libs/db:4.8[-nocxx,java?] ) >=dev-libs/xerces-c-3 >=dev-libs/xqilla-2.1.2 sys-libs/zlib perl? ( dev-lang/perl ) python? ( >=dev-python/bsddb3-4.8.0 ) tcl? ( dev-lang/tcl ) java? ( >=virtual/jre-1.5 ) sys-devel/libtool java? ( >=virtual/jdk-1.5 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( =dev-lang/python-2* ) dev-lang/perl[-build] java? ( >=dev-java/java-config-2.1.9-r1 )
 || ( sys-libs/db:4.8[cxx,java?] sys-libs/db:4.8[-nocxx,java?] ) >=dev-libs/xerces-c-3 >=dev-libs/xqilla-2.1.2 sys-libs/zlib perl? ( dev-lang/perl ) python? ( >=dev-python/bsddb3-4.8.0 ) tcl? ( dev-lang/tcl ) java? ( >=virtual/jre-1.5 ) python? ( =dev-lang/python-2* ) dev-lang/perl[-build] java? ( >=dev-java/java-config-2.1.9-r1 )
 0
 http://download-east.oracle.com/berkeley-db/dbxml-2.5.16.tar.gz http://download-west.oracle.com/berkeley-db/dbxml-2.5.16.tar.gz http://download-uk.oracle.com/berkeley-db/dbxml-2.5.16.tar.gz
diff --git a/metadata/cache/dev-libs/distorm64-3.1 b/metadata/cache/dev-libs/distorm64-3.1
index ca1d0115add8..bc94cbd3ce52 100644
--- a/metadata/cache/dev-libs/distorm64-3.1
+++ b/metadata/cache/dev-libs/distorm64-3.1
@@ -1,4 +1,4 @@
-=dev-lang/python-2*
+app-arch/unzip =dev-lang/python-2*
 =dev-lang/python-2*
 0
 http://distorm.googlecode.com/files/distorm3-1.0.zip
diff --git a/metadata/cache/dev-libs/dmalloc-5.5.2-r3 b/metadata/cache/dev-libs/dmalloc-5.5.2-r3
index 9c4d1e9c9737..7dd74922f0ef 100644
--- a/metadata/cache/dev-libs/dmalloc-5.5.2-r3
+++ b/metadata/cache/dev-libs/dmalloc-5.5.2-r3
@@ -1,4 +1,4 @@
-sys-apps/texinfo || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+sys-apps/texinfo || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 http://dmalloc.com/releases/dmalloc-5.5.2.tgz
diff --git a/metadata/cache/dev-libs/dmalloc-5.5.2-r4 b/metadata/cache/dev-libs/dmalloc-5.5.2-r4
index b992d06f224c..1fa813be06d4 100644
--- a/metadata/cache/dev-libs/dmalloc-5.5.2-r4
+++ b/metadata/cache/dev-libs/dmalloc-5.5.2-r4
@@ -1,4 +1,4 @@
-sys-apps/texinfo || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+sys-apps/texinfo || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 http://dmalloc.com/releases/dmalloc-5.5.2.tgz
diff --git a/metadata/cache/dev-libs/dvutil-1.0.10-r2 b/metadata/cache/dev-libs/dvutil-1.0.10-r2
index 0744c84a0ecd..2db1b3b8a97c 100644
--- a/metadata/cache/dev-libs/dvutil-1.0.10-r2
+++ b/metadata/cache/dev-libs/dvutil-1.0.10-r2
@@ -1,4 +1,4 @@
-ssl? ( dev-libs/openssl:0 ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+ssl? ( dev-libs/openssl:0 ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 ssl? ( dev-libs/openssl:0 )
 0
 http://tinf2.vub.ac.be/~dvermeir/software/dv/dvutil/download/dvutil-1.0.10.tar.gz mirror://gentoo/dvutil-1.0.10-asneeded.patch.bz2
diff --git a/metadata/cache/dev-libs/expat-2.1.0_beta3 b/metadata/cache/dev-libs/expat-2.1.0_beta3
index 6454f263bf39..6c3e946fb103 100644
--- a/metadata/cache/dev-libs/expat-2.1.0_beta3
+++ b/metadata/cache/dev-libs/expat-2.1.0_beta3
@@ -6,7 +6,7 @@ mirror://sourceforge/expat/expat-2.1.0-beta3.tar.gz
 http://expat.sourceforge.net/
 MIT
 XML parsing libraries
-~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd
+~alpha ~amd64 ~arm hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd
 eutils libtool multilib toolchain-funcs user
 elibc_FreeBSD examples static-libs unicode
 
diff --git a/metadata/cache/dev-libs/fcgi-2.4.1_pre0910052249 b/metadata/cache/dev-libs/fcgi-2.4.1_pre0910052249
index 398cc214eee2..f0be0e45b6cd 100644
--- a/metadata/cache/dev-libs/fcgi-2.4.1_pre0910052249
+++ b/metadata/cache/dev-libs/fcgi-2.4.1_pre0910052249
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 http://www.fastcgi.com/dist/fcgi-2.4.1-SNAP-0910052249.tar.gz
diff --git a/metadata/cache/dev-libs/fribidi-0.19.2-r1 b/metadata/cache/dev-libs/fribidi-0.19.2-r1
index 4dba3ad22abb..563e7bb3bc07 100644
--- a/metadata/cache/dev-libs/fribidi-0.19.2-r1
+++ b/metadata/cache/dev-libs/fribidi-0.19.2-r1
@@ -1,4 +1,4 @@
->=dev-libs/glib-2.4:2 dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-libs/glib-2.4:2 dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=dev-libs/glib-2.4:2
 0
 http://fribidi.org/download/fribidi-0.19.2.tar.gz
diff --git a/metadata/cache/dev-libs/gdome2-0.8.1-r3 b/metadata/cache/dev-libs/gdome2-0.8.1-r3
index dcb17cf506d2..92e99db12562 100644
--- a/metadata/cache/dev-libs/gdome2-0.8.1-r3
+++ b/metadata/cache/dev-libs/gdome2-0.8.1-r3
@@ -1,4 +1,4 @@
->=dev-libs/glib-2.2.0 >=dev-libs/libxml2-2.4.26 dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
+>=dev-libs/glib-2.2.0 >=dev-libs/libxml2-2.4.26 dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
 >=dev-libs/glib-2.2.0 >=dev-libs/libxml2-2.4.26
 0
 http://gdome2.cs.unibo.it/tarball/gdome2-0.8.1.tar.gz
diff --git a/metadata/cache/dev-libs/geoip-1.4.8 b/metadata/cache/dev-libs/geoip-1.4.8
index 6857d3ea941e..21956cfe01a3 100644
--- a/metadata/cache/dev-libs/geoip-1.4.8
+++ b/metadata/cache/dev-libs/geoip-1.4.8
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 perl-geoipupdate? ( dev-perl/PerlIO-gzip dev-perl/libwww-perl )
 0
 http://www.maxmind.com/download/geoip/api/c/GeoIP-1.4.8.tar.gz ipv6? ( http://geolite.maxmind.com/download/geoip/database/GeoIPv6.dat.gz )
diff --git a/metadata/cache/dev-libs/gjs-0.7.14 b/metadata/cache/dev-libs/gjs-0.7.14
index 481a4e72c66f..a8d03c352f58 100644
--- a/metadata/cache/dev-libs/gjs-0.7.14
+++ b/metadata/cache/dev-libs/gjs-0.7.14
@@ -1,4 +1,4 @@
->=dev-libs/glib-2.18:2 >=dev-libs/gobject-introspection-0.10.1 >=net-libs/xulrunner-2.0:1.9 dev-libs/dbus-glib sys-libs/readline x11-libs/cairo sys-devel/gettext >=dev-util/pkgconfig-0.9 !dev-lang/spidermonkey || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 =dev-lang/python-2* test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+>=dev-libs/glib-2.18:2 >=dev-libs/gobject-introspection-0.10.1 >=net-libs/xulrunner-2.0:1.9 dev-libs/dbus-glib sys-libs/readline x11-libs/cairo sys-devel/gettext >=dev-util/pkgconfig-0.9 !dev-lang/spidermonkey || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 =dev-lang/python-2* test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 >=dev-libs/glib-2.18:2 >=dev-libs/gobject-introspection-0.10.1 >=net-libs/xulrunner-2.0:1.9 dev-libs/dbus-glib sys-libs/readline x11-libs/cairo =dev-lang/python-2*
 0
 mirror://gnome/sources/gjs/0.7/gjs-0.7.14.tar.bz2
diff --git a/metadata/cache/dev-libs/glib-2.28.8 b/metadata/cache/dev-libs/glib-2.28.8
index 885110408153..6a19b54b54b3 100644
--- a/metadata/cache/dev-libs/glib-2.28.8
+++ b/metadata/cache/dev-libs/glib-2.28.8
@@ -1,4 +1,4 @@
-virtual/libiconv sys-libs/zlib xattr? ( sys-apps/attr ) fam? ( virtual/fam ) >=sys-devel/gettext-0.11 >=dev-util/gtk-doc-am-1.13 doc? ( >=dev-libs/libxslt-1.0 >=dev-util/gtk-doc-1.13 ~app-text/docbook-xml-dtd-4.1.2 ) test? ( >=sys-apps/dbus-1.2.14 ) !<dev-util/gtk-doc-1.15-r2 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils =dev-lang/python-2* test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+virtual/libiconv sys-libs/zlib xattr? ( sys-apps/attr ) fam? ( virtual/fam ) >=sys-devel/gettext-0.11 >=dev-util/gtk-doc-am-1.13 doc? ( >=dev-libs/libxslt-1.0 >=dev-util/gtk-doc-1.13 ~app-text/docbook-xml-dtd-4.1.2 ) test? ( >=sys-apps/dbus-1.2.14 ) !<dev-util/gtk-doc-1.15-r2 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils =dev-lang/python-2* test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 virtual/libiconv sys-libs/zlib xattr? ( sys-apps/attr ) fam? ( virtual/fam ) =dev-lang/python-2*
 2
 mirror://gnome/sources/glib/2.28/glib-2.28.8.tar.xz http://pkgconfig.freedesktop.org/releases/pkg-config-0.26.tar.gz
diff --git a/metadata/cache/dev-libs/glib-2.30.2 b/metadata/cache/dev-libs/glib-2.30.2
index d4e1498a43e0..c347ab3a762a 100644
--- a/metadata/cache/dev-libs/glib-2.30.2
+++ b/metadata/cache/dev-libs/glib-2.30.2
@@ -1,4 +1,4 @@
-virtual/libiconv virtual/libffi sys-libs/zlib xattr? ( sys-apps/attr ) fam? ( virtual/fam ) utils? ( >=dev-util/gdbus-codegen-2.30.2 ) >=sys-devel/gettext-0.11 >=dev-util/gtk-doc-am-1.15 doc? ( >=dev-libs/libxslt-1.0 >=dev-util/gdbus-codegen-2.30.2 >=dev-util/gtk-doc-1.15 ~app-text/docbook-xml-dtd-4.1.2 ) systemtap? ( >=dev-util/systemtap-1.3 ) test? ( sys-devel/gdb =dev-lang/python-2* >=dev-util/gdbus-codegen-2.30.2 >=sys-apps/dbus-1.2.14 ) !<dev-util/gtk-doc-1.15-r2 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils utils? ( =dev-lang/python-2* ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+virtual/libiconv virtual/libffi sys-libs/zlib xattr? ( sys-apps/attr ) fam? ( virtual/fam ) utils? ( >=dev-util/gdbus-codegen-2.30.2 ) >=sys-devel/gettext-0.11 >=dev-util/gtk-doc-am-1.15 doc? ( >=dev-libs/libxslt-1.0 >=dev-util/gdbus-codegen-2.30.2 >=dev-util/gtk-doc-1.15 ~app-text/docbook-xml-dtd-4.1.2 ) systemtap? ( >=dev-util/systemtap-1.3 ) test? ( sys-devel/gdb =dev-lang/python-2* >=dev-util/gdbus-codegen-2.30.2 >=sys-apps/dbus-1.2.14 ) !<dev-util/gtk-doc-1.15-r2 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils utils? ( =dev-lang/python-2* ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 virtual/libiconv virtual/libffi sys-libs/zlib xattr? ( sys-apps/attr ) fam? ( virtual/fam ) utils? ( >=dev-util/gdbus-codegen-2.30.2 ) utils? ( =dev-lang/python-2* )
 2
 mirror://gnome/sources/glib/2.30/glib-2.30.2.tar.xz http://pkgconfig.freedesktop.org/releases/pkg-config-0.26.tar.gz
diff --git a/metadata/cache/dev-libs/glib-2.30.2-r1 b/metadata/cache/dev-libs/glib-2.30.2-r1
index 7c4b1dcf2cfb..cbff812b26ad 100644
--- a/metadata/cache/dev-libs/glib-2.30.2-r1
+++ b/metadata/cache/dev-libs/glib-2.30.2-r1
@@ -1,4 +1,4 @@
-virtual/libiconv virtual/libffi sys-libs/zlib xattr? ( sys-apps/attr ) fam? ( virtual/fam ) utils? ( >=dev-util/gdbus-codegen-2.30.2 ) >=sys-devel/gettext-0.11 >=dev-util/gtk-doc-am-1.15 doc? ( >=dev-libs/libxslt-1.0 >=dev-util/gdbus-codegen-2.30.2 >=dev-util/gtk-doc-1.15 ~app-text/docbook-xml-dtd-4.1.2 ) systemtap? ( >=dev-util/systemtap-1.3 ) test? ( sys-devel/gdb =dev-lang/python-2* >=dev-util/gdbus-codegen-2.30.2 >=sys-apps/dbus-1.2.14 ) !<dev-util/gtk-doc-1.15-r2 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils utils? ( =dev-lang/python-2* ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+virtual/libiconv virtual/libffi sys-libs/zlib xattr? ( sys-apps/attr ) fam? ( virtual/fam ) utils? ( >=dev-util/gdbus-codegen-2.30.2 ) >=sys-devel/gettext-0.11 >=dev-util/gtk-doc-am-1.15 doc? ( >=dev-libs/libxslt-1.0 >=dev-util/gdbus-codegen-2.30.2 >=dev-util/gtk-doc-1.15 ~app-text/docbook-xml-dtd-4.1.2 ) systemtap? ( >=dev-util/systemtap-1.3 ) test? ( sys-devel/gdb =dev-lang/python-2* >=dev-util/gdbus-codegen-2.30.2 >=sys-apps/dbus-1.2.14 ) !<dev-util/gtk-doc-1.15-r2 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils utils? ( =dev-lang/python-2* ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 virtual/libiconv virtual/libffi sys-libs/zlib xattr? ( sys-apps/attr ) fam? ( virtual/fam ) utils? ( >=dev-util/gdbus-codegen-2.30.2 ) utils? ( =dev-lang/python-2* )
 2
 mirror://gnome/sources/glib/2.30/glib-2.30.2.tar.xz http://pkgconfig.freedesktop.org/releases/pkg-config-0.26.tar.gz
diff --git a/metadata/cache/dev-libs/glib-2.30.3 b/metadata/cache/dev-libs/glib-2.30.3
index 2baf6b24157c..aeae90ba607e 100644
--- a/metadata/cache/dev-libs/glib-2.30.3
+++ b/metadata/cache/dev-libs/glib-2.30.3
@@ -1,4 +1,4 @@
-virtual/libiconv virtual/libffi sys-libs/zlib xattr? ( sys-apps/attr ) fam? ( virtual/fam ) utils? ( >=dev-util/gdbus-codegen-2.30.3 ) >=sys-devel/gettext-0.11 >=dev-util/gtk-doc-am-1.15 doc? ( >=dev-libs/libxslt-1.0 >=dev-util/gdbus-codegen-2.30.3 >=dev-util/gtk-doc-1.15 ~app-text/docbook-xml-dtd-4.1.2 ) systemtap? ( >=dev-util/systemtap-1.3 ) test? ( sys-devel/gdb =dev-lang/python-2* >=dev-util/gdbus-codegen-2.30.3 >=sys-apps/dbus-1.2.14 ) !<dev-util/gtk-doc-1.15-r2 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils utils? ( =dev-lang/python-2* ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+virtual/libiconv virtual/libffi sys-libs/zlib xattr? ( sys-apps/attr ) fam? ( virtual/fam ) utils? ( >=dev-util/gdbus-codegen-2.30.3 ) >=sys-devel/gettext-0.11 >=dev-util/gtk-doc-am-1.15 doc? ( >=dev-libs/libxslt-1.0 >=dev-util/gdbus-codegen-2.30.3 >=dev-util/gtk-doc-1.15 ~app-text/docbook-xml-dtd-4.1.2 ) systemtap? ( >=dev-util/systemtap-1.3 ) test? ( sys-devel/gdb =dev-lang/python-2* >=dev-util/gdbus-codegen-2.30.3 >=sys-apps/dbus-1.2.14 ) !<dev-util/gtk-doc-1.15-r2 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils utils? ( =dev-lang/python-2* ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 virtual/libiconv virtual/libffi sys-libs/zlib xattr? ( sys-apps/attr ) fam? ( virtual/fam ) utils? ( >=dev-util/gdbus-codegen-2.30.3 ) utils? ( =dev-lang/python-2* )
 2
 mirror://gnome/sources/glib/2.30/glib-2.30.3.tar.xz http://pkgconfig.freedesktop.org/releases/pkg-config-0.26.tar.gz
diff --git a/metadata/cache/dev-libs/gmime-2.2.27 b/metadata/cache/dev-libs/gmime-2.2.27
index a9cd777e541f..c385a6de7fe3 100644
--- a/metadata/cache/dev-libs/gmime-2.2.27
+++ b/metadata/cache/dev-libs/gmime-2.2.27
@@ -1,4 +1,4 @@
->=dev-libs/glib-2:2 sys-libs/zlib mono? ( dev-lang/mono >=dev-dotnet/gtk-sharp-2.4.0:2 ) dev-util/pkgconfig dev-util/gtk-doc-am doc? ( >=dev-util/gtk-doc-1.0 app-text/docbook-sgml-utils ) mono? ( dev-dotnet/gtk-sharp-gapi:2 ) >=sys-apps/sed-4 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-libs/glib-2:2 sys-libs/zlib mono? ( dev-lang/mono >=dev-dotnet/gtk-sharp-2.4.0:2 ) dev-util/pkgconfig dev-util/gtk-doc-am doc? ( >=dev-util/gtk-doc-1.0 app-text/docbook-sgml-utils ) mono? ( dev-dotnet/gtk-sharp-gapi:2 ) >=sys-apps/sed-4 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=dev-libs/glib-2:2 sys-libs/zlib mono? ( dev-lang/mono >=dev-dotnet/gtk-sharp-2.4.0:2 )
 0
 mirror://gnome/sources/gmime/2.2/gmime-2.2.27.tar.bz2 http://dev.gentoo.org/~pacho/gnome/gmime-sharp.snk
diff --git a/metadata/cache/dev-libs/gnulib-2009.03.03.14.07.45-r1 b/metadata/cache/dev-libs/gnulib-2009.03.03.14.07.45-r1
index 90b689fc8f7a..212583505eb6 100644
--- a/metadata/cache/dev-libs/gnulib-2009.03.03.14.07.45-r1
+++ b/metadata/cache/dev-libs/gnulib-2009.03.03.14.07.45-r1
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 http://dev.gentoo.org/~drizzt/distfiles/gnulib-8d2524ce78ca107074727cbd8780c26a203a107c.tar.gz
diff --git a/metadata/cache/dev-libs/gobject-introspection-0.10.8 b/metadata/cache/dev-libs/gobject-introspection-0.10.8
index 58aa30c8fe39..3c35ed7f7851 100644
--- a/metadata/cache/dev-libs/gobject-introspection-0.10.8
+++ b/metadata/cache/dev-libs/gobject-introspection-0.10.8
@@ -1,4 +1,4 @@
->=dev-libs/glib-2.24:2 virtual/libffi dev-util/pkgconfig sys-devel/bison sys-devel/flex virtual/yacc doc? ( >=dev-util/gtk-doc-1.12 ) test? ( x11-libs/cairo ) >=sys-apps/sed-4 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-libs/glib-2.24:2 virtual/libffi dev-util/pkgconfig sys-devel/bison sys-devel/flex virtual/yacc doc? ( >=dev-util/gtk-doc-1.12 ) test? ( x11-libs/cairo ) >=sys-apps/sed-4 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=dev-libs/glib-2.24:2 virtual/libffi || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
 0
 mirror://gnome/sources/gobject-introspection/0.10/gobject-introspection-0.10.8.tar.bz2
diff --git a/metadata/cache/dev-libs/iksemel-1.3 b/metadata/cache/dev-libs/iksemel-1.3
index 2f65138147a0..0dc7d361babe 100644
--- a/metadata/cache/dev-libs/iksemel-1.3
+++ b/metadata/cache/dev-libs/iksemel-1.3
@@ -1,4 +1,4 @@
-gnutls? ( net-libs/gnutls ) gnutls? ( dev-util/pkgconfig ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+gnutls? ( net-libs/gnutls ) gnutls? ( dev-util/pkgconfig ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 gnutls? ( net-libs/gnutls )
 0
 http://iksemel.googlecode.com/files/iksemel-1.3.tar.gz
diff --git a/metadata/cache/dev-libs/iksemel-1.4 b/metadata/cache/dev-libs/iksemel-1.4
index f951bb1a145a..f1545b206167 100644
--- a/metadata/cache/dev-libs/iksemel-1.4
+++ b/metadata/cache/dev-libs/iksemel-1.4
@@ -1,4 +1,4 @@
-ssl? ( net-libs/gnutls ) ssl? ( dev-util/pkgconfig ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+ssl? ( net-libs/gnutls ) ssl? ( dev-util/pkgconfig ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 ssl? ( net-libs/gnutls )
 0
 http://iksemel.googlecode.com/files/iksemel-1.4.tar.gz
diff --git a/metadata/cache/dev-libs/jemalloc-2.2.5 b/metadata/cache/dev-libs/jemalloc-2.2.5
index ce4a5f095dae..e5d091bbc538 100644
--- a/metadata/cache/dev-libs/jemalloc-2.2.5
+++ b/metadata/cache/dev-libs/jemalloc-2.2.5
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 http://www.canonware.com/download/jemalloc/jemalloc-2.2.5.tar.bz2
diff --git a/metadata/cache/dev-libs/jemalloc-2.2.5-r1 b/metadata/cache/dev-libs/jemalloc-2.2.5-r1
index d7c6d6eabf35..bcb1807b79a5 100644
--- a/metadata/cache/dev-libs/jemalloc-2.2.5-r1
+++ b/metadata/cache/dev-libs/jemalloc-2.2.5-r1
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 http://www.canonware.com/download/jemalloc/jemalloc-2.2.5.tar.bz2
diff --git a/metadata/cache/dev-libs/judy-1.0.5 b/metadata/cache/dev-libs/judy-1.0.5
index 96188921728d..ab4d4a2a0d58 100644
--- a/metadata/cache/dev-libs/judy-1.0.5
+++ b/metadata/cache/dev-libs/judy-1.0.5
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 mirror://sourceforge/judy/Judy-1.0.5.tar.gz
diff --git a/metadata/cache/dev-libs/libappindicator-0.4.1-r201 b/metadata/cache/dev-libs/libappindicator-0.4.1-r201
index b25a68c3eda1..cf2b7e632ac7 100644
--- a/metadata/cache/dev-libs/libappindicator-0.4.1-r201
+++ b/metadata/cache/dev-libs/libappindicator-0.4.1-r201
@@ -1,4 +1,4 @@
-dev-libs/dbus-glib >=dev-libs/glib-2.26 dev-libs/libdbusmenu:0[gtk] >=dev-libs/libindicator-0.4:0 dev-python/pygobject:2 >=dev-python/pygtk-2.14:2 >=x11-libs/gtk+-2.18:2 introspection? ( >=dev-libs/gobject-introspection-0.10 ) dev-lang/vala:0.14[vapigen] dev-util/gtk-doc-am dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool =dev-lang/python-2.7*
+dev-libs/dbus-glib >=dev-libs/glib-2.26 dev-libs/libdbusmenu:0[gtk] >=dev-libs/libindicator-0.4:0 dev-python/pygobject:2 >=dev-python/pygtk-2.14:2 >=x11-libs/gtk+-2.18:2 introspection? ( >=dev-libs/gobject-introspection-0.10 ) dev-lang/vala:0.14[vapigen] dev-util/gtk-doc-am dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool =dev-lang/python-2.7*
 dev-libs/dbus-glib >=dev-libs/glib-2.26 dev-libs/libdbusmenu:0[gtk] >=dev-libs/libindicator-0.4:0 dev-python/pygobject:2 >=dev-python/pygtk-2.14:2 >=x11-libs/gtk+-2.18:2 introspection? ( >=dev-libs/gobject-introspection-0.10 ) =dev-lang/python-2.7*
 0
 http://launchpad.net/libappindicator/0.4/0.4.1/+download/libappindicator-0.4.1.tar.gz
diff --git a/metadata/cache/dev-libs/libappindicator-0.4.1-r300 b/metadata/cache/dev-libs/libappindicator-0.4.1-r300
index 43d7383a2dcb..65928b75721d 100644
--- a/metadata/cache/dev-libs/libappindicator-0.4.1-r300
+++ b/metadata/cache/dev-libs/libappindicator-0.4.1-r300
@@ -1,4 +1,4 @@
-dev-libs/dbus-glib >=dev-libs/glib-2.26 dev-libs/libdbusmenu:3[gtk] >=dev-libs/libindicator-0.4:3 x11-libs/gtk+:3 introspection? ( >=dev-libs/gobject-introspection-0.10 ) dev-lang/vala:0.14[vapigen] dev-util/gtk-doc-am dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-libs/dbus-glib >=dev-libs/glib-2.26 dev-libs/libdbusmenu:3[gtk] >=dev-libs/libindicator-0.4:3 x11-libs/gtk+:3 introspection? ( >=dev-libs/gobject-introspection-0.10 ) dev-lang/vala:0.14[vapigen] dev-util/gtk-doc-am dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-libs/dbus-glib >=dev-libs/glib-2.26 dev-libs/libdbusmenu:3[gtk] >=dev-libs/libindicator-0.4:3 x11-libs/gtk+:3 introspection? ( >=dev-libs/gobject-introspection-0.10 )
 3
 http://launchpad.net/libappindicator/0.4/0.4.1/+download/libappindicator-0.4.1.tar.gz
diff --git a/metadata/cache/dev-libs/libcdio-0.82 b/metadata/cache/dev-libs/libcdio-0.82
index 741381960284..27c78cf8dc5c 100644
--- a/metadata/cache/dev-libs/libcdio-0.82
+++ b/metadata/cache/dev-libs/libcdio-0.82
@@ -1,4 +1,4 @@
-cddb? ( >=media-libs/libcddb-1.0.1 ) virtual/libintl sys-devel/gettext dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+cddb? ( >=media-libs/libcddb-1.0.1 ) virtual/libintl sys-devel/gettext dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 cddb? ( >=media-libs/libcddb-1.0.1 ) virtual/libintl
 0
 mirror://gnu/libcdio/libcdio-0.82.tar.gz
diff --git a/metadata/cache/dev-libs/libcgroup-0.37-r2 b/metadata/cache/dev-libs/libcgroup-0.37-r2
index 7cc3cad7a6b6..e8bd98c19e49 100644
--- a/metadata/cache/dev-libs/libcgroup-0.37-r2
+++ b/metadata/cache/dev-libs/libcgroup-0.37-r2
@@ -1,4 +1,4 @@
-pam? ( virtual/pam ) sys-devel/bison sys-devel/flex || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+pam? ( virtual/pam ) sys-devel/bison sys-devel/flex || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 pam? ( virtual/pam )
 0
 mirror://sourceforge/libcg/libcgroup-0.37.tar.bz2
diff --git a/metadata/cache/dev-libs/libchewing-0.3.2-r1 b/metadata/cache/dev-libs/libchewing-0.3.2-r1
index 6ad2af611e59..176bfd707c46 100644
--- a/metadata/cache/dev-libs/libchewing-0.3.2-r1
+++ b/metadata/cache/dev-libs/libchewing-0.3.2-r1
@@ -1,4 +1,4 @@
-dev-util/pkgconfig test? ( sys-libs/ncurses[unicode] >=dev-libs/check-0.9.4 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-util/pkgconfig test? ( sys-libs/ncurses[unicode] >=dev-libs/check-0.9.4 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 http://chewing.csie.net/download/libchewing/libchewing-0.3.2.tar.bz2
diff --git a/metadata/cache/dev-libs/libdnet-1.11-r2 b/metadata/cache/dev-libs/libdnet-1.11-r2
index 5e1e6cdeeb03..e2499547361d 100644
--- a/metadata/cache/dev-libs/libdnet-1.11-r2
+++ b/metadata/cache/dev-libs/libdnet-1.11-r2
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( =dev-lang/python-2* )
+|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( =dev-lang/python-2* )
 python? ( =dev-lang/python-2* )
 0
 mirror://sourceforge/libdnet/libdnet-1.11.tar.gz
diff --git a/metadata/cache/dev-libs/libelf-0.8.13-r1 b/metadata/cache/dev-libs/libelf-0.8.13-r1
index c101451b15e0..2f886a735458 100644
--- a/metadata/cache/dev-libs/libelf-0.8.13-r1
+++ b/metadata/cache/dev-libs/libelf-0.8.13-r1
@@ -1,4 +1,4 @@
-nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 !dev-libs/elfutils
 0
 http://www.mr511.de/software/libelf-0.8.13.tar.gz
diff --git a/metadata/cache/dev-libs/libev-3.90-r2 b/metadata/cache/dev-libs/libev-3.90-r2
index b78512b6b559..a43818fe9c08 100644
--- a/metadata/cache/dev-libs/libev-3.90-r2
+++ b/metadata/cache/dev-libs/libev-3.90-r2
@@ -1,4 +1,4 @@
-elibc_glibc? ( >=sys-libs/glibc-2.9_p20081201 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+elibc_glibc? ( >=sys-libs/glibc-2.9_p20081201 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 elibc_glibc? ( >=sys-libs/glibc-2.9_p20081201 )
 0
 http://dist.schmorp.de/libev/libev-3.9.tar.gz http://dist.schmorp.de/libev/Attic/libev-3.9.tar.gz
diff --git a/metadata/cache/dev-libs/libev-4.03 b/metadata/cache/dev-libs/libev-4.03
index 6c60c00c15f8..5cd51cbd84b4 100644
--- a/metadata/cache/dev-libs/libev-4.03
+++ b/metadata/cache/dev-libs/libev-4.03
@@ -1,4 +1,4 @@
-elibc_glibc? ( >=sys-libs/glibc-2.9_p20081201 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+elibc_glibc? ( >=sys-libs/glibc-2.9_p20081201 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 elibc_glibc? ( >=sys-libs/glibc-2.9_p20081201 )
 0
 http://dist.schmorp.de/libev/libev-4.03.tar.gz http://dist.schmorp.de/libev/Attic/libev-4.03.tar.gz
diff --git a/metadata/cache/dev-libs/libev-4.04 b/metadata/cache/dev-libs/libev-4.04
index febd60eb9020..94286e0ac104 100644
--- a/metadata/cache/dev-libs/libev-4.04
+++ b/metadata/cache/dev-libs/libev-4.04
@@ -1,4 +1,4 @@
-elibc_glibc? ( >=sys-libs/glibc-2.9_p20081201 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+elibc_glibc? ( >=sys-libs/glibc-2.9_p20081201 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 elibc_glibc? ( >=sys-libs/glibc-2.9_p20081201 )
 0
 http://dist.schmorp.de/libev/libev-4.04.tar.gz http://dist.schmorp.de/libev/Attic/libev-4.04.tar.gz
diff --git a/metadata/cache/dev-libs/libevent-2.0.16 b/metadata/cache/dev-libs/libevent-2.0.16
index 884316549bfc..e59bd1e85ef0 100644
--- a/metadata/cache/dev-libs/libevent-2.0.16
+++ b/metadata/cache/dev-libs/libevent-2.0.16
@@ -1,4 +1,4 @@
-ssl? ( dev-libs/openssl ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+ssl? ( dev-libs/openssl ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 ssl? ( dev-libs/openssl ) !<=dev-libs/9libs-1.0
 0
 mirror://sourceforge/levent/files/libevent-2.0.16-stable.tar.gz
diff --git a/metadata/cache/dev-libs/libevent-2.0.17 b/metadata/cache/dev-libs/libevent-2.0.17
index afc4dfaf4e09..e7f69e86d2d8 100644
--- a/metadata/cache/dev-libs/libevent-2.0.17
+++ b/metadata/cache/dev-libs/libevent-2.0.17
@@ -1,4 +1,4 @@
-ssl? ( dev-libs/openssl ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+ssl? ( dev-libs/openssl ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 ssl? ( dev-libs/openssl ) !<=dev-libs/9libs-1.0
 0
 mirror://sourceforge/levent/files/libevent-2.0.17-stable.tar.gz
diff --git a/metadata/cache/dev-libs/libexplain-0.51 b/metadata/cache/dev-libs/libexplain-0.51
index d84b79891fe0..5dc94a467772 100644
--- a/metadata/cache/dev-libs/libexplain-0.51
+++ b/metadata/cache/dev-libs/libexplain-0.51
@@ -1,4 +1,4 @@
->=sys-kernel/linux-headers-2.6.35 sys-libs/libcap >=sys-libs/glibc-2.11 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=sys-kernel/linux-headers-2.6.35 sys-libs/libcap >=sys-libs/glibc-2.11 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=sys-kernel/linux-headers-2.6.35 sys-libs/libcap >=sys-libs/glibc-2.11
 0
 http://libexplain.sourceforge.net/libexplain-0.51.D001.tar.gz
diff --git a/metadata/cache/dev-libs/libexplain-0.52 b/metadata/cache/dev-libs/libexplain-0.52
index ea6f9572e657..7f1b815cd81b 100644
--- a/metadata/cache/dev-libs/libexplain-0.52
+++ b/metadata/cache/dev-libs/libexplain-0.52
@@ -1,4 +1,4 @@
->=sys-kernel/linux-headers-2.6.35 sys-libs/libcap >=sys-libs/glibc-2.11 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=sys-kernel/linux-headers-2.6.35 sys-libs/libcap >=sys-libs/glibc-2.11 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=sys-kernel/linux-headers-2.6.35 sys-libs/libcap >=sys-libs/glibc-2.11
 0
 http://libexplain.sourceforge.net/libexplain-0.52.D001.tar.gz
diff --git a/metadata/cache/dev-libs/libgamin-0.1.10-r2 b/metadata/cache/dev-libs/libgamin-0.1.10-r2
index 4f9bc40e0e70..e271c17f80e2 100644
--- a/metadata/cache/dev-libs/libgamin-0.1.10-r2
+++ b/metadata/cache/dev-libs/libgamin-0.1.10-r2
@@ -1,4 +1,4 @@
-!app-admin/fam !<app-admin/gamin-0.1.10 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( =dev-lang/python-2* )
+!app-admin/fam !<app-admin/gamin-0.1.10 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( =dev-lang/python-2* )
 !app-admin/fam !<app-admin/gamin-0.1.10 python? ( =dev-lang/python-2* )
 0
 mirror://gnome/sources/gamin/0.1/gamin-0.1.10.tar.bz2 mirror://gentoo/gamin-0.1.9-freebsd.patch.bz2 http://pkgconfig.freedesktop.org/releases/pkg-config-0.26.tar.gz
diff --git a/metadata/cache/dev-libs/libgcrypt-1.4.6 b/metadata/cache/dev-libs/libgcrypt-1.4.6
index 0c73acc2f8c7..a3acd39590d6 100644
--- a/metadata/cache/dev-libs/libgcrypt-1.4.6
+++ b/metadata/cache/dev-libs/libgcrypt-1.4.6
@@ -1,4 +1,4 @@
->=dev-libs/libgpg-error-1.5 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-libs/libgpg-error-1.5 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=dev-libs/libgpg-error-1.5
 0
 mirror://gnupg/libgcrypt/libgcrypt-1.4.6.tar.bz2 ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-1.4.6.tar.bz2
diff --git a/metadata/cache/dev-libs/libgcrypt-1.4.6-r1 b/metadata/cache/dev-libs/libgcrypt-1.4.6-r1
index 6b1092b4c22f..eb580bfd7178 100644
--- a/metadata/cache/dev-libs/libgcrypt-1.4.6-r1
+++ b/metadata/cache/dev-libs/libgcrypt-1.4.6-r1
@@ -1,4 +1,4 @@
->=dev-libs/libgpg-error-1.5 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-libs/libgpg-error-1.5 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=dev-libs/libgpg-error-1.5
 0
 mirror://gnupg/libgcrypt/libgcrypt-1.4.6.tar.bz2 ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-1.4.6.tar.bz2
diff --git a/metadata/cache/dev-libs/libgcrypt-1.5.0 b/metadata/cache/dev-libs/libgcrypt-1.5.0
index de571b019aeb..0d9bdd88e2e9 100644
--- a/metadata/cache/dev-libs/libgcrypt-1.5.0
+++ b/metadata/cache/dev-libs/libgcrypt-1.5.0
@@ -1,4 +1,4 @@
->=dev-libs/libgpg-error-1.8 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-libs/libgpg-error-1.8 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=dev-libs/libgpg-error-1.8
 0
 mirror://gnupg/libgcrypt/libgcrypt-1.5.0.tar.bz2 ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-1.5.0.tar.bz2
diff --git a/metadata/cache/dev-libs/libgcrypt-1.5.0-r1 b/metadata/cache/dev-libs/libgcrypt-1.5.0-r1
index a04a493ebc2f..32a13d0e7048 100644
--- a/metadata/cache/dev-libs/libgcrypt-1.5.0-r1
+++ b/metadata/cache/dev-libs/libgcrypt-1.5.0-r1
@@ -1,4 +1,4 @@
->=dev-libs/libgpg-error-1.8 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-libs/libgpg-error-1.8 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=dev-libs/libgpg-error-1.8
 0
 mirror://gnupg/libgcrypt/libgcrypt-1.5.0.tar.bz2 ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-1.5.0.tar.bz2
diff --git a/metadata/cache/dev-libs/libgcrypt-1.5.0-r2 b/metadata/cache/dev-libs/libgcrypt-1.5.0-r2
index b57358b5290a..95ff532b25ba 100644
--- a/metadata/cache/dev-libs/libgcrypt-1.5.0-r2
+++ b/metadata/cache/dev-libs/libgcrypt-1.5.0-r2
@@ -1,4 +1,4 @@
->=dev-libs/libgpg-error-1.8 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-libs/libgpg-error-1.8 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=dev-libs/libgpg-error-1.8
 0
 mirror://gnupg/libgcrypt/libgcrypt-1.5.0.tar.bz2 ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-1.5.0.tar.bz2 mirror://gentoo/libgcrypt-1.5.0-idea.patch.bz2
diff --git a/metadata/cache/dev-libs/libgdata-0.8.1-r2 b/metadata/cache/dev-libs/libgdata-0.8.1-r2
index e7165e8cc157..8a9cda40e026 100644
--- a/metadata/cache/dev-libs/libgdata-0.8.1-r2
+++ b/metadata/cache/dev-libs/libgdata-0.8.1-r2
@@ -1,4 +1,4 @@
->=dev-libs/glib-2.19:2 || ( >=x11-libs/gdk-pixbuf-2.14:2 >=x11-libs/gtk+-2.14:2 ) app-misc/ca-certificates >=dev-libs/libxml2-2:2 >=net-libs/libsoup-2.26.1:2.4[introspection?] gnome? ( >=net-libs/libsoup-gnome-2.26.1:2.4[introspection?] ) introspection? ( >=dev-libs/gobject-introspection-0.9.7 ) >=dev-util/intltool-0.40 gnome-base/gnome-common doc? ( >=dev-util/gtk-doc-1.14 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+>=dev-libs/glib-2.19:2 || ( >=x11-libs/gdk-pixbuf-2.14:2 >=x11-libs/gtk+-2.14:2 ) app-misc/ca-certificates >=dev-libs/libxml2-2:2 >=net-libs/libsoup-2.26.1:2.4[introspection?] gnome? ( >=net-libs/libsoup-gnome-2.26.1:2.4[introspection?] ) introspection? ( >=dev-libs/gobject-introspection-0.9.7 ) >=dev-util/intltool-0.40 gnome-base/gnome-common doc? ( >=dev-util/gtk-doc-1.14 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 >=dev-libs/glib-2.19:2 || ( >=x11-libs/gdk-pixbuf-2.14:2 >=x11-libs/gtk+-2.14:2 ) app-misc/ca-certificates >=dev-libs/libxml2-2:2 >=net-libs/libsoup-2.26.1:2.4[introspection?] gnome? ( >=net-libs/libsoup-gnome-2.26.1:2.4[introspection?] ) introspection? ( >=dev-libs/gobject-introspection-0.9.7 )
 0
 mirror://gnome/sources/libgdata/0.8/libgdata-0.8.1.tar.bz2
diff --git a/metadata/cache/dev-libs/libgweather-2.30.3 b/metadata/cache/dev-libs/libgweather-2.30.3
index 2ac536a8072a..421f0606cac4 100644
--- a/metadata/cache/dev-libs/libgweather-2.30.3
+++ b/metadata/cache/dev-libs/libgweather-2.30.3
@@ -1,4 +1,4 @@
->=x11-libs/gtk+-2.11:2 >=dev-libs/glib-2.13:2 >=gnome-base/gconf-2.8:2 >=net-libs/libsoup-gnome-2.25.1:2.4 >=dev-libs/libxml2-2.6.0:2 >=sys-libs/timezone-data-2010k python? ( >=dev-python/pygobject-2:2 >=dev-python/pygtk-2 ) !<gnome-base/gnome-applets-2.22.0 sys-devel/gettext >=dev-util/intltool-0.40.3 >=dev-util/pkgconfig-0.19 >=dev-util/gtk-doc-am-1.9 doc? ( >=dev-util/gtk-doc-1.9 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 python? ( =dev-lang/python-2* )
+>=x11-libs/gtk+-2.11:2 >=dev-libs/glib-2.13:2 >=gnome-base/gconf-2.8:2 >=net-libs/libsoup-gnome-2.25.1:2.4 >=dev-libs/libxml2-2.6.0:2 >=sys-libs/timezone-data-2010k python? ( >=dev-python/pygobject-2:2 >=dev-python/pygtk-2 ) !<gnome-base/gnome-applets-2.22.0 sys-devel/gettext >=dev-util/intltool-0.40.3 >=dev-util/pkgconfig-0.19 >=dev-util/gtk-doc-am-1.9 doc? ( >=dev-util/gtk-doc-1.9 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 python? ( =dev-lang/python-2* )
 >=x11-libs/gtk+-2.11:2 >=dev-libs/glib-2.13:2 >=gnome-base/gconf-2.8:2 >=net-libs/libsoup-gnome-2.25.1:2.4 >=dev-libs/libxml2-2.6.0:2 >=sys-libs/timezone-data-2010k python? ( >=dev-python/pygobject-2:2 >=dev-python/pygtk-2 ) !<gnome-base/gnome-applets-2.22.0 python? ( =dev-lang/python-2* )
 2
 mirror://gnome/sources/libgweather/2.30/libgweather-2.30.3.tar.bz2
diff --git a/metadata/cache/dev-libs/libhid-0.2.16-r2 b/metadata/cache/dev-libs/libhid-0.2.16-r2
index f2ee3da410a7..eb33062426ac 100644
--- a/metadata/cache/dev-libs/libhid-0.2.16-r2
+++ b/metadata/cache/dev-libs/libhid-0.2.16-r2
@@ -1,4 +1,4 @@
-virtual/libusb:0 doc? ( app-doc/doxygen ) python? ( dev-lang/swig ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( =dev-lang/python-2* )
+virtual/libusb:0 doc? ( app-doc/doxygen ) python? ( dev-lang/swig ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( =dev-lang/python-2* )
 virtual/libusb:0 python? ( =dev-lang/python-2* )
 0
 http://beta.magicaltux.net/libhid-0.2.16.tar.gz
diff --git a/metadata/cache/dev-libs/libhid-0.2.16-r3 b/metadata/cache/dev-libs/libhid-0.2.16-r3
index f2ee3da410a7..eb33062426ac 100644
--- a/metadata/cache/dev-libs/libhid-0.2.16-r3
+++ b/metadata/cache/dev-libs/libhid-0.2.16-r3
@@ -1,4 +1,4 @@
-virtual/libusb:0 doc? ( app-doc/doxygen ) python? ( dev-lang/swig ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( =dev-lang/python-2* )
+virtual/libusb:0 doc? ( app-doc/doxygen ) python? ( dev-lang/swig ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( =dev-lang/python-2* )
 virtual/libusb:0 python? ( =dev-lang/python-2* )
 0
 http://beta.magicaltux.net/libhid-0.2.16.tar.gz
diff --git a/metadata/cache/dev-libs/libindicate-0.6.1-r201 b/metadata/cache/dev-libs/libindicate-0.6.1-r201
index 6e1e083335e7..08f55f38e1b2 100644
--- a/metadata/cache/dev-libs/libindicate-0.6.1-r201
+++ b/metadata/cache/dev-libs/libindicate-0.6.1-r201
@@ -1,4 +1,4 @@
->=dev-libs/dbus-glib-0.76 >=dev-libs/glib-2.18:2 >=dev-libs/libdbusmenu-0.3.97:0[introspection?] dev-libs/libxml2:2 dev-python/pygtk:2 >=x11-libs/gtk+-2.12:2 dev-libs/libindicate:3 introspection? ( dev-libs/gobject-introspection ) !<dev-libs/libindicate-0.6.1-r201 gnome-base/gnome-common app-text/gnome-doc-utils dev-util/gtk-doc-am dev-util/pkgconfig dev-lang/vala:0.14[vapigen] || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool =dev-lang/python-2.7*
+>=dev-libs/dbus-glib-0.76 >=dev-libs/glib-2.18:2 >=dev-libs/libdbusmenu-0.3.97:0[introspection?] dev-libs/libxml2:2 dev-python/pygtk:2 >=x11-libs/gtk+-2.12:2 dev-libs/libindicate:3 introspection? ( dev-libs/gobject-introspection ) !<dev-libs/libindicate-0.6.1-r201 gnome-base/gnome-common app-text/gnome-doc-utils dev-util/gtk-doc-am dev-util/pkgconfig dev-lang/vala:0.14[vapigen] || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool =dev-lang/python-2.7*
 >=dev-libs/dbus-glib-0.76 >=dev-libs/glib-2.18:2 >=dev-libs/libdbusmenu-0.3.97:0[introspection?] dev-libs/libxml2:2 dev-python/pygtk:2 >=x11-libs/gtk+-2.12:2 dev-libs/libindicate:3 introspection? ( dev-libs/gobject-introspection ) !<dev-libs/libindicate-0.6.1-r201 =dev-lang/python-2.7*
 0
 http://launchpad.net/libindicate/0.6/0.6.1/+download/libindicate-0.6.1.tar.gz
diff --git a/metadata/cache/dev-libs/libindicate-0.6.1-r300 b/metadata/cache/dev-libs/libindicate-0.6.1-r300
index faf5cb7e84e6..0dcea54d967b 100644
--- a/metadata/cache/dev-libs/libindicate-0.6.1-r300
+++ b/metadata/cache/dev-libs/libindicate-0.6.1-r300
@@ -1,4 +1,4 @@
->=dev-libs/dbus-glib-0.76 >=dev-libs/glib-2.18:2 >=dev-libs/libdbusmenu-0.3.97:3[introspection?] dev-libs/libxml2:2 x11-libs/gtk+:3 introspection? ( dev-libs/gobject-introspection ) !<dev-libs/libindicate-0.6.1-r201 gnome-base/gnome-common app-text/gnome-doc-utils dev-util/gtk-doc-am dev-util/pkgconfig dev-lang/vala:0.14[vapigen] || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-libs/dbus-glib-0.76 >=dev-libs/glib-2.18:2 >=dev-libs/libdbusmenu-0.3.97:3[introspection?] dev-libs/libxml2:2 x11-libs/gtk+:3 introspection? ( dev-libs/gobject-introspection ) !<dev-libs/libindicate-0.6.1-r201 gnome-base/gnome-common app-text/gnome-doc-utils dev-util/gtk-doc-am dev-util/pkgconfig dev-lang/vala:0.14[vapigen] || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=dev-libs/dbus-glib-0.76 >=dev-libs/glib-2.18:2 >=dev-libs/libdbusmenu-0.3.97:3[introspection?] dev-libs/libxml2:2 x11-libs/gtk+:3 introspection? ( dev-libs/gobject-introspection ) !<dev-libs/libindicate-0.6.1-r201
 3
 http://launchpad.net/libindicate/0.6/0.6.1/+download/libindicate-0.6.1.tar.gz
diff --git a/metadata/cache/dev-libs/libjwc_c-1.1-r1 b/metadata/cache/dev-libs/libjwc_c-1.1-r1
index a15abf5d7f3d..191eae9042d4 100644
--- a/metadata/cache/dev-libs/libjwc_c-1.1-r1
+++ b/metadata/cache/dev-libs/libjwc_c-1.1-r1
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 ftp://ftp.ccp4.ac.uk/jwc/libjwc_c-1.1.tar.gz
diff --git a/metadata/cache/dev-libs/libjwc_f-1.1-r1 b/metadata/cache/dev-libs/libjwc_f-1.1-r1
index 80bd9825c53e..4c20560b79e7 100644
--- a/metadata/cache/dev-libs/libjwc_f-1.1-r1
+++ b/metadata/cache/dev-libs/libjwc_f-1.1-r1
@@ -1,4 +1,4 @@
-virtual/fortran || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+virtual/fortran || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 virtual/fortran
 0
 ftp://ftp.ccp4.ac.uk/jwc/libjwc_f-1.1.tar.gz
diff --git a/metadata/cache/dev-libs/liblognorm-0.3.2-r1 b/metadata/cache/dev-libs/liblognorm-0.3.2-r1
index 5996f0a68919..7f9adc36f447 100644
--- a/metadata/cache/dev-libs/liblognorm-0.3.2-r1
+++ b/metadata/cache/dev-libs/liblognorm-0.3.2-r1
@@ -1,4 +1,4 @@
-dev-libs/libestr dev-libs/libee || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-libs/libestr dev-libs/libee || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-libs/libestr dev-libs/libee
 0
 http://www.liblognorm.com/files/download/liblognorm-0.3.2.tar.gz
diff --git a/metadata/cache/dev-libs/libmcrypt-2.5.8-r2 b/metadata/cache/dev-libs/libmcrypt-2.5.8-r2
index e5abea02dcd7..bab775a7b631 100644
--- a/metadata/cache/dev-libs/libmcrypt-2.5.8-r2
+++ b/metadata/cache/dev-libs/libmcrypt-2.5.8-r2
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 mirror://sourceforge/mcrypt/libmcrypt-2.5.8.tar.gz
diff --git a/metadata/cache/dev-libs/libmemcache-1.4.0_rc2-r1 b/metadata/cache/dev-libs/libmemcache-1.4.0_rc2-r1
index 7408d40a3ab7..575387961987 100644
--- a/metadata/cache/dev-libs/libmemcache-1.4.0_rc2-r1
+++ b/metadata/cache/dev-libs/libmemcache-1.4.0_rc2-r1
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 http://people.freebsd.org/~seanc/libmemcache/libmemcache-1.4.0.rc2.tar.bz2
diff --git a/metadata/cache/dev-libs/libmimedir-0.4 b/metadata/cache/dev-libs/libmimedir-0.4
index 54a60ad1e586..e862c6f9cb7c 100644
--- a/metadata/cache/dev-libs/libmimedir-0.4
+++ b/metadata/cache/dev-libs/libmimedir-0.4
@@ -1,4 +1,4 @@
-sys-devel/bison sys-devel/flex || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+sys-devel/bison sys-devel/flex || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 mirror://sourceforge/synce/libmimedir-0.4.tar.gz
diff --git a/metadata/cache/dev-libs/libmirage-1.5.0-r1 b/metadata/cache/dev-libs/libmirage-1.5.0-r1
index ddbda3b51a6d..df3f5e981805 100644
--- a/metadata/cache/dev-libs/libmirage-1.5.0-r1
+++ b/metadata/cache/dev-libs/libmirage-1.5.0-r1
@@ -1,4 +1,4 @@
->=dev-libs/glib-2.28:2 >=media-libs/libsndfile-1.0 sys-libs/zlib dev-util/gtk-doc-am dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-libs/glib-2.28:2 >=media-libs/libsndfile-1.0 sys-libs/zlib dev-util/gtk-doc-am dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=dev-libs/glib-2.28:2 >=media-libs/libsndfile-1.0 sys-libs/zlib
 0
 mirror://sourceforge/cdemu/libmirage-1.5.0.tar.bz2
diff --git a/metadata/cache/dev-libs/libmix-2.05-r5 b/metadata/cache/dev-libs/libmix-2.05-r5
index cc479bb3d51d..7b8acad777ce 100644
--- a/metadata/cache/dev-libs/libmix-2.05-r5
+++ b/metadata/cache/dev-libs/libmix-2.05-r5
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 http://mixter.void.ru/libmix-205.tgz
diff --git a/metadata/cache/dev-libs/libmix-2.05-r6 b/metadata/cache/dev-libs/libmix-2.05-r6
index f266a3a0507a..59b24c94a0e8 100644
--- a/metadata/cache/dev-libs/libmix-2.05-r6
+++ b/metadata/cache/dev-libs/libmix-2.05-r6
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 http://mixter.void.ru/libmix-205.tgz
diff --git a/metadata/cache/dev-libs/libnatspec-0.2.6 b/metadata/cache/dev-libs/libnatspec-0.2.6
index 2355fbeeafe9..372b2f318d88 100644
--- a/metadata/cache/dev-libs/libnatspec-0.2.6
+++ b/metadata/cache/dev-libs/libnatspec-0.2.6
@@ -1,4 +1,4 @@
-python? ( >=dev-lang/python-2.3 ) dev-libs/popt doc? ( app-doc/doxygen ) python? ( dev-lang/tcl ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+python? ( >=dev-lang/python-2.3 ) dev-libs/popt doc? ( app-doc/doxygen ) python? ( dev-lang/tcl ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 python? ( >=dev-lang/python-2.3 ) dev-libs/popt
 0
 mirror://sourceforge/natspec/libnatspec-0.2.6.tar.bz2
diff --git a/metadata/cache/dev-libs/libp11-0.2.8-r1 b/metadata/cache/dev-libs/libp11-0.2.8-r1
index 3a9a2baa0da3..7ce18b21e120 100644
--- a/metadata/cache/dev-libs/libp11-0.2.8-r1
+++ b/metadata/cache/dev-libs/libp11-0.2.8-r1
@@ -1,4 +1,4 @@
-dev-libs/openssl dev-util/pkgconfig doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-libs/openssl dev-util/pkgconfig doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-libs/openssl
 0
 http://www.opensc-project.org/files/libp11/libp11-0.2.8.tar.gz
diff --git a/metadata/cache/dev-libs/libpcre-7.9-r1 b/metadata/cache/dev-libs/libpcre-7.9-r1
index 86b302ec7c75..d1c372eab23a 100644
--- a/metadata/cache/dev-libs/libpcre-7.9-r1
+++ b/metadata/cache/dev-libs/libpcre-7.9-r1
@@ -1,4 +1,4 @@
-bzip2? ( app-arch/bzip2 ) zlib? ( sys-libs/zlib ) dev-util/pkgconfig userland_GNU? ( >=sys-apps/findutils-4.4.0 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+bzip2? ( app-arch/bzip2 ) zlib? ( sys-libs/zlib ) dev-util/pkgconfig userland_GNU? ( >=sys-apps/findutils-4.4.0 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 bzip2? ( app-arch/bzip2 ) zlib? ( sys-libs/zlib )
 3
 ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-7.9.tar.bz2
diff --git a/metadata/cache/dev-libs/libpcre-8.21 b/metadata/cache/dev-libs/libpcre-8.21
index d766c4986111..bdd80b5c5f8c 100644
--- a/metadata/cache/dev-libs/libpcre-8.21
+++ b/metadata/cache/dev-libs/libpcre-8.21
@@ -1,4 +1,4 @@
-bzip2? ( app-arch/bzip2 ) zlib? ( sys-libs/zlib ) readline? ( sys-libs/readline ) dev-util/pkgconfig userland_GNU? ( >=sys-apps/findutils-4.4.0 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+bzip2? ( app-arch/bzip2 ) zlib? ( sys-libs/zlib ) readline? ( sys-libs/readline ) dev-util/pkgconfig userland_GNU? ( >=sys-apps/findutils-4.4.0 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 bzip2? ( app-arch/bzip2 ) zlib? ( sys-libs/zlib ) readline? ( sys-libs/readline )
 3
 mirror://sourceforge/pcre/pcre-8.21.tar.bz2 ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-8.21.tar.bz2
diff --git a/metadata/cache/dev-libs/libprelude-1.0.0-r1 b/metadata/cache/dev-libs/libprelude-1.0.0-r1
index 303f8f7578c2..99dea69aaf51 100644
--- a/metadata/cache/dev-libs/libprelude-1.0.0-r1
+++ b/metadata/cache/dev-libs/libprelude-1.0.0-r1
@@ -1,4 +1,4 @@
->=net-libs/gnutls-1.0.17 lua? ( dev-lang/lua ) perl? ( dev-lang/perl ) ruby? ( dev-lang/ruby ) !net-analyzer/prelude-nids sys-devel/flex perl? ( dev-lang/swig ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( =dev-lang/python-2* )
+>=net-libs/gnutls-1.0.17 lua? ( dev-lang/lua ) perl? ( dev-lang/perl ) ruby? ( dev-lang/ruby ) !net-analyzer/prelude-nids sys-devel/flex perl? ( dev-lang/swig ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( =dev-lang/python-2* )
 >=net-libs/gnutls-1.0.17 lua? ( dev-lang/lua ) perl? ( dev-lang/perl ) ruby? ( dev-lang/ruby ) !net-analyzer/prelude-nids python? ( =dev-lang/python-2* )
 0
 http://www.prelude-technologies.com/download/releases/libprelude/libprelude-1.0.0.tar.gz
diff --git a/metadata/cache/dev-libs/libpreludedb-1.0.0-r1 b/metadata/cache/dev-libs/libpreludedb-1.0.0-r1
index 4ab7f3b19d7e..aa48553a7985 100644
--- a/metadata/cache/dev-libs/libpreludedb-1.0.0-r1
+++ b/metadata/cache/dev-libs/libpreludedb-1.0.0-r1
@@ -1,4 +1,4 @@
->=dev-libs/libprelude-0.9.9 mysql? ( virtual/mysql ) perl? ( dev-lang/perl ) postgres? ( dev-db/postgresql-server ) sqlite? ( =dev-db/sqlite-3* ) doc? ( dev-util/gtk-doc ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( =dev-lang/python-2* )
+>=dev-libs/libprelude-0.9.9 mysql? ( virtual/mysql ) perl? ( dev-lang/perl ) postgres? ( dev-db/postgresql-server ) sqlite? ( =dev-db/sqlite-3* ) doc? ( dev-util/gtk-doc ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( =dev-lang/python-2* )
 >=dev-libs/libprelude-0.9.9 mysql? ( virtual/mysql ) perl? ( dev-lang/perl ) postgres? ( dev-db/postgresql-server ) sqlite? ( =dev-db/sqlite-3* ) python? ( =dev-lang/python-2* )
 0
 http://www.prelude-technologies.com/download/releases/libpreludedb/libpreludedb-1.0.0.tar.gz
diff --git a/metadata/cache/dev-libs/librapi2-0.15.2 b/metadata/cache/dev-libs/librapi2-0.15.2
index c17a46c0360c..70fa3f5f9d67 100644
--- a/metadata/cache/dev-libs/librapi2-0.15.2
+++ b/metadata/cache/dev-libs/librapi2-0.15.2
@@ -1,4 +1,4 @@
->=dev-libs/libsynce-0.15.1[dbus] >=dev-libs/dbus-glib-0.88 python? ( >=dev-python/pyrex-0.9.6 ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) )
+>=dev-libs/libsynce-0.15.1[dbus] >=dev-libs/dbus-glib-0.88 python? ( >=dev-python/pyrex-0.9.6 ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) )
 >=dev-libs/libsynce-0.15.1[dbus] >=dev-libs/dbus-glib-0.88 python? ( >=dev-python/pyrex-0.9.6 ) python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) )
 0
 mirror://sourceforge/synce/librapi2-0.15.2.tar.gz
diff --git a/metadata/cache/dev-libs/libreport-2.0.7 b/metadata/cache/dev-libs/libreport-2.0.7
index 56bf21263690..1f1c656ecc35 100644
--- a/metadata/cache/dev-libs/libreport-2.0.7
+++ b/metadata/cache/dev-libs/libreport-2.0.7
@@ -1,4 +1,4 @@
->=dev-libs/glib-2.21:2 dev-libs/newt dev-libs/nss dev-libs/libtar dev-libs/libxml2 dev-libs/xmlrpc-c gnome-base/gnome-keyring net-misc/curl[ssl] sys-apps/dbus x11-libs/gtk+:2 app-text/asciidoc app-text/xmlto >=dev-util/intltool-0.3.50 >=dev-util/pkgconfig-0.9.0 >=sys-devel/gettext-0.17 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
+>=dev-libs/glib-2.21:2 dev-libs/newt dev-libs/nss dev-libs/libtar dev-libs/libxml2 dev-libs/xmlrpc-c gnome-base/gnome-keyring net-misc/curl[ssl] sys-apps/dbus x11-libs/gtk+:2 app-text/asciidoc app-text/xmlto >=dev-util/intltool-0.3.50 >=dev-util/pkgconfig-0.9.0 >=sys-devel/gettext-0.17 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
 >=dev-libs/glib-2.21:2 dev-libs/newt dev-libs/nss dev-libs/libtar dev-libs/libxml2 dev-libs/xmlrpc-c gnome-base/gnome-keyring net-misc/curl[ssl] sys-apps/dbus x11-libs/gtk+:2 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
 0
 https://fedorahosted.org/released/abrt/libreport-2.0.7.tar.gz
diff --git a/metadata/cache/dev-libs/libreport-2.0.9 b/metadata/cache/dev-libs/libreport-2.0.9
index cceb2ce73ab5..5ff00cd9084c 100644
--- a/metadata/cache/dev-libs/libreport-2.0.9
+++ b/metadata/cache/dev-libs/libreport-2.0.9
@@ -1,4 +1,4 @@
->=dev-libs/glib-2.21:2 dev-libs/newt dev-libs/nss dev-libs/libtar dev-libs/libxml2 dev-libs/xmlrpc-c gnome-base/gnome-keyring net-libs/libproxy net-misc/curl[ssl] sys-apps/dbus x11-libs/gtk+:2 app-text/asciidoc app-text/xmlto >=dev-util/intltool-0.3.50 >=dev-util/pkgconfig-0.9.0 >=sys-devel/gettext-0.17 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
+>=dev-libs/glib-2.21:2 dev-libs/newt dev-libs/nss dev-libs/libtar dev-libs/libxml2 dev-libs/xmlrpc-c gnome-base/gnome-keyring net-libs/libproxy net-misc/curl[ssl] sys-apps/dbus x11-libs/gtk+:2 app-text/asciidoc app-text/xmlto >=dev-util/intltool-0.3.50 >=dev-util/pkgconfig-0.9.0 >=sys-devel/gettext-0.17 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
 >=dev-libs/glib-2.21:2 dev-libs/newt dev-libs/nss dev-libs/libtar dev-libs/libxml2 dev-libs/xmlrpc-c gnome-base/gnome-keyring net-libs/libproxy net-misc/curl[ssl] sys-apps/dbus x11-libs/gtk+:2 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
 0
 https://fedorahosted.org/released/abrt/libreport-2.0.9.tar.gz
diff --git a/metadata/cache/dev-libs/librtfcomp-1.1 b/metadata/cache/dev-libs/librtfcomp-1.1
index 2304465a3777..53c1c0236644 100644
--- a/metadata/cache/dev-libs/librtfcomp-1.1
+++ b/metadata/cache/dev-libs/librtfcomp-1.1
@@ -1,4 +1,4 @@
-python? ( >=dev-python/pyrex-0.9.6 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) )
+python? ( >=dev-python/pyrex-0.9.6 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) )
 python? ( >=dev-python/pyrex-0.9.6 ) python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) )
 0
 mirror://sourceforge/synce/librtfcomp-1.1.tar.gz
diff --git a/metadata/cache/dev-libs/libsigc++-1.2.7 b/metadata/cache/dev-libs/libsigc++-1.2.7
index 10c4aeaf598b..953021232265 100644
--- a/metadata/cache/dev-libs/libsigc++-1.2.7
+++ b/metadata/cache/dev-libs/libsigc++-1.2.7
@@ -1,4 +1,4 @@
-sys-devel/m4 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+sys-devel/m4 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 
 1.2
 mirror://gnome/sources/libsigc++/1.2/libsigc++-1.2.7.tar.bz2
diff --git a/metadata/cache/dev-libs/libtar-1.2.11-r4 b/metadata/cache/dev-libs/libtar-1.2.11-r4
index 759cc67646f2..afb96ebf4f5b 100644
--- a/metadata/cache/dev-libs/libtar-1.2.11-r4
+++ b/metadata/cache/dev-libs/libtar-1.2.11-r4
@@ -1,4 +1,4 @@
-zlib? ( sys-libs/zlib ) !zlib? ( app-arch/gzip ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+zlib? ( sys-libs/zlib ) !zlib? ( app-arch/gzip ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 zlib? ( sys-libs/zlib ) !zlib? ( app-arch/gzip )
 0
 ftp://ftp.feep.net/pub/software/libtar/libtar-1.2.11.tar.gz mirror://debian/pool/main/libt/libtar/libtar_1.2.11-6.diff.gz
diff --git a/metadata/cache/dev-libs/libtecla-1.6.1-r1 b/metadata/cache/dev-libs/libtecla-1.6.1-r1
index c32b5c2f372c..9a278e418a00 100644
--- a/metadata/cache/dev-libs/libtecla-1.6.1-r1
+++ b/metadata/cache/dev-libs/libtecla-1.6.1-r1
@@ -1,4 +1,4 @@
-sys-libs/ncurses || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+sys-libs/ncurses || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 sys-libs/ncurses
 0
 http://www.astro.caltech.edu/~mcs/tecla/libtecla-1.6.1.tar.gz
diff --git a/metadata/cache/dev-libs/libunicode-0.4-r1 b/metadata/cache/dev-libs/libunicode-0.4-r1
index 020121f30c12..edddfe4c84bc 100644
--- a/metadata/cache/dev-libs/libunicode-0.4-r1
+++ b/metadata/cache/dev-libs/libunicode-0.4-r1
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 ftp://ftp.gnome.org/pub/GNOME/sources/libunicode/0.4/libunicode-0.4.gnome.tar.gz
diff --git a/metadata/cache/dev-libs/libusb-0.1.12-r7 b/metadata/cache/dev-libs/libusb-0.1.12-r7
index d19436f57f7b..7c8bb3329e67 100644
--- a/metadata/cache/dev-libs/libusb-0.1.12-r7
+++ b/metadata/cache/dev-libs/libusb-0.1.12-r7
@@ -1,4 +1,4 @@
-!dev-libs/libusb-compat doc? ( app-text/openjade app-text/docbook-dsssl-stylesheets app-text/docbook-sgml-utils ~app-text/docbook-sgml-dtd-4.2 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+!dev-libs/libusb-compat doc? ( app-text/openjade app-text/docbook-dsssl-stylesheets app-text/docbook-sgml-utils ~app-text/docbook-sgml-dtd-4.2 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 !dev-libs/libusb-compat
 0
 mirror://sourceforge/libusb/libusb-0.1.12.tar.gz
diff --git a/metadata/cache/dev-libs/libusb-1.0.9_rc3 b/metadata/cache/dev-libs/libusb-1.0.9_rc3
index ad5f06ea7c16..d05e40b3b3ec 100644
--- a/metadata/cache/dev-libs/libusb-1.0.9_rc3
+++ b/metadata/cache/dev-libs/libusb-1.0.9_rc3
@@ -1,4 +1,4 @@
-doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 1
 mirror://debian/pool/main/libu/libusb-1.0/libusb-1.0_1.0.9~rc3.orig.tar.gz
diff --git a/metadata/cache/dev-libs/libxls-0.3.0_pre107 b/metadata/cache/dev-libs/libxls-0.3.0_pre107
index ffa5c5ebd7e8..8dea2c1d93b0 100644
--- a/metadata/cache/dev-libs/libxls-0.3.0_pre107
+++ b/metadata/cache/dev-libs/libxls-0.3.0_pre107
@@ -1,4 +1,4 @@
-virtual/libintl !<app-text/catdoc-0.94.2-r2 dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+virtual/libintl !<app-text/catdoc-0.94.2-r2 dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 virtual/libintl !<app-text/catdoc-0.94.2-r2
 0
 mirror://gentoo/libxls-0.3.0_pre107.tar.bz2
diff --git a/metadata/cache/dev-libs/libxml2-2.7.8-r4 b/metadata/cache/dev-libs/libxml2-2.7.8-r4
index ddd10852bccd..c1e3d1cdc630 100644
--- a/metadata/cache/dev-libs/libxml2-2.7.8-r4
+++ b/metadata/cache/dev-libs/libxml2-2.7.8-r4
@@ -1,4 +1,4 @@
-sys-libs/zlib icu? ( dev-libs/icu ) readline? ( sys-libs/readline ) hppa? ( >=sys-devel/binutils-2.15.92.0.2 ) python? ( =dev-lang/python-2* ) python? ( =dev-lang/python-2*[xml] ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+sys-libs/zlib icu? ( dev-libs/icu ) readline? ( sys-libs/readline ) hppa? ( >=sys-devel/binutils-2.15.92.0.2 ) python? ( =dev-lang/python-2* ) python? ( =dev-lang/python-2*[xml] ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 sys-libs/zlib icu? ( dev-libs/icu ) readline? ( sys-libs/readline ) python? ( =dev-lang/python-2* ) python? ( =dev-lang/python-2*[xml] )
 2
 ftp://xmlsoft.org/libxml2/libxml2-2.7.8.tar.gz test? ( http://www.w3.org/XML/2004/xml-schema-test-suite/xmlschema2002-01-16/xsts-2002-01-16.tar.gz http://www.w3.org/XML/2004/xml-schema-test-suite/xmlschema2004-01-14/xsts-2004-01-14.tar.gz )
diff --git a/metadata/cache/dev-libs/libxml2-2.7.8-r5 b/metadata/cache/dev-libs/libxml2-2.7.8-r5
index ddd10852bccd..c1e3d1cdc630 100644
--- a/metadata/cache/dev-libs/libxml2-2.7.8-r5
+++ b/metadata/cache/dev-libs/libxml2-2.7.8-r5
@@ -1,4 +1,4 @@
-sys-libs/zlib icu? ( dev-libs/icu ) readline? ( sys-libs/readline ) hppa? ( >=sys-devel/binutils-2.15.92.0.2 ) python? ( =dev-lang/python-2* ) python? ( =dev-lang/python-2*[xml] ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+sys-libs/zlib icu? ( dev-libs/icu ) readline? ( sys-libs/readline ) hppa? ( >=sys-devel/binutils-2.15.92.0.2 ) python? ( =dev-lang/python-2* ) python? ( =dev-lang/python-2*[xml] ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 sys-libs/zlib icu? ( dev-libs/icu ) readline? ( sys-libs/readline ) python? ( =dev-lang/python-2* ) python? ( =dev-lang/python-2*[xml] )
 2
 ftp://xmlsoft.org/libxml2/libxml2-2.7.8.tar.gz test? ( http://www.w3.org/XML/2004/xml-schema-test-suite/xmlschema2002-01-16/xsts-2002-01-16.tar.gz http://www.w3.org/XML/2004/xml-schema-test-suite/xmlschema2004-01-14/xsts-2004-01-14.tar.gz )
diff --git a/metadata/cache/dev-libs/libxslt-1.1.26-r2 b/metadata/cache/dev-libs/libxslt-1.1.26-r2
index 79f140335996..62df2f35b0b9 100644
--- a/metadata/cache/dev-libs/libxslt-1.1.26-r2
+++ b/metadata/cache/dev-libs/libxslt-1.1.26-r2
@@ -1,4 +1,4 @@
->=dev-libs/libxml2-2.6.27:2 crypt? ( >=dev-libs/libgcrypt-1.1.42 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( =dev-lang/python-2* )
+>=dev-libs/libxml2-2.6.27:2 crypt? ( >=dev-libs/libgcrypt-1.1.42 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( =dev-lang/python-2* )
 >=dev-libs/libxml2-2.6.27:2 crypt? ( >=dev-libs/libgcrypt-1.1.42 ) python? ( =dev-lang/python-2* )
 0
 ftp://xmlsoft.org/libxslt/libxslt-1.1.26.tar.gz
diff --git a/metadata/cache/dev-libs/libxslt-1.1.26-r3 b/metadata/cache/dev-libs/libxslt-1.1.26-r3
index aaf67b791b63..68bfa92b6f7d 100644
--- a/metadata/cache/dev-libs/libxslt-1.1.26-r3
+++ b/metadata/cache/dev-libs/libxslt-1.1.26-r3
@@ -1,4 +1,4 @@
->=dev-libs/libxml2-2.6.27:2 crypt? ( >=dev-libs/libgcrypt-1.1.42 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( =dev-lang/python-2* )
+>=dev-libs/libxml2-2.6.27:2 crypt? ( >=dev-libs/libgcrypt-1.1.42 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( =dev-lang/python-2* )
 >=dev-libs/libxml2-2.6.27:2 crypt? ( >=dev-libs/libgcrypt-1.1.42 ) python? ( =dev-lang/python-2* )
 0
 ftp://xmlsoft.org/libxslt/libxslt-1.1.26.tar.gz
diff --git a/metadata/cache/dev-libs/libzeitgeist-0.3.12 b/metadata/cache/dev-libs/libzeitgeist-0.3.12
index dd698358af3d..bbddf3f6f9c5 100644
--- a/metadata/cache/dev-libs/libzeitgeist-0.3.12
+++ b/metadata/cache/dev-libs/libzeitgeist-0.3.12
@@ -1,4 +1,4 @@
-dev-libs/glib:2 dev-util/gtk-doc dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-libs/glib:2 dev-util/gtk-doc dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-libs/glib:2 gnome-extra/zeitgeist
 0
 http://launchpad.net/libzeitgeist/0.3/0.3.12/+download/libzeitgeist-0.3.12.tar.gz
diff --git a/metadata/cache/dev-libs/libzeitgeist-0.3.14 b/metadata/cache/dev-libs/libzeitgeist-0.3.14
index d054282276a3..7ac4a89c92c6 100644
--- a/metadata/cache/dev-libs/libzeitgeist-0.3.14
+++ b/metadata/cache/dev-libs/libzeitgeist-0.3.14
@@ -1,4 +1,4 @@
-dev-libs/glib:2 dev-util/gtk-doc dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-libs/glib:2 dev-util/gtk-doc dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-libs/glib:2 gnome-extra/zeitgeist
 0
 http://launchpad.net/libzeitgeist/0.3/0.3.14/+download/libzeitgeist-0.3.14.tar.gz
diff --git a/metadata/cache/dev-libs/libzeitgeist-0.3.16 b/metadata/cache/dev-libs/libzeitgeist-0.3.16
index a42a8d9ed77a..9691a00e84c0 100644
--- a/metadata/cache/dev-libs/libzeitgeist-0.3.16
+++ b/metadata/cache/dev-libs/libzeitgeist-0.3.16
@@ -1,4 +1,4 @@
-dev-libs/glib:2 dev-util/gtk-doc dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-libs/glib:2 dev-util/gtk-doc dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-libs/glib:2 gnome-extra/zeitgeist
 0
 http://launchpad.net/libzeitgeist/0.3/0.3.16/+download/libzeitgeist-0.3.16.tar.gz
diff --git a/metadata/cache/dev-libs/lockdev-1.0.3.1.2-r1 b/metadata/cache/dev-libs/lockdev-1.0.3.1.2-r1
index 07e012565661..6753e0c0a362 100644
--- a/metadata/cache/dev-libs/lockdev-1.0.3.1.2-r1
+++ b/metadata/cache/dev-libs/lockdev-1.0.3.1.2-r1
@@ -1,4 +1,4 @@
-perl? ( dev-lang/perl[-build] ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+perl? ( dev-lang/perl[-build] ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 perl? ( dev-lang/perl[-build] )
 0
 mirror://debian/pool/main/l/lockdev/lockdev_1.0.3.orig.tar.gz mirror://debian/pool/main/l/lockdev/lockdev_1.0.3-1.2.diff.gz
diff --git a/metadata/cache/dev-libs/log4cpp-1.0 b/metadata/cache/dev-libs/log4cpp-1.0
index 82dc9d05d6a6..57c887547d8d 100644
--- a/metadata/cache/dev-libs/log4cpp-1.0
+++ b/metadata/cache/dev-libs/log4cpp-1.0
@@ -1,4 +1,4 @@
-doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 mirror://sourceforge/log4cpp/log4cpp-1.0.tar.gz
diff --git a/metadata/cache/dev-libs/m17n-lib-1.6.2 b/metadata/cache/dev-libs/m17n-lib-1.6.2
index c8522fbac3b8..55c161225024 100644
--- a/metadata/cache/dev-libs/m17n-lib-1.6.2
+++ b/metadata/cache/dev-libs/m17n-lib-1.6.2
@@ -1,4 +1,4 @@
-X? ( x11-libs/libXaw x11-libs/libXft x11-libs/libX11 gd? ( media-libs/gd[png] ) dev-libs/fribidi >=media-libs/freetype-2.1 media-libs/fontconfig >=dev-libs/libotf-0.9.4 ) dev-libs/libxml2 ~dev-db/m17n-db-1.6.2 dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+X? ( x11-libs/libXaw x11-libs/libXft x11-libs/libX11 gd? ( media-libs/gd[png] ) dev-libs/fribidi >=media-libs/freetype-2.1 media-libs/fontconfig >=dev-libs/libotf-0.9.4 ) dev-libs/libxml2 ~dev-db/m17n-db-1.6.2 dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 X? ( x11-libs/libXaw x11-libs/libXft x11-libs/libX11 gd? ( media-libs/gd[png] ) dev-libs/fribidi >=media-libs/freetype-2.1 media-libs/fontconfig >=dev-libs/libotf-0.9.4 ) dev-libs/libxml2 ~dev-db/m17n-db-1.6.2
 0
 http://www.m17n.org/m17n-lib-download/m17n-lib-1.6.2.tar.gz
diff --git a/metadata/cache/dev-libs/m17n-lib-1.6.3 b/metadata/cache/dev-libs/m17n-lib-1.6.3
index 352be4239a84..36a7236f46bc 100644
--- a/metadata/cache/dev-libs/m17n-lib-1.6.3
+++ b/metadata/cache/dev-libs/m17n-lib-1.6.3
@@ -1,4 +1,4 @@
-X? ( x11-libs/libXaw x11-libs/libXft x11-libs/libX11 gd? ( media-libs/gd[png] ) dev-libs/fribidi >=media-libs/freetype-2.1 media-libs/fontconfig >=dev-libs/libotf-0.9.4 ) dev-libs/libxml2 ~dev-db/m17n-db-1.6.3 dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+X? ( x11-libs/libXaw x11-libs/libXft x11-libs/libX11 gd? ( media-libs/gd[png] ) dev-libs/fribidi >=media-libs/freetype-2.1 media-libs/fontconfig >=dev-libs/libotf-0.9.4 ) dev-libs/libxml2 ~dev-db/m17n-db-1.6.3 dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 X? ( x11-libs/libXaw x11-libs/libXft x11-libs/libX11 gd? ( media-libs/gd[png] ) dev-libs/fribidi >=media-libs/freetype-2.1 media-libs/fontconfig >=dev-libs/libotf-0.9.4 ) dev-libs/libxml2 ~dev-db/m17n-db-1.6.3
 0
 http://www.m17n.org/m17n-lib-download/m17n-lib-1.6.3.tar.gz
diff --git a/metadata/cache/dev-libs/maloc-0.2.1-r3 b/metadata/cache/dev-libs/maloc-0.2.1-r3
index 5470b477006e..17c0c03661a8 100644
--- a/metadata/cache/dev-libs/maloc-0.2.1-r3
+++ b/metadata/cache/dev-libs/maloc-0.2.1-r3
@@ -1,4 +1,4 @@
-sys-libs/readline mpi? ( virtual/mpi ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+sys-libs/readline mpi? ( virtual/mpi ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 sys-libs/readline mpi? ( virtual/mpi )
 0
 http://cam.ucsd.edu/~mholst/codes/maloc/maloc-0.2-1.tar.gz
diff --git a/metadata/cache/dev-libs/maloc-1.4 b/metadata/cache/dev-libs/maloc-1.4
index 538c50cb726a..9a287bb15ccd 100644
--- a/metadata/cache/dev-libs/maloc-1.4
+++ b/metadata/cache/dev-libs/maloc-1.4
@@ -1,4 +1,4 @@
-sys-libs/readline mpi? ( virtual/mpi ) doc? ( media-gfx/graphviz app-doc/doxygen ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+sys-libs/readline mpi? ( virtual/mpi ) doc? ( media-gfx/graphviz app-doc/doxygen ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 sys-libs/readline mpi? ( virtual/mpi )
 0
 http://www.fetk.org/codes/download/maloc-1.4.tar.gz
diff --git a/metadata/cache/dev-libs/maloc-1.5 b/metadata/cache/dev-libs/maloc-1.5
index 05ac3bcee68f..9c59c2125c19 100644
--- a/metadata/cache/dev-libs/maloc-1.5
+++ b/metadata/cache/dev-libs/maloc-1.5
@@ -1,4 +1,4 @@
-sys-libs/readline mpi? ( virtual/mpi ) doc? ( media-gfx/graphviz app-doc/doxygen ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+sys-libs/readline mpi? ( virtual/mpi ) doc? ( media-gfx/graphviz app-doc/doxygen ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 sys-libs/readline mpi? ( virtual/mpi )
 0
 http://www.fetk.org/codes/download/maloc-1.5.tar.gz
diff --git a/metadata/cache/dev-libs/mini-xml-2.6 b/metadata/cache/dev-libs/mini-xml-2.6
index 20ecbb537aeb..d2acebd044a5 100644
--- a/metadata/cache/dev-libs/mini-xml-2.6
+++ b/metadata/cache/dev-libs/mini-xml-2.6
@@ -1,4 +1,4 @@
-dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 mirror://easysw/mxml/2.6/mxml-2.6.tar.gz
diff --git a/metadata/cache/dev-libs/mozldap-6.0.6-r2 b/metadata/cache/dev-libs/mozldap-6.0.6-r2
index 5a60b70ac99b..e93079a4af68 100644
--- a/metadata/cache/dev-libs/mozldap-6.0.6-r2
+++ b/metadata/cache/dev-libs/mozldap-6.0.6-r2
@@ -1,4 +1,4 @@
->=dev-libs/nss-3.11.4 >=dev-libs/nspr-4.0.1 >=dev-libs/svrcore-4.0.0 sasl? ( dev-libs/cyrus-sasl ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) =sys-devel/autoconf-2.1* sys-devel/libtool
+>=dev-libs/nss-3.11.4 >=dev-libs/nspr-4.0.1 >=dev-libs/svrcore-4.0.0 sasl? ( dev-libs/cyrus-sasl ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) =sys-devel/autoconf-2.1* sys-devel/libtool
 >=dev-libs/nss-3.11.4 >=dev-libs/nspr-4.0.1 >=dev-libs/svrcore-4.0.0 sasl? ( dev-libs/cyrus-sasl )
 0
 ftp://ftp.mozilla.org/pub/mozilla.org/directory/c-sdk/releases/v6.0.6/src/mozldap-6.0.6.tar.gz
diff --git a/metadata/cache/dev-libs/msgpack-0.4.2 b/metadata/cache/dev-libs/msgpack-0.4.2
index 5ed9c9bd193b..210048590042 100644
--- a/metadata/cache/dev-libs/msgpack-0.4.2
+++ b/metadata/cache/dev-libs/msgpack-0.4.2
@@ -1,4 +1,4 @@
-test? ( dev-cpp/gtest ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+test? ( dev-cpp/gtest ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 mirror://sourceforge.jp/msgpack/46155/msgpack-0.4.2.tar.gz
diff --git a/metadata/cache/dev-libs/nettle-2.4 b/metadata/cache/dev-libs/nettle-2.4
index 21308d0860bb..47771eec8898 100644
--- a/metadata/cache/dev-libs/nettle-2.4
+++ b/metadata/cache/dev-libs/nettle-2.4
@@ -1,4 +1,4 @@
-gmp? ( dev-libs/gmp ) ssl? ( dev-libs/openssl ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+gmp? ( dev-libs/gmp ) ssl? ( dev-libs/openssl ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 gmp? ( dev-libs/gmp ) ssl? ( dev-libs/openssl )
 0
 http://www.lysator.liu.se/~nisse/archive/nettle-2.4.tar.gz
diff --git a/metadata/cache/dev-libs/newt-0.52.13 b/metadata/cache/dev-libs/newt-0.52.13
index 72cfe11077a8..fe9e9d250d8a 100644
--- a/metadata/cache/dev-libs/newt-0.52.13
+++ b/metadata/cache/dev-libs/newt-0.52.13
@@ -1,4 +1,4 @@
-=sys-libs/slang-2* >=dev-libs/popt-1.6 elibc_uclibc? ( sys-libs/ncurses ) gpm? ( sys-libs/gpm ) tcl? ( =dev-lang/tcl-8.5* ) =dev-lang/python-2* || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+=sys-libs/slang-2* >=dev-libs/popt-1.6 elibc_uclibc? ( sys-libs/ncurses ) gpm? ( sys-libs/gpm ) tcl? ( =dev-lang/tcl-8.5* ) =dev-lang/python-2* || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 =sys-libs/slang-2* >=dev-libs/popt-1.6 elibc_uclibc? ( sys-libs/ncurses ) gpm? ( sys-libs/gpm ) tcl? ( =dev-lang/tcl-8.5* ) =dev-lang/python-2*
 0
 https://fedorahosted.org/releases/n/e/newt/newt-0.52.13.tar.gz
diff --git a/metadata/cache/dev-libs/newt-0.52.14-r1 b/metadata/cache/dev-libs/newt-0.52.14-r1
index de8cb7cac409..946680031ba2 100644
--- a/metadata/cache/dev-libs/newt-0.52.14-r1
+++ b/metadata/cache/dev-libs/newt-0.52.14-r1
@@ -1,4 +1,4 @@
-=sys-libs/slang-2* >=dev-libs/popt-1.6 elibc_uclibc? ( sys-libs/ncurses ) gpm? ( sys-libs/gpm ) tcl? ( =dev-lang/tcl-8.5* ) =dev-lang/python-2* || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+=sys-libs/slang-2* >=dev-libs/popt-1.6 elibc_uclibc? ( sys-libs/ncurses ) gpm? ( sys-libs/gpm ) tcl? ( =dev-lang/tcl-8.5* ) =dev-lang/python-2* || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 =sys-libs/slang-2* >=dev-libs/popt-1.6 elibc_uclibc? ( sys-libs/ncurses ) gpm? ( sys-libs/gpm ) tcl? ( =dev-lang/tcl-8.5* ) =dev-lang/python-2*
 0
 https://fedorahosted.org/releases/n/e/newt/newt-0.52.14.tar.gz
diff --git a/metadata/cache/dev-libs/nspr-4.9 b/metadata/cache/dev-libs/nspr-4.9
index 791c396b1ca3..0d3c65ea2c14 100644
--- a/metadata/cache/dev-libs/nspr-4.9
+++ b/metadata/cache/dev-libs/nspr-4.9
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/automake-1.11.1 ) =sys-devel/autoconf-2.1* sys-devel/libtool
+|| ( >=sys-devel/automake-1.11.1:1.11 ) =sys-devel/autoconf-2.1* sys-devel/libtool
 
 0
 ftp://ftp.mozilla.org/pub/mozilla.org/nspr/releases/v4.9/src/nspr-4.9.tar.gz
diff --git a/metadata/cache/dev-libs/opencryptoki-2.3.3-r5 b/metadata/cache/dev-libs/opencryptoki-2.3.3-r5
index 0eb6b078ce71..18233bc7075e 100644
--- a/metadata/cache/dev-libs/opencryptoki-2.3.3-r5
+++ b/metadata/cache/dev-libs/opencryptoki-2.3.3-r5
@@ -1,4 +1,4 @@
-tpm? ( app-crypt/trousers ) dev-libs/openssl || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+tpm? ( app-crypt/trousers ) dev-libs/openssl || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 tpm? ( app-crypt/trousers ) dev-libs/openssl
 0
 mirror://sourceforge/opencryptoki/opencryptoki-2.3.3.tar.bz2 http://dev.gentoo.org/~flameeyes/opencryptoki/opencryptoki-2.3.3-backports-3.tar.bz2
diff --git a/metadata/cache/dev-libs/openobex-1.5 b/metadata/cache/dev-libs/openobex-1.5
index 28f61d3eb964..420f845ff09e 100644
--- a/metadata/cache/dev-libs/openobex-1.5
+++ b/metadata/cache/dev-libs/openobex-1.5
@@ -1,4 +1,4 @@
-bluetooth? ( net-wireless/bluez ) usb? ( virtual/libusb:0 ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+bluetooth? ( net-wireless/bluez ) usb? ( virtual/libusb:0 ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 bluetooth? ( net-wireless/bluez ) usb? ( virtual/libusb:0 )
 0
 mirror://kernel/linux/bluetooth/openobex-1.5.tar.gz
diff --git a/metadata/cache/dev-libs/opensc-0.11.13-r2 b/metadata/cache/dev-libs/opensc-0.11.13-r2
index fb50d7eba677..726306cc3d50 100644
--- a/metadata/cache/dev-libs/opensc-0.11.13-r2
+++ b/metadata/cache/dev-libs/opensc-0.11.13-r2
@@ -1,4 +1,4 @@
-sys-devel/libtool 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 ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+sys-devel/libtool 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 ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 sys-devel/libtool 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 )
 0
 http://www.opensc-project.org/files/opensc/opensc-0.11.13.tar.gz
diff --git a/metadata/cache/dev-libs/opensc-0.12.0-r2 b/metadata/cache/dev-libs/opensc-0.12.0-r2
index b249ac3f4b50..21a47e785e51 100644
--- a/metadata/cache/dev-libs/opensc-0.12.0-r2
+++ b/metadata/cache/dev-libs/opensc-0.12.0-r2
@@ -1,4 +1,4 @@
-sys-devel/libtool 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 ) dev-util/pkgconfig app-text/docbook-xsl-stylesheets dev-libs/libxslt || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+sys-devel/libtool 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 ) dev-util/pkgconfig app-text/docbook-xsl-stylesheets dev-libs/libxslt || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 sys-devel/libtool 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 )
 0
 http://www.opensc-project.org/files/opensc/opensc-0.12.0.tar.gz
diff --git a/metadata/cache/dev-libs/opensc-0.12.1 b/metadata/cache/dev-libs/opensc-0.12.1
index b5d18e73e929..3021f96efe98 100644
--- a/metadata/cache/dev-libs/opensc-0.12.1
+++ b/metadata/cache/dev-libs/opensc-0.12.1
@@ -1,4 +1,4 @@
-sys-devel/libtool 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 ) dev-util/pkgconfig app-text/docbook-xsl-stylesheets dev-libs/libxslt || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+sys-devel/libtool 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 ) dev-util/pkgconfig app-text/docbook-xsl-stylesheets dev-libs/libxslt || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 sys-devel/libtool 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 )
 0
 http://www.opensc-project.org/files/opensc/opensc-0.12.1.tar.gz
diff --git a/metadata/cache/dev-libs/opensc-0.12.2 b/metadata/cache/dev-libs/opensc-0.12.2
index 839400c7254a..a2dfa29a681c 100644
--- a/metadata/cache/dev-libs/opensc-0.12.2
+++ b/metadata/cache/dev-libs/opensc-0.12.2
@@ -1,4 +1,4 @@
-libtool? ( sys-devel/libtool ) 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 ) dev-util/pkgconfig app-text/docbook-xsl-stylesheets dev-libs/libxslt || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+libtool? ( sys-devel/libtool ) 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 ) dev-util/pkgconfig app-text/docbook-xsl-stylesheets dev-libs/libxslt || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 libtool? ( sys-devel/libtool ) 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 )
 0
 http://www.opensc-project.org/files/opensc/opensc-0.12.2.tar.gz
diff --git a/metadata/cache/dev-libs/ossp-uuid-1.6.2-r1 b/metadata/cache/dev-libs/ossp-uuid-1.6.2-r1
index 42bf23bbf2f1..cbef50bb06d9 100644
--- a/metadata/cache/dev-libs/ossp-uuid-1.6.2-r1
+++ b/metadata/cache/dev-libs/ossp-uuid-1.6.2-r1
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php? ( php_targets_php5-3? ( dev-lang/php:5.3 ) )
+|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php? ( php_targets_php5-3? ( dev-lang/php:5.3 ) )
 php? ( || ( =dev-libs/ossp-uuid-1.6.2-r1[php_targets_php5-3] ) php_targets_php5-3? ( dev-lang/php:5.3 ) )
 0
 ftp://ftp.ossp.org/pkg/lib/uuid/uuid-1.6.2.tar.gz
diff --git a/metadata/cache/dev-libs/ppl-0.10.2-r1 b/metadata/cache/dev-libs/ppl-0.10.2-r1
index 5e5eda39df37..cb75ff1c5c25 100644
--- a/metadata/cache/dev-libs/ppl-0.10.2-r1
+++ b/metadata/cache/dev-libs/ppl-0.10.2-r1
@@ -1,4 +1,4 @@
->=dev-libs/gmp-4.1.3[cxx] lpsol? ( sci-mathematics/glpk ) sys-devel/m4 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-libs/gmp-4.1.3[cxx] lpsol? ( sci-mathematics/glpk ) sys-devel/m4 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=dev-libs/gmp-4.1.3[cxx] lpsol? ( sci-mathematics/glpk )
 0
 http://www.cs.unipr.it/ppl/Download/ftp/releases/0.10.2/ppl-0.10.2.tar.bz2 mirror://gentoo/ppl-0.10.2-gmp-5-fix.patch.bz2
diff --git a/metadata/cache/dev-libs/protobuf-2.3.0-r1 b/metadata/cache/dev-libs/protobuf-2.3.0-r1
index 491b3b48dabd..f10d3f273001 100644
--- a/metadata/cache/dev-libs/protobuf-2.3.0-r1
+++ b/metadata/cache/dev-libs/protobuf-2.3.0-r1
@@ -1,4 +1,4 @@
-java? ( >=virtual/jdk-1.5 ) python? ( dev-python/setuptools ) emacs? ( virtual/emacs ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( =dev-lang/python-2* ) java? ( >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip ) )
+java? ( >=virtual/jdk-1.5 ) python? ( dev-python/setuptools ) emacs? ( virtual/emacs ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( =dev-lang/python-2* ) java? ( >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip ) )
 java? ( >=virtual/jre-1.5 ) emacs? ( virtual/emacs ) python? ( =dev-lang/python-2* ) java? ( >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip ) )
 0
 http://protobuf.googlecode.com/files/protobuf-2.3.0.tar.bz2
diff --git a/metadata/cache/dev-libs/protobuf-2.4.0a b/metadata/cache/dev-libs/protobuf-2.4.0a
index c7fd31827943..518e07960672 100644
--- a/metadata/cache/dev-libs/protobuf-2.4.0a
+++ b/metadata/cache/dev-libs/protobuf-2.4.0a
@@ -1,4 +1,4 @@
-java? ( >=virtual/jdk-1.5 ) python? ( dev-python/setuptools ) emacs? ( virtual/emacs ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( =dev-lang/python-2* ) java? ( >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip ) )
+java? ( >=virtual/jdk-1.5 ) python? ( dev-python/setuptools ) emacs? ( virtual/emacs ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( =dev-lang/python-2* ) java? ( >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip ) )
 java? ( >=virtual/jre-1.5 ) emacs? ( virtual/emacs ) python? ( =dev-lang/python-2* ) java? ( >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip ) )
 0
 http://protobuf.googlecode.com/files/protobuf-2.4.0a.tar.bz2
diff --git a/metadata/cache/dev-libs/protobuf-2.4.1 b/metadata/cache/dev-libs/protobuf-2.4.1
index e54ef0faf4a3..c9a58c1eba00 100644
--- a/metadata/cache/dev-libs/protobuf-2.4.1
+++ b/metadata/cache/dev-libs/protobuf-2.4.1
@@ -1,4 +1,4 @@
-java? ( >=virtual/jdk-1.5 ) python? ( dev-python/setuptools ) emacs? ( virtual/emacs ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( =dev-lang/python-2* ) java? ( >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip ) )
+java? ( >=virtual/jdk-1.5 ) python? ( dev-python/setuptools ) emacs? ( virtual/emacs ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( =dev-lang/python-2* ) java? ( >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip ) )
 java? ( >=virtual/jre-1.5 ) emacs? ( virtual/emacs ) python? ( =dev-lang/python-2* ) java? ( >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip ) )
 0
 http://protobuf.googlecode.com/files/protobuf-2.4.1.tar.bz2
diff --git a/metadata/cache/dev-libs/pslib-0.4.1-r2 b/metadata/cache/dev-libs/pslib-0.4.1-r2
index 2f636db8b312..2397cc159f44 100644
--- a/metadata/cache/dev-libs/pslib-0.4.1-r2
+++ b/metadata/cache/dev-libs/pslib-0.4.1-r2
@@ -1,4 +1,4 @@
-png? ( >=media-libs/libpng-1.2.43-r2:0 ) jpeg? ( virtual/jpeg ) tiff? ( media-libs/tiff ) dev-lang/perl >=dev-libs/glib-2 dev-util/intltool dev-perl/XML-Parser || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+png? ( >=media-libs/libpng-1.2.43-r2:0 ) jpeg? ( virtual/jpeg ) tiff? ( media-libs/tiff ) dev-lang/perl >=dev-libs/glib-2 dev-util/intltool dev-perl/XML-Parser || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 png? ( >=media-libs/libpng-1.2.43-r2:0 ) jpeg? ( virtual/jpeg ) tiff? ( media-libs/tiff )
 0
 mirror://sourceforge/pslib/pslib-0.4.1.tar.gz
diff --git a/metadata/cache/dev-libs/pwlib-1.10.10-r3 b/metadata/cache/dev-libs/pwlib-1.10.10-r3
index 2db852a9333b..e3c09cd63b50 100644
--- a/metadata/cache/dev-libs/pwlib-1.10.10-r3
+++ b/metadata/cache/dev-libs/pwlib-1.10.10-r3
@@ -1,4 +1,4 @@
-alsa? ( media-libs/alsa-lib ) ldap? ( >=net-nds/openldap-2.3.35 ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( media-libs/libsdl ) ssl? ( dev-libs/openssl ) xml? ( dev-libs/expat ) >=sys-devel/bison-1.28 >=sys-devel/flex-2.5.4a >=sys-apps/sed-4 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+alsa? ( media-libs/alsa-lib ) ldap? ( >=net-nds/openldap-2.3.35 ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( media-libs/libsdl ) ssl? ( dev-libs/openssl ) xml? ( dev-libs/expat ) >=sys-devel/bison-1.28 >=sys-devel/flex-2.5.4a >=sys-apps/sed-4 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 alsa? ( media-libs/alsa-lib ) ldap? ( >=net-nds/openldap-2.3.35 ) sasl? ( dev-libs/cyrus-sasl ) sdl? ( media-libs/libsdl ) ssl? ( dev-libs/openssl ) xml? ( dev-libs/expat )
 0
 http://www.ekiga.org/admin/downloads/latest/sources/sources/pwlib-1.10.10.tar.gz
diff --git a/metadata/cache/dev-libs/svrcore-4.0.4 b/metadata/cache/dev-libs/svrcore-4.0.4
index 9266addfae2f..33fc31b85e37 100644
--- a/metadata/cache/dev-libs/svrcore-4.0.4
+++ b/metadata/cache/dev-libs/svrcore-4.0.4
@@ -1,4 +1,4 @@
->=dev-libs/nss-3.11 >=dev-libs/nspr-4.6 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-libs/nss-3.11 >=dev-libs/nspr-4.6 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=dev-libs/nss-3.11 >=dev-libs/nspr-4.6
 0
 http://ftp.mozilla.org/pub/mozilla.org/directory/svrcore/releases/4.0.4/src/svrcore-4.0.4.tar.bz2
diff --git a/metadata/cache/dev-libs/tntnet-1.6.3 b/metadata/cache/dev-libs/tntnet-1.6.3
index 93d4fb4de018..b928e860bdfd 100644
--- a/metadata/cache/dev-libs/tntnet-1.6.3
+++ b/metadata/cache/dev-libs/tntnet-1.6.3
@@ -1,4 +1,4 @@
-dev-libs/cxxtools sys-libs/zlib ssl? ( gnutls? ( >=net-libs/gnutls-1.2.0 ) !gnutls? ( dev-libs/openssl ) ) app-arch/zip ssl? ( gnutls? ( dev-util/pkgconfig ) ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-libs/cxxtools sys-libs/zlib ssl? ( gnutls? ( >=net-libs/gnutls-1.2.0 ) !gnutls? ( dev-libs/openssl ) ) app-arch/zip ssl? ( gnutls? ( dev-util/pkgconfig ) ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-libs/cxxtools sys-libs/zlib ssl? ( gnutls? ( >=net-libs/gnutls-1.2.0 ) !gnutls? ( dev-libs/openssl ) )
 0
 http://www.tntnet.org/download/tntnet-1.6.3.tar.gz
diff --git a/metadata/cache/dev-libs/tntnet-2.0-r1 b/metadata/cache/dev-libs/tntnet-2.0-r1
index 24bb23c8e195..e7e4320f6d75 100644
--- a/metadata/cache/dev-libs/tntnet-2.0-r1
+++ b/metadata/cache/dev-libs/tntnet-2.0-r1
@@ -1,4 +1,4 @@
->=dev-libs/cxxtools-2.0 sys-libs/zlib ssl? ( gnutls? ( >=net-libs/gnutls-1.2.0 dev-libs/libgcrypt ) !gnutls? ( dev-libs/openssl ) ) examples? ( app-arch/zip ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-libs/cxxtools-2.0 sys-libs/zlib ssl? ( gnutls? ( >=net-libs/gnutls-1.2.0 dev-libs/libgcrypt ) !gnutls? ( dev-libs/openssl ) ) examples? ( app-arch/zip ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=dev-libs/cxxtools-2.0 sys-libs/zlib ssl? ( gnutls? ( >=net-libs/gnutls-1.2.0 dev-libs/libgcrypt ) !gnutls? ( dev-libs/openssl ) )
 0
 http://www.tntnet.org/download/tntnet-2.0.tar.gz
diff --git a/metadata/cache/dev-libs/totem-pl-parser-2.32.3 b/metadata/cache/dev-libs/totem-pl-parser-2.32.3
index 9154b0b79584..edceb3318afb 100644
--- a/metadata/cache/dev-libs/totem-pl-parser-2.32.3
+++ b/metadata/cache/dev-libs/totem-pl-parser-2.32.3
@@ -1,4 +1,4 @@
->=dev-libs/glib-2.24:2 dev-libs/gmime:2.4 >=net-libs/libsoup-gnome-2.30:2.4 introspection? ( >=dev-libs/gobject-introspection-0.9.5 ) !<media-video/totem-2.21 >=sys-devel/gettext-0.17 >=dev-util/intltool-0.35 gnome-base/gnome-common >=dev-util/gtk-doc-am-1.11 doc? ( >=dev-util/gtk-doc-1.11 ) >=sys-apps/sed-4 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-libs/glib-2.24:2 dev-libs/gmime:2.4 >=net-libs/libsoup-gnome-2.30:2.4 introspection? ( >=dev-libs/gobject-introspection-0.9.5 ) !<media-video/totem-2.21 >=sys-devel/gettext-0.17 >=dev-util/intltool-0.35 gnome-base/gnome-common >=dev-util/gtk-doc-am-1.11 doc? ( >=dev-util/gtk-doc-1.11 ) >=sys-apps/sed-4 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=dev-libs/glib-2.24:2 dev-libs/gmime:2.4 >=net-libs/libsoup-gnome-2.30:2.4 introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
 0
 mirror://gnome/sources/totem-pl-parser/2.32/totem-pl-parser-2.32.3.tar.bz2 mirror://gentoo/introspection-20110205.m4.tar.bz2
diff --git a/metadata/cache/dev-libs/ucl-1.03-r1 b/metadata/cache/dev-libs/ucl-1.03-r1
index 81f952b98e90..ba653a2c5f4b 100644
--- a/metadata/cache/dev-libs/ucl-1.03-r1
+++ b/metadata/cache/dev-libs/ucl-1.03-r1
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 http://www.oberhumer.com/opensource/ucl/download/ucl-1.03.tar.gz
diff --git a/metadata/cache/dev-libs/udis86-1.7 b/metadata/cache/dev-libs/udis86-1.7
index 8d31d7ad4a96..c7021200ca39 100644
--- a/metadata/cache/dev-libs/udis86-1.7
+++ b/metadata/cache/dev-libs/udis86-1.7
@@ -1,4 +1,4 @@
-test? ( amd64? ( dev-lang/yasm ) x86? ( dev-lang/yasm ) x86-fbsd? ( dev-lang/yasm ) ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+test? ( amd64? ( dev-lang/yasm ) x86? ( dev-lang/yasm ) x86-fbsd? ( dev-lang/yasm ) ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 mirror://sourceforge/udis86/udis86-1.7.tar.gz
diff --git a/metadata/cache/dev-libs/uriparser-0.7.5 b/metadata/cache/dev-libs/uriparser-0.7.5
index 99d51da545b9..29d574b0c0e8 100644
--- a/metadata/cache/dev-libs/uriparser-0.7.5
+++ b/metadata/cache/dev-libs/uriparser-0.7.5
@@ -1,4 +1,4 @@
-dev-util/pkgconfig doc? ( >=app-doc/doxygen-1.5.8 qt4? ( x11-libs/qt-assistant ) ) test? ( dev-util/cpptest ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-util/pkgconfig doc? ( >=app-doc/doxygen-1.5.8 qt4? ( x11-libs/qt-assistant ) ) test? ( dev-util/cpptest ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 mirror://sourceforge/uriparser/uriparser-0.7.5.tar.bz2
diff --git a/metadata/cache/dev-libs/wayland-0.85.0 b/metadata/cache/dev-libs/wayland-0.85.0
index 21a17da9e0c2..c58c034e0611 100644
--- a/metadata/cache/dev-libs/wayland-0.85.0
+++ b/metadata/cache/dev-libs/wayland-0.85.0
@@ -1,4 +1,4 @@
-dev-libs/expat dev-libs/libffi || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-libs/expat dev-libs/libffi || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-libs/expat dev-libs/libffi
 0
 http://wayland.freedesktop.org/releases/wayland-0.85.0.tar.xz
diff --git a/metadata/cache/dev-libs/xapian-bindings-1.2.8 b/metadata/cache/dev-libs/xapian-bindings-1.2.8
index 0d68b169f9b9..ecadf069356c 100644
--- a/metadata/cache/dev-libs/xapian-bindings-1.2.8
+++ b/metadata/cache/dev-libs/xapian-bindings-1.2.8
@@ -1,4 +1,4 @@
-=dev-libs/xapian-1.2.8* lua? ( >=dev-lang/lua-5.1 ) mono? ( >=dev-lang/mono-1.0.8 ) perl? ( dev-lang/perl ) ruby? ( dev-lang/ruby ) tcl? ( >=dev-lang/tcl-8.1 ) java? ( >=virtual/jdk-1.3 ) java? ( >=dev-java/java-config-2.1.9-r1 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php? ( php_targets_php5-3? ( dev-lang/php:5.3 ) ) python? ( =dev-lang/python-2* ) =dev-lang/python-2*[threads]
+=dev-libs/xapian-1.2.8* lua? ( >=dev-lang/lua-5.1 ) mono? ( >=dev-lang/mono-1.0.8 ) perl? ( dev-lang/perl ) ruby? ( dev-lang/ruby ) tcl? ( >=dev-lang/tcl-8.1 ) java? ( >=virtual/jdk-1.3 ) java? ( >=dev-java/java-config-2.1.9-r1 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php? ( php_targets_php5-3? ( dev-lang/php:5.3 ) ) python? ( =dev-lang/python-2* ) =dev-lang/python-2*[threads]
 =dev-libs/xapian-1.2.8* lua? ( >=dev-lang/lua-5.1 ) mono? ( >=dev-lang/mono-1.0.8 ) perl? ( dev-lang/perl ) ruby? ( dev-lang/ruby ) tcl? ( >=dev-lang/tcl-8.1 ) java? ( >=virtual/jre-1.3 ) java? ( >=dev-java/java-config-2.1.9-r1 ) php? ( || ( =dev-libs/xapian-bindings-1.2.8[php_targets_php5-3] ) php_targets_php5-3? ( dev-lang/php:5.3 ) ) python? ( =dev-lang/python-2* ) =dev-lang/python-2*[threads]
 0
 http://oligarchy.co.uk/xapian/1.2.8/xapian-bindings-1.2.8.tar.gz
diff --git a/metadata/cache/dev-libs/xapian-bindings-1.2.9 b/metadata/cache/dev-libs/xapian-bindings-1.2.9
index 72abd93133e3..801447214d57 100644
--- a/metadata/cache/dev-libs/xapian-bindings-1.2.9
+++ b/metadata/cache/dev-libs/xapian-bindings-1.2.9
@@ -1,4 +1,4 @@
-=dev-libs/xapian-1.2.9* lua? ( >=dev-lang/lua-5.1 ) mono? ( >=dev-lang/mono-1.0.8 ) perl? ( dev-lang/perl ) ruby? ( dev-lang/ruby ) tcl? ( >=dev-lang/tcl-8.1 ) java? ( >=virtual/jdk-1.3 ) java? ( >=dev-java/java-config-2.1.9-r1 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php? ( php_targets_php5-3? ( dev-lang/php:5.3 ) ) python? ( =dev-lang/python-2* ) =dev-lang/python-2*[threads]
+=dev-libs/xapian-1.2.9* lua? ( >=dev-lang/lua-5.1 ) mono? ( >=dev-lang/mono-1.0.8 ) perl? ( dev-lang/perl ) ruby? ( dev-lang/ruby ) tcl? ( >=dev-lang/tcl-8.1 ) java? ( >=virtual/jdk-1.3 ) java? ( >=dev-java/java-config-2.1.9-r1 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php? ( php_targets_php5-3? ( dev-lang/php:5.3 ) ) python? ( =dev-lang/python-2* ) =dev-lang/python-2*[threads]
 =dev-libs/xapian-1.2.9* lua? ( >=dev-lang/lua-5.1 ) mono? ( >=dev-lang/mono-1.0.8 ) perl? ( dev-lang/perl ) ruby? ( dev-lang/ruby ) tcl? ( >=dev-lang/tcl-8.1 ) java? ( >=virtual/jre-1.3 ) java? ( >=dev-java/java-config-2.1.9-r1 ) php? ( || ( =dev-libs/xapian-bindings-1.2.9[php_targets_php5-3] ) php_targets_php5-3? ( dev-lang/php:5.3 ) ) python? ( =dev-lang/python-2* ) =dev-lang/python-2*[threads]
 0
 http://oligarchy.co.uk/xapian/1.2.9/xapian-bindings-1.2.9.tar.gz
diff --git a/metadata/cache/dev-libs/xqilla-2.2.4 b/metadata/cache/dev-libs/xqilla-2.2.4
index 1119cece8e52..74249f3edf86 100644
--- a/metadata/cache/dev-libs/xqilla-2.2.4
+++ b/metadata/cache/dev-libs/xqilla-2.2.4
@@ -1,4 +1,4 @@
->=dev-libs/xerces-c-3.1.0 faxpp? ( dev-libs/faxpp ) htmltidy? ( app-text/htmltidy ) doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-libs/xerces-c-3.1.0 faxpp? ( dev-libs/faxpp ) htmltidy? ( app-text/htmltidy ) doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=dev-libs/xerces-c-3.1.0 faxpp? ( dev-libs/faxpp ) htmltidy? ( app-text/htmltidy )
 0
 mirror://sourceforge/xqilla/XQilla-2.2.4.tar.gz
diff --git a/metadata/cache/dev-libs/yaz-3.0.47 b/metadata/cache/dev-libs/yaz-3.0.47
index c338673b31bc..187f5cb7fea2 100644
--- a/metadata/cache/dev-libs/yaz-3.0.47
+++ b/metadata/cache/dev-libs/yaz-3.0.47
@@ -1,4 +1,4 @@
-dev-libs/libxml2 dev-libs/libxslt dev-libs/openssl icu? ( dev-libs/icu ) tcpd? ( sys-apps/tcp-wrappers ) ziffy? ( net-libs/libpcap ) dev-util/pkgconfig dev-lang/tcl >=sys-devel/libtool-2 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-libs/libxml2 dev-libs/libxslt dev-libs/openssl icu? ( dev-libs/icu ) tcpd? ( sys-apps/tcp-wrappers ) ziffy? ( net-libs/libpcap ) dev-util/pkgconfig dev-lang/tcl >=sys-devel/libtool-2 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-libs/libxml2 dev-libs/libxslt dev-libs/openssl icu? ( dev-libs/icu ) tcpd? ( sys-apps/tcp-wrappers ) ziffy? ( net-libs/libpcap )
 0
 http://ftp.indexdata.dk/pub/yaz/yaz-3.0.47.tar.gz
diff --git a/metadata/cache/dev-libs/yaz-3.0.50 b/metadata/cache/dev-libs/yaz-3.0.50
index 8797db3bffb8..14c6f7376a6a 100644
--- a/metadata/cache/dev-libs/yaz-3.0.50
+++ b/metadata/cache/dev-libs/yaz-3.0.50
@@ -1,4 +1,4 @@
-dev-libs/libxml2 dev-libs/libxslt dev-libs/openssl icu? ( dev-libs/icu ) tcpd? ( sys-apps/tcp-wrappers ) ziffy? ( net-libs/libpcap ) dev-util/pkgconfig dev-lang/tcl >=sys-devel/libtool-2 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-libs/libxml2 dev-libs/libxslt dev-libs/openssl icu? ( dev-libs/icu ) tcpd? ( sys-apps/tcp-wrappers ) ziffy? ( net-libs/libpcap ) dev-util/pkgconfig dev-lang/tcl >=sys-devel/libtool-2 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-libs/libxml2 dev-libs/libxslt dev-libs/openssl icu? ( dev-libs/icu ) tcpd? ( sys-apps/tcp-wrappers ) ziffy? ( net-libs/libpcap )
 0
 http://ftp.indexdata.dk/pub/yaz/yaz-3.0.50.tar.gz
diff --git a/metadata/cache/dev-libs/zthread-2.3.2-r1 b/metadata/cache/dev-libs/zthread-2.3.2-r1
index b6d919e180ee..15dfcdf77c22 100644
--- a/metadata/cache/dev-libs/zthread-2.3.2-r1
+++ b/metadata/cache/dev-libs/zthread-2.3.2-r1
@@ -1,4 +1,4 @@
-doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 mirror://sourceforge/zthread/ZThread-2.3.2.tar.gz
diff --git a/metadata/cache/dev-libs/zthread-2.3.2-r2 b/metadata/cache/dev-libs/zthread-2.3.2-r2
index 9bd7a3cc7be8..5fcaaa0fed55 100644
--- a/metadata/cache/dev-libs/zthread-2.3.2-r2
+++ b/metadata/cache/dev-libs/zthread-2.3.2-r2
@@ -1,4 +1,4 @@
-doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 mirror://sourceforge/zthread/ZThread-2.3.2.tar.gz
diff --git a/metadata/cache/dev-ml/camlimages-3.0.2 b/metadata/cache/dev-ml/camlimages-3.0.2
index b7bea3775e72..804e4f70dbf9 100644
--- a/metadata/cache/dev-ml/camlimages-3.0.2
+++ b/metadata/cache/dev-ml/camlimages-3.0.2
@@ -1,4 +1,4 @@
-dev-ml/ocaml-autoconf dev-ml/findlib || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-ml/ocaml-autoconf dev-ml/findlib || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=dev-lang/ocaml-3.10.2[X,ocamlopt] gif? ( media-libs/giflib ) gtk? ( dev-ml/lablgtk ) gs? ( app-text/ghostscript-gpl ) jpeg? ( virtual/jpeg ) tiff? ( media-libs/tiff ) >=media-libs/libpng-1.4 truetype? ( >=media-libs/freetype-2 ) xpm? ( x11-libs/libXpm )
 0
 http://cristal.inria.fr/camlimages/camlimages-3.0.2.tgz
diff --git a/metadata/cache/dev-ml/ocurl-0.5.1 b/metadata/cache/dev-ml/ocurl-0.5.1
index c598cb63b875..04cfde7fcb78 100644
--- a/metadata/cache/dev-ml/ocurl-0.5.1
+++ b/metadata/cache/dev-ml/ocurl-0.5.1
@@ -1,4 +1,4 @@
->=net-misc/curl-7.9.8 dev-libs/openssl >=dev-ml/findlib-1.0.4-r1 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=net-misc/curl-7.9.8 dev-libs/openssl >=dev-ml/findlib-1.0.4-r1 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=net-misc/curl-7.9.8 dev-libs/openssl
 0
 mirror://sourceforge/ocurl/ocurl-0.5.1.tgz
diff --git a/metadata/cache/dev-ml/ocurl-0.5.3 b/metadata/cache/dev-ml/ocurl-0.5.3
index 14b3f77a1780..f099707c1526 100644
--- a/metadata/cache/dev-ml/ocurl-0.5.3
+++ b/metadata/cache/dev-ml/ocurl-0.5.3
@@ -1,4 +1,4 @@
->=net-misc/curl-7.9.8 dev-libs/openssl >=dev-ml/findlib-1.0.4-r1 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=net-misc/curl-7.9.8 dev-libs/openssl >=dev-ml/findlib-1.0.4-r1 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=net-misc/curl-7.9.8 dev-libs/openssl
 0
 mirror://sourceforge/ocurl/ocurl-0.5.3.tgz
diff --git a/metadata/cache/dev-perl/JSON-2.530.0 b/metadata/cache/dev-perl/JSON-2.530.0
index ceb18992e3c7..a9d673c1aad6 100644
--- a/metadata/cache/dev-perl/JSON-2.530.0
+++ b/metadata/cache/dev-perl/JSON-2.530.0
@@ -6,7 +6,7 @@ mirror://cpan/authors/id/M/MA/MAKAMAKA/JSON-2.53.tar.gz
 http://search.cpan.org/dist/JSON/
 || ( Artistic GPL-1 GPL-2 GPL-3 )
 parse and convert to JSON (JavaScript Object Notation)
-alpha amd64 ia64 ppc ~ppc64 sparc x86 ~x64-macos ~x86-solaris
+alpha amd64 ~hppa ia64 ppc ~ppc64 sparc x86 ~x64-macos ~x86-solaris
 base eutils multilib perl-module toolchain-funcs user
 
 
diff --git a/metadata/cache/dev-perl/Module-Install-1.60.0 b/metadata/cache/dev-perl/Module-Install-1.60.0
index 4c7792331241..224d73ed2641 100644
--- a/metadata/cache/dev-perl/Module-Install-1.60.0
+++ b/metadata/cache/dev-perl/Module-Install-1.60.0
@@ -6,7 +6,7 @@ mirror://cpan/authors/id/A/AD/ADAMK/Module-Install-1.06.tar.gz
 http://search.cpan.org/dist/Module-Install/
 || ( Artistic GPL-1 GPL-2 GPL-3 )
 Standalone, extensible Perl module installer
-~amd64 ~x86
+~amd64 ~hppa ~x86
 base eutils multilib perl-module toolchain-funcs user
 test
 
diff --git a/metadata/cache/dev-perl/Module-ScanDeps-1.80.0 b/metadata/cache/dev-perl/Module-ScanDeps-1.80.0
index 4239a3c2453f..5202f7e8a110 100644
--- a/metadata/cache/dev-perl/Module-ScanDeps-1.80.0
+++ b/metadata/cache/dev-perl/Module-ScanDeps-1.80.0
@@ -6,7 +6,7 @@ mirror://cpan/authors/id/R/RS/RSCHUPP/Module-ScanDeps-1.08.tar.gz
 http://search.cpan.org/dist/Module-ScanDeps/
 || ( Artistic GPL-1 GPL-2 GPL-3 )
 Recursively scan Perl code for dependencies
-~amd64 ~x86
+~amd64 ~hppa ~x86
 base eutils multilib perl-module toolchain-funcs user
 test
 
diff --git a/metadata/cache/dev-perl/Unicode-EastAsianWidth-1.30 b/metadata/cache/dev-perl/Unicode-EastAsianWidth-1.30
index 76312783cbba..a5096edf7d9d 100644
--- a/metadata/cache/dev-perl/Unicode-EastAsianWidth-1.30
+++ b/metadata/cache/dev-perl/Unicode-EastAsianWidth-1.30
@@ -6,7 +6,7 @@ mirror://cpan/authors/id/A/AU/AUDREYT/Unicode-EastAsianWidth-1.30.tar.gz
 http://search.cpan.org/dist/Unicode-EastAsianWidth/
 MIT
 East Asian Width properties
-~amd64 ~x86
+~amd64 ~hppa ~x86
 base eutils multilib perl-module toolchain-funcs user
 
 
diff --git a/metadata/cache/dev-php/PEAR-Benchmark-1.2.9 b/metadata/cache/dev-php/PEAR-Benchmark-1.2.9
index 0bb07ea9afd9..ea84af7e7b70 100644
--- a/metadata/cache/dev-php/PEAR-Benchmark-1.2.9
+++ b/metadata/cache/dev-php/PEAR-Benchmark-1.2.9
@@ -14,7 +14,7 @@ multilib php-pear-r1 toolchain-funcs
 
 4
 
-install postinst unpack
+install postinst
 
 
 
diff --git a/metadata/cache/dev-php/adodb-ext-504-r2 b/metadata/cache/dev-php/adodb-ext-504-r2
index 0e4f563a7d8b..9dc12cece8b8 100644
--- a/metadata/cache/dev-php/adodb-ext-504-r2
+++ b/metadata/cache/dev-php/adodb-ext-504-r2
@@ -1,4 +1,4 @@
->=dev-php/adodb-4.70 app-arch/unzip || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 )
+>=dev-php/adodb-4.70 app-arch/unzip || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 )
 >=dev-php/adodb-4.70 || ( =dev-php/adodb-ext-504-r2[php_targets_php5-3] ) php_targets_php5-3? ( dev-lang/php:5.3 )
 0
 http://phplens.com/lens/dl/adodb-ext-504.zip
diff --git a/metadata/cache/dev-php/awl-0.51-r1 b/metadata/cache/dev-php/awl-0.51-r1
new file mode 100644
index 000000000000..d7d3e5dbd2c1
--- /dev/null
+++ b/metadata/cache/dev-php/awl-0.51-r1
@@ -0,0 +1,22 @@
+dev-lang/php[pdo,postgres,xml] doc? ( dev-php/PEAR-PhpDocumentor ) =dev-lang/php-5* dev-lang/php
+dev-lang/php[pdo,postgres,xml] doc? ( dev-php/PEAR-PhpDocumentor ) =dev-lang/php-5* dev-lang/php
+0
+http://debian.mcmillan.net.nz/packages/awl/awl-0.51.tar.gz
+
+http://andrew.mcmillan.net.nz/projects/awl
+GPL-2
+Andrew McMillan's web libraries: A collection of generic classes used by the davical calendar server
+~amd64 ~x86
+depend.php eutils multilib php-lib-r1 phpconfutils toolchain-funcs user
+doc
+
+
+
+2
+
+compile install
+
+
+
+
+
diff --git a/metadata/cache/dev-php/eaccelerator-0.9.6.1-r1 b/metadata/cache/dev-php/eaccelerator-0.9.6.1-r1
index c8e366a8eab4..eb351cb8af6d 100644
--- a/metadata/cache/dev-php/eaccelerator-0.9.6.1-r1
+++ b/metadata/cache/dev-php/eaccelerator-0.9.6.1-r1
@@ -1,4 +1,4 @@
-!dev-php/pecl-apc !dev-php/xcache apache2? ( =www-servers/apache-2* ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 )
+!dev-php/pecl-apc !dev-php/xcache apache2? ( =www-servers/apache-2* ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 )
 !dev-php/pecl-apc !dev-php/xcache >=dev-lang/php-5.1[zlib,session?] virtual/httpd-php apache2? ( =www-servers/apache-2* ) || ( =dev-php/eaccelerator-0.9.6.1-r1[php_targets_php5-3] ) php_targets_php5-3? ( dev-lang/php:5.3 )
 0
 http://bart.eaccelerator.net/source/0.9.6.1/eaccelerator-0.9.6.1.tar.bz2
diff --git a/metadata/cache/dev-php/eaccelerator-0.9.6.1-r3 b/metadata/cache/dev-php/eaccelerator-0.9.6.1-r3
index b5931c066edf..5f45da904775 100644
--- a/metadata/cache/dev-php/eaccelerator-0.9.6.1-r3
+++ b/metadata/cache/dev-php/eaccelerator-0.9.6.1-r3
@@ -1,4 +1,4 @@
-!dev-php/pecl-apc !dev-php/xcache apache2? ( =www-servers/apache-2* ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 )
+!dev-php/pecl-apc !dev-php/xcache apache2? ( =www-servers/apache-2* ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 )
 !dev-php/pecl-apc !dev-php/xcache >=dev-lang/php-5.1[zlib,session?] virtual/httpd-php apache2? ( =www-servers/apache-2* ) || ( =dev-php/eaccelerator-0.9.6.1-r3[php_targets_php5-3] ) php_targets_php5-3? ( dev-lang/php:5.3 )
 0
 http://bart.eaccelerator.net/source/0.9.6.1/eaccelerator-0.9.6.1.tar.bz2
diff --git a/metadata/cache/dev-php/eaccelerator-0.9.6.1-r4 b/metadata/cache/dev-php/eaccelerator-0.9.6.1-r4
index bb6d49071ad0..e8de01d1e6aa 100644
--- a/metadata/cache/dev-php/eaccelerator-0.9.6.1-r4
+++ b/metadata/cache/dev-php/eaccelerator-0.9.6.1-r4
@@ -1,4 +1,4 @@
-!dev-php/pecl-apc !dev-php/xcache apache2? ( =www-servers/apache-2* ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 )
+!dev-php/pecl-apc !dev-php/xcache apache2? ( =www-servers/apache-2* ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 )
 !dev-php/pecl-apc !dev-php/xcache >=dev-lang/php-5.1[zlib,session?] virtual/httpd-php apache2? ( =www-servers/apache-2* ) || ( =dev-php/eaccelerator-0.9.6.1-r4[php_targets_php5-3] ) php_targets_php5-3? ( dev-lang/php:5.3 )
 0
 http://bart.eaccelerator.net/source/0.9.6.1/eaccelerator-0.9.6.1.tar.bz2
diff --git a/metadata/cache/dev-php/eaccelerator-0.9.6.1-r5 b/metadata/cache/dev-php/eaccelerator-0.9.6.1-r5
index 967f9e846261..0c5013f1a68e 100644
--- a/metadata/cache/dev-php/eaccelerator-0.9.6.1-r5
+++ b/metadata/cache/dev-php/eaccelerator-0.9.6.1-r5
@@ -1,4 +1,4 @@
-!dev-php/pecl-apc !dev-php/xcache apache2? ( =www-servers/apache-2* ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 )
+!dev-php/pecl-apc !dev-php/xcache apache2? ( =www-servers/apache-2* ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 )
 !dev-php/pecl-apc !dev-php/xcache >=dev-lang/php-5.1[zlib,session?] virtual/httpd-php apache2? ( =www-servers/apache-2* ) || ( =dev-php/eaccelerator-0.9.6.1-r5[php_targets_php5-3] ) php_targets_php5-3? ( dev-lang/php:5.3 )
 0
 http://bart.eaccelerator.net/source/0.9.6.1/eaccelerator-0.9.6.1.tar.bz2
diff --git a/metadata/cache/dev-php/ffmpeg-php-0.6.0-r1 b/metadata/cache/dev-php/ffmpeg-php-0.6.0-r1
index 1c3b435bc756..9e9e80207739 100644
--- a/metadata/cache/dev-php/ffmpeg-php-0.6.0-r1
+++ b/metadata/cache/dev-php/ffmpeg-php-0.6.0-r1
@@ -1,4 +1,4 @@
-virtual/ffmpeg || ( dev-lang/php[gd] dev-lang/php[gd-external] ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 )
+virtual/ffmpeg || ( dev-lang/php[gd] dev-lang/php[gd-external] ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 )
 virtual/ffmpeg || ( dev-lang/php[gd] dev-lang/php[gd-external] ) || ( =dev-php/ffmpeg-php-0.6.0-r1[php_targets_php5-3] ) php_targets_php5-3? ( dev-lang/php:5.3 )
 0
 mirror://sourceforge/ffmpeg-php/ffmpeg-php-0.6.0.tbz2
diff --git a/metadata/cache/dev-php/igbinary-1.1.1-r1 b/metadata/cache/dev-php/igbinary-1.1.1-r1
index b918b1e20ba5..7d35c76768c7 100644
--- a/metadata/cache/dev-php/igbinary-1.1.1-r1
+++ b/metadata/cache/dev-php/igbinary-1.1.1-r1
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 )
+|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 )
 || ( =dev-php/igbinary-1.1.1-r1[php_targets_php5-3] =dev-php/igbinary-1.1.1-r1[php_targets_php5-4] ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 )
 0
 http://opensource.dynamoid.com/igbinary-1.1.1.tar.gz
diff --git a/metadata/cache/dev-php/libvirt-php-0.4.1 b/metadata/cache/dev-php/libvirt-php-0.4.1
index 1b1dfe0d3f68..7e2a5d8cff27 100644
--- a/metadata/cache/dev-php/libvirt-php-0.4.1
+++ b/metadata/cache/dev-php/libvirt-php-0.4.1
@@ -1,4 +1,4 @@
-doc? ( app-text/xhtml1 dev-libs/libxslt ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 )
+doc? ( app-text/xhtml1 dev-libs/libxslt ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 )
 app-emulation/libvirt dev-libs/libxml2 || ( =dev-php/libvirt-php-0.4.1[php_targets_php5-3] ) php_targets_php5-3? ( dev-lang/php:5.3 )
 0
 http://libvirt.org/sources/php/libvirt-php-0.4.1.tar.gz
diff --git a/metadata/cache/dev-php/libvirt-php-0.4.2 b/metadata/cache/dev-php/libvirt-php-0.4.2
index e2d55119f92c..b24c1293bded 100644
--- a/metadata/cache/dev-php/libvirt-php-0.4.2
+++ b/metadata/cache/dev-php/libvirt-php-0.4.2
@@ -1,4 +1,4 @@
-doc? ( app-text/xhtml1 dev-libs/libxslt ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 )
+doc? ( app-text/xhtml1 dev-libs/libxslt ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 )
 app-emulation/libvirt dev-libs/libxml2 || ( =dev-php/libvirt-php-0.4.2[php_targets_php5-3] ) php_targets_php5-3? ( dev-lang/php:5.3 )
 0
 http://libvirt.org/sources/php/libvirt-php-0.4.2.tar.gz
diff --git a/metadata/cache/dev-php/libvirt-php-9999 b/metadata/cache/dev-php/libvirt-php-9999
index df38161e3325..52afb320f9cb 100644
--- a/metadata/cache/dev-php/libvirt-php-9999
+++ b/metadata/cache/dev-php/libvirt-php-9999
@@ -1,4 +1,4 @@
-doc? ( app-text/xhtml1 dev-libs/libxslt ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 ) dev-vcs/git
+doc? ( app-text/xhtml1 dev-libs/libxslt ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 ) dev-vcs/git
 app-emulation/libvirt dev-libs/libxml2 || ( =dev-php/libvirt-php-9999[php_targets_php5-3] ) php_targets_php5-3? ( dev-lang/php:5.3 )
 0
 
diff --git a/metadata/cache/dev-php/magickwand-1.0.8-r1 b/metadata/cache/dev-php/magickwand-1.0.8-r1
index 0ba1a178dea0..52602b4cba22 100644
--- a/metadata/cache/dev-php/magickwand-1.0.8-r1
+++ b/metadata/cache/dev-php/magickwand-1.0.8-r1
@@ -1,4 +1,4 @@
->=media-gfx/imagemagick-6.5.2.9 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 )
+>=media-gfx/imagemagick-6.5.2.9 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 )
 >=media-gfx/imagemagick-6.5.2.9 || ( =dev-php/magickwand-1.0.8-r1[php_targets_php5-3] ) php_targets_php5-3? ( dev-lang/php:5.3 )
 0
 http://www.magickwand.org/download/php/MagickWandForPHP-1.0.8.tar.bz2
diff --git a/metadata/cache/dev-php/magickwand-1.0.9 b/metadata/cache/dev-php/magickwand-1.0.9
index 8f2b5d94074e..cb86f1061bde 100644
--- a/metadata/cache/dev-php/magickwand-1.0.9
+++ b/metadata/cache/dev-php/magickwand-1.0.9
@@ -1,4 +1,4 @@
->=media-gfx/imagemagick-6.5.2.9 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 )
+>=media-gfx/imagemagick-6.5.2.9 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 )
 >=media-gfx/imagemagick-6.5.2.9 || ( =dev-php/magickwand-1.0.9[php_targets_php5-3] =dev-php/magickwand-1.0.9[php_targets_php5-4] ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 )
 0
 http://www.magickwand.org/download/php/MagickWandForPHP-1.0.9.tar.bz2
diff --git a/metadata/cache/dev-php/pecl-apc-3.1.7 b/metadata/cache/dev-php/pecl-apc-3.1.7
index fdd2c0961309..ad318e394085 100644
--- a/metadata/cache/dev-php/pecl-apc-3.1.7
+++ b/metadata/cache/dev-php/pecl-apc-3.1.7
@@ -1,4 +1,4 @@
-!dev-php/eaccelerator !dev-php/xcache || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 )
+!dev-php/eaccelerator !dev-php/xcache || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 )
 !dev-php/eaccelerator !dev-php/xcache || ( =dev-php/pecl-apc-3.1.7[php_targets_php5-3] ) php_targets_php5-3? ( dev-lang/php:5.3 )
 0
 http://pecl.php.net/get/APC-3.1.7.tgz
diff --git a/metadata/cache/dev-php/pecl-apc-3.1.9 b/metadata/cache/dev-php/pecl-apc-3.1.9
index 649d24b4aeed..f3206fdd00c8 100644
--- a/metadata/cache/dev-php/pecl-apc-3.1.9
+++ b/metadata/cache/dev-php/pecl-apc-3.1.9
@@ -1,4 +1,4 @@
-!dev-php/eaccelerator !dev-php/xcache || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 )
+!dev-php/eaccelerator !dev-php/xcache || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 )
 !dev-php/eaccelerator !dev-php/xcache || ( =dev-php/pecl-apc-3.1.9[php_targets_php5-3] ) php_targets_php5-3? ( dev-lang/php:5.3 )
 0
 http://pecl.php.net/get/APC-3.1.9.tgz
diff --git a/metadata/cache/dev-php/pecl-apc-3.1.9-r1 b/metadata/cache/dev-php/pecl-apc-3.1.9-r1
index 100838f755f4..c18d521d4579 100644
--- a/metadata/cache/dev-php/pecl-apc-3.1.9-r1
+++ b/metadata/cache/dev-php/pecl-apc-3.1.9-r1
@@ -1,4 +1,4 @@
-!dev-php/eaccelerator !dev-php/xcache || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 )
+!dev-php/eaccelerator !dev-php/xcache || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 )
 !dev-php/eaccelerator !dev-php/xcache || ( =dev-php/pecl-apc-3.1.9-r1[php_targets_php5-3] ) php_targets_php5-3? ( dev-lang/php:5.3 )
 0
 http://pecl.php.net/get/APC-3.1.9.tgz
diff --git a/metadata/cache/dev-php/pecl-apc-3.1.9-r2 b/metadata/cache/dev-php/pecl-apc-3.1.9-r2
index 5336701452cc..723f43a61e49 100644
--- a/metadata/cache/dev-php/pecl-apc-3.1.9-r2
+++ b/metadata/cache/dev-php/pecl-apc-3.1.9-r2
@@ -1,4 +1,4 @@
-!dev-php/eaccelerator !dev-php/xcache || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 )
+!dev-php/eaccelerator !dev-php/xcache || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 )
 !dev-php/eaccelerator !dev-php/xcache || ( =dev-php/pecl-apc-3.1.9-r2[php_targets_php5-3] ) php_targets_php5-3? ( dev-lang/php:5.3 )
 0
 http://pecl.php.net/get/APC-3.1.9.tgz
diff --git a/metadata/cache/dev-php/pecl-bbcode-1.0.3_beta1 b/metadata/cache/dev-php/pecl-bbcode-1.0.3_beta1
index fe245cbf78c5..d35f28cb6f9f 100644
--- a/metadata/cache/dev-php/pecl-bbcode-1.0.3_beta1
+++ b/metadata/cache/dev-php/pecl-bbcode-1.0.3_beta1
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 )
+|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 )
 || ( =dev-php/pecl-bbcode-1.0.3_beta1[php_targets_php5-3] =dev-php/pecl-bbcode-1.0.3_beta1[php_targets_php5-4] ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 )
 0
 http://pecl.php.net/get/bbcode-1.0.3b1.tgz
diff --git a/metadata/cache/dev-php/pecl-cairo-0.3.1 b/metadata/cache/dev-php/pecl-cairo-0.3.1
index 52eddb46fb0e..74846ee092a4 100644
--- a/metadata/cache/dev-php/pecl-cairo-0.3.1
+++ b/metadata/cache/dev-php/pecl-cairo-0.3.1
@@ -1,4 +1,4 @@
->=x11-libs/cairo-1.4[svg] || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 )
+>=x11-libs/cairo-1.4[svg] || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 )
 >=x11-libs/cairo-1.4[svg] || ( =dev-php/pecl-cairo-0.3.1[php_targets_php5-3] =dev-php/pecl-cairo-0.3.1[php_targets_php5-4] ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 )
 0
 http://pecl.php.net/get/cairo-0.3.1.tgz
diff --git a/metadata/cache/dev-php/pecl-crack-0.4-r1 b/metadata/cache/dev-php/pecl-crack-0.4-r1
index 1dd78c8bbd7b..872c68b1bb7b 100644
--- a/metadata/cache/dev-php/pecl-crack-0.4-r1
+++ b/metadata/cache/dev-php/pecl-crack-0.4-r1
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 )
+|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 )
 || ( =dev-php/pecl-crack-0.4-r1[php_targets_php5-3] ) php_targets_php5-3? ( dev-lang/php:5.3 )
 0
 http://pecl.php.net/get/crack-0.4.tgz
diff --git a/metadata/cache/dev-php/pecl-dbx-1.1.2 b/metadata/cache/dev-php/pecl-dbx-1.1.2
index 1d6469325e4a..d4bb6ff1e069 100644
--- a/metadata/cache/dev-php/pecl-dbx-1.1.2
+++ b/metadata/cache/dev-php/pecl-dbx-1.1.2
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 )
+|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 )
 || ( =dev-php/pecl-dbx-1.1.2[php_targets_php5-3] =dev-php/pecl-dbx-1.1.2[php_targets_php5-4] ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 )
 0
 http://pecl.php.net/get/dbx-1.1.2.tgz
diff --git a/metadata/cache/dev-php/pecl-dio-0.0.4_rc4-r2 b/metadata/cache/dev-php/pecl-dio-0.0.4_rc4-r2
index fa24b0d200c3..6a906f59ec9f 100644
--- a/metadata/cache/dev-php/pecl-dio-0.0.4_rc4-r2
+++ b/metadata/cache/dev-php/pecl-dio-0.0.4_rc4-r2
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 )
+|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 )
 || ( =dev-php/pecl-dio-0.0.4_rc4-r2[php_targets_php5-3] ) php_targets_php5-3? ( dev-lang/php:5.3 )
 0
 http://pecl.php.net/get/dio-0.0.4RC4.tgz
diff --git a/metadata/cache/dev-php/pecl-drizzle-0.4.2-r1 b/metadata/cache/dev-php/pecl-drizzle-0.4.2-r1
index 04c1af63c435..3a8125eb76a4 100644
--- a/metadata/cache/dev-php/pecl-drizzle-0.4.2-r1
+++ b/metadata/cache/dev-php/pecl-drizzle-0.4.2-r1
@@ -1,4 +1,4 @@
-dev-db/drizzle || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 )
+dev-db/drizzle || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 )
 dev-db/drizzle || ( =dev-php/pecl-drizzle-0.4.2-r1[php_targets_php5-3] ) php_targets_php5-3? ( dev-lang/php:5.3 )
 0
 http://pecl.php.net/get/drizzle-0.4.2.tgz
diff --git a/metadata/cache/dev-php/pecl-gearman-0.8.0 b/metadata/cache/dev-php/pecl-gearman-0.8.0
index 680857cdf5c1..99dcdbdda575 100644
--- a/metadata/cache/dev-php/pecl-gearman-0.8.0
+++ b/metadata/cache/dev-php/pecl-gearman-0.8.0
@@ -1,4 +1,4 @@
-sys-cluster/gearmand || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 )
+sys-cluster/gearmand || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 )
 sys-cluster/gearmand || ( =dev-php/pecl-gearman-0.8.0[php_targets_php5-3] ) php_targets_php5-3? ( dev-lang/php:5.3 )
 0
 http://pecl.php.net/get/gearman-0.8.0.tgz
diff --git a/metadata/cache/dev-php/pecl-gearman-1.0.1 b/metadata/cache/dev-php/pecl-gearman-1.0.1
index c2801be0429d..9e695b9ddd0c 100644
--- a/metadata/cache/dev-php/pecl-gearman-1.0.1
+++ b/metadata/cache/dev-php/pecl-gearman-1.0.1
@@ -1,4 +1,4 @@
->=sys-cluster/gearmand-0.21 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 )
+>=sys-cluster/gearmand-0.21 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 )
 >=sys-cluster/gearmand-0.21 || ( =dev-php/pecl-gearman-1.0.1[php_targets_php5-3] ) php_targets_php5-3? ( dev-lang/php:5.3 )
 0
 http://pecl.php.net/get/gearman-1.0.1.tgz
diff --git a/metadata/cache/dev-php/pecl-gearman-1.0.1-r1 b/metadata/cache/dev-php/pecl-gearman-1.0.1-r1
index 21ce20f49eac..7eba795107a6 100644
--- a/metadata/cache/dev-php/pecl-gearman-1.0.1-r1
+++ b/metadata/cache/dev-php/pecl-gearman-1.0.1-r1
@@ -1,4 +1,4 @@
->=sys-cluster/gearmand-0.21 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 )
+>=sys-cluster/gearmand-0.21 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 )
 >=sys-cluster/gearmand-0.21 || ( =dev-php/pecl-gearman-1.0.1-r1[php_targets_php5-3] =dev-php/pecl-gearman-1.0.1-r1[php_targets_php5-4] ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 )
 0
 http://pecl.php.net/get/gearman-1.0.1.tgz
diff --git a/metadata/cache/dev-php/pecl-gearman-1.0.2 b/metadata/cache/dev-php/pecl-gearman-1.0.2
index 230944f0ada2..40110c4dc0ad 100644
--- a/metadata/cache/dev-php/pecl-gearman-1.0.2
+++ b/metadata/cache/dev-php/pecl-gearman-1.0.2
@@ -1,4 +1,4 @@
->=sys-cluster/gearmand-0.21 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 )
+>=sys-cluster/gearmand-0.21 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 )
 >=sys-cluster/gearmand-0.21 || ( =dev-php/pecl-gearman-1.0.2[php_targets_php5-3] =dev-php/pecl-gearman-1.0.2[php_targets_php5-4] ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 )
 0
 http://pecl.php.net/get/gearman-1.0.2.tgz
diff --git a/metadata/cache/dev-php/pecl-geoip-1.0.7-r1 b/metadata/cache/dev-php/pecl-geoip-1.0.7-r1
index 43dc21f82a0d..238586d51e46 100644
--- a/metadata/cache/dev-php/pecl-geoip-1.0.7-r1
+++ b/metadata/cache/dev-php/pecl-geoip-1.0.7-r1
@@ -1,4 +1,4 @@
->=dev-libs/geoip-1.4.0 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 )
+>=dev-libs/geoip-1.4.0 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 )
 >=dev-libs/geoip-1.4.0 || ( =dev-php/pecl-geoip-1.0.7-r1[php_targets_php5-3] ) php_targets_php5-3? ( dev-lang/php:5.3 )
 0
 http://pecl.php.net/get/geoip-1.0.7.tgz
diff --git a/metadata/cache/dev-php/pecl-geoip-1.0.8-r1 b/metadata/cache/dev-php/pecl-geoip-1.0.8-r1
index b5c31a3e9df3..8cbaedbf1edf 100644
--- a/metadata/cache/dev-php/pecl-geoip-1.0.8-r1
+++ b/metadata/cache/dev-php/pecl-geoip-1.0.8-r1
@@ -1,4 +1,4 @@
->=dev-libs/geoip-1.4.0 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 )
+>=dev-libs/geoip-1.4.0 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 )
 >=dev-libs/geoip-1.4.0 || ( =dev-php/pecl-geoip-1.0.8-r1[php_targets_php5-3] =dev-php/pecl-geoip-1.0.8-r1[php_targets_php5-4] ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 )
 0
 http://pecl.php.net/get/geoip-1.0.8.tgz
diff --git a/metadata/cache/dev-php/pecl-gnupg-1.3.2-r1 b/metadata/cache/dev-php/pecl-gnupg-1.3.2-r1
index fc56c6bbd153..e812363772ea 100644
--- a/metadata/cache/dev-php/pecl-gnupg-1.3.2-r1
+++ b/metadata/cache/dev-php/pecl-gnupg-1.3.2-r1
@@ -1,4 +1,4 @@
-app-crypt/gpgme || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 )
+app-crypt/gpgme || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 )
 app-crypt/gpgme || ( =dev-php/pecl-gnupg-1.3.2-r1[php_targets_php5-3] ) php_targets_php5-3? ( dev-lang/php:5.3 )
 0
 http://pecl.php.net/get/gnupg-1.3.2.tgz
diff --git a/metadata/cache/dev-php/pecl-haru-1.0.0-r1 b/metadata/cache/dev-php/pecl-haru-1.0.0-r1
index d4b384b4321e..2243148227bc 100644
--- a/metadata/cache/dev-php/pecl-haru-1.0.0-r1
+++ b/metadata/cache/dev-php/pecl-haru-1.0.0-r1
@@ -1,4 +1,4 @@
-media-libs/libharu[png?,zlib?] || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 )
+media-libs/libharu[png?,zlib?] || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 )
 media-libs/libharu[png?,zlib?] || ( =dev-php/pecl-haru-1.0.0-r1[php_targets_php5-3] ) php_targets_php5-3? ( dev-lang/php:5.3 )
 0
 http://pecl.php.net/get/haru-1.0.0.tgz
diff --git a/metadata/cache/dev-php/pecl-haru-1.0.3 b/metadata/cache/dev-php/pecl-haru-1.0.3
index 6533eff7b156..091d69a8a540 100644
--- a/metadata/cache/dev-php/pecl-haru-1.0.3
+++ b/metadata/cache/dev-php/pecl-haru-1.0.3
@@ -1,4 +1,4 @@
-media-libs/libharu[png?,zlib?] || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 )
+media-libs/libharu[png?,zlib?] || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 )
 media-libs/libharu[png?,zlib?] || ( =dev-php/pecl-haru-1.0.3[php_targets_php5-3] =dev-php/pecl-haru-1.0.3[php_targets_php5-4] ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 )
 0
 http://pecl.php.net/get/haru-1.0.3.tgz
diff --git a/metadata/cache/dev-php/pecl-htscanner-1.0.0 b/metadata/cache/dev-php/pecl-htscanner-1.0.0
index c1f2468a1be5..8ce969ec6e4f 100644
--- a/metadata/cache/dev-php/pecl-htscanner-1.0.0
+++ b/metadata/cache/dev-php/pecl-htscanner-1.0.0
@@ -1,4 +1,4 @@
-dev-lang/php[cgi] || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 )
+dev-lang/php[cgi] || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 )
 dev-lang/php[cgi] || ( =dev-php/pecl-htscanner-1.0.0[php_targets_php5-3] ) php_targets_php5-3? ( dev-lang/php:5.3 )
 0
 http://pecl.php.net/get/htscanner-1.0.0.tgz
diff --git a/metadata/cache/dev-php/pecl-htscanner-1.0.1 b/metadata/cache/dev-php/pecl-htscanner-1.0.1
index 4e7d4741f2b3..c6532798b6eb 100644
--- a/metadata/cache/dev-php/pecl-htscanner-1.0.1
+++ b/metadata/cache/dev-php/pecl-htscanner-1.0.1
@@ -1,4 +1,4 @@
-dev-lang/php[cgi] || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 )
+dev-lang/php[cgi] || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 )
 dev-lang/php[cgi] || ( =dev-php/pecl-htscanner-1.0.1[php_targets_php5-3] ) php_targets_php5-3? ( dev-lang/php:5.3 )
 0
 http://pecl.php.net/get/htscanner-1.0.1.tgz
diff --git a/metadata/cache/dev-php/pecl-http-1.7.0-r1 b/metadata/cache/dev-php/pecl-http-1.7.0-r1
index 8899ef77e650..bbb614e30003 100644
--- a/metadata/cache/dev-php/pecl-http-1.7.0-r1
+++ b/metadata/cache/dev-php/pecl-http-1.7.0-r1
@@ -1,4 +1,4 @@
->=net-misc/curl-7.19.4 sys-libs/zlib dev-libs/libevent || ( <dev-lang/php-5.3[spl] >=dev-lang/php-5.3 ) >=dev-lang/php-5[hash,session,iconv] || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 ) >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-3? ( dev-lang/php:5.3 )
+>=net-misc/curl-7.19.4 sys-libs/zlib dev-libs/libevent || ( <dev-lang/php-5.3[spl] >=dev-lang/php-5.3 ) >=dev-lang/php-5[hash,session,iconv] || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 ) >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-3? ( dev-lang/php:5.3 )
 >=net-misc/curl-7.19.4 sys-libs/zlib dev-libs/libevent || ( <dev-lang/php-5.3[spl] >=dev-lang/php-5.3 ) >=dev-lang/php-5[hash,session,iconv] || ( =dev-php/pecl-http-1.7.0-r1[php_targets_php5-3] ) php_targets_php5-3? ( dev-lang/php:5.3 ) || ( =dev-php/pecl-http-1.7.0-r1[php_targets_php5-3] =dev-php/pecl-http-1.7.0-r1[php_targets_php5-3] ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-3? ( dev-lang/php:5.3 )
 0
 http://pecl.php.net/get/pecl_http-1.7.0.tgz
diff --git a/metadata/cache/dev-php/pecl-http-1.7.1 b/metadata/cache/dev-php/pecl-http-1.7.1
index 22d8e53a23f6..9c3c73a94420 100644
--- a/metadata/cache/dev-php/pecl-http-1.7.1
+++ b/metadata/cache/dev-php/pecl-http-1.7.1
@@ -1,4 +1,4 @@
->=net-misc/curl-7.19.4 sys-libs/zlib dev-libs/libevent || ( <dev-lang/php-5.3[spl] >=dev-lang/php-5.3 ) >=dev-lang/php-5[hash,session,iconv] php_targets_php5-3? ( dev-lang/php:5.3[-threads] ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 ) >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-3? ( dev-lang/php:5.3 )
+>=net-misc/curl-7.19.4 sys-libs/zlib dev-libs/libevent || ( <dev-lang/php-5.3[spl] >=dev-lang/php-5.3 ) >=dev-lang/php-5[hash,session,iconv] php_targets_php5-3? ( dev-lang/php:5.3[-threads] ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 ) >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-3? ( dev-lang/php:5.3 )
 >=net-misc/curl-7.19.4 sys-libs/zlib dev-libs/libevent || ( <dev-lang/php-5.3[spl] >=dev-lang/php-5.3 ) >=dev-lang/php-5[hash,session,iconv] php_targets_php5-3? ( dev-lang/php:5.3[-threads] ) || ( =dev-php/pecl-http-1.7.1[php_targets_php5-3] ) php_targets_php5-3? ( dev-lang/php:5.3 ) || ( =dev-php/pecl-http-1.7.1[php_targets_php5-3] =dev-php/pecl-http-1.7.1[php_targets_php5-3] ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-3? ( dev-lang/php:5.3 )
 0
 http://pecl.php.net/get/pecl_http-1.7.1.tgz
diff --git a/metadata/cache/dev-php/pecl-http-1.7.3 b/metadata/cache/dev-php/pecl-http-1.7.3
index 11466d630108..2a1adaf6812a 100644
--- a/metadata/cache/dev-php/pecl-http-1.7.3
+++ b/metadata/cache/dev-php/pecl-http-1.7.3
@@ -1,4 +1,4 @@
->=net-misc/curl-7.19.4 sys-libs/zlib dev-libs/libevent || ( <dev-lang/php-5.3[spl] >=dev-lang/php-5.3 ) >=dev-lang/php-5[hash,session,iconv] php_targets_php5-3? ( dev-lang/php:5.3[-threads] ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 ) >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 )
+>=net-misc/curl-7.19.4 sys-libs/zlib dev-libs/libevent || ( <dev-lang/php-5.3[spl] >=dev-lang/php-5.3 ) >=dev-lang/php-5[hash,session,iconv] php_targets_php5-3? ( dev-lang/php:5.3[-threads] ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 ) >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 )
 >=net-misc/curl-7.19.4 sys-libs/zlib dev-libs/libevent || ( <dev-lang/php-5.3[spl] >=dev-lang/php-5.3 ) >=dev-lang/php-5[hash,session,iconv] php_targets_php5-3? ( dev-lang/php:5.3[-threads] ) || ( =dev-php/pecl-http-1.7.3[php_targets_php5-3] =dev-php/pecl-http-1.7.3[php_targets_php5-4] ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 ) || ( =dev-php/pecl-http-1.7.3[php_targets_php5-3] =dev-php/pecl-http-1.7.3[php_targets_php5-4] =dev-php/pecl-http-1.7.3[php_targets_php5-3] =dev-php/pecl-http-1.7.3[php_targets_php5-4] ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 )
 0
 http://pecl.php.net/get/pecl_http-1.7.3.tgz
diff --git a/metadata/cache/dev-php/pecl-http-1.7.3-r1 b/metadata/cache/dev-php/pecl-http-1.7.3-r1
index 923ee0905699..ba10272a0648 100644
--- a/metadata/cache/dev-php/pecl-http-1.7.3-r1
+++ b/metadata/cache/dev-php/pecl-http-1.7.3-r1
@@ -1,4 +1,4 @@
->=net-misc/curl-7.19.4 sys-libs/zlib dev-libs/libevent >=dev-lang/php-5[hash,session,iconv] || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 ) >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 )
+>=net-misc/curl-7.19.4 sys-libs/zlib dev-libs/libevent >=dev-lang/php-5[hash,session,iconv] || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 ) >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 )
 >=net-misc/curl-7.19.4 sys-libs/zlib dev-libs/libevent >=dev-lang/php-5[hash,session,iconv] || ( =dev-php/pecl-http-1.7.3-r1[php_targets_php5-3] =dev-php/pecl-http-1.7.3-r1[php_targets_php5-4] ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 ) || ( =dev-php/pecl-http-1.7.3-r1[php_targets_php5-3] =dev-php/pecl-http-1.7.3-r1[php_targets_php5-4] =dev-php/pecl-http-1.7.3-r1[php_targets_php5-3] =dev-php/pecl-http-1.7.3-r1[php_targets_php5-4] ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 )
 0
 http://pecl.php.net/get/pecl_http-1.7.3.tgz
diff --git a/metadata/cache/dev-php/pecl-id3-0.2-r2 b/metadata/cache/dev-php/pecl-id3-0.2-r2
index e0a4442c815d..379c58270285 100644
--- a/metadata/cache/dev-php/pecl-id3-0.2-r2
+++ b/metadata/cache/dev-php/pecl-id3-0.2-r2
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 )
+|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 )
 || ( =dev-php/pecl-id3-0.2-r2[php_targets_php5-3] ) php_targets_php5-3? ( dev-lang/php:5.3 )
 0
 http://pecl.php.net/get/id3-0.2.tgz
diff --git a/metadata/cache/dev-php/pecl-imagick-3.0.0-r1 b/metadata/cache/dev-php/pecl-imagick-3.0.0-r1
index 6725fb202207..a2d8101154ca 100644
--- a/metadata/cache/dev-php/pecl-imagick-3.0.0-r1
+++ b/metadata/cache/dev-php/pecl-imagick-3.0.0-r1
@@ -1,4 +1,4 @@
->=media-gfx/imagemagick-6.2.4 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 )
+>=media-gfx/imagemagick-6.2.4 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 )
 >=media-gfx/imagemagick-6.2.4 || ( =dev-php/pecl-imagick-3.0.0-r1[php_targets_php5-3] ) php_targets_php5-3? ( dev-lang/php:5.3 )
 0
 http://pecl.php.net/get/imagick-3.0.0.tgz
diff --git a/metadata/cache/dev-php/pecl-imagick-3.0.1-r1 b/metadata/cache/dev-php/pecl-imagick-3.0.1-r1
index df9fd8a500c0..a55a2a894c49 100644
--- a/metadata/cache/dev-php/pecl-imagick-3.0.1-r1
+++ b/metadata/cache/dev-php/pecl-imagick-3.0.1-r1
@@ -1,4 +1,4 @@
->=media-gfx/imagemagick-6.2.4 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 )
+>=media-gfx/imagemagick-6.2.4 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 )
 >=media-gfx/imagemagick-6.2.4 || ( =dev-php/pecl-imagick-3.0.1-r1[php_targets_php5-3] ) php_targets_php5-3? ( dev-lang/php:5.3 )
 0
 http://pecl.php.net/get/imagick-3.0.1.tgz
diff --git a/metadata/cache/dev-php/pecl-libevent-0.0.4 b/metadata/cache/dev-php/pecl-libevent-0.0.4
index 7080f54a1f2f..505afaf392e0 100644
--- a/metadata/cache/dev-php/pecl-libevent-0.0.4
+++ b/metadata/cache/dev-php/pecl-libevent-0.0.4
@@ -1,4 +1,4 @@
->=dev-libs/libevent-1.4.0 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 )
+>=dev-libs/libevent-1.4.0 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 )
 >=dev-libs/libevent-1.4.0 || ( =dev-php/pecl-libevent-0.0.4[php_targets_php5-3] =dev-php/pecl-libevent-0.0.4[php_targets_php5-4] ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 )
 0
 http://pecl.php.net/get/libevent-0.0.4.tgz
diff --git a/metadata/cache/dev-php/pecl-lzf-1.5.2-r1 b/metadata/cache/dev-php/pecl-lzf-1.5.2-r1
index 56fa67b4fe5d..17935165db7c 100644
--- a/metadata/cache/dev-php/pecl-lzf-1.5.2-r1
+++ b/metadata/cache/dev-php/pecl-lzf-1.5.2-r1
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 )
+|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 )
 || ( =dev-php/pecl-lzf-1.5.2-r1[php_targets_php5-3] ) php_targets_php5-3? ( dev-lang/php:5.3 )
 0
 http://pecl.php.net/get/LZF-1.5.2.tgz
diff --git a/metadata/cache/dev-php/pecl-mailparse-2.1.5-r1 b/metadata/cache/dev-php/pecl-mailparse-2.1.5-r1
index 13fd7542e332..3a0b128e83be 100644
--- a/metadata/cache/dev-php/pecl-mailparse-2.1.5-r1
+++ b/metadata/cache/dev-php/pecl-mailparse-2.1.5-r1
@@ -1,4 +1,4 @@
-dev-lang/php[unicode] dev-util/re2c || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 )
+dev-lang/php[unicode] dev-util/re2c || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 )
 dev-lang/php[unicode] || ( =dev-php/pecl-mailparse-2.1.5-r1[php_targets_php5-3] ) php_targets_php5-3? ( dev-lang/php:5.3 )
 0
 http://pecl.php.net/get/mailparse-2.1.5.tgz
diff --git a/metadata/cache/dev-php/pecl-mcve-7.0.3-r1 b/metadata/cache/dev-php/pecl-mcve-7.0.3-r1
index 593548e81974..9b0cc31aa4e9 100644
--- a/metadata/cache/dev-php/pecl-mcve-7.0.3-r1
+++ b/metadata/cache/dev-php/pecl-mcve-7.0.3-r1
@@ -1,4 +1,4 @@
-dev-libs/openssl net-libs/libmonetra || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 )
+dev-libs/openssl net-libs/libmonetra || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 )
 dev-libs/openssl net-libs/libmonetra dev-lang/php[ssl] || ( =dev-php/pecl-mcve-7.0.3-r1[php_targets_php5-3] ) php_targets_php5-3? ( dev-lang/php:5.3 )
 0
 http://pecl.php.net/get/mcve-7.0.3.tgz
diff --git a/metadata/cache/dev-php/pecl-memcache-2.2.6-r1 b/metadata/cache/dev-php/pecl-memcache-2.2.6-r1
index ef3086fea78d..ca7ca921d437 100644
--- a/metadata/cache/dev-php/pecl-memcache-2.2.6-r1
+++ b/metadata/cache/dev-php/pecl-memcache-2.2.6-r1
@@ -1,4 +1,4 @@
-sys-libs/zlib dev-lang/php[session?] || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 )
+sys-libs/zlib dev-lang/php[session?] || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 )
 sys-libs/zlib dev-lang/php[session?] || ( =dev-php/pecl-memcache-2.2.6-r1[php_targets_php5-3] ) php_targets_php5-3? ( dev-lang/php:5.3 )
 0
 http://pecl.php.net/get/memcache-2.2.6.tgz
diff --git a/metadata/cache/dev-php/pecl-memcache-3.0.5-r1 b/metadata/cache/dev-php/pecl-memcache-3.0.5-r1
index 14ca50013bf4..ab5b88e916af 100644
--- a/metadata/cache/dev-php/pecl-memcache-3.0.5-r1
+++ b/metadata/cache/dev-php/pecl-memcache-3.0.5-r1
@@ -1,4 +1,4 @@
-sys-libs/zlib dev-lang/php[session?] || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 )
+sys-libs/zlib dev-lang/php[session?] || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 )
 sys-libs/zlib dev-lang/php[session?] || ( =dev-php/pecl-memcache-3.0.5-r1[php_targets_php5-3] ) php_targets_php5-3? ( dev-lang/php:5.3 )
 0
 http://pecl.php.net/get/memcache-3.0.5.tgz
diff --git a/metadata/cache/dev-php/pecl-memcache-3.0.5-r2 b/metadata/cache/dev-php/pecl-memcache-3.0.5-r2
index a2f3db934a58..1fd330ca234f 100644
--- a/metadata/cache/dev-php/pecl-memcache-3.0.5-r2
+++ b/metadata/cache/dev-php/pecl-memcache-3.0.5-r2
@@ -1,4 +1,4 @@
-sys-libs/zlib dev-lang/php[session?] || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 )
+sys-libs/zlib dev-lang/php[session?] || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 )
 sys-libs/zlib dev-lang/php[session?] || ( =dev-php/pecl-memcache-3.0.5-r2[php_targets_php5-3] ) php_targets_php5-3? ( dev-lang/php:5.3 )
 0
 http://pecl.php.net/get/memcache-3.0.5.tgz
diff --git a/metadata/cache/dev-php/pecl-memcache-3.0.6 b/metadata/cache/dev-php/pecl-memcache-3.0.6
index 7956c8fe8b66..dc8504133ea0 100644
--- a/metadata/cache/dev-php/pecl-memcache-3.0.6
+++ b/metadata/cache/dev-php/pecl-memcache-3.0.6
@@ -1,4 +1,4 @@
-sys-libs/zlib dev-lang/php[session?] || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 )
+sys-libs/zlib dev-lang/php[session?] || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 )
 sys-libs/zlib dev-lang/php[session?] || ( =dev-php/pecl-memcache-3.0.6[php_targets_php5-3] ) php_targets_php5-3? ( dev-lang/php:5.3 )
 0
 http://pecl.php.net/get/memcache-3.0.6.tgz
diff --git a/metadata/cache/dev-php/pecl-memcache-3.0.6-r1 b/metadata/cache/dev-php/pecl-memcache-3.0.6-r1
index d684f8edcd9b..3c64b9463c46 100644
--- a/metadata/cache/dev-php/pecl-memcache-3.0.6-r1
+++ b/metadata/cache/dev-php/pecl-memcache-3.0.6-r1
@@ -1,4 +1,4 @@
-sys-libs/zlib dev-lang/php[session?] || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 )
+sys-libs/zlib dev-lang/php[session?] || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 )
 sys-libs/zlib dev-lang/php[session?] || ( =dev-php/pecl-memcache-3.0.6-r1[php_targets_php5-3] =dev-php/pecl-memcache-3.0.6-r1[php_targets_php5-4] ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 )
 0
 http://pecl.php.net/get/memcache-3.0.6.tgz
diff --git a/metadata/cache/dev-php/pecl-memcached-1.0.2-r1 b/metadata/cache/dev-php/pecl-memcached-1.0.2-r1
index c5ca9a0bb653..6d473956eda4 100644
--- a/metadata/cache/dev-php/pecl-memcached-1.0.2-r1
+++ b/metadata/cache/dev-php/pecl-memcached-1.0.2-r1
@@ -1,4 +1,4 @@
->=dev-libs/libmemcached-0.38 sys-libs/zlib dev-lang/php[session?] || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 )
+>=dev-libs/libmemcached-0.38 sys-libs/zlib dev-lang/php[session?] || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 )
 >=dev-libs/libmemcached-0.38 sys-libs/zlib dev-lang/php[session?] || ( =dev-php/pecl-memcached-1.0.2-r1[php_targets_php5-3] ) php_targets_php5-3? ( dev-lang/php:5.3 )
 0
 http://pecl.php.net/get/memcached-1.0.2.tgz
diff --git a/metadata/cache/dev-php/pecl-memcached-2.0.1 b/metadata/cache/dev-php/pecl-memcached-2.0.1
index 86208e0ae500..9a460c6da61e 100644
--- a/metadata/cache/dev-php/pecl-memcached-2.0.1
+++ b/metadata/cache/dev-php/pecl-memcached-2.0.1
@@ -1,4 +1,4 @@
->=dev-libs/libmemcached-0.38 sys-libs/zlib dev-lang/php[session?] igbinary? ( dev-php/igbinary[php_targets_php5-4?,php_targets_php5-3?] ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 )
+>=dev-libs/libmemcached-0.38 sys-libs/zlib dev-lang/php[session?] igbinary? ( dev-php/igbinary[php_targets_php5-4?,php_targets_php5-3?] ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 )
 >=dev-libs/libmemcached-0.38 sys-libs/zlib dev-lang/php[session?] igbinary? ( dev-php/igbinary[php_targets_php5-4?,php_targets_php5-3?] ) || ( =dev-php/pecl-memcached-2.0.1[php_targets_php5-3] =dev-php/pecl-memcached-2.0.1[php_targets_php5-4] ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 )
 0
 http://pecl.php.net/get/memcached-2.0.1.tgz
diff --git a/metadata/cache/dev-php/pecl-mogilefs-0.9.1 b/metadata/cache/dev-php/pecl-mogilefs-0.9.1
index 1e0d0848b100..ca1daf3a2c3f 100644
--- a/metadata/cache/dev-php/pecl-mogilefs-0.9.1
+++ b/metadata/cache/dev-php/pecl-mogilefs-0.9.1
@@ -1,4 +1,4 @@
-net-libs/neon || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 )
+net-libs/neon || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 )
 net-libs/neon || ( =dev-php/pecl-mogilefs-0.9.1[php_targets_php5-3] =dev-php/pecl-mogilefs-0.9.1[php_targets_php5-4] ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 )
 0
 http://pecl.php.net/get/mogilefs-0.9.1.tgz
diff --git a/metadata/cache/dev-php/pecl-mongo-1.2.9 b/metadata/cache/dev-php/pecl-mongo-1.2.9
index 4dfba1806d53..9ccc7f8b70c8 100644
--- a/metadata/cache/dev-php/pecl-mongo-1.2.9
+++ b/metadata/cache/dev-php/pecl-mongo-1.2.9
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 )
+|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 )
 || ( =dev-php/pecl-mongo-1.2.9[php_targets_php5-3] =dev-php/pecl-mongo-1.2.9[php_targets_php5-4] ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 )
 0
 http://pecl.php.net/get/mongo-1.2.9.tgz
diff --git a/metadata/cache/dev-php/pecl-mysqlnd_ms-1.1.1 b/metadata/cache/dev-php/pecl-mysqlnd_ms-1.1.1
index 5e057a9e8143..f0c8d3e20a32 100644
--- a/metadata/cache/dev-php/pecl-mysqlnd_ms-1.1.1
+++ b/metadata/cache/dev-php/pecl-mysqlnd_ms-1.1.1
@@ -1,4 +1,4 @@
-dev-lang/php[mysqlnd] || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 )
+dev-lang/php[mysqlnd] || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 )
 dev-lang/php[mysqlnd] || ( =dev-php/pecl-mysqlnd_ms-1.1.1[php_targets_php5-3] ) php_targets_php5-3? ( dev-lang/php:5.3 )
 0
 http://pecl.php.net/get/mysqlnd_ms-1.1.1.tgz
diff --git a/metadata/cache/dev-php/pecl-mysqlnd_ms-1.1.2 b/metadata/cache/dev-php/pecl-mysqlnd_ms-1.1.2
index 8bbc87e91048..09cd90c9f204 100644
--- a/metadata/cache/dev-php/pecl-mysqlnd_ms-1.1.2
+++ b/metadata/cache/dev-php/pecl-mysqlnd_ms-1.1.2
@@ -1,4 +1,4 @@
-dev-lang/php[mysqlnd] || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 )
+dev-lang/php[mysqlnd] || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 )
 dev-lang/php[mysqlnd] || ( =dev-php/pecl-mysqlnd_ms-1.1.2[php_targets_php5-3] ) php_targets_php5-3? ( dev-lang/php:5.3 )
 0
 http://pecl.php.net/get/mysqlnd_ms-1.1.2.tgz
diff --git a/metadata/cache/dev-php/pecl-mysqlnd_ms-1.2.2 b/metadata/cache/dev-php/pecl-mysqlnd_ms-1.2.2
index 8e86fce7e6e3..b7936d4fdd1e 100644
--- a/metadata/cache/dev-php/pecl-mysqlnd_ms-1.2.2
+++ b/metadata/cache/dev-php/pecl-mysqlnd_ms-1.2.2
@@ -1,4 +1,4 @@
-dev-lang/php[mysqlnd] || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 )
+dev-lang/php[mysqlnd] || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 )
 dev-lang/php[mysqlnd] || ( =dev-php/pecl-mysqlnd_ms-1.2.2[php_targets_php5-3] ) php_targets_php5-3? ( dev-lang/php:5.3 )
 0
 http://pecl.php.net/get/mysqlnd_ms-1.2.2.tgz
diff --git a/metadata/cache/dev-php/pecl-mysqlnd_qc-1.0.1 b/metadata/cache/dev-php/pecl-mysqlnd_qc-1.0.1
index e006c09e2cd7..0cb448fff106 100644
--- a/metadata/cache/dev-php/pecl-mysqlnd_qc-1.0.1
+++ b/metadata/cache/dev-php/pecl-mysqlnd_qc-1.0.1
@@ -1,4 +1,4 @@
-dev-lang/php[mysqlnd] || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 )
+dev-lang/php[mysqlnd] || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 )
 dev-lang/php[mysqlnd] || ( =dev-php/pecl-mysqlnd_qc-1.0.1[php_targets_php5-3] ) php_targets_php5-3? ( dev-lang/php:5.3 )
 0
 http://pecl.php.net/get/mysqlnd_qc-1.0.1.tgz
diff --git a/metadata/cache/dev-php/pecl-ncurses-1.0.1 b/metadata/cache/dev-php/pecl-ncurses-1.0.1
index 1ea77f23b174..e6598c53e247 100644
--- a/metadata/cache/dev-php/pecl-ncurses-1.0.1
+++ b/metadata/cache/dev-php/pecl-ncurses-1.0.1
@@ -1,4 +1,4 @@
-sys-libs/ncurses || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 )
+sys-libs/ncurses || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 )
 sys-libs/ncurses || ( =dev-php/pecl-ncurses-1.0.1[php_targets_php5-3] ) php_targets_php5-3? ( dev-lang/php:5.3 )
 0
 http://pecl.php.net/get/ncurses-1.0.1.tgz
diff --git a/metadata/cache/dev-php/pecl-oauth-1.2.2 b/metadata/cache/dev-php/pecl-oauth-1.2.2
index bc970486755c..752afbc66dcd 100644
--- a/metadata/cache/dev-php/pecl-oauth-1.2.2
+++ b/metadata/cache/dev-php/pecl-oauth-1.2.2
@@ -1,4 +1,4 @@
-dev-lang/php[hash] || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 )
+dev-lang/php[hash] || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 )
 dev-lang/php[hash] || ( =dev-php/pecl-oauth-1.2.2[php_targets_php5-3] ) php_targets_php5-3? ( dev-lang/php:5.3 )
 0
 http://pecl.php.net/get/oauth-1.2.2.tgz
diff --git a/metadata/cache/dev-php/pecl-oauth-1.2.2-r1 b/metadata/cache/dev-php/pecl-oauth-1.2.2-r1
index 58cb68c80350..cfc5a14bd7c1 100644
--- a/metadata/cache/dev-php/pecl-oauth-1.2.2-r1
+++ b/metadata/cache/dev-php/pecl-oauth-1.2.2-r1
@@ -1,4 +1,4 @@
-dev-lang/php[hash] || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 )
+dev-lang/php[hash] || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 )
 dev-lang/php[hash] || ( =dev-php/pecl-oauth-1.2.2-r1[php_targets_php5-3] =dev-php/pecl-oauth-1.2.2-r1[php_targets_php5-4] ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 )
 0
 http://pecl.php.net/get/oauth-1.2.2.tgz
diff --git a/metadata/cache/dev-php/pecl-pam-1.0.2-r1 b/metadata/cache/dev-php/pecl-pam-1.0.2-r1
index 2c5490f3c40d..3e02a67ef30b 100644
--- a/metadata/cache/dev-php/pecl-pam-1.0.2-r1
+++ b/metadata/cache/dev-php/pecl-pam-1.0.2-r1
@@ -1,4 +1,4 @@
-sys-libs/pam || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 )
+sys-libs/pam || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 )
 sys-libs/pam || ( =dev-php/pecl-pam-1.0.2-r1[php_targets_php5-3] ) php_targets_php5-3? ( dev-lang/php:5.3 )
 0
 http://pecl.php.net/get/pam-1.0.2.tgz
diff --git a/metadata/cache/dev-php/pecl-ps-1.3.6-r1 b/metadata/cache/dev-php/pecl-ps-1.3.6-r1
index 0186e07f61cc..be9ce7782d0f 100644
--- a/metadata/cache/dev-php/pecl-ps-1.3.6-r1
+++ b/metadata/cache/dev-php/pecl-ps-1.3.6-r1
@@ -1,4 +1,4 @@
-dev-libs/pslib || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 )
+dev-libs/pslib || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 )
 dev-libs/pslib || ( =dev-php/pecl-ps-1.3.6-r1[php_targets_php5-3] ) php_targets_php5-3? ( dev-lang/php:5.3 )
 0
 http://pecl.php.net/get/ps-1.3.6.tgz
diff --git a/metadata/cache/dev-php/pecl-radius-1.2.5-r1 b/metadata/cache/dev-php/pecl-radius-1.2.5-r1
index 7818ceaa0404..cf2a31f2174e 100644
--- a/metadata/cache/dev-php/pecl-radius-1.2.5-r1
+++ b/metadata/cache/dev-php/pecl-radius-1.2.5-r1
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 )
+|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 )
 || ( =dev-php/pecl-radius-1.2.5-r1[php_targets_php5-3] ) php_targets_php5-3? ( dev-lang/php:5.3 )
 0
 http://pecl.php.net/get/radius-1.2.5.tgz
diff --git a/metadata/cache/dev-php/pecl-rrd-1.0.5 b/metadata/cache/dev-php/pecl-rrd-1.0.5
index ec7ff09187e2..464a3d24c6a8 100644
--- a/metadata/cache/dev-php/pecl-rrd-1.0.5
+++ b/metadata/cache/dev-php/pecl-rrd-1.0.5
@@ -1,4 +1,4 @@
->=net-analyzer/rrdtool-1.4.5-r1 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 )
+>=net-analyzer/rrdtool-1.4.5-r1 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 )
 >=net-analyzer/rrdtool-1.4.5-r1 || ( =dev-php/pecl-rrd-1.0.5[php_targets_php5-3] ) php_targets_php5-3? ( dev-lang/php:5.3 )
 0
 http://pecl.php.net/get/rrd-1.0.5.tgz
diff --git a/metadata/cache/dev-php/pecl-sca_sdo-1.2.4-r2 b/metadata/cache/dev-php/pecl-sca_sdo-1.2.4-r2
index e58dacdc942a..ef8c687c0b43 100644
--- a/metadata/cache/dev-php/pecl-sca_sdo-1.2.4-r2
+++ b/metadata/cache/dev-php/pecl-sca_sdo-1.2.4-r2
@@ -1,4 +1,4 @@
->=dev-lang/php-5.2[json,soap,xml] || ( <dev-lang/php-5.3[pcre,reflection,spl] >=dev-lang/php-5.3.1 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 )
+>=dev-lang/php-5.2[json,soap,xml] || ( <dev-lang/php-5.3[pcre,reflection,spl] >=dev-lang/php-5.3.1 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 )
 >=dev-lang/php-5.2[json,soap,xml] || ( <dev-lang/php-5.3[pcre,reflection,spl] >=dev-lang/php-5.3.1 ) || ( =dev-php/pecl-sca_sdo-1.2.4-r2[php_targets_php5-3] ) php_targets_php5-3? ( dev-lang/php:5.3 )
 0
 http://pecl.php.net/get/SCA_SDO-1.2.4.tgz
diff --git a/metadata/cache/dev-php/pecl-ssh2-0.11.2-r1 b/metadata/cache/dev-php/pecl-ssh2-0.11.2-r1
index 310ece23b49d..c64606cf42da 100644
--- a/metadata/cache/dev-php/pecl-ssh2-0.11.2-r1
+++ b/metadata/cache/dev-php/pecl-ssh2-0.11.2-r1
@@ -1,4 +1,4 @@
->=net-libs/libssh2-0.18 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 )
+>=net-libs/libssh2-0.18 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 )
 >=net-libs/libssh2-0.18 || ( =dev-php/pecl-ssh2-0.11.2-r1[php_targets_php5-3] ) php_targets_php5-3? ( dev-lang/php:5.3 )
 0
 http://pecl.php.net/get/ssh2-0.11.2.tgz
diff --git a/metadata/cache/dev-php/pecl-ssh2-0.11.3 b/metadata/cache/dev-php/pecl-ssh2-0.11.3
index 5d27460da0fc..fe7a8b6d3838 100644
--- a/metadata/cache/dev-php/pecl-ssh2-0.11.3
+++ b/metadata/cache/dev-php/pecl-ssh2-0.11.3
@@ -1,4 +1,4 @@
->=net-libs/libssh2-0.18 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 )
+>=net-libs/libssh2-0.18 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 )
 >=net-libs/libssh2-0.18 || ( =dev-php/pecl-ssh2-0.11.3[php_targets_php5-3] ) php_targets_php5-3? ( dev-lang/php:5.3 )
 0
 http://pecl.php.net/get/ssh2-0.11.3.tgz
diff --git a/metadata/cache/dev-php/pecl-ssh2-0.11.3-r1 b/metadata/cache/dev-php/pecl-ssh2-0.11.3-r1
index 2390ebf5ce33..75a2fe0e6ff9 100644
--- a/metadata/cache/dev-php/pecl-ssh2-0.11.3-r1
+++ b/metadata/cache/dev-php/pecl-ssh2-0.11.3-r1
@@ -1,4 +1,4 @@
->=net-libs/libssh2-0.18 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 )
+>=net-libs/libssh2-0.18 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 )
 >=net-libs/libssh2-0.18 || ( =dev-php/pecl-ssh2-0.11.3-r1[php_targets_php5-3] =dev-php/pecl-ssh2-0.11.3-r1[php_targets_php5-4] ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 )
 0
 http://pecl.php.net/get/ssh2-0.11.3.tgz
diff --git a/metadata/cache/dev-php/pecl-stomp-1.0.3 b/metadata/cache/dev-php/pecl-stomp-1.0.3
index 3eeddb68bb21..9761689fa6e8 100644
--- a/metadata/cache/dev-php/pecl-stomp-1.0.3
+++ b/metadata/cache/dev-php/pecl-stomp-1.0.3
@@ -1,4 +1,4 @@
-ssl? ( dev-lang/php[ssl] ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 )
+ssl? ( dev-lang/php[ssl] ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 )
 ssl? ( dev-lang/php[ssl] ) || ( =dev-php/pecl-stomp-1.0.3[php_targets_php5-3] ) php_targets_php5-3? ( dev-lang/php:5.3 )
 0
 http://pecl.php.net/get/stomp-1.0.3.tgz
diff --git a/metadata/cache/dev-php/pecl-svn-1.0.1 b/metadata/cache/dev-php/pecl-svn-1.0.1
index 6e5920664e69..4211167a59e5 100644
--- a/metadata/cache/dev-php/pecl-svn-1.0.1
+++ b/metadata/cache/dev-php/pecl-svn-1.0.1
@@ -1,4 +1,4 @@
-<dev-vcs/subversion-1.7 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 )
+<dev-vcs/subversion-1.7 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 )
 <dev-vcs/subversion-1.7 || ( =dev-php/pecl-svn-1.0.1[php_targets_php5-3] ) php_targets_php5-3? ( dev-lang/php:5.3 )
 0
 http://pecl.php.net/get/svn-1.0.1.tgz
diff --git a/metadata/cache/dev-php/pecl-syck-0.9.3-r1 b/metadata/cache/dev-php/pecl-syck-0.9.3-r1
index e9d7b1f06240..33c599e10b1e 100644
--- a/metadata/cache/dev-php/pecl-syck-0.9.3-r1
+++ b/metadata/cache/dev-php/pecl-syck-0.9.3-r1
@@ -1,4 +1,4 @@
-dev-libs/syck || ( <dev-lang/php-5.3.1[hash,spl] >=dev-lang/php-5.3.1[hash] ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 )
+dev-libs/syck || ( <dev-lang/php-5.3.1[hash,spl] >=dev-lang/php-5.3.1[hash] ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 )
 dev-libs/syck || ( <dev-lang/php-5.3.1[hash,spl] >=dev-lang/php-5.3.1[hash] ) || ( =dev-php/pecl-syck-0.9.3-r1[php_targets_php5-3] ) php_targets_php5-3? ( dev-lang/php:5.3 )
 0
 http://pecl.php.net/get/syck-0.9.3.tgz
diff --git a/metadata/cache/dev-php/pecl-taint-0.4.0 b/metadata/cache/dev-php/pecl-taint-0.4.0
index adbfe41bf320..088f020a2ed0 100644
--- a/metadata/cache/dev-php/pecl-taint-0.4.0
+++ b/metadata/cache/dev-php/pecl-taint-0.4.0
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 )
+|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 )
 || ( =dev-php/pecl-taint-0.4.0[php_targets_php5-3] =dev-php/pecl-taint-0.4.0[php_targets_php5-4] ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 )
 0
 http://pecl.php.net/get/taint-0.4.0.tgz
diff --git a/metadata/cache/dev-php/pecl-taint-0.4.1 b/metadata/cache/dev-php/pecl-taint-0.4.1
index d40e1cd03a86..929f764ddde1 100644
--- a/metadata/cache/dev-php/pecl-taint-0.4.1
+++ b/metadata/cache/dev-php/pecl-taint-0.4.1
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 )
+|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 )
 || ( =dev-php/pecl-taint-0.4.1[php_targets_php5-3] =dev-php/pecl-taint-0.4.1[php_targets_php5-4] ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 )
 0
 http://pecl.php.net/get/taint-0.4.1.tgz
diff --git a/metadata/cache/dev-php/pecl-timezonedb-2011.13 b/metadata/cache/dev-php/pecl-timezonedb-2011.13
index 3f32b7f2b102..9a29f40b7a71 100644
--- a/metadata/cache/dev-php/pecl-timezonedb-2011.13
+++ b/metadata/cache/dev-php/pecl-timezonedb-2011.13
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 )
+|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 )
 || ( =dev-php/pecl-timezonedb-2011.13[php_targets_php5-3] ) php_targets_php5-3? ( dev-lang/php:5.3 )
 0
 http://pecl.php.net/get/timezonedb-2011.13.tgz
diff --git a/metadata/cache/dev-php/pecl-timezonedb-2011.14 b/metadata/cache/dev-php/pecl-timezonedb-2011.14
index 832c4a0e63f2..306fc7a3cac3 100644
--- a/metadata/cache/dev-php/pecl-timezonedb-2011.14
+++ b/metadata/cache/dev-php/pecl-timezonedb-2011.14
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 )
+|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 )
 || ( =dev-php/pecl-timezonedb-2011.14[php_targets_php5-3] ) php_targets_php5-3? ( dev-lang/php:5.3 )
 0
 http://pecl.php.net/get/timezonedb-2011.14.tgz
diff --git a/metadata/cache/dev-php/pecl-timezonedb-2012.1 b/metadata/cache/dev-php/pecl-timezonedb-2012.1
index fa1316df70bf..33a9a870e5d2 100644
--- a/metadata/cache/dev-php/pecl-timezonedb-2012.1
+++ b/metadata/cache/dev-php/pecl-timezonedb-2012.1
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 )
+|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 )
 || ( =dev-php/pecl-timezonedb-2012.1[php_targets_php5-3] ) php_targets_php5-3? ( dev-lang/php:5.3 )
 0
 http://pecl.php.net/get/timezonedb-2012.1.tgz
diff --git a/metadata/cache/dev-php/pecl-translit-0.6.0-r1 b/metadata/cache/dev-php/pecl-translit-0.6.0-r1
index 2e4425a5e5ac..5b9002935bce 100644
--- a/metadata/cache/dev-php/pecl-translit-0.6.0-r1
+++ b/metadata/cache/dev-php/pecl-translit-0.6.0-r1
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 )
+|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 )
 || ( =dev-php/pecl-translit-0.6.0-r1[php_targets_php5-3] ) php_targets_php5-3? ( dev-lang/php:5.3 )
 0
 http://pecl.php.net/get/translit-0.6.0.tgz
diff --git a/metadata/cache/dev-php/pecl-uploadprogress-1.0.1-r1 b/metadata/cache/dev-php/pecl-uploadprogress-1.0.1-r1
index abb0fe50758d..67b6769744a8 100644
--- a/metadata/cache/dev-php/pecl-uploadprogress-1.0.1-r1
+++ b/metadata/cache/dev-php/pecl-uploadprogress-1.0.1-r1
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 )
+|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 )
 || ( =dev-php/pecl-uploadprogress-1.0.1-r1[php_targets_php5-3] ) php_targets_php5-3? ( dev-lang/php:5.3 )
 0
 http://pecl.php.net/get/uploadprogress-1.0.1.tgz
diff --git a/metadata/cache/dev-php/pecl-uploadprogress-1.0.3.1 b/metadata/cache/dev-php/pecl-uploadprogress-1.0.3.1
index a3f9758f893c..8391a72c8183 100644
--- a/metadata/cache/dev-php/pecl-uploadprogress-1.0.3.1
+++ b/metadata/cache/dev-php/pecl-uploadprogress-1.0.3.1
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 )
+|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 )
 || ( =dev-php/pecl-uploadprogress-1.0.3.1[php_targets_php5-3] =dev-php/pecl-uploadprogress-1.0.3.1[php_targets_php5-4] ) php_targets_php5-3? ( dev-lang/php:5.3 ) php_targets_php5-4? ( dev-lang/php:5.4 )
 0
 http://pecl.php.net/get/uploadprogress-1.0.3.1.tgz
diff --git a/metadata/cache/dev-php/pecl-uuid-1.0.2 b/metadata/cache/dev-php/pecl-uuid-1.0.2
index c6eb99e257c8..bc3b9dcb14cc 100644
--- a/metadata/cache/dev-php/pecl-uuid-1.0.2
+++ b/metadata/cache/dev-php/pecl-uuid-1.0.2
@@ -1,4 +1,4 @@
-sys-apps/util-linux || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 )
+sys-apps/util-linux || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 )
 sys-apps/util-linux || ( =dev-php/pecl-uuid-1.0.2[php_targets_php5-3] ) php_targets_php5-3? ( dev-lang/php:5.3 )
 0
 http://pecl.php.net/get/uuid-1.0.2.tgz
diff --git a/metadata/cache/dev-php/pecl-xdiff-1.5.1-r1 b/metadata/cache/dev-php/pecl-xdiff-1.5.1-r1
index 61908250f118..c7d19247563d 100644
--- a/metadata/cache/dev-php/pecl-xdiff-1.5.1-r1
+++ b/metadata/cache/dev-php/pecl-xdiff-1.5.1-r1
@@ -1,4 +1,4 @@
-dev-libs/libxdiff || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 )
+dev-libs/libxdiff || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 )
 dev-libs/libxdiff || ( =dev-php/pecl-xdiff-1.5.1-r1[php_targets_php5-3] ) php_targets_php5-3? ( dev-lang/php:5.3 )
 0
 http://pecl.php.net/get/xdiff-1.5.1.tgz
diff --git a/metadata/cache/dev-php/pecl-yaml-1.0.1 b/metadata/cache/dev-php/pecl-yaml-1.0.1
index d9b1a94faae0..265ce97b346d 100644
--- a/metadata/cache/dev-php/pecl-yaml-1.0.1
+++ b/metadata/cache/dev-php/pecl-yaml-1.0.1
@@ -1,4 +1,4 @@
->=dev-libs/libyaml-0.1.0 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 )
+>=dev-libs/libyaml-0.1.0 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 )
 >=dev-libs/libyaml-0.1.0 || ( =dev-php/pecl-yaml-1.0.1[php_targets_php5-3] ) php_targets_php5-3? ( dev-lang/php:5.3 )
 0
 http://pecl.php.net/get/yaml-1.0.1.tgz
diff --git a/metadata/cache/dev-php/pecl-yaz-1.0.14-r1 b/metadata/cache/dev-php/pecl-yaz-1.0.14-r1
index 24925e755363..62d52ddf4237 100644
--- a/metadata/cache/dev-php/pecl-yaz-1.0.14-r1
+++ b/metadata/cache/dev-php/pecl-yaz-1.0.14-r1
@@ -1,4 +1,4 @@
->=dev-libs/yaz-3.0.2 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 )
+>=dev-libs/yaz-3.0.2 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 )
 >=dev-libs/yaz-3.0.2 || ( =dev-php/pecl-yaz-1.0.14-r1[php_targets_php5-3] ) php_targets_php5-3? ( dev-lang/php:5.3 )
 0
 http://pecl.php.net/get/yaz-1.0.14.tgz
diff --git a/metadata/cache/dev-php/pecl-yaz-1.1.1 b/metadata/cache/dev-php/pecl-yaz-1.1.1
index d546a990d8c4..50688b191345 100644
--- a/metadata/cache/dev-php/pecl-yaz-1.1.1
+++ b/metadata/cache/dev-php/pecl-yaz-1.1.1
@@ -1,4 +1,4 @@
->=dev-libs/yaz-3.0.2 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 )
+>=dev-libs/yaz-3.0.2 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 )
 >=dev-libs/yaz-3.0.2 || ( =dev-php/pecl-yaz-1.1.1[php_targets_php5-3] ) php_targets_php5-3? ( dev-lang/php:5.3 )
 0
 http://pecl.php.net/get/yaz-1.1.1.tgz
diff --git a/metadata/cache/dev-php/suhosin-0.9.32.1-r2 b/metadata/cache/dev-php/suhosin-0.9.32.1-r2
index ace8e113a2a7..eb320a5d0d2b 100644
--- a/metadata/cache/dev-php/suhosin-0.9.32.1-r2
+++ b/metadata/cache/dev-php/suhosin-0.9.32.1-r2
@@ -1,4 +1,4 @@
-dev-lang/php[unicode] || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 )
+dev-lang/php[unicode] || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 )
 dev-lang/php[unicode] || ( =dev-php/suhosin-0.9.32.1-r2[php_targets_php5-3] ) php_targets_php5-3? ( dev-lang/php:5.3 )
 0
 http://download.suhosin.org/suhosin-0.9.32.1.tar.gz
diff --git a/metadata/cache/dev-php/suhosin-0.9.33 b/metadata/cache/dev-php/suhosin-0.9.33
index 1801edf12a7e..50d209547003 100644
--- a/metadata/cache/dev-php/suhosin-0.9.33
+++ b/metadata/cache/dev-php/suhosin-0.9.33
@@ -1,4 +1,4 @@
-dev-lang/php[unicode] || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 )
+dev-lang/php[unicode] || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 )
 dev-lang/php[unicode] || ( =dev-php/suhosin-0.9.33[php_targets_php5-3] ) php_targets_php5-3? ( dev-lang/php:5.3 )
 0
 http://download.suhosin.org/suhosin-0.9.33.tgz
diff --git a/metadata/cache/dev-php/xcache-1.3.1 b/metadata/cache/dev-php/xcache-1.3.1
index 135f18be864f..bad1af1af5df 100644
--- a/metadata/cache/dev-php/xcache-1.3.1
+++ b/metadata/cache/dev-php/xcache-1.3.1
@@ -1,4 +1,4 @@
-virtual/httpd-php !dev-php/eaccelerator !dev-php/pecl-apc || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 )
+virtual/httpd-php !dev-php/eaccelerator !dev-php/pecl-apc || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 )
 virtual/httpd-php !dev-php/eaccelerator !dev-php/pecl-apc || ( =dev-php/xcache-1.3.1[php_targets_php5-3] ) php_targets_php5-3? ( dev-lang/php:5.3 )
 0
 http://xcache.lighttpd.net/pub/Releases/1.3.1/xcache-1.3.1.tar.bz2
diff --git a/metadata/cache/dev-php/xcache-1.3.2 b/metadata/cache/dev-php/xcache-1.3.2
index 87a1ef0ac0d6..b590e4b73b58 100644
--- a/metadata/cache/dev-php/xcache-1.3.2
+++ b/metadata/cache/dev-php/xcache-1.3.2
@@ -1,4 +1,4 @@
-virtual/httpd-php !dev-php/eaccelerator !dev-php/pecl-apc || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 )
+virtual/httpd-php !dev-php/eaccelerator !dev-php/pecl-apc || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 )
 virtual/httpd-php !dev-php/eaccelerator !dev-php/pecl-apc || ( =dev-php/xcache-1.3.2[php_targets_php5-3] ) php_targets_php5-3? ( dev-lang/php:5.3 )
 0
 http://xcache.lighttpd.net/pub/Releases/1.3.2/xcache-1.3.2.tar.bz2
diff --git a/metadata/cache/dev-php/xdebug-2.1.0-r1 b/metadata/cache/dev-php/xdebug-2.1.0-r1
index 7b716d4492af..d53d11fd0a18 100644
--- a/metadata/cache/dev-php/xdebug-2.1.0-r1
+++ b/metadata/cache/dev-php/xdebug-2.1.0-r1
@@ -1,4 +1,4 @@
-!dev-php/ZendOptimizer || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 )
+!dev-php/ZendOptimizer || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 )
 !dev-php/ZendOptimizer ~dev-php/xdebug-client-2.1.0 || ( =dev-php/xdebug-2.1.0-r1[php_targets_php5-3] ) php_targets_php5-3? ( dev-lang/php:5.3 )
 0
 http://pecl.php.net/get/xdebug-2.1.0.tgz
diff --git a/metadata/cache/dev-php/xdebug-2.1.1 b/metadata/cache/dev-php/xdebug-2.1.1
index 366933f0390a..8c294430d50f 100644
--- a/metadata/cache/dev-php/xdebug-2.1.1
+++ b/metadata/cache/dev-php/xdebug-2.1.1
@@ -1,4 +1,4 @@
-!dev-php/ZendOptimizer || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 )
+!dev-php/ZendOptimizer || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 )
 !dev-php/ZendOptimizer ~dev-php/xdebug-client-2.1.1 || ( =dev-php/xdebug-2.1.1[php_targets_php5-3] ) php_targets_php5-3? ( dev-lang/php:5.3 )
 0
 http://pecl.php.net/get/xdebug-2.1.1.tgz
diff --git a/metadata/cache/dev-php/xdebug-2.1.2 b/metadata/cache/dev-php/xdebug-2.1.2
index 35c2107456a0..d2d9e01fd2e8 100644
--- a/metadata/cache/dev-php/xdebug-2.1.2
+++ b/metadata/cache/dev-php/xdebug-2.1.2
@@ -1,4 +1,4 @@
-!dev-php/ZendOptimizer || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 )
+!dev-php/ZendOptimizer || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 )
 !dev-php/ZendOptimizer ~dev-php/xdebug-client-2.1.2 || ( =dev-php/xdebug-2.1.2[php_targets_php5-3] ) php_targets_php5-3? ( dev-lang/php:5.3 )
 0
 http://pecl.php.net/get/xdebug-2.1.2.tgz
diff --git a/metadata/cache/dev-php/xdebug-2.1.3 b/metadata/cache/dev-php/xdebug-2.1.3
index b3f61c9e4d27..2c62d8709e90 100644
--- a/metadata/cache/dev-php/xdebug-2.1.3
+++ b/metadata/cache/dev-php/xdebug-2.1.3
@@ -1,4 +1,4 @@
-!dev-php/ZendOptimizer || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 )
+!dev-php/ZendOptimizer || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 )
 !dev-php/ZendOptimizer ~dev-php/xdebug-client-2.1.3 || ( =dev-php/xdebug-2.1.3[php_targets_php5-3] ) php_targets_php5-3? ( dev-lang/php:5.3 )
 0
 http://pecl.php.net/get/xdebug-2.1.3.tgz
diff --git a/metadata/cache/dev-php/xdebug-2.1.4 b/metadata/cache/dev-php/xdebug-2.1.4
index 4c35e6114261..976ebe6822ba 100644
--- a/metadata/cache/dev-php/xdebug-2.1.4
+++ b/metadata/cache/dev-php/xdebug-2.1.4
@@ -1,4 +1,4 @@
-!dev-php/ZendOptimizer || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 )
+!dev-php/ZendOptimizer || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 )
 !dev-php/ZendOptimizer ~dev-php/xdebug-client-2.1.4 || ( =dev-php/xdebug-2.1.4[php_targets_php5-3] ) php_targets_php5-3? ( dev-lang/php:5.3 )
 0
 http://pecl.php.net/get/xdebug-2.1.4.tgz
diff --git a/metadata/cache/dev-php/xhprof-0.9.2 b/metadata/cache/dev-php/xhprof-0.9.2
index 5580584fbef6..e3afccb25675 100644
--- a/metadata/cache/dev-php/xhprof-0.9.2
+++ b/metadata/cache/dev-php/xhprof-0.9.2
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 )
+|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php_targets_php5-3? ( dev-lang/php:5.3 )
 dev-lang/php || ( =dev-php/xhprof-0.9.2[php_targets_php5-3] ) php_targets_php5-3? ( dev-lang/php:5.3 )
 0
 http://pecl.php.net/get/xhprof-0.9.2.tgz
diff --git a/metadata/cache/dev-python/brasero-python-2.32.0 b/metadata/cache/dev-python/brasero-python-2.32.0
index 298c0317ff21..cd1d462e9b0b 100644
--- a/metadata/cache/dev-python/brasero-python-2.32.0
+++ b/metadata/cache/dev-python/brasero-python-2.32.0
@@ -1,4 +1,4 @@
->=app-cdr/brasero-2.29 !<dev-python/gnome-python-desktop-2.22.0-r10 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 =dev-lang/python-2* ~dev-python/gnome-python-desktop-base-2.32.0 dev-util/pkgconfig
+>=app-cdr/brasero-2.29 !<dev-python/gnome-python-desktop-2.22.0-r10 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 =dev-lang/python-2* ~dev-python/gnome-python-desktop-base-2.32.0 dev-util/pkgconfig
 >=app-cdr/brasero-2.29 !<dev-python/gnome-python-desktop-2.22.0-r10 =dev-lang/python-2* ~dev-python/gnome-python-desktop-base-2.32.0
 0
 mirror://gnome/sources/gnome-python-desktop/2.32/gnome-python-desktop-2.32.0.tar.bz2
diff --git a/metadata/cache/dev-python/bug-buddy-python-2.32.0 b/metadata/cache/dev-python/bug-buddy-python-2.32.0
index 4429c9a97d43..43ab9405b31f 100644
--- a/metadata/cache/dev-python/bug-buddy-python-2.32.0
+++ b/metadata/cache/dev-python/bug-buddy-python-2.32.0
@@ -1,4 +1,4 @@
->=gnome-extra/bug-buddy-2.16:2 !<dev-python/gnome-python-desktop-2.22.0-r10 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 ~dev-python/gnome-python-desktop-base-2.32.0 dev-util/pkgconfig
+>=gnome-extra/bug-buddy-2.16:2 !<dev-python/gnome-python-desktop-2.22.0-r10 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 ~dev-python/gnome-python-desktop-base-2.32.0 dev-util/pkgconfig
 >=gnome-extra/bug-buddy-2.16:2 !<dev-python/gnome-python-desktop-2.22.0-r10 ~dev-python/gnome-python-desktop-base-2.32.0
 0
 mirror://gnome/sources/gnome-python-desktop/2.32/gnome-python-desktop-2.32.0.tar.bz2
diff --git a/metadata/cache/dev-python/egg-python-2.25.3 b/metadata/cache/dev-python/egg-python-2.25.3
index 59c72f0998b8..488a9f0b1b69 100644
--- a/metadata/cache/dev-python/egg-python-2.25.3
+++ b/metadata/cache/dev-python/egg-python-2.25.3
@@ -1,4 +1,4 @@
->=dev-python/libbonobo-python-2.22.1 >=dev-python/libgnome-python-2.22.1 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 =dev-lang/python-2* !<=dev-python/gnome-python-extras-2.19.1-r2 ~dev-python/gnome-python-extras-base-2.25.3 dev-util/pkgconfig
+>=dev-python/libbonobo-python-2.22.1 >=dev-python/libgnome-python-2.22.1 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 =dev-lang/python-2* !<=dev-python/gnome-python-extras-2.19.1-r2 ~dev-python/gnome-python-extras-base-2.25.3 dev-util/pkgconfig
 >=dev-python/libbonobo-python-2.22.1 >=dev-python/libgnome-python-2.22.1 =dev-lang/python-2* !<=dev-python/gnome-python-extras-2.19.1-r2 ~dev-python/gnome-python-extras-base-2.25.3
 0
 mirror://gnome/sources/gnome-python-extras/2.25/gnome-python-extras-2.25.3.tar.bz2
diff --git a/metadata/cache/dev-python/evince-python-2.32.0 b/metadata/cache/dev-python/evince-python-2.32.0
index 54c87ca9a73d..6deb31622970 100644
--- a/metadata/cache/dev-python/evince-python-2.32.0
+++ b/metadata/cache/dev-python/evince-python-2.32.0
@@ -1,4 +1,4 @@
->=app-text/evince-2.32 !<dev-python/gnome-python-desktop-2.22.0-r10 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 =dev-lang/python-2* ~dev-python/gnome-python-desktop-base-2.32.0 dev-util/pkgconfig
+>=app-text/evince-2.32 !<dev-python/gnome-python-desktop-2.22.0-r10 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 =dev-lang/python-2* ~dev-python/gnome-python-desktop-base-2.32.0 dev-util/pkgconfig
 >=app-text/evince-2.32 !<dev-python/gnome-python-desktop-2.22.0-r10 =dev-lang/python-2* ~dev-python/gnome-python-desktop-base-2.32.0
 0
 mirror://gnome/sources/gnome-python-desktop/2.32/gnome-python-desktop-2.32.0.tar.bz2
diff --git a/metadata/cache/dev-python/evolution-python-2.32.0 b/metadata/cache/dev-python/evolution-python-2.32.0
index bc96f05a5bdb..2f1ff8f1db0f 100644
--- a/metadata/cache/dev-python/evolution-python-2.32.0
+++ b/metadata/cache/dev-python/evolution-python-2.32.0
@@ -1,4 +1,4 @@
->=gnome-extra/evolution-data-server-1.2 dev-python/libbonobo-python:2 !<dev-python/gnome-python-desktop-2.22.0-r10 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 =dev-lang/python-2* ~dev-python/gnome-python-desktop-base-2.32.0 dev-util/pkgconfig
+>=gnome-extra/evolution-data-server-1.2 dev-python/libbonobo-python:2 !<dev-python/gnome-python-desktop-2.22.0-r10 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 =dev-lang/python-2* ~dev-python/gnome-python-desktop-base-2.32.0 dev-util/pkgconfig
 >=gnome-extra/evolution-data-server-1.2 dev-python/libbonobo-python:2 !<dev-python/gnome-python-desktop-2.22.0-r10 =dev-lang/python-2* ~dev-python/gnome-python-desktop-base-2.32.0
 0
 mirror://gnome/sources/gnome-python-desktop/2.32/gnome-python-desktop-2.32.0.tar.bz2
diff --git a/metadata/cache/dev-python/gconf-python-2.28.1 b/metadata/cache/dev-python/gconf-python-2.28.1
index 18724d0b84ed..6743568a5e6b 100644
--- a/metadata/cache/dev-python/gconf-python-2.28.1
+++ b/metadata/cache/dev-python/gconf-python-2.28.1
@@ -1,4 +1,4 @@
-dev-python/pygobject:2 >=gnome-base/gconf-2.11.1 !<dev-python/gnome-python-2.22.1 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 =dev-lang/python-2* ~dev-python/gnome-python-base-2.28.1 dev-util/pkgconfig
+dev-python/pygobject:2 >=gnome-base/gconf-2.11.1 !<dev-python/gnome-python-2.22.1 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 =dev-lang/python-2* ~dev-python/gnome-python-base-2.28.1 dev-util/pkgconfig
 dev-python/pygobject:2 >=gnome-base/gconf-2.11.1 !<dev-python/gnome-python-2.22.1 =dev-lang/python-2* ~dev-python/gnome-python-base-2.28.1
 2
 mirror://gnome/sources/gnome-python/2.28/gnome-python-2.28.1.tar.bz2
diff --git a/metadata/cache/dev-python/gdl-python-2.25.3 b/metadata/cache/dev-python/gdl-python-2.25.3
index e74f877dd6cd..6799275675e3 100644
--- a/metadata/cache/dev-python/gdl-python-2.25.3
+++ b/metadata/cache/dev-python/gdl-python-2.25.3
@@ -1,4 +1,4 @@
->=dev-libs/gdl-2.28:1 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 =dev-lang/python-2* !<=dev-python/gnome-python-extras-2.19.1-r2 ~dev-python/gnome-python-extras-base-2.25.3 dev-util/pkgconfig
+>=dev-libs/gdl-2.28:1 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 =dev-lang/python-2* !<=dev-python/gnome-python-extras-2.19.1-r2 ~dev-python/gnome-python-extras-base-2.25.3 dev-util/pkgconfig
 >=dev-libs/gdl-2.28:1 =dev-lang/python-2* !<=dev-python/gnome-python-extras-2.19.1-r2 ~dev-python/gnome-python-extras-base-2.25.3
 0
 mirror://gnome/sources/gnome-python-extras/2.25/gnome-python-extras-2.25.3.tar.bz2
diff --git a/metadata/cache/dev-python/gnome-applets-python-2.32.0 b/metadata/cache/dev-python/gnome-applets-python-2.32.0
index 3ef7fd8a9690..39672a1798c2 100644
--- a/metadata/cache/dev-python/gnome-applets-python-2.32.0
+++ b/metadata/cache/dev-python/gnome-applets-python-2.32.0
@@ -1,4 +1,4 @@
->=gnome-base/gnome-panel-2.13.4 >=dev-python/libbonobo-python-2.22.0:2 gnome-base/libgnome gnome-base/libgnomeui !<dev-python/gnome-python-desktop-2.22.0-r10 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 =dev-lang/python-2* ~dev-python/gnome-python-desktop-base-2.32.0 dev-util/pkgconfig
+>=gnome-base/gnome-panel-2.13.4 >=dev-python/libbonobo-python-2.22.0:2 gnome-base/libgnome gnome-base/libgnomeui !<dev-python/gnome-python-desktop-2.22.0-r10 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 =dev-lang/python-2* ~dev-python/gnome-python-desktop-base-2.32.0 dev-util/pkgconfig
 >=gnome-base/gnome-panel-2.13.4 >=dev-python/libbonobo-python-2.22.0:2 gnome-base/libgnome gnome-base/libgnomeui !<dev-python/gnome-python-desktop-2.22.0-r10 =dev-lang/python-2* ~dev-python/gnome-python-desktop-base-2.32.0
 0
 mirror://gnome/sources/gnome-python-desktop/2.32/gnome-python-desktop-2.32.0.tar.bz2
diff --git a/metadata/cache/dev-python/gnome-desktop-python-2.32.0 b/metadata/cache/dev-python/gnome-desktop-python-2.32.0
index a617ed55f45f..261f46fc78c0 100644
--- a/metadata/cache/dev-python/gnome-desktop-python-2.32.0
+++ b/metadata/cache/dev-python/gnome-desktop-python-2.32.0
@@ -1,4 +1,4 @@
->=gnome-base/gnome-desktop-2.10.0:2 >=dev-python/gnome-vfs-python-2.22:2 !<dev-python/gnome-python-desktop-2.22.0-r10 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 =dev-lang/python-2* ~dev-python/gnome-python-desktop-base-2.32.0 dev-util/pkgconfig
+>=gnome-base/gnome-desktop-2.10.0:2 >=dev-python/gnome-vfs-python-2.22:2 !<dev-python/gnome-python-desktop-2.22.0-r10 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 =dev-lang/python-2* ~dev-python/gnome-python-desktop-base-2.32.0 dev-util/pkgconfig
 >=gnome-base/gnome-desktop-2.10.0:2 >=dev-python/gnome-vfs-python-2.22:2 !<dev-python/gnome-python-desktop-2.22.0-r10 =dev-lang/python-2* ~dev-python/gnome-python-desktop-base-2.32.0
 0
 mirror://gnome/sources/gnome-python-desktop/2.32/gnome-python-desktop-2.32.0.tar.bz2
diff --git a/metadata/cache/dev-python/gnome-keyring-python-2.32.0 b/metadata/cache/dev-python/gnome-keyring-python-2.32.0
index c1dd573d667c..f381bcece7ba 100644
--- a/metadata/cache/dev-python/gnome-keyring-python-2.32.0
+++ b/metadata/cache/dev-python/gnome-keyring-python-2.32.0
@@ -1,4 +1,4 @@
->=gnome-base/gnome-keyring-0.5.0 !<dev-python/gnome-python-desktop-2.22.0-r10 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 =dev-lang/python-2* ~dev-python/gnome-python-desktop-base-2.32.0 dev-util/pkgconfig
+>=gnome-base/gnome-keyring-0.5.0 !<dev-python/gnome-python-desktop-2.22.0-r10 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 =dev-lang/python-2* ~dev-python/gnome-python-desktop-base-2.32.0 dev-util/pkgconfig
 >=gnome-base/gnome-keyring-0.5.0 !<dev-python/gnome-python-desktop-2.22.0-r10 =dev-lang/python-2* ~dev-python/gnome-python-desktop-base-2.32.0
 0
 mirror://gnome/sources/gnome-python-desktop/2.32/gnome-python-desktop-2.32.0.tar.bz2
diff --git a/metadata/cache/dev-python/gnome-media-python-2.32.0 b/metadata/cache/dev-python/gnome-media-python-2.32.0
index 3601f88989b3..f8be4e23754d 100644
--- a/metadata/cache/dev-python/gnome-media-python-2.32.0
+++ b/metadata/cache/dev-python/gnome-media-python-2.32.0
@@ -1,4 +1,4 @@
->=gnome-extra/gnome-media-2.10.0:2 <gnome-extra/gnome-media-2.91 >=gnome-base/gconf-2.10.0:2 >=dev-python/gconf-python-2.25.90:2 !<dev-python/gnome-python-desktop-2.22.0-r10 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 =dev-lang/python-2* ~dev-python/gnome-python-desktop-base-2.32.0 dev-util/pkgconfig
+>=gnome-extra/gnome-media-2.10.0:2 <gnome-extra/gnome-media-2.91 >=gnome-base/gconf-2.10.0:2 >=dev-python/gconf-python-2.25.90:2 !<dev-python/gnome-python-desktop-2.22.0-r10 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 =dev-lang/python-2* ~dev-python/gnome-python-desktop-base-2.32.0 dev-util/pkgconfig
 >=gnome-extra/gnome-media-2.10.0:2 <gnome-extra/gnome-media-2.91 >=gnome-base/gconf-2.10.0:2 >=dev-python/gconf-python-2.25.90:2 !<dev-python/gnome-python-desktop-2.22.0-r10 =dev-lang/python-2* ~dev-python/gnome-python-desktop-base-2.32.0
 0
 mirror://gnome/sources/gnome-python-desktop/2.32/gnome-python-desktop-2.32.0.tar.bz2
diff --git a/metadata/cache/dev-python/gnome-vfs-python-2.28.1 b/metadata/cache/dev-python/gnome-vfs-python-2.28.1
index 627067323ea9..11f12bfad689 100644
--- a/metadata/cache/dev-python/gnome-vfs-python-2.28.1
+++ b/metadata/cache/dev-python/gnome-vfs-python-2.28.1
@@ -1,4 +1,4 @@
-dev-python/pygobject:2 >=gnome-base/gnome-vfs-2.24.0 >=gnome-base/libbonobo-2.8 !<dev-python/gnome-python-2.22.1 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 =dev-lang/python-2* ~dev-python/gnome-python-base-2.28.1 dev-util/pkgconfig
+dev-python/pygobject:2 >=gnome-base/gnome-vfs-2.24.0 >=gnome-base/libbonobo-2.8 !<dev-python/gnome-python-2.22.1 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 =dev-lang/python-2* ~dev-python/gnome-python-base-2.28.1 dev-util/pkgconfig
 dev-python/pygobject:2 >=gnome-base/gnome-vfs-2.24.0 >=gnome-base/libbonobo-2.8 !<dev-python/gnome-python-2.22.1 =dev-lang/python-2* ~dev-python/gnome-python-base-2.28.1
 2
 mirror://gnome/sources/gnome-python/2.28/gnome-python-2.28.1.tar.bz2
diff --git a/metadata/cache/dev-python/gst-python-0.10.20 b/metadata/cache/dev-python/gst-python-0.10.20
index 8aae3b9917e9..4e550f6f7f5d 100644
--- a/metadata/cache/dev-python/gst-python-0.10.20
+++ b/metadata/cache/dev-python/gst-python-0.10.20
@@ -1,4 +1,4 @@
-|| ( >=dev-python/pygobject-2.11.2:2 >=dev-python/pygtk-2.6.3 ) >=media-libs/gstreamer-0.10.31 >=media-libs/gst-plugins-base-0.10.31 dev-libs/libxml2 dev-util/pkgconfig test? ( media-plugins/gst-plugins-ogg media-plugins/gst-plugins-vorbis ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool =dev-lang/python-2*
+|| ( >=dev-python/pygobject-2.11.2:2 >=dev-python/pygtk-2.6.3 ) >=media-libs/gstreamer-0.10.31 >=media-libs/gst-plugins-base-0.10.31 dev-libs/libxml2 dev-util/pkgconfig test? ( media-plugins/gst-plugins-ogg media-plugins/gst-plugins-vorbis ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool =dev-lang/python-2*
 || ( >=dev-python/pygobject-2.11.2:2 >=dev-python/pygtk-2.6.3 ) >=media-libs/gstreamer-0.10.31 >=media-libs/gst-plugins-base-0.10.31 dev-libs/libxml2 =dev-lang/python-2*
 0.10
 http://gstreamer.freedesktop.org/src/gst-python/gst-python-0.10.20.tar.bz2
diff --git a/metadata/cache/dev-python/gst-python-0.10.21 b/metadata/cache/dev-python/gst-python-0.10.21
index 09950778c4ac..7f37948df901 100644
--- a/metadata/cache/dev-python/gst-python-0.10.21
+++ b/metadata/cache/dev-python/gst-python-0.10.21
@@ -1,4 +1,4 @@
-|| ( >=dev-python/pygobject-2.11.2:2 >=dev-python/pygtk-2.6.3 ) >=media-libs/gstreamer-0.10.32 >=media-libs/gst-plugins-base-0.10.32 dev-libs/libxml2 dev-util/pkgconfig test? ( media-plugins/gst-plugins-ogg media-plugins/gst-plugins-vorbis ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool =dev-lang/python-2*
+|| ( >=dev-python/pygobject-2.11.2:2 >=dev-python/pygtk-2.6.3 ) >=media-libs/gstreamer-0.10.32 >=media-libs/gst-plugins-base-0.10.32 dev-libs/libxml2 dev-util/pkgconfig test? ( media-plugins/gst-plugins-ogg media-plugins/gst-plugins-vorbis ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool =dev-lang/python-2*
 || ( >=dev-python/pygobject-2.11.2:2 >=dev-python/pygtk-2.6.3 ) >=media-libs/gstreamer-0.10.32 >=media-libs/gst-plugins-base-0.10.32 dev-libs/libxml2 =dev-lang/python-2*
 0.10
 http://gstreamer.freedesktop.org/src/gst-python/gst-python-0.10.21.tar.bz2
diff --git a/metadata/cache/dev-python/gst-python-0.10.22 b/metadata/cache/dev-python/gst-python-0.10.22
index 5ada1b46dcc3..00c338112a23 100644
--- a/metadata/cache/dev-python/gst-python-0.10.22
+++ b/metadata/cache/dev-python/gst-python-0.10.22
@@ -1,4 +1,4 @@
-dev-libs/libxml2 >=dev-python/pygobject-2.28:2 >=media-libs/gstreamer-0.10.32 >=media-libs/gst-plugins-base-0.10.32 dev-util/pkgconfig test? ( media-plugins/gst-plugins-ogg media-plugins/gst-plugins-vorbis ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
+dev-libs/libxml2 >=dev-python/pygobject-2.28:2 >=media-libs/gstreamer-0.10.32 >=media-libs/gst-plugins-base-0.10.32 dev-util/pkgconfig test? ( media-plugins/gst-plugins-ogg media-plugins/gst-plugins-vorbis ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
 dev-libs/libxml2 >=dev-python/pygobject-2.28:2 >=media-libs/gstreamer-0.10.32 >=media-libs/gst-plugins-base-0.10.32 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
 0.10
 http://gstreamer.freedesktop.org/src/gst-python/gst-python-0.10.22.tar.bz2
diff --git a/metadata/cache/dev-python/gtkhtml-python-2.25.3 b/metadata/cache/dev-python/gtkhtml-python-2.25.3
index 0f95d10875a2..2692f49312ca 100644
--- a/metadata/cache/dev-python/gtkhtml-python-2.25.3
+++ b/metadata/cache/dev-python/gtkhtml-python-2.25.3
@@ -1,4 +1,4 @@
-=gnome-extra/gtkhtml-2* || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 =dev-lang/python-2* !<=dev-python/gnome-python-extras-2.19.1-r2 ~dev-python/gnome-python-extras-base-2.25.3 dev-util/pkgconfig
+=gnome-extra/gtkhtml-2* || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 =dev-lang/python-2* !<=dev-python/gnome-python-extras-2.19.1-r2 ~dev-python/gnome-python-extras-base-2.25.3 dev-util/pkgconfig
 =gnome-extra/gtkhtml-2* =dev-lang/python-2* !<=dev-python/gnome-python-extras-2.19.1-r2 ~dev-python/gnome-python-extras-base-2.25.3
 0
 mirror://gnome/sources/gnome-python-extras/2.25/gnome-python-extras-2.25.3.tar.bz2
diff --git a/metadata/cache/dev-python/gtkspell-python-2.25.3 b/metadata/cache/dev-python/gtkspell-python-2.25.3
index 115cfdde92e9..7b08b32846f1 100644
--- a/metadata/cache/dev-python/gtkspell-python-2.25.3
+++ b/metadata/cache/dev-python/gtkspell-python-2.25.3
@@ -1,4 +1,4 @@
-app-text/gtkspell:2 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 =dev-lang/python-2* !<=dev-python/gnome-python-extras-2.19.1-r2 ~dev-python/gnome-python-extras-base-2.25.3 dev-util/pkgconfig
+app-text/gtkspell:2 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 =dev-lang/python-2* !<=dev-python/gnome-python-extras-2.19.1-r2 ~dev-python/gnome-python-extras-base-2.25.3 dev-util/pkgconfig
 app-text/gtkspell:2 =dev-lang/python-2* !<=dev-python/gnome-python-extras-2.19.1-r2 ~dev-python/gnome-python-extras-base-2.25.3
 0
 mirror://gnome/sources/gnome-python-extras/2.25/gnome-python-extras-2.25.3.tar.bz2
diff --git a/metadata/cache/dev-python/libbonobo-python-2.28.1 b/metadata/cache/dev-python/libbonobo-python-2.28.1
index 8f8dc9433bb2..ce353d022be2 100644
--- a/metadata/cache/dev-python/libbonobo-python-2.28.1
+++ b/metadata/cache/dev-python/libbonobo-python-2.28.1
@@ -1,4 +1,4 @@
-dev-python/pygobject:2 >=dev-python/pyorbit-2.24.0 >=gnome-base/libbonobo-2.24.0 >=gnome-base/libbonoboui-2.24.0 >=dev-python/libgnomecanvas-python-2.28.1 !<dev-python/gnome-python-2.22.1 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 =dev-lang/python-2* ~dev-python/gnome-python-base-2.28.1 dev-util/pkgconfig
+dev-python/pygobject:2 >=dev-python/pyorbit-2.24.0 >=gnome-base/libbonobo-2.24.0 >=gnome-base/libbonoboui-2.24.0 >=dev-python/libgnomecanvas-python-2.28.1 !<dev-python/gnome-python-2.22.1 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 =dev-lang/python-2* ~dev-python/gnome-python-base-2.28.1 dev-util/pkgconfig
 dev-python/pygobject:2 >=dev-python/pyorbit-2.24.0 >=gnome-base/libbonobo-2.24.0 >=gnome-base/libbonoboui-2.24.0 >=dev-python/libgnomecanvas-python-2.28.1 !<dev-python/gnome-python-2.22.1 =dev-lang/python-2* ~dev-python/gnome-python-base-2.28.1
 2
 mirror://gnome/sources/gnome-python/2.28/gnome-python-2.28.1.tar.bz2
diff --git a/metadata/cache/dev-python/libgda-python-2.25.3 b/metadata/cache/dev-python/libgda-python-2.25.3
index c87a2bc95001..b1ae07c4e075 100644
--- a/metadata/cache/dev-python/libgda-python-2.25.3
+++ b/metadata/cache/dev-python/libgda-python-2.25.3
@@ -1,4 +1,4 @@
->=gnome-extra/libgda-4:4 >=dev-python/libbonobo-python-2.22.1:2 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 =dev-lang/python-2* !<=dev-python/gnome-python-extras-2.19.1-r2 ~dev-python/gnome-python-extras-base-2.25.3 dev-util/pkgconfig
+>=gnome-extra/libgda-4:4 >=dev-python/libbonobo-python-2.22.1:2 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 =dev-lang/python-2* !<=dev-python/gnome-python-extras-2.19.1-r2 ~dev-python/gnome-python-extras-base-2.25.3 dev-util/pkgconfig
 >=gnome-extra/libgda-4:4 >=dev-python/libbonobo-python-2.22.1:2 =dev-lang/python-2* !<=dev-python/gnome-python-extras-2.19.1-r2 ~dev-python/gnome-python-extras-base-2.25.3
 0
 mirror://gnome/sources/gnome-python-extras/2.25/gnome-python-extras-2.25.3.tar.bz2
diff --git a/metadata/cache/dev-python/libgksu-python-2.25.3 b/metadata/cache/dev-python/libgksu-python-2.25.3
index 3be788433314..8d8f97a2752b 100644
--- a/metadata/cache/dev-python/libgksu-python-2.25.3
+++ b/metadata/cache/dev-python/libgksu-python-2.25.3
@@ -1,4 +1,4 @@
->=x11-libs/libgksu-2.0.4 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 =dev-lang/python-2* !<=dev-python/gnome-python-extras-2.19.1-r2 ~dev-python/gnome-python-extras-base-2.25.3 dev-util/pkgconfig
+>=x11-libs/libgksu-2.0.4 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 =dev-lang/python-2* !<=dev-python/gnome-python-extras-2.19.1-r2 ~dev-python/gnome-python-extras-base-2.25.3 dev-util/pkgconfig
 >=x11-libs/libgksu-2.0.4 =dev-lang/python-2* !<=dev-python/gnome-python-extras-2.19.1-r2 ~dev-python/gnome-python-extras-base-2.25.3
 0
 mirror://gnome/sources/gnome-python-extras/2.25/gnome-python-extras-2.25.3.tar.bz2
diff --git a/metadata/cache/dev-python/libgnome-python-2.28.1 b/metadata/cache/dev-python/libgnome-python-2.28.1
index fa19412d164c..80184c58e6d8 100644
--- a/metadata/cache/dev-python/libgnome-python-2.28.1
+++ b/metadata/cache/dev-python/libgnome-python-2.28.1
@@ -1,4 +1,4 @@
->=gnome-base/libgnome-2.24.1 >=gnome-base/libgnomeui-2.24.0 dev-python/pygobject:2 >=dev-python/pyorbit-2.24.0 >=dev-python/libbonobo-python-2.28.1 >=dev-python/gnome-vfs-python-2.28.1 >=dev-python/libgnomecanvas-python-2.28.1 !<dev-python/gnome-python-2.22.1 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 =dev-lang/python-2* ~dev-python/gnome-python-base-2.28.1 dev-util/pkgconfig
+>=gnome-base/libgnome-2.24.1 >=gnome-base/libgnomeui-2.24.0 dev-python/pygobject:2 >=dev-python/pyorbit-2.24.0 >=dev-python/libbonobo-python-2.28.1 >=dev-python/gnome-vfs-python-2.28.1 >=dev-python/libgnomecanvas-python-2.28.1 !<dev-python/gnome-python-2.22.1 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 =dev-lang/python-2* ~dev-python/gnome-python-base-2.28.1 dev-util/pkgconfig
 >=gnome-base/libgnome-2.24.1 >=gnome-base/libgnomeui-2.24.0 dev-python/pygobject:2 >=dev-python/pyorbit-2.24.0 >=dev-python/libbonobo-python-2.28.1 >=dev-python/gnome-vfs-python-2.28.1 >=dev-python/libgnomecanvas-python-2.28.1 !<dev-python/gnome-python-2.22.1 =dev-lang/python-2* ~dev-python/gnome-python-base-2.28.1
 2
 mirror://gnome/sources/gnome-python/2.28/gnome-python-2.28.1.tar.bz2
diff --git a/metadata/cache/dev-python/libgnomecanvas-python-2.28.1 b/metadata/cache/dev-python/libgnomecanvas-python-2.28.1
index 13eecde41c56..0393fe55369d 100644
--- a/metadata/cache/dev-python/libgnomecanvas-python-2.28.1
+++ b/metadata/cache/dev-python/libgnomecanvas-python-2.28.1
@@ -1,4 +1,4 @@
-dev-python/pygobject:2 >=gnome-base/libgnomecanvas-2.8.0 !<dev-python/gnome-python-2.22.1 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 =dev-lang/python-2* ~dev-python/gnome-python-base-2.28.1 dev-util/pkgconfig
+dev-python/pygobject:2 >=gnome-base/libgnomecanvas-2.8.0 !<dev-python/gnome-python-2.22.1 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 =dev-lang/python-2* ~dev-python/gnome-python-base-2.28.1 dev-util/pkgconfig
 dev-python/pygobject:2 >=gnome-base/libgnomecanvas-2.8.0 !<dev-python/gnome-python-2.22.1 =dev-lang/python-2* ~dev-python/gnome-python-base-2.28.1
 2
 mirror://gnome/sources/gnome-python/2.28/gnome-python-2.28.1.tar.bz2
diff --git a/metadata/cache/dev-python/libgnomeprint-python-2.32.0 b/metadata/cache/dev-python/libgnomeprint-python-2.32.0
index 128818434d73..8f129d402cff 100644
--- a/metadata/cache/dev-python/libgnomeprint-python-2.32.0
+++ b/metadata/cache/dev-python/libgnomeprint-python-2.32.0
@@ -1,4 +1,4 @@
->=gnome-base/libgnomeprint-2.2.0:2.2 >=gnome-base/libgnomeprintui-2.2.0:2.2 >=dev-python/libgnomecanvas-python-2.25.90:2 !<dev-python/gnome-python-desktop-2.22.0-r10 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 =dev-lang/python-2* ~dev-python/gnome-python-desktop-base-2.32.0 dev-util/pkgconfig
+>=gnome-base/libgnomeprint-2.2.0:2.2 >=gnome-base/libgnomeprintui-2.2.0:2.2 >=dev-python/libgnomecanvas-python-2.25.90:2 !<dev-python/gnome-python-desktop-2.22.0-r10 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 =dev-lang/python-2* ~dev-python/gnome-python-desktop-base-2.32.0 dev-util/pkgconfig
 >=gnome-base/libgnomeprint-2.2.0:2.2 >=gnome-base/libgnomeprintui-2.2.0:2.2 >=dev-python/libgnomecanvas-python-2.25.90:2 !<dev-python/gnome-python-desktop-2.22.0-r10 =dev-lang/python-2* ~dev-python/gnome-python-desktop-base-2.32.0
 0
 mirror://gnome/sources/gnome-python-desktop/2.32/gnome-python-desktop-2.32.0.tar.bz2
diff --git a/metadata/cache/dev-python/libgtop-python-2.32.0 b/metadata/cache/dev-python/libgtop-python-2.32.0
index c19657a66372..f3b8ce301e32 100644
--- a/metadata/cache/dev-python/libgtop-python-2.32.0
+++ b/metadata/cache/dev-python/libgtop-python-2.32.0
@@ -1,4 +1,4 @@
->=gnome-base/libgtop-2.13.0:2 !<dev-python/gnome-python-desktop-2.22.0-r10 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 =dev-lang/python-2* ~dev-python/gnome-python-desktop-base-2.32.0 dev-util/pkgconfig
+>=gnome-base/libgtop-2.13.0:2 !<dev-python/gnome-python-desktop-2.22.0-r10 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 =dev-lang/python-2* ~dev-python/gnome-python-desktop-base-2.32.0 dev-util/pkgconfig
 >=gnome-base/libgtop-2.13.0:2 !<dev-python/gnome-python-desktop-2.22.0-r10 =dev-lang/python-2* ~dev-python/gnome-python-desktop-base-2.32.0
 0
 mirror://gnome/sources/gnome-python-desktop/2.32/gnome-python-desktop-2.32.0.tar.bz2
diff --git a/metadata/cache/dev-python/librsvg-python-2.32.0 b/metadata/cache/dev-python/librsvg-python-2.32.0
index bba4858efc23..b65aa31aff7c 100644
--- a/metadata/cache/dev-python/librsvg-python-2.32.0
+++ b/metadata/cache/dev-python/librsvg-python-2.32.0
@@ -1,4 +1,4 @@
->=gnome-base/librsvg-2.13.93:2 dev-python/pycairo !<dev-python/gnome-python-desktop-2.22.0-r10 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 ~dev-python/gnome-python-desktop-base-2.32.0 dev-util/pkgconfig
+>=gnome-base/librsvg-2.13.93:2 dev-python/pycairo !<dev-python/gnome-python-desktop-2.22.0-r10 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 ~dev-python/gnome-python-desktop-base-2.32.0 dev-util/pkgconfig
 >=gnome-base/librsvg-2.13.93:2 dev-python/pycairo !<dev-python/gnome-python-desktop-2.22.0-r10 ~dev-python/gnome-python-desktop-base-2.32.0
 0
 mirror://gnome/sources/gnome-python-desktop/2.32/gnome-python-desktop-2.32.0.tar.bz2
diff --git a/metadata/cache/dev-python/libwnck-python-2.32.0 b/metadata/cache/dev-python/libwnck-python-2.32.0
index 29d0a1901831..9eef7b0cdaa4 100644
--- a/metadata/cache/dev-python/libwnck-python-2.32.0
+++ b/metadata/cache/dev-python/libwnck-python-2.32.0
@@ -1,4 +1,4 @@
->=x11-libs/libwnck-2.19.3:1 !<dev-python/gnome-python-desktop-2.22.0-r10 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 =dev-lang/python-2* ~dev-python/gnome-python-desktop-base-2.32.0 dev-util/pkgconfig
+>=x11-libs/libwnck-2.19.3:1 !<dev-python/gnome-python-desktop-2.22.0-r10 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 =dev-lang/python-2* ~dev-python/gnome-python-desktop-base-2.32.0 dev-util/pkgconfig
 >=x11-libs/libwnck-2.19.3:1 !<dev-python/gnome-python-desktop-2.22.0-r10 =dev-lang/python-2* ~dev-python/gnome-python-desktop-base-2.32.0
 0
 mirror://gnome/sources/gnome-python-desktop/2.32/gnome-python-desktop-2.32.0.tar.bz2
diff --git a/metadata/cache/dev-python/metacity-python-2.32.0 b/metadata/cache/dev-python/metacity-python-2.32.0
index 3cc2aa773cd5..340fb69e273f 100644
--- a/metadata/cache/dev-python/metacity-python-2.32.0
+++ b/metadata/cache/dev-python/metacity-python-2.32.0
@@ -1,4 +1,4 @@
->=x11-wm/metacity-2.21.5 !<dev-python/gnome-python-desktop-2.22.0-r10 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 =dev-lang/python-2* ~dev-python/gnome-python-desktop-base-2.32.0 dev-util/pkgconfig
+>=x11-wm/metacity-2.21.5 !<dev-python/gnome-python-desktop-2.22.0-r10 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 =dev-lang/python-2* ~dev-python/gnome-python-desktop-base-2.32.0 dev-util/pkgconfig
 >=x11-wm/metacity-2.21.5 !<dev-python/gnome-python-desktop-2.22.0-r10 =dev-lang/python-2* ~dev-python/gnome-python-desktop-base-2.32.0
 0
 mirror://gnome/sources/gnome-python-desktop/2.32/gnome-python-desktop-2.32.0.tar.bz2
diff --git a/metadata/cache/dev-python/nautilus-python-0.7.3 b/metadata/cache/dev-python/nautilus-python-0.7.3
index 7d8112c59dd6..e1d5e76ed47e 100644
--- a/metadata/cache/dev-python/nautilus-python-0.7.3
+++ b/metadata/cache/dev-python/nautilus-python-0.7.3
@@ -1,4 +1,4 @@
->=dev-python/pygtk-2.8 >=dev-python/pygobject-2.16:2 >=gnome-base/nautilus-2.22 <gnome-base/nautilus-2.90 >=dev-python/gconf-python-2.12 doc? ( >=dev-util/gtk-doc-1.9 ) >=sys-apps/sed-4 =dev-lang/python-2* || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-python/pygtk-2.8 >=dev-python/pygobject-2.16:2 >=gnome-base/nautilus-2.22 <gnome-base/nautilus-2.90 >=dev-python/gconf-python-2.12 doc? ( >=dev-util/gtk-doc-1.9 ) >=sys-apps/sed-4 =dev-lang/python-2* || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=dev-python/pygtk-2.8 >=dev-python/pygobject-2.16:2 >=gnome-base/nautilus-2.22 <gnome-base/nautilus-2.90 =dev-lang/python-2*
 0
 mirror://gnome/sources/nautilus-python/0.7/nautilus-python-0.7.3.tar.bz2
diff --git a/metadata/cache/dev-python/pyatspi-2.2.1 b/metadata/cache/dev-python/pyatspi-2.2.1
index ceb08fd1d16b..f7306904e87c 100644
--- a/metadata/cache/dev-python/pyatspi-2.2.1
+++ b/metadata/cache/dev-python/pyatspi-2.2.1
@@ -1,4 +1,4 @@
-dev-python/dbus-python >=dev-python/pygobject-2.90.1:3 dev-util/pkgconfig test? ( >=dev-libs/atk-2.1.0 >=dev-libs/dbus-glib-0.7 dev-libs/glib:2 dev-libs/libxml2:2 >=x11-libs/gtk+-2.10:2 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
+dev-python/dbus-python >=dev-python/pygobject-2.90.1:3 dev-util/pkgconfig test? ( >=dev-libs/atk-2.1.0 >=dev-libs/dbus-glib-0.7 dev-libs/glib:2 dev-libs/libxml2:2 >=x11-libs/gtk+-2.10:2 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
 dev-python/dbus-python >=dev-python/pygobject-2.90.1:3 >=sys-apps/dbus-1 >=app-accessibility/at-spi2-core-2.2.1[introspection] !<gnome-extra/at-spi-1.32.0-r1 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
 0
 mirror://gnome/sources/pyatspi/2.2/pyatspi-2.2.1.tar.xz
diff --git a/metadata/cache/dev-python/pygobject-2.26.0-r1 b/metadata/cache/dev-python/pygobject-2.26.0-r1
index 18304aa89a55..d06849a36840 100644
--- a/metadata/cache/dev-python/pygobject-2.26.0-r1
+++ b/metadata/cache/dev-python/pygobject-2.26.0-r1
@@ -1,4 +1,4 @@
->=dev-libs/glib-2.24:2 !<dev-python/pygtk-2.13 introspection? ( >=dev-libs/gobject-introspection-0.9.5 cairo? ( >=dev-python/pycairo-1.0.2 ) ) libffi? ( virtual/libffi ) doc? ( dev-libs/libxslt >=app-text/docbook-xsl-stylesheets-1.70.1 ) test? ( media-fonts/font-cursor-misc media-fonts/font-misc-misc ) >=dev-util/pkgconfig-0.12 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) || ( =dev-lang/python-2.7*[threads=] =dev-lang/python-2.6*[threads=] =dev-lang/python-2.5*[threads=] ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+>=dev-libs/glib-2.24:2 !<dev-python/pygtk-2.13 introspection? ( >=dev-libs/gobject-introspection-0.9.5 cairo? ( >=dev-python/pycairo-1.0.2 ) ) libffi? ( virtual/libffi ) doc? ( dev-libs/libxslt >=app-text/docbook-xsl-stylesheets-1.70.1 ) test? ( media-fonts/font-cursor-misc media-fonts/font-misc-misc ) >=dev-util/pkgconfig-0.12 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) || ( =dev-lang/python-2.7*[threads=] =dev-lang/python-2.6*[threads=] =dev-lang/python-2.5*[threads=] ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 >=dev-libs/glib-2.24:2 !<dev-python/pygtk-2.13 introspection? ( >=dev-libs/gobject-introspection-0.9.5 cairo? ( >=dev-python/pycairo-1.0.2 ) ) libffi? ( virtual/libffi ) || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) || ( =dev-lang/python-2.7*[threads=] =dev-lang/python-2.6*[threads=] =dev-lang/python-2.5*[threads=] )
 2
 mirror://gnome/sources/pygobject/2.26/pygobject-2.26.0.tar.bz2
diff --git a/metadata/cache/dev-python/pygobject-2.28.6 b/metadata/cache/dev-python/pygobject-2.28.6
index 6ebe20743560..b2628d5b0430 100644
--- a/metadata/cache/dev-python/pygobject-2.28.6
+++ b/metadata/cache/dev-python/pygobject-2.28.6
@@ -1,4 +1,4 @@
->=dev-libs/glib-2.24.0:2 introspection? ( >=dev-libs/gobject-introspection-0.10.2 cairo? ( >=dev-python/pycairo-1.2.0 ) ) libffi? ( virtual/libffi ) doc? ( dev-libs/libxslt >=app-text/docbook-xsl-stylesheets-1.70.1 ) test? ( media-fonts/font-cursor-misc media-fonts/font-misc-misc ) >=dev-util/pkgconfig-0.12 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+>=dev-libs/glib-2.24.0:2 introspection? ( >=dev-libs/gobject-introspection-0.10.2 cairo? ( >=dev-python/pycairo-1.2.0 ) ) libffi? ( virtual/libffi ) doc? ( dev-libs/libxslt >=app-text/docbook-xsl-stylesheets-1.70.1 ) test? ( media-fonts/font-cursor-misc media-fonts/font-misc-misc ) >=dev-util/pkgconfig-0.12 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 >=dev-libs/glib-2.24.0:2 introspection? ( >=dev-libs/gobject-introspection-0.10.2 cairo? ( >=dev-python/pycairo-1.2.0 ) ) libffi? ( virtual/libffi ) !<dev-python/pygtk-2.13 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
 2
 mirror://gnome/sources/pygobject/2.28/pygobject-2.28.6.tar.xz
diff --git a/metadata/cache/dev-python/pygobject-2.28.6-r50 b/metadata/cache/dev-python/pygobject-2.28.6-r50
index d8a1c494d3ad..4dc0eaf1ae83 100644
--- a/metadata/cache/dev-python/pygobject-2.28.6-r50
+++ b/metadata/cache/dev-python/pygobject-2.28.6-r50
@@ -1,4 +1,4 @@
->=dev-libs/glib-2.24.0:2 libffi? ( virtual/libffi ) doc? ( dev-libs/libxslt >=app-text/docbook-xsl-stylesheets-1.70.1 ) test? ( media-fonts/font-cursor-misc media-fonts/font-misc-misc ) >=dev-util/pkgconfig-0.12 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+>=dev-libs/glib-2.24.0:2 libffi? ( virtual/libffi ) doc? ( dev-libs/libxslt >=app-text/docbook-xsl-stylesheets-1.70.1 ) test? ( media-fonts/font-cursor-misc media-fonts/font-misc-misc ) >=dev-util/pkgconfig-0.12 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 >=dev-libs/glib-2.24.0:2 libffi? ( virtual/libffi ) !<dev-python/pygtk-2.13 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
 2
 mirror://gnome/sources/pygobject/2.28/pygobject-2.28.6.tar.xz
diff --git a/metadata/cache/dev-python/pygobject-2.28.6-r51 b/metadata/cache/dev-python/pygobject-2.28.6-r51
index 63e06f79f986..78b0ce7c8e1b 100644
--- a/metadata/cache/dev-python/pygobject-2.28.6-r51
+++ b/metadata/cache/dev-python/pygobject-2.28.6-r51
@@ -1,4 +1,4 @@
->=dev-libs/glib-2.24.0:2 libffi? ( virtual/libffi ) doc? ( dev-libs/libxslt >=app-text/docbook-xsl-stylesheets-1.70.1 ) test? ( media-fonts/font-cursor-misc media-fonts/font-misc-misc ) >=dev-util/pkgconfig-0.12 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+>=dev-libs/glib-2.24.0:2 libffi? ( virtual/libffi ) doc? ( dev-libs/libxslt >=app-text/docbook-xsl-stylesheets-1.70.1 ) test? ( media-fonts/font-cursor-misc media-fonts/font-misc-misc ) >=dev-util/pkgconfig-0.12 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 >=dev-libs/glib-2.24.0:2 libffi? ( virtual/libffi ) !<dev-python/pygtk-2.13 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
 2
 mirror://gnome/sources/pygobject/2.28/pygobject-2.28.6.tar.xz
diff --git a/metadata/cache/dev-python/pygobject-3.0.2 b/metadata/cache/dev-python/pygobject-3.0.2
index 1b8118e14e1a..7ceef21877ab 100644
--- a/metadata/cache/dev-python/pygobject-3.0.2
+++ b/metadata/cache/dev-python/pygobject-3.0.2
@@ -1,4 +1,4 @@
->=dev-libs/glib-2.24.0:2 >=dev-libs/gobject-introspection-1.29 virtual/libffi cairo? ( >=dev-python/pycairo-1.10.0 ) test? ( media-fonts/font-cursor-misc media-fonts/font-misc-misc >=dev-libs/gobject-introspection-1.29.17 ) >=dev-util/pkgconfig-0.12 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 || ( =dev-lang/python-3.2* =dev-lang/python-3.1* =dev-lang/python-2.7* =dev-lang/python-2.6* ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+>=dev-libs/glib-2.24.0:2 >=dev-libs/gobject-introspection-1.29 virtual/libffi cairo? ( >=dev-python/pycairo-1.10.0 ) test? ( media-fonts/font-cursor-misc media-fonts/font-misc-misc >=dev-libs/gobject-introspection-1.29.17 ) >=dev-util/pkgconfig-0.12 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 || ( =dev-lang/python-3.2* =dev-lang/python-3.1* =dev-lang/python-2.7* =dev-lang/python-2.6* ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 >=dev-libs/glib-2.24.0:2 >=dev-libs/gobject-introspection-1.29 virtual/libffi cairo? ( >=dev-python/pycairo-1.10.0 ) !<dev-python/pygtk-2.13 !<dev-python/pygobject-2.28.6-r50:2[introspection] || ( =dev-lang/python-3.2* =dev-lang/python-3.1* =dev-lang/python-2.7* =dev-lang/python-2.6* )
 3
 mirror://gnome/sources/pygobject/3.0/pygobject-3.0.2.tar.xz
diff --git a/metadata/cache/dev-python/pygobject-3.0.3 b/metadata/cache/dev-python/pygobject-3.0.3
index 83aa57ec4672..94de8a02e566 100644
--- a/metadata/cache/dev-python/pygobject-3.0.3
+++ b/metadata/cache/dev-python/pygobject-3.0.3
@@ -1,4 +1,4 @@
->=dev-libs/glib-2.24.0:2 >=dev-libs/gobject-introspection-1.29 virtual/libffi cairo? ( >=dev-python/pycairo-1.10.0 ) test? ( media-fonts/font-cursor-misc media-fonts/font-misc-misc >=dev-libs/gobject-introspection-1.29.17 ) >=dev-util/pkgconfig-0.12 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 || ( =dev-lang/python-3.2* =dev-lang/python-3.1* =dev-lang/python-2.7* =dev-lang/python-2.6* ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+>=dev-libs/glib-2.24.0:2 >=dev-libs/gobject-introspection-1.29 virtual/libffi cairo? ( >=dev-python/pycairo-1.10.0 ) test? ( media-fonts/font-cursor-misc media-fonts/font-misc-misc >=dev-libs/gobject-introspection-1.29.17 ) >=dev-util/pkgconfig-0.12 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 || ( =dev-lang/python-3.2* =dev-lang/python-3.1* =dev-lang/python-2.7* =dev-lang/python-2.6* ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 >=dev-libs/glib-2.24.0:2 >=dev-libs/gobject-introspection-1.29 virtual/libffi cairo? ( >=dev-python/pycairo-1.10.0 ) !<dev-python/pygtk-2.13 !<dev-python/pygobject-2.28.6-r50:2[introspection] || ( =dev-lang/python-3.2* =dev-lang/python-3.1* =dev-lang/python-2.7* =dev-lang/python-2.6* )
 3
 mirror://gnome/sources/pygobject/3.0/pygobject-3.0.3.tar.xz
diff --git a/metadata/cache/dev-python/pygobject-3.0.4 b/metadata/cache/dev-python/pygobject-3.0.4
index ee892af8471a..dc721b06a70f 100644
--- a/metadata/cache/dev-python/pygobject-3.0.4
+++ b/metadata/cache/dev-python/pygobject-3.0.4
@@ -1,4 +1,4 @@
->=dev-libs/glib-2.24.0:2 >=dev-libs/gobject-introspection-1.29 virtual/libffi cairo? ( >=dev-python/pycairo-1.10.0 ) test? ( media-fonts/font-cursor-misc media-fonts/font-misc-misc >=dev-libs/gobject-introspection-1.29.17 ) >=dev-util/pkgconfig-0.12 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 || ( =dev-lang/python-3.2* =dev-lang/python-3.1* =dev-lang/python-2.7* =dev-lang/python-2.6* ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+>=dev-libs/glib-2.24.0:2 >=dev-libs/gobject-introspection-1.29 virtual/libffi cairo? ( >=dev-python/pycairo-1.10.0 ) test? ( media-fonts/font-cursor-misc media-fonts/font-misc-misc >=dev-libs/gobject-introspection-1.29.17 ) >=dev-util/pkgconfig-0.12 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 || ( =dev-lang/python-3.2* =dev-lang/python-3.1* =dev-lang/python-2.7* =dev-lang/python-2.6* ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 >=dev-libs/glib-2.24.0:2 >=dev-libs/gobject-introspection-1.29 virtual/libffi cairo? ( >=dev-python/pycairo-1.10.0 ) !<dev-python/pygtk-2.13 !<dev-python/pygobject-2.28.6-r50:2[introspection] || ( =dev-lang/python-3.2* =dev-lang/python-3.1* =dev-lang/python-2.7* =dev-lang/python-2.6* )
 3
 mirror://gnome/sources/pygobject/3.0/pygobject-3.0.4.tar.xz
diff --git a/metadata/cache/dev-python/pygtk-2.24.0-r1 b/metadata/cache/dev-python/pygtk-2.24.0-r1
index 9a334e7dc1f5..70760025a229 100644
--- a/metadata/cache/dev-python/pygtk-2.24.0-r1
+++ b/metadata/cache/dev-python/pygtk-2.24.0-r1
@@ -1,4 +1,4 @@
->=dev-libs/glib-2.8:2 >=x11-libs/pango-1.16 >=dev-libs/atk-1.12 >=x11-libs/gtk+-2.24:2 >=dev-python/pycairo-1.0.2 >=dev-python/pygobject-2.21.3:2 dev-python/numpy >=gnome-base/libglade-2.5:2.0 doc? ( dev-libs/libxslt >=app-text/docbook-xsl-stylesheets-1.70.1 ) >=dev-util/pkgconfig-0.9 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+>=dev-libs/glib-2.8:2 >=x11-libs/pango-1.16 >=dev-libs/atk-1.12 >=x11-libs/gtk+-2.24:2 >=dev-python/pycairo-1.0.2 >=dev-python/pygobject-2.21.3:2 dev-python/numpy >=gnome-base/libglade-2.5:2.0 doc? ( dev-libs/libxslt >=app-text/docbook-xsl-stylesheets-1.70.1 ) >=dev-util/pkgconfig-0.9 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 >=dev-libs/glib-2.8:2 >=x11-libs/pango-1.16 >=dev-libs/atk-1.12 >=x11-libs/gtk+-2.24:2 >=dev-python/pycairo-1.0.2 >=dev-python/pygobject-2.21.3:2 dev-python/numpy >=gnome-base/libglade-2.5:2.0 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
 2
 mirror://gnome/sources/pygtk/2.24/pygtk-2.24.0.tar.bz2
diff --git a/metadata/cache/dev-python/pygtk-2.24.0-r2 b/metadata/cache/dev-python/pygtk-2.24.0-r2
index aa6ecefecb33..518abbcbd4c9 100644
--- a/metadata/cache/dev-python/pygtk-2.24.0-r2
+++ b/metadata/cache/dev-python/pygtk-2.24.0-r2
@@ -1,4 +1,4 @@
->=dev-libs/glib-2.8:2 >=x11-libs/pango-1.16 >=dev-libs/atk-1.12 >=x11-libs/gtk+-2.24:2 >=dev-python/pycairo-1.0.2 >=dev-python/pygobject-2.21.3:2 dev-python/numpy >=gnome-base/libglade-2.5:2.0 doc? ( dev-libs/libxslt >=app-text/docbook-xsl-stylesheets-1.70.1 ) >=dev-util/pkgconfig-0.9 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=sys-apps/sed-4
+>=dev-libs/glib-2.8:2 >=x11-libs/pango-1.16 >=dev-libs/atk-1.12 >=x11-libs/gtk+-2.24:2 >=dev-python/pycairo-1.0.2 >=dev-python/pygobject-2.21.3:2 dev-python/numpy >=gnome-base/libglade-2.5:2.0 doc? ( dev-libs/libxslt >=app-text/docbook-xsl-stylesheets-1.70.1 ) >=dev-util/pkgconfig-0.9 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=sys-apps/sed-4
 >=dev-libs/glib-2.8:2 >=x11-libs/pango-1.16 >=dev-libs/atk-1.12 >=x11-libs/gtk+-2.24:2 >=dev-python/pycairo-1.0.2 >=dev-python/pygobject-2.21.3:2 dev-python/numpy >=gnome-base/libglade-2.5:2.0 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
 2
 mirror://gnome/sources/pygtk/2.24/pygtk-2.24.0.tar.bz2
diff --git a/metadata/cache/dev-python/python-gudev-147.2 b/metadata/cache/dev-python/python-gudev-147.2
index 08c48a2e06fb..67e6b49e9b7b 100644
--- a/metadata/cache/dev-python/python-gudev-147.2
+++ b/metadata/cache/dev-python/python-gudev-147.2
@@ -1,4 +1,4 @@
-dev-python/pygobject:2 || ( >=sys-fs/udev-171[gudev] >=sys-fs/udev-147[extras] ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
+dev-python/pygobject:2 || ( >=sys-fs/udev-171[gudev] >=sys-fs/udev-147[extras] ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
 dev-python/pygobject:2 || ( >=sys-fs/udev-171[gudev] >=sys-fs/udev-147[extras] ) || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
 0
 https://github.com/nzjrs/python-gudev/tarball/147.2 -> python-gudev-147.2.tar.gz
diff --git a/metadata/cache/dev-python/pythonmagick-0.9.7 b/metadata/cache/dev-python/pythonmagick-0.9.7
index 03e85d613697..d0d0a1c6242c 100644
--- a/metadata/cache/dev-python/pythonmagick-0.9.7
+++ b/metadata/cache/dev-python/pythonmagick-0.9.7
@@ -1,4 +1,4 @@
-<dev-libs/boost-1.48[python] >=media-gfx/imagemagick-6.4 dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
+<dev-libs/boost-1.48[python] >=media-gfx/imagemagick-6.4 dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
 <dev-libs/boost-1.48[python] >=media-gfx/imagemagick-6.4 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
 0
 http://www.imagemagick.org/download/python/PythonMagick-0.9.7.tar.xz
diff --git a/metadata/cache/dev-python/pythonmagick-0.9.7-r1 b/metadata/cache/dev-python/pythonmagick-0.9.7-r1
index 923bd7fb559e..081f87537249 100644
--- a/metadata/cache/dev-python/pythonmagick-0.9.7-r1
+++ b/metadata/cache/dev-python/pythonmagick-0.9.7-r1
@@ -1,4 +1,4 @@
->=dev-libs/boost-1.48[python] >=media-gfx/imagemagick-6.4 dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool || ( =dev-lang/python-3.2* =dev-lang/python-3.1* =dev-lang/python-2.7* =dev-lang/python-2.6* )
+>=dev-libs/boost-1.48[python] >=media-gfx/imagemagick-6.4 dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool || ( =dev-lang/python-3.2* =dev-lang/python-3.1* =dev-lang/python-2.7* =dev-lang/python-2.6* )
 >=dev-libs/boost-1.48[python] >=media-gfx/imagemagick-6.4 || ( =dev-lang/python-3.2* =dev-lang/python-3.1* =dev-lang/python-2.7* =dev-lang/python-2.6* )
 0
 http://www.imagemagick.org/download/python/PythonMagick-0.9.7.tar.xz
diff --git a/metadata/cache/dev-python/simpy-2.3 b/metadata/cache/dev-python/simpy-2.3
index ced024fd32fe..14facccb1076 100644
--- a/metadata/cache/dev-python/simpy-2.3
+++ b/metadata/cache/dev-python/simpy-2.3
@@ -1,4 +1,4 @@
-doc? ( <=dev-python/sphinx-1.0.7 ) test? ( dev-python/pytest ) || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) || ( =dev-lang/python-2.7*[tk] =dev-lang/python-2.6*[tk] )
+doc? ( dev-python/sphinx ) test? ( dev-python/pytest ) || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) || ( =dev-lang/python-2.7*[tk] =dev-lang/python-2.6*[tk] )
 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) || ( =dev-lang/python-2.7*[tk] =dev-lang/python-2.6*[tk] )
 0
 mirror://sourceforge/simpy/SimPy-2.3.tar.gz
diff --git a/metadata/cache/dev-python/telepathy-python-0.15.19 b/metadata/cache/dev-python/telepathy-python-0.15.19
index 6793d9467fa1..5906ebb8606d 100644
--- a/metadata/cache/dev-python/telepathy-python-0.15.19
+++ b/metadata/cache/dev-python/telepathy-python-0.15.19
@@ -1,4 +1,4 @@
-dev-libs/libxslt || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-libs/libxslt || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=dev-python/dbus-python-0.80
 0
 http://telepathy.freedesktop.org/releases/telepathy-python/telepathy-python-0.15.19.tar.gz
diff --git a/metadata/cache/dev-python/totem-python-2.32.0 b/metadata/cache/dev-python/totem-python-2.32.0
index d90a60c4d1eb..7a84ccc979e0 100644
--- a/metadata/cache/dev-python/totem-python-2.32.0
+++ b/metadata/cache/dev-python/totem-python-2.32.0
@@ -1,4 +1,4 @@
->=media-video/totem-1.4.0 >=dev-python/gnome-vfs-python-2.25.90:2 !<dev-python/gnome-python-desktop-2.22.0-r10 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 =dev-lang/python-2* ~dev-python/gnome-python-desktop-base-2.32.0 dev-util/pkgconfig
+>=media-video/totem-1.4.0 >=dev-python/gnome-vfs-python-2.25.90:2 !<dev-python/gnome-python-desktop-2.22.0-r10 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 =dev-lang/python-2* ~dev-python/gnome-python-desktop-base-2.32.0 dev-util/pkgconfig
 >=media-video/totem-1.4.0 >=dev-python/gnome-vfs-python-2.25.90:2 !<dev-python/gnome-python-desktop-2.22.0-r10 =dev-lang/python-2* ~dev-python/gnome-python-desktop-base-2.32.0
 0
 mirror://gnome/sources/gnome-python-desktop/2.32/gnome-python-desktop-2.32.0.tar.bz2
diff --git a/metadata/cache/dev-scheme/c-wrapper-0.6.1 b/metadata/cache/dev-scheme/c-wrapper-0.6.1
index 4183add6b512..8c080ffcdcf7 100644
--- a/metadata/cache/dev-scheme/c-wrapper-0.6.1
+++ b/metadata/cache/dev-scheme/c-wrapper-0.6.1
@@ -1,4 +1,4 @@
-dev-scheme/gauche virtual/libffi || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-scheme/gauche virtual/libffi || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-scheme/gauche virtual/libffi
 0
 http://homepage.mac.com/naoki.koguro/prog/c-wrapper/c-wrapper-0.6.1.tgz
diff --git a/metadata/cache/dev-scheme/escm-1.1 b/metadata/cache/dev-scheme/escm-1.1
index 6f74b937babb..e20fa890fdbf 100644
--- a/metadata/cache/dev-scheme/escm-1.1
+++ b/metadata/cache/dev-scheme/escm-1.1
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 || ( dev-scheme/gauche dev-scheme/guile )
 0
 http://practical-scheme.net/vault/escm-1.1.tar.gz
diff --git a/metadata/cache/dev-scheme/gauche-0.9.1 b/metadata/cache/dev-scheme/gauche-0.9.1
index af330e5a7b4b..87c4a7224b08 100644
--- a/metadata/cache/dev-scheme/gauche-0.9.1
+++ b/metadata/cache/dev-scheme/gauche-0.9.1
@@ -1,4 +1,4 @@
-sys-libs/gdbm || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+sys-libs/gdbm || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 sys-libs/gdbm
 0
 mirror://sourceforge/gauche/Gauche-0.9.1.tgz
diff --git a/metadata/cache/dev-scheme/gauche-0.9.2 b/metadata/cache/dev-scheme/gauche-0.9.2
index 26c8981a4e0f..a5717a1a02df 100644
--- a/metadata/cache/dev-scheme/gauche-0.9.2
+++ b/metadata/cache/dev-scheme/gauche-0.9.2
@@ -1,4 +1,4 @@
-sys-libs/gdbm || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+sys-libs/gdbm || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 sys-libs/gdbm
 0
 mirror://sourceforge/gauche/Gauche-0.9.2.tgz
diff --git a/metadata/cache/dev-scheme/gauche-cdb-0.3.1 b/metadata/cache/dev-scheme/gauche-cdb-0.3.1
index 27990850dd1f..1887f2a179ea 100644
--- a/metadata/cache/dev-scheme/gauche-cdb-0.3.1
+++ b/metadata/cache/dev-scheme/gauche-cdb-0.3.1
@@ -1,4 +1,4 @@
-dev-scheme/gauche dev-db/tinycdb || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-scheme/gauche dev-db/tinycdb || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-scheme/gauche dev-db/tinycdb
 0
 mirror://sourceforge.jp/gauche/8407/Gauche-cdb-0.3.1.tar.gz
diff --git a/metadata/cache/dev-scheme/gauche-cdb-0.3.1-r1 b/metadata/cache/dev-scheme/gauche-cdb-0.3.1-r1
index 2ceee9e06c6c..cb78f3a6dd79 100644
--- a/metadata/cache/dev-scheme/gauche-cdb-0.3.1-r1
+++ b/metadata/cache/dev-scheme/gauche-cdb-0.3.1-r1
@@ -1,4 +1,4 @@
-dev-scheme/gauche dev-db/tinycdb || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-scheme/gauche dev-db/tinycdb || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-scheme/gauche dev-db/tinycdb
 0
 mirror://sourceforge.jp/gauche/8407/Gauche-cdb-0.3.1.tar.gz
diff --git a/metadata/cache/dev-scheme/gauche-gtk-0.6_pre1 b/metadata/cache/dev-scheme/gauche-gtk-0.6_pre1
index 5c4737bf9c91..41d342b7bccf 100644
--- a/metadata/cache/dev-scheme/gauche-gtk-0.6_pre1
+++ b/metadata/cache/dev-scheme/gauche-gtk-0.6_pre1
@@ -1,4 +1,4 @@
-dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 x11-libs/gtk+:2 dev-scheme/gauche opengl? ( x11-libs/gtkglext dev-scheme/gauche-gl )
 0
 https://github.com/shirok/Gauche-gtk2/tarball/598828842a339a44c32ab8c16f5f9a77f3c1c799 -> Gauche-gtk-0.6_pre1.tar.gz
diff --git a/metadata/cache/dev-scheme/gauche-qdbm-0.2 b/metadata/cache/dev-scheme/gauche-qdbm-0.2
index 38ccdf2d5fcb..00b8ccd06040 100644
--- a/metadata/cache/dev-scheme/gauche-qdbm-0.2
+++ b/metadata/cache/dev-scheme/gauche-qdbm-0.2
@@ -1,4 +1,4 @@
-dev-scheme/gauche dev-db/qdbm || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-scheme/gauche dev-db/qdbm || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-scheme/gauche dev-db/qdbm
 0
 mirror://sourceforge.jp/gauche/6988/Gauche-qdbm-0.2.tar.gz
diff --git a/metadata/cache/dev-scheme/gauche-qdbm-0.2-r1 b/metadata/cache/dev-scheme/gauche-qdbm-0.2-r1
index 04574397b29e..b9ccb8789b06 100644
--- a/metadata/cache/dev-scheme/gauche-qdbm-0.2-r1
+++ b/metadata/cache/dev-scheme/gauche-qdbm-0.2-r1
@@ -1,4 +1,4 @@
-dev-scheme/gauche dev-db/qdbm || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-scheme/gauche dev-db/qdbm || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-scheme/gauche dev-db/qdbm
 0
 mirror://sourceforge.jp/gauche/6988/Gauche-qdbm-0.2.tar.gz
diff --git a/metadata/cache/dev-scheme/greg-2.0.0 b/metadata/cache/dev-scheme/greg-2.0.0
index f6f93b2b9edc..19329e980cb7 100644
--- a/metadata/cache/dev-scheme/greg-2.0.0
+++ b/metadata/cache/dev-scheme/greg-2.0.0
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=dev-scheme/guile-1.8
 0
 http://download.gna.org/greg/greg-2.0.0.tar.gz
diff --git a/metadata/cache/dev-scheme/guile-1.8.4-r1 b/metadata/cache/dev-scheme/guile-1.8.4-r1
index a96b19188d3a..a5f4c2de1198 100644
--- a/metadata/cache/dev-scheme/guile-1.8.4-r1
+++ b/metadata/cache/dev-scheme/guile-1.8.4-r1
@@ -1,4 +1,4 @@
->=dev-libs/gmp-4.1 >=sys-devel/libtool-1.5.6 sys-devel/gettext || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-libs/gmp-4.1 >=sys-devel/libtool-1.5.6 sys-devel/gettext || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=dev-libs/gmp-4.1 >=sys-devel/libtool-1.5.6 sys-devel/gettext
 12
 mirror://gnu/guile/guile-1.8.4.tar.gz
diff --git a/metadata/cache/dev-scheme/guile-1.8.5 b/metadata/cache/dev-scheme/guile-1.8.5
index 65546e1dcbf8..cb3c37ad7ba2 100644
--- a/metadata/cache/dev-scheme/guile-1.8.5
+++ b/metadata/cache/dev-scheme/guile-1.8.5
@@ -1,4 +1,4 @@
->=dev-libs/gmp-4.1 >=sys-devel/libtool-1.5.6 sys-devel/gettext || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-libs/gmp-4.1 >=sys-devel/libtool-1.5.6 sys-devel/gettext || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=dev-libs/gmp-4.1 >=sys-devel/libtool-1.5.6 sys-devel/gettext
 12
 mirror://gnu/guile/guile-1.8.5.tar.gz
diff --git a/metadata/cache/dev-scheme/guile-1.8.5-r1 b/metadata/cache/dev-scheme/guile-1.8.5-r1
index 658c362716d7..9c26f83f636d 100644
--- a/metadata/cache/dev-scheme/guile-1.8.5-r1
+++ b/metadata/cache/dev-scheme/guile-1.8.5-r1
@@ -1,4 +1,4 @@
->=dev-libs/gmp-4.1 >=sys-devel/libtool-1.5.6 sys-devel/gettext emacs? ( virtual/emacs ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-libs/gmp-4.1 >=sys-devel/libtool-1.5.6 sys-devel/gettext emacs? ( virtual/emacs ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=dev-libs/gmp-4.1 >=sys-devel/libtool-1.5.6 sys-devel/gettext emacs? ( virtual/emacs )
 12
 mirror://gnu/guile/guile-1.8.5.tar.gz
diff --git a/metadata/cache/dev-scheme/guile-1.8.7 b/metadata/cache/dev-scheme/guile-1.8.7
index 851a9c3b7d63..438865271fc8 100644
--- a/metadata/cache/dev-scheme/guile-1.8.7
+++ b/metadata/cache/dev-scheme/guile-1.8.7
@@ -1,4 +1,4 @@
->=dev-libs/gmp-4.1 >=sys-devel/libtool-1.5.6 sys-devel/gettext emacs? ( virtual/emacs ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-libs/gmp-4.1 >=sys-devel/libtool-1.5.6 sys-devel/gettext emacs? ( virtual/emacs ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=dev-libs/gmp-4.1 >=sys-devel/libtool-1.5.6 sys-devel/gettext emacs? ( virtual/emacs )
 12
 mirror://gnu/guile/guile-1.8.7.tar.gz
diff --git a/metadata/cache/dev-scheme/guile-1.8.7-r1 b/metadata/cache/dev-scheme/guile-1.8.7-r1
index 0f33d8e534c3..df8580090008 100644
--- a/metadata/cache/dev-scheme/guile-1.8.7-r1
+++ b/metadata/cache/dev-scheme/guile-1.8.7-r1
@@ -1,4 +1,4 @@
->=dev-libs/gmp-4.1 >=sys-devel/libtool-1.5.6 sys-devel/gettext emacs? ( virtual/emacs ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-libs/gmp-4.1 >=sys-devel/libtool-1.5.6 sys-devel/gettext emacs? ( virtual/emacs ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=dev-libs/gmp-4.1 >=sys-devel/libtool-1.5.6 sys-devel/gettext emacs? ( virtual/emacs )
 12
 mirror://gnu/guile/guile-1.8.7.tar.gz
diff --git a/metadata/cache/dev-scheme/guile-1.8.7-r2 b/metadata/cache/dev-scheme/guile-1.8.7-r2
index 305dac2f4d99..471b7d5d442c 100644
--- a/metadata/cache/dev-scheme/guile-1.8.7-r2
+++ b/metadata/cache/dev-scheme/guile-1.8.7-r2
@@ -1,4 +1,4 @@
->=dev-libs/gmp-4.1 >=sys-devel/libtool-1.5.6 sys-devel/gettext emacs? ( virtual/emacs ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-libs/gmp-4.1 >=sys-devel/libtool-1.5.6 sys-devel/gettext emacs? ( virtual/emacs ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=dev-libs/gmp-4.1 >=sys-devel/libtool-1.5.6 sys-devel/gettext emacs? ( virtual/emacs )
 12
 mirror://gnu/guile/guile-1.8.7.tar.gz
diff --git a/metadata/cache/dev-scheme/guile-1.8.8-r1 b/metadata/cache/dev-scheme/guile-1.8.8-r1
index 6b6cf3bec80d..3fbfbd8da7f7 100644
--- a/metadata/cache/dev-scheme/guile-1.8.8-r1
+++ b/metadata/cache/dev-scheme/guile-1.8.8-r1
@@ -1,4 +1,4 @@
->=dev-libs/gmp-4.1 >=sys-devel/libtool-1.5.6 sys-devel/gettext emacs? ( virtual/emacs ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-libs/gmp-4.1 >=sys-devel/libtool-1.5.6 sys-devel/gettext emacs? ( virtual/emacs ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=dev-libs/gmp-4.1 >=sys-devel/libtool-1.5.6 sys-devel/gettext emacs? ( virtual/emacs )
 12
 mirror://gnu/guile/guile-1.8.8.tar.gz
diff --git a/metadata/cache/dev-scheme/guile-gnome-platform-2.16.1 b/metadata/cache/dev-scheme/guile-gnome-platform-2.16.1
index 6982ab79e87e..7bb6d6e188f5 100644
--- a/metadata/cache/dev-scheme/guile-gnome-platform-2.16.1
+++ b/metadata/cache/dev-scheme/guile-gnome-platform-2.16.1
@@ -1,4 +1,4 @@
->=dev-scheme/guile-1.6.4 >=dev-libs/g-wrap-1.9.11 dev-scheme/guile-cairo dev-libs/atk gnome-base/libbonobo gnome-base/orbit:2 >=gnome-base/gconf-2.18:2 >=dev-libs/glib-2.10:2 >=gnome-base/gnome-vfs-2.16:2 >=x11-libs/gtk+-2.10:2 >=gnome-base/libglade-2.6:2.0 >=gnome-base/libgnomecanvas-2.14 >=gnome-base/libgnomeui-2.16 >=x11-libs/pango-1.14 dev-scheme/guile-lib dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-scheme/guile-1.6.4 >=dev-libs/g-wrap-1.9.11 dev-scheme/guile-cairo dev-libs/atk gnome-base/libbonobo gnome-base/orbit:2 >=gnome-base/gconf-2.18:2 >=dev-libs/glib-2.10:2 >=gnome-base/gnome-vfs-2.16:2 >=x11-libs/gtk+-2.10:2 >=gnome-base/libglade-2.6:2.0 >=gnome-base/libgnomecanvas-2.14 >=gnome-base/libgnomeui-2.16 >=x11-libs/pango-1.14 dev-scheme/guile-lib dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=dev-scheme/guile-1.6.4 >=dev-libs/g-wrap-1.9.11 dev-scheme/guile-cairo dev-libs/atk gnome-base/libbonobo gnome-base/orbit:2 >=gnome-base/gconf-2.18:2 >=dev-libs/glib-2.10:2 >=gnome-base/gnome-vfs-2.16:2 >=x11-libs/gtk+-2.10:2 >=gnome-base/libglade-2.6:2.0 >=gnome-base/libgnomecanvas-2.14 >=gnome-base/libgnomeui-2.16 >=x11-libs/pango-1.14 dev-scheme/guile-lib
 0
 http://ftp.gnu.org/pub/gnu/guile-gnome/guile-gnome-platform/guile-gnome-platform-2.16.1.tar.gz
diff --git a/metadata/cache/dev-scheme/guile-gnome-platform-2.16.1-r1 b/metadata/cache/dev-scheme/guile-gnome-platform-2.16.1-r1
index f1c823862720..8d1f442bc85b 100644
--- a/metadata/cache/dev-scheme/guile-gnome-platform-2.16.1-r1
+++ b/metadata/cache/dev-scheme/guile-gnome-platform-2.16.1-r1
@@ -1,4 +1,4 @@
-dev-libs/atk dev-libs/g-wrap dev-libs/glib:2 dev-scheme/guile:12 dev-scheme/guile-cairo dev-scheme/guile-lib gnome-base/gconf:2 gnome-base/gnome-vfs:2 gnome-base/libbonobo gnome-base/libglade:2.0 gnome-base/libgnomecanvas gnome-base/libgnomeui gnome-base/orbit:2 x11-libs/gtk+:2 x11-libs/pango dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-libs/atk dev-libs/g-wrap dev-libs/glib:2 dev-scheme/guile:12 dev-scheme/guile-cairo dev-scheme/guile-lib gnome-base/gconf:2 gnome-base/gnome-vfs:2 gnome-base/libbonobo gnome-base/libglade:2.0 gnome-base/libgnomecanvas gnome-base/libgnomeui gnome-base/orbit:2 x11-libs/gtk+:2 x11-libs/pango dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-libs/atk dev-libs/g-wrap dev-libs/glib:2 dev-scheme/guile:12 dev-scheme/guile-cairo dev-scheme/guile-lib gnome-base/gconf:2 gnome-base/gnome-vfs:2 gnome-base/libbonobo gnome-base/libglade:2.0 gnome-base/libgnomecanvas gnome-base/libgnomeui gnome-base/orbit:2 x11-libs/gtk+:2 x11-libs/pango
 0
 http://ftp.gnu.org/pub/gnu/guile-gnome/guile-gnome-platform/guile-gnome-platform-2.16.1.tar.gz
diff --git a/metadata/cache/dev-scheme/ikarus-0.0.3_p1870 b/metadata/cache/dev-scheme/ikarus-0.0.3_p1870
index 17b43ef64d50..25bb3a5511b1 100644
--- a/metadata/cache/dev-scheme/ikarus-0.0.3_p1870
+++ b/metadata/cache/dev-scheme/ikarus-0.0.3_p1870
@@ -1,4 +1,4 @@
->=dev-libs/gmp-4.2.2 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-libs/gmp-4.2.2 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=dev-libs/gmp-4.2.2
 0
 http://ikarus-scheme.org/ikarus.dev/ikarus-scheme-r1870.tgz
diff --git a/metadata/cache/dev-tcltk/expect-5.43.0-r1 b/metadata/cache/dev-tcltk/expect-5.43.0-r1
index 03648f63be5d..b12df08d6b9f 100644
--- a/metadata/cache/dev-tcltk/expect-5.43.0-r1
+++ b/metadata/cache/dev-tcltk/expect-5.43.0-r1
@@ -1,4 +1,4 @@
->=dev-lang/tcl-8.2 X? ( >=dev-lang/tk-8.2 ) || ( >=sys-devel/automake-1.11.1 ) =sys-devel/autoconf-2.1* sys-devel/libtool
+>=dev-lang/tcl-8.2 X? ( >=dev-lang/tk-8.2 ) || ( >=sys-devel/automake-1.11.1:1.11 ) =sys-devel/autoconf-2.1* sys-devel/libtool
 >=dev-lang/tcl-8.2 X? ( >=dev-lang/tk-8.2 )
 0
 http://expect.nist.gov/src/expect-5.43.0.tar.gz
diff --git a/metadata/cache/dev-tcltk/expect-5.44.1.15 b/metadata/cache/dev-tcltk/expect-5.44.1.15
index 292763886364..5ad7887cc968 100644
--- a/metadata/cache/dev-tcltk/expect-5.44.1.15
+++ b/metadata/cache/dev-tcltk/expect-5.44.1.15
@@ -1,4 +1,4 @@
->=dev-lang/tcl-8.2[threads?] X? ( >=dev-lang/tk-8.2[threads?] ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-lang/tcl-8.2[threads?] X? ( >=dev-lang/tk-8.2[threads?] ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=dev-lang/tcl-8.2[threads?] X? ( >=dev-lang/tk-8.2[threads?] )
 0
 mirror://sourceforge/expect/expect-5.44.1.15.tar.bz2
diff --git a/metadata/cache/dev-tcltk/expect-5.45 b/metadata/cache/dev-tcltk/expect-5.45
index fb3c65d2d2fa..f0564bd71d2d 100644
--- a/metadata/cache/dev-tcltk/expect-5.45
+++ b/metadata/cache/dev-tcltk/expect-5.45
@@ -1,4 +1,4 @@
->=dev-lang/tcl-8.2[threads?] || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-lang/tcl-8.2[threads?] || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=dev-lang/tcl-8.2[threads?]
 0
 mirror://sourceforge/expect/expect5.45.tar.gz
diff --git a/metadata/cache/dev-tcltk/itk-3.4_pre20090417-r1 b/metadata/cache/dev-tcltk/itk-3.4_pre20090417-r1
index 68db9864394a..af494e2d4404 100644
--- a/metadata/cache/dev-tcltk/itk-3.4_pre20090417-r1
+++ b/metadata/cache/dev-tcltk/itk-3.4_pre20090417-r1
@@ -1,4 +1,4 @@
-dev-lang/tk ~dev-tcltk/itcl-3.4_beta1 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-lang/tk ~dev-tcltk/itcl-3.4_beta1 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-lang/tk ~dev-tcltk/itcl-3.4_beta1
 0
 mirror://gentoo/incrTcl-3.4_pre20090417.tar.gz
diff --git a/metadata/cache/dev-tcltk/tdom-0.8.3-r1 b/metadata/cache/dev-tcltk/tdom-0.8.3-r1
index 8a7a9d75d114..da62b570525a 100644
--- a/metadata/cache/dev-tcltk/tdom-0.8.3-r1
+++ b/metadata/cache/dev-tcltk/tdom-0.8.3-r1
@@ -1,4 +1,4 @@
-dev-lang/tcl dev-libs/expat || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-lang/tcl dev-libs/expat || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-lang/tcl dev-libs/expat
 0
 mirror://github/tDOM/tdom/tDOM-0.8.3.tgz
diff --git a/metadata/cache/dev-tcltk/thread-2.6.2 b/metadata/cache/dev-tcltk/thread-2.6.2
index 14028543c392..97dc0b0aa6f1 100644
--- a/metadata/cache/dev-tcltk/thread-2.6.2
+++ b/metadata/cache/dev-tcltk/thread-2.6.2
@@ -1,4 +1,4 @@
-dev-lang/tcl[threads] gdbm? ( sys-libs/gdbm ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-lang/tcl[threads] gdbm? ( sys-libs/gdbm ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-lang/tcl[threads] gdbm? ( sys-libs/gdbm )
 0
 mirror://sourceforge/tcl/thread2.6.2.tar.gz
diff --git a/metadata/cache/dev-tcltk/thread-2.6.6 b/metadata/cache/dev-tcltk/thread-2.6.6
index a9d5c4daec91..587ced63cf17 100644
--- a/metadata/cache/dev-tcltk/thread-2.6.6
+++ b/metadata/cache/dev-tcltk/thread-2.6.6
@@ -1,4 +1,4 @@
-dev-lang/tcl[threads] gdbm? ( sys-libs/gdbm ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-lang/tcl[threads] gdbm? ( sys-libs/gdbm ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-lang/tcl[threads] gdbm? ( sys-libs/gdbm )
 0
 mirror://sourceforge/tcl/thread2.6.6.tar.gz
diff --git a/metadata/cache/dev-tcltk/tkzinc-3.3.4 b/metadata/cache/dev-tcltk/tkzinc-3.3.4
index f574c69144ea..2af477494ab5 100644
--- a/metadata/cache/dev-tcltk/tkzinc-3.3.4
+++ b/metadata/cache/dev-tcltk/tkzinc-3.3.4
@@ -1,4 +1,4 @@
-dev-lang/tk media-libs/glew virtual/opengl doc? ( virtual/latex-base ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-lang/tk media-libs/glew virtual/opengl doc? ( virtual/latex-base ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-lang/tk media-libs/glew virtual/opengl doc? ( virtual/latex-base )
 0
 http://www.tkzinc.org/Packages/zinc-tk_3.3.4.tar.gz
diff --git a/metadata/cache/dev-tcltk/tkzinc-3.3.6 b/metadata/cache/dev-tcltk/tkzinc-3.3.6
index bc27d2bbca35..ec7e6def2b27 100644
--- a/metadata/cache/dev-tcltk/tkzinc-3.3.6
+++ b/metadata/cache/dev-tcltk/tkzinc-3.3.6
@@ -1,4 +1,4 @@
-dev-lang/tk media-libs/glew virtual/opengl doc? ( virtual/latex-base ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-lang/tk media-libs/glew virtual/opengl doc? ( virtual/latex-base ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-lang/tk media-libs/glew virtual/opengl doc? ( virtual/latex-base )
 0
 http://www.tkzinc.org/Packages/Tkzinc-3.3.6plus.tar.gz
diff --git a/metadata/cache/dev-tex/catdvi-0.14-r1 b/metadata/cache/dev-tex/catdvi-0.14-r1
index d5cff199b5f7..b08be8fd5bf1 100644
--- a/metadata/cache/dev-tex/catdvi-0.14-r1
+++ b/metadata/cache/dev-tex/catdvi-0.14-r1
@@ -1,4 +1,4 @@
-virtual/tex-base || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+virtual/tex-base || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 virtual/tex-base
 0
 mirror://sourceforge/catdvi/catdvi-0.14.tar.gz
diff --git a/metadata/cache/dev-tex/cjk-latex-4.8.2 b/metadata/cache/dev-tex/cjk-latex-4.8.2
index 21a3572ecf89..8a7dbd3a96b1 100644
--- a/metadata/cache/dev-tex/cjk-latex-4.8.2
+++ b/metadata/cache/dev-tex/cjk-latex-4.8.2
@@ -1,4 +1,4 @@
-virtual/latex-base emacs? ( virtual/emacs ) virtual/latex-base >=sys-apps/texinfo-4.2-r5 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+virtual/latex-base emacs? ( virtual/emacs ) virtual/latex-base >=sys-apps/texinfo-4.2-r5 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 virtual/latex-base emacs? ( virtual/emacs ) app-arch/unzip virtual/latex-base
 0
 ftp://ftp.ffii.org/pub/cjk/cjk-4.8.2.tar.gz mirror://gentoo/cjk-4.8.2-fonts.zip doc? ( ftp://ftp.ffii.org/pub/cjk/cjk-4.8.2-doc.tar.gz )
diff --git a/metadata/cache/dev-util/astyle-1.24 b/metadata/cache/dev-util/astyle-1.24
index 1d361c394de7..8d2536bb26e8 100644
--- a/metadata/cache/dev-util/astyle-1.24
+++ b/metadata/cache/dev-util/astyle-1.24
@@ -1,4 +1,4 @@
-java? ( >=virtual/jdk-1.6 ) java? ( >=dev-java/java-config-2.1.9-r1 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+java? ( >=virtual/jdk-1.6 ) java? ( >=dev-java/java-config-2.1.9-r1 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 java? ( >=virtual/jdk-1.6 ) java? ( >=dev-java/java-config-2.1.9-r1 )
 0
 mirror://sourceforge/astyle/astyle_1.24_linux.tar.gz http://gentoo.ccss.cz/1.24-autotools.patch.bz2
diff --git a/metadata/cache/dev-util/bless-0.6.0-r1 b/metadata/cache/dev-util/bless-0.6.0-r1
index 4867f163224b..43e0f23d25f0 100644
--- a/metadata/cache/dev-util/bless-0.6.0-r1
+++ b/metadata/cache/dev-util/bless-0.6.0-r1
@@ -1,4 +1,4 @@
->=dev-lang/mono-1.1.14 >=dev-dotnet/gtk-sharp-2.12 >=dev-dotnet/glade-sharp-2.12 app-text/scrollkeeper >=sys-devel/gettext-0.15 >=dev-util/pkgconfig-0.19 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+>=dev-lang/mono-1.1.14 >=dev-dotnet/gtk-sharp-2.12 >=dev-dotnet/glade-sharp-2.12 app-text/scrollkeeper >=sys-devel/gettext-0.15 >=dev-util/pkgconfig-0.19 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 >=dev-lang/mono-1.1.14 >=dev-dotnet/gtk-sharp-2.12 >=dev-dotnet/glade-sharp-2.12
 0
 http://download.gna.org/bless/bless-0.6.0.tar.gz
diff --git a/metadata/cache/dev-util/ccglue-0.3.1 b/metadata/cache/dev-util/ccglue-0.3.1
index 3b200101578b..1bc5c27c8139 100644
--- a/metadata/cache/dev-util/ccglue-0.3.1
+++ b/metadata/cache/dev-util/ccglue-0.3.1
@@ -1,4 +1,4 @@
-dev-libs/glib:2 dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-libs/glib:2 dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-libs/glib:2
 0
 mirror://sourceforge/ccglue/ccglue-release-0.3.1.tar.gz
diff --git a/metadata/cache/dev-util/cmockery-0.1.2 b/metadata/cache/dev-util/cmockery-0.1.2
index 7c0f5ceb8267..cac2279e70aa 100644
--- a/metadata/cache/dev-util/cmockery-0.1.2
+++ b/metadata/cache/dev-util/cmockery-0.1.2
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 http://cmockery.googlecode.com/files/cmockery-0.1.2.tar.gz
diff --git a/metadata/cache/dev-util/cocom-0.996-r1 b/metadata/cache/dev-util/cocom-0.996-r1
index 510cbc95e716..a9a751c1b2db 100644
--- a/metadata/cache/dev-util/cocom-0.996-r1
+++ b/metadata/cache/dev-util/cocom-0.996-r1
@@ -1,4 +1,4 @@
-!!media-gfx/hugin || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+!!media-gfx/hugin || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 !!media-gfx/hugin
 0
 mirror://sourceforge/cocom/cocom-0.996.tar.gz
diff --git a/metadata/cache/dev-util/codeblocks-9999 b/metadata/cache/dev-util/codeblocks-9999
index 656a66395f9f..a808295f2a72 100644
--- a/metadata/cache/dev-util/codeblocks-9999
+++ b/metadata/cache/dev-util/codeblocks-9999
@@ -1,4 +1,4 @@
-x11-libs/wxGTK:2.8[X] app-arch/zip dev-libs/libgamin sys-devel/libtool:2 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/subversion net-misc/rsync
+x11-libs/wxGTK:2.8[X] app-arch/zip dev-libs/libgamin sys-devel/libtool:2 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/subversion net-misc/rsync
 x11-libs/wxGTK:2.8[X]
 0
 
diff --git a/metadata/cache/dev-util/cpptest-1.1.0 b/metadata/cache/dev-util/cpptest-1.1.0
index 7bced4e5b65f..f5add7d73ea8 100644
--- a/metadata/cache/dev-util/cpptest-1.1.0
+++ b/metadata/cache/dev-util/cpptest-1.1.0
@@ -1,4 +1,4 @@
-doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 mirror://sourceforge/cpptest/cpptest-1.1.0.tar.gz
diff --git a/metadata/cache/dev-util/cpptest-1.1.1 b/metadata/cache/dev-util/cpptest-1.1.1
index 2edb2042fd0f..ed49b100b508 100644
--- a/metadata/cache/dev-util/cpptest-1.1.1
+++ b/metadata/cache/dev-util/cpptest-1.1.1
@@ -1,4 +1,4 @@
-doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 mirror://sourceforge/cpptest/cpptest-1.1.1.tar.gz
diff --git a/metadata/cache/dev-util/cppunit-1.12.1 b/metadata/cache/dev-util/cppunit-1.12.1
index 1b5e79d0143d..bbb1526749d2 100644
--- a/metadata/cache/dev-util/cppunit-1.12.1
+++ b/metadata/cache/dev-util/cppunit-1.12.1
@@ -1,4 +1,4 @@
-doc? ( app-doc/doxygen media-gfx/graphviz ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+doc? ( app-doc/doxygen media-gfx/graphviz ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 mirror://sourceforge/cppunit/cppunit-1.12.1.tar.gz
diff --git a/metadata/cache/dev-util/cppunit-1.12.1-r1 b/metadata/cache/dev-util/cppunit-1.12.1-r1
index 6c07618ecff5..a574f4ecb29a 100644
--- a/metadata/cache/dev-util/cppunit-1.12.1-r1
+++ b/metadata/cache/dev-util/cppunit-1.12.1-r1
@@ -1,4 +1,4 @@
-doc? ( app-doc/doxygen media-gfx/graphviz ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+doc? ( app-doc/doxygen media-gfx/graphviz ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 mirror://sourceforge/cppunit/cppunit-1.12.1.tar.gz
diff --git a/metadata/cache/dev-util/cunit-2.1-r1 b/metadata/cache/dev-util/cunit-2.1-r1
index 5fa5ebfa9bc1..61aa8b9b3906 100644
--- a/metadata/cache/dev-util/cunit-2.1-r1
+++ b/metadata/cache/dev-util/cunit-2.1-r1
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 mirror://sourceforge/cunit/CUnit-2.1-0-src.tar.gz
diff --git a/metadata/cache/dev-util/ftnchek-3.3.1-r1 b/metadata/cache/dev-util/ftnchek-3.3.1-r1
index 04327e8087df..4206adc3c999 100644
--- a/metadata/cache/dev-util/ftnchek-3.3.1-r1
+++ b/metadata/cache/dev-util/ftnchek-3.3.1-r1
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 http://www.dsm.fordham.edu/~ftnchek/download/ftnchek-3.3.1.tar.gz
diff --git a/metadata/cache/dev-util/geany-plugins-0.20-r1 b/metadata/cache/dev-util/geany-plugins-0.20-r1
index 00cbc389f26c..0fd06f64eadd 100644
--- a/metadata/cache/dev-util/geany-plugins-0.20-r1
+++ b/metadata/cache/dev-util/geany-plugins-0.20-r1
@@ -1,4 +1,4 @@
->=dev-util/geany-0.20 dev-libs/libxml2:2 dev-libs/glib:2 enchant? ( app-text/enchant ) gtkspell? ( app-text/gtkspell:2 ) lua? ( dev-lang/lua ) soup? ( net-libs/libsoup ) webkit? ( net-libs/webkit-gtk:2 x11-libs/gtk+:2 x11-libs/gdk-pixbuf:2 ) nls? ( sys-devel/gettext ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-util/geany-0.20 dev-libs/libxml2:2 dev-libs/glib:2 enchant? ( app-text/enchant ) gtkspell? ( app-text/gtkspell:2 ) lua? ( dev-lang/lua ) soup? ( net-libs/libsoup ) webkit? ( net-libs/webkit-gtk:2 x11-libs/gtk+:2 x11-libs/gdk-pixbuf:2 ) nls? ( sys-devel/gettext ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=dev-util/geany-0.20 dev-libs/libxml2:2 dev-libs/glib:2 enchant? ( app-text/enchant ) gtkspell? ( app-text/gtkspell:2 ) lua? ( dev-lang/lua ) soup? ( net-libs/libsoup ) webkit? ( net-libs/webkit-gtk:2 x11-libs/gtk+:2 x11-libs/gdk-pixbuf:2 )
 0
 http://plugins.geany.org/geany-plugins/geany-plugins-0.20.tar.gz
diff --git a/metadata/cache/dev-util/ghh-9999 b/metadata/cache/dev-util/ghh-9999
index add2d2a1a1d2..1f859fba04eb 100644
--- a/metadata/cache/dev-util/ghh-9999
+++ b/metadata/cache/dev-util/ghh-9999
@@ -1,4 +1,4 @@
-x11-libs/gtk+:2 dev-libs/glib:2 gnome-base/libgnome app-text/gnome-doc-utils >=app-text/asciidoc-8 dev-python/pygtk:2 dev-vcs/git dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
+x11-libs/gtk+:2 dev-libs/glib:2 gnome-base/libgnome app-text/gnome-doc-utils >=app-text/asciidoc-8 dev-python/pygtk:2 dev-vcs/git dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
 x11-libs/gtk+:2 dev-libs/glib:2 gnome-base/libgnome app-text/gnome-doc-utils >=app-text/asciidoc-8 dev-python/pygtk:2 dev-vcs/git || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
 0
 
diff --git a/metadata/cache/dev-util/gource-0.35 b/metadata/cache/dev-util/gource-0.35
index 5fabef0f029c..f90eac622db9 100644
--- a/metadata/cache/dev-util/gource-0.35
+++ b/metadata/cache/dev-util/gource-0.35
@@ -1,4 +1,4 @@
->=media-libs/libsdl-1.2.10[opengl,X] >=media-libs/sdl-image-1.2[jpeg,png] dev-libs/libpcre:3 >=media-libs/libpng-1.2 virtual/jpeg media-libs/mesa media-fonts/freefont-ttf >=media-libs/glew-1.5 dev-libs/tinyxml[-stl] dev-util/pkgconfig media-libs/freetype:2 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=media-libs/libsdl-1.2.10[opengl,X] >=media-libs/sdl-image-1.2[jpeg,png] dev-libs/libpcre:3 >=media-libs/libpng-1.2 virtual/jpeg media-libs/mesa media-fonts/freefont-ttf >=media-libs/glew-1.5 dev-libs/tinyxml[-stl] dev-util/pkgconfig media-libs/freetype:2 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=media-libs/libsdl-1.2.10[opengl,X] >=media-libs/sdl-image-1.2[jpeg,png] dev-libs/libpcre:3 >=media-libs/libpng-1.2 virtual/jpeg media-libs/mesa media-fonts/freefont-ttf >=media-libs/glew-1.5 dev-libs/tinyxml[-stl]
 0
 http://gource.googlecode.com/files/gource-0.35.tar.gz
diff --git a/metadata/cache/dev-util/gource-0.37 b/metadata/cache/dev-util/gource-0.37
index e0a8864d6570..4995fa8d9e1f 100644
--- a/metadata/cache/dev-util/gource-0.37
+++ b/metadata/cache/dev-util/gource-0.37
@@ -1,4 +1,4 @@
->=media-libs/libsdl-1.2.10[opengl,X] >=media-libs/sdl-image-1.2[jpeg,png] dev-libs/libpcre:3 >=media-libs/libpng-1.2 virtual/jpeg media-libs/mesa media-fonts/freefont-ttf >=media-libs/glew-1.5 dev-libs/tinyxml dev-util/pkgconfig media-libs/freetype:2 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=media-libs/libsdl-1.2.10[opengl,X] >=media-libs/sdl-image-1.2[jpeg,png] dev-libs/libpcre:3 >=media-libs/libpng-1.2 virtual/jpeg media-libs/mesa media-fonts/freefont-ttf >=media-libs/glew-1.5 dev-libs/tinyxml dev-util/pkgconfig media-libs/freetype:2 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=media-libs/libsdl-1.2.10[opengl,X] >=media-libs/sdl-image-1.2[jpeg,png] dev-libs/libpcre:3 >=media-libs/libpng-1.2 virtual/jpeg media-libs/mesa media-fonts/freefont-ttf >=media-libs/glew-1.5 dev-libs/tinyxml
 0
 http://gource.googlecode.com/files/gource-0.37.tar.gz
diff --git a/metadata/cache/dev-util/insight-6.8.1 b/metadata/cache/dev-util/insight-6.8.1
index 6d6a6b60e7a8..4fd6590b734b 100644
--- a/metadata/cache/dev-util/insight-6.8.1
+++ b/metadata/cache/dev-util/insight-6.8.1
@@ -1,4 +1,4 @@
-dev-libs/expat dev-tcltk/iwidgets sys-libs/ncurses sys-libs/readline x11-libs/libX11 dev-lang/tcl dev-lang/tk dev-tcltk/itcl dev-tcltk/itk sys-devel/bison nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-libs/expat dev-tcltk/iwidgets sys-libs/ncurses sys-libs/readline x11-libs/libX11 dev-lang/tcl dev-lang/tk dev-tcltk/itcl dev-tcltk/itk sys-devel/bison nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-libs/expat dev-tcltk/iwidgets sys-libs/ncurses sys-libs/readline x11-libs/libX11
 0
 ftp://sources.redhat.com/pub/insight/releases/insight-6.8-1a.tar.bz2 http://dev.gentooexperimental.org/~scarabeus/insight-6.8.1-patchset-01.tar.xz
diff --git a/metadata/cache/dev-util/mono-debugger-2.10 b/metadata/cache/dev-util/mono-debugger-2.10
index 0562dd8f273f..d4e03df62d95 100644
--- a/metadata/cache/dev-util/mono-debugger-2.10
+++ b/metadata/cache/dev-util/mono-debugger-2.10
@@ -1,4 +1,4 @@
-!!=dev-lang/mono-2.2 sys-devel/binutils dev-libs/glib:2 !dev-lang/mercury =dev-lang/mono-2.10* >=dev-util/pkgconfig-0.23 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+!!=dev-lang/mono-2.2 sys-devel/binutils dev-libs/glib:2 !dev-lang/mercury =dev-lang/mono-2.10* >=dev-util/pkgconfig-0.23 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 !!=dev-lang/mono-2.2 sys-devel/binutils dev-libs/glib:2 =dev-lang/mono-2.10*
 0
 http://download.mono-project.com/sources/mono-debugger/mono-debugger-2.10.tar.bz2
diff --git a/metadata/cache/dev-util/mono-tools-2.10 b/metadata/cache/dev-util/mono-tools-2.10
index 9a569a7ce4d2..2fa2be678c87 100644
--- a/metadata/cache/dev-util/mono-tools-2.10
+++ b/metadata/cache/dev-util/mono-tools-2.10
@@ -1,4 +1,4 @@
-=virtual/monodoc-2.10* >=dev-dotnet/gtk-sharp-2.12.6:2 >=dev-dotnet/glade-sharp-2.12.6:2 >=dev-dotnet/gconf-sharp-2:2 gtkhtml? ( >=dev-dotnet/gtkhtml-sharp-2.24.0:2 ) webkit? ( >=dev-dotnet/webkit-sharp-0.2-r1 ) sys-devel/gettext >=dev-util/pkgconfig-0.19 =dev-lang/mono-2.10* >=dev-util/pkgconfig-0.23 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+=virtual/monodoc-2.10* >=dev-dotnet/gtk-sharp-2.12.6:2 >=dev-dotnet/glade-sharp-2.12.6:2 >=dev-dotnet/gconf-sharp-2:2 gtkhtml? ( >=dev-dotnet/gtkhtml-sharp-2.24.0:2 ) webkit? ( >=dev-dotnet/webkit-sharp-0.2-r1 ) sys-devel/gettext >=dev-util/pkgconfig-0.19 =dev-lang/mono-2.10* >=dev-util/pkgconfig-0.23 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 =virtual/monodoc-2.10* >=dev-dotnet/gtk-sharp-2.12.6:2 >=dev-dotnet/glade-sharp-2.12.6:2 >=dev-dotnet/gconf-sharp-2:2 gtkhtml? ( >=dev-dotnet/gtkhtml-sharp-2.24.0:2 ) webkit? ( >=dev-dotnet/webkit-sharp-0.2-r1 ) =dev-lang/mono-2.10*
 0
 http://download.mono-project.com/sources/mono-tools/mono-tools-2.10.tar.bz2
diff --git a/metadata/cache/dev-util/regexxer-0.10 b/metadata/cache/dev-util/regexxer-0.10
index 80704effc65b..d4f427b61fc1 100644
--- a/metadata/cache/dev-util/regexxer-0.10
+++ b/metadata/cache/dev-util/regexxer-0.10
@@ -1,4 +1,4 @@
->=dev-cpp/glibmm-2.28 dev-cpp/gtkmm:3.0 dev-cpp/gtksourceviewmm:3.0 dev-util/intltool dev-util/pkgconfig sys-devel/gettext || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
+>=dev-cpp/glibmm-2.28 dev-cpp/gtkmm:3.0 dev-cpp/gtksourceviewmm:3.0 dev-util/intltool dev-util/pkgconfig sys-devel/gettext || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
 >=dev-cpp/glibmm-2.28 dev-cpp/gtkmm:3.0 dev-cpp/gtksourceviewmm:3.0
 0
 mirror://sourceforge/regexxer/regexxer-0.10.tar.xz
diff --git a/metadata/cache/dev-util/scanmem-0.07 b/metadata/cache/dev-util/scanmem-0.07
index 56a70b70cb7d..5c3bb8972ffd 100644
--- a/metadata/cache/dev-util/scanmem-0.07
+++ b/metadata/cache/dev-util/scanmem-0.07
@@ -1,4 +1,4 @@
-sys-libs/readline || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+sys-libs/readline || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 sys-libs/readline
 0
 http://taviso.decsystem.org/files/scanmem/scanmem-0.07.tar.gz
diff --git a/metadata/cache/dev-util/schroot-1.4.23 b/metadata/cache/dev-util/schroot-1.4.23
index 2dd243c9833f..acbc6e318a43 100644
--- a/metadata/cache/dev-util/schroot-1.4.23
+++ b/metadata/cache/dev-util/schroot-1.4.23
@@ -1,4 +1,4 @@
->=dev-libs/boost-1.42.0 dev-libs/lockdev >=sys-apps/util-linux-2.16 lvm? ( sys-fs/lvm2 ) pam? ( sys-libs/pam ) doc? ( app-doc/doxygen media-gfx/graphviz ) nls? ( sys-devel/gettext ) test? ( >=dev-util/cppunit-1.10.0 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-libs/boost-1.42.0 dev-libs/lockdev >=sys-apps/util-linux-2.16 lvm? ( sys-fs/lvm2 ) pam? ( sys-libs/pam ) doc? ( app-doc/doxygen media-gfx/graphviz ) nls? ( sys-devel/gettext ) test? ( >=dev-util/cppunit-1.10.0 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=dev-libs/boost-1.42.0 dev-libs/lockdev >=sys-apps/util-linux-2.16 lvm? ( sys-fs/lvm2 ) pam? ( sys-libs/pam ) sys-apps/debianutils dchroot? ( !sys-apps/dchroot ) nls? ( virtual/libintl )
 0
 mirror://debian/pool/main/s/schroot/schroot_1.4.23.orig.tar.bz2
diff --git a/metadata/cache/dev-util/schroot-1.4.23-r1 b/metadata/cache/dev-util/schroot-1.4.23-r1
index 0e4688df0270..514e8bf3a6de 100644
--- a/metadata/cache/dev-util/schroot-1.4.23-r1
+++ b/metadata/cache/dev-util/schroot-1.4.23-r1
@@ -1,4 +1,4 @@
->=dev-libs/boost-1.42.0 dev-libs/lockdev >=sys-apps/util-linux-2.16 btrfs? ( >=sys-fs/btrfs-progs-0.19-r2 ) lvm? ( sys-fs/lvm2 ) pam? ( sys-libs/pam ) doc? ( app-doc/doxygen media-gfx/graphviz ) nls? ( sys-devel/gettext ) test? ( >=dev-util/cppunit-1.10.0 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-libs/boost-1.42.0 dev-libs/lockdev >=sys-apps/util-linux-2.16 btrfs? ( >=sys-fs/btrfs-progs-0.19-r2 ) lvm? ( sys-fs/lvm2 ) pam? ( sys-libs/pam ) doc? ( app-doc/doxygen media-gfx/graphviz ) nls? ( sys-devel/gettext ) test? ( >=dev-util/cppunit-1.10.0 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=dev-libs/boost-1.42.0 dev-libs/lockdev >=sys-apps/util-linux-2.16 btrfs? ( >=sys-fs/btrfs-progs-0.19-r2 ) lvm? ( sys-fs/lvm2 ) pam? ( sys-libs/pam ) sys-apps/debianutils dchroot? ( !sys-apps/dchroot ) nls? ( virtual/libintl )
 0
 mirror://debian/pool/main/s/schroot/schroot_1.4.23.orig.tar.bz2
diff --git a/metadata/cache/dev-util/schroot-1.4.25 b/metadata/cache/dev-util/schroot-1.4.25
index 4c77a56c75ad..f1f7c4fcbf04 100644
--- a/metadata/cache/dev-util/schroot-1.4.25
+++ b/metadata/cache/dev-util/schroot-1.4.25
@@ -1,4 +1,4 @@
->=dev-libs/boost-1.42.0 dev-libs/lockdev >=sys-apps/util-linux-2.16 btrfs? ( >=sys-fs/btrfs-progs-0.19-r2 ) lvm? ( sys-fs/lvm2 ) pam? ( sys-libs/pam ) sys-apps/groff doc? ( app-doc/doxygen media-gfx/graphviz ) nls? ( sys-devel/gettext ) test? ( >=dev-util/cppunit-1.10.0 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-libs/boost-1.42.0 dev-libs/lockdev >=sys-apps/util-linux-2.16 btrfs? ( >=sys-fs/btrfs-progs-0.19-r2 ) lvm? ( sys-fs/lvm2 ) pam? ( sys-libs/pam ) sys-apps/groff doc? ( app-doc/doxygen media-gfx/graphviz ) nls? ( sys-devel/gettext ) test? ( >=dev-util/cppunit-1.10.0 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=dev-libs/boost-1.42.0 dev-libs/lockdev >=sys-apps/util-linux-2.16 btrfs? ( >=sys-fs/btrfs-progs-0.19-r2 ) lvm? ( sys-fs/lvm2 ) pam? ( sys-libs/pam ) sys-apps/debianutils dchroot? ( !sys-apps/dchroot ) nls? ( virtual/libintl )
 0
 mirror://debian/pool/main/s/schroot/schroot_1.4.25.orig.tar.bz2
diff --git a/metadata/cache/dev-util/splint-3.1.2 b/metadata/cache/dev-util/splint-3.1.2
index ff29768c5aee..330dfcd441c1 100644
--- a/metadata/cache/dev-util/splint-3.1.2
+++ b/metadata/cache/dev-util/splint-3.1.2
@@ -1,4 +1,4 @@
-
+sys-devel/flex virtual/yacc
 
 0
 http://www.splint.org/downloads/splint-3.1.2.src.tgz
diff --git a/metadata/cache/dev-util/strace-4.6 b/metadata/cache/dev-util/strace-4.6
index 803ea7a708c1..f07a1164b9a1 100644
--- a/metadata/cache/dev-util/strace-4.6
+++ b/metadata/cache/dev-util/strace-4.6
@@ -1,4 +1,4 @@
-aio? ( >=dev-libs/libaio-0.3.106 ) sys-kernel/linux-headers || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+aio? ( >=dev-libs/libaio-0.3.106 ) sys-kernel/linux-headers || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 mirror://sourceforge/strace/strace-4.6.tar.xz mirror://gentoo/strace-4.6-x32.patch.xz
diff --git a/metadata/cache/dev-util/strace-9999 b/metadata/cache/dev-util/strace-9999
index be052458eb0e..21f6a91ee4d7 100644
--- a/metadata/cache/dev-util/strace-9999
+++ b/metadata/cache/dev-util/strace-9999
@@ -1,4 +1,4 @@
-aio? ( >=dev-libs/libaio-0.3.106 ) sys-kernel/linux-headers dev-vcs/git || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+aio? ( >=dev-libs/libaio-0.3.106 ) sys-kernel/linux-headers dev-vcs/git || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 
diff --git a/metadata/cache/dev-util/valgrind-3.6.0 b/metadata/cache/dev-util/valgrind-3.6.0
index 62d08a70caff..5b1e49d2672f 100644
--- a/metadata/cache/dev-util/valgrind-3.6.0
+++ b/metadata/cache/dev-util/valgrind-3.6.0
@@ -1,4 +1,4 @@
-mpi? ( virtual/mpi ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+mpi? ( virtual/mpi ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 mpi? ( virtual/mpi )
 0
 http://www.valgrind.org/downloads/valgrind-3.6.0.tar.bz2
diff --git a/metadata/cache/dev-util/valgrind-3.6.1 b/metadata/cache/dev-util/valgrind-3.6.1
index 32b8eb5bb3b3..d072c72a5e87 100644
--- a/metadata/cache/dev-util/valgrind-3.6.1
+++ b/metadata/cache/dev-util/valgrind-3.6.1
@@ -1,4 +1,4 @@
-mpi? ( virtual/mpi ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+mpi? ( virtual/mpi ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 mpi? ( virtual/mpi )
 0
 http://www.valgrind.org/downloads/valgrind-3.6.1.tar.bz2
diff --git a/metadata/cache/dev-util/valgrind-3.6.1-r1 b/metadata/cache/dev-util/valgrind-3.6.1-r1
index 32b8eb5bb3b3..d072c72a5e87 100644
--- a/metadata/cache/dev-util/valgrind-3.6.1-r1
+++ b/metadata/cache/dev-util/valgrind-3.6.1-r1
@@ -1,4 +1,4 @@
-mpi? ( virtual/mpi ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+mpi? ( virtual/mpi ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 mpi? ( virtual/mpi )
 0
 http://www.valgrind.org/downloads/valgrind-3.6.1.tar.bz2
diff --git a/metadata/cache/dev-util/valgrind-3.6.1-r2 b/metadata/cache/dev-util/valgrind-3.6.1-r2
index f79f5e004300..0675e8bf1641 100644
--- a/metadata/cache/dev-util/valgrind-3.6.1-r2
+++ b/metadata/cache/dev-util/valgrind-3.6.1-r2
@@ -1,4 +1,4 @@
-mpi? ( virtual/mpi ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+mpi? ( virtual/mpi ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 mpi? ( virtual/mpi )
 0
 http://www.valgrind.org/downloads/valgrind-3.6.1.tar.bz2
diff --git a/metadata/cache/dev-util/valgrind-3.6.1-r3 b/metadata/cache/dev-util/valgrind-3.6.1-r3
index f79f5e004300..0675e8bf1641 100644
--- a/metadata/cache/dev-util/valgrind-3.6.1-r3
+++ b/metadata/cache/dev-util/valgrind-3.6.1-r3
@@ -1,4 +1,4 @@
-mpi? ( virtual/mpi ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+mpi? ( virtual/mpi ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 mpi? ( virtual/mpi )
 0
 http://www.valgrind.org/downloads/valgrind-3.6.1.tar.bz2
diff --git a/metadata/cache/dev-util/valgrind-3.7.0-r1 b/metadata/cache/dev-util/valgrind-3.7.0-r1
index a816af558c65..3f413361b973 100644
--- a/metadata/cache/dev-util/valgrind-3.7.0-r1
+++ b/metadata/cache/dev-util/valgrind-3.7.0-r1
@@ -1,4 +1,4 @@
-mpi? ( virtual/mpi ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+mpi? ( virtual/mpi ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 mpi? ( virtual/mpi )
 0
 http://www.valgrind.org/downloads/valgrind-3.7.0.tar.bz2
diff --git a/metadata/cache/dev-util/valgrind-3.7.0-r2 b/metadata/cache/dev-util/valgrind-3.7.0-r2
index a816af558c65..3f413361b973 100644
--- a/metadata/cache/dev-util/valgrind-3.7.0-r2
+++ b/metadata/cache/dev-util/valgrind-3.7.0-r2
@@ -1,4 +1,4 @@
-mpi? ( virtual/mpi ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+mpi? ( virtual/mpi ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 mpi? ( virtual/mpi )
 0
 http://www.valgrind.org/downloads/valgrind-3.7.0.tar.bz2
diff --git a/metadata/cache/dev-util/valgrind-3.7.0-r3 b/metadata/cache/dev-util/valgrind-3.7.0-r3
index a816af558c65..3f413361b973 100644
--- a/metadata/cache/dev-util/valgrind-3.7.0-r3
+++ b/metadata/cache/dev-util/valgrind-3.7.0-r3
@@ -1,4 +1,4 @@
-mpi? ( virtual/mpi ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+mpi? ( virtual/mpi ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 mpi? ( virtual/mpi )
 0
 http://www.valgrind.org/downloads/valgrind-3.7.0.tar.bz2
diff --git a/metadata/cache/dev-util/visualvm-1.3.3-r1 b/metadata/cache/dev-util/visualvm-1.3.3-r1
index b5cd7f82d6d6..89a220989442 100644
--- a/metadata/cache/dev-util/visualvm-1.3.3-r1
+++ b/metadata/cache/dev-util/visualvm-1.3.3-r1
@@ -1,4 +1,4 @@
-dev-java/icedtea:6 dev-util/netbeans:7.0 dev-java/ant-core dev-java/ant-nodeps || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-java/icedtea:6 dev-util/netbeans:7.0 dev-java/ant-core dev-java/ant-nodeps || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-java/icedtea:6 dev-util/netbeans:7.0
 6
 http://icedtea.classpath.org/download/visualvm/visualvm_harness-1.3.tar.gz http://icedtea.classpath.org/download/visualvm/visualvm_133-src.tar.gz http://icedtea.classpath.org/download/visualvm/netbeans-profiler-visualvm_release701.tar.gz
diff --git a/metadata/cache/dev-util/visualvm-1.3.3-r8 b/metadata/cache/dev-util/visualvm-1.3.3-r8
index 8ec94a69bbbc..97863bce9d24 100644
--- a/metadata/cache/dev-util/visualvm-1.3.3-r8
+++ b/metadata/cache/dev-util/visualvm-1.3.3-r8
@@ -1,4 +1,4 @@
-dev-java/icedtea:7 dev-util/netbeans:7.0 dev-java/ant-core dev-java/ant-nodeps || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-java/icedtea:7 dev-util/netbeans:7.0 dev-java/ant-core dev-java/ant-nodeps || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-java/icedtea:7 dev-util/netbeans:7.0
 7
 http://icedtea.classpath.org/download/visualvm/visualvm_harness-1.3.tar.gz http://icedtea.classpath.org/download/visualvm/visualvm_133-src.tar.gz http://icedtea.classpath.org/download/visualvm/netbeans-profiler-visualvm_release701.tar.gz
diff --git a/metadata/cache/dev-vcs/giggle-0.5 b/metadata/cache/dev-vcs/giggle-0.5
index 1ceac3dcb45c..c1fafb3ec1a2 100644
--- a/metadata/cache/dev-vcs/giggle-0.5
+++ b/metadata/cache/dev-vcs/giggle-0.5
@@ -1,4 +1,4 @@
->=dev-vcs/git-1.5 >=dev-libs/glib-2.18:2 >=x11-libs/gtk+-2.10:2 >=x11-libs/gtksourceview-2.8:2.0 gnome-base/gnome-common eds? ( gnome-extra/evolution-data-server ) >=gnome-base/libglade-2.4:2.0 >=x11-libs/vte-0.17:0 sys-devel/gettext >=dev-util/pkgconfig-0.15 >=dev-util/intltool-0.35 >=sys-devel/autoconf-2.64 >=sys-devel/libtool-2 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+>=dev-vcs/git-1.5 >=dev-libs/glib-2.18:2 >=x11-libs/gtk+-2.10:2 >=x11-libs/gtksourceview-2.8:2.0 gnome-base/gnome-common eds? ( gnome-extra/evolution-data-server ) >=gnome-base/libglade-2.4:2.0 >=x11-libs/vte-0.17:0 sys-devel/gettext >=dev-util/pkgconfig-0.15 >=dev-util/intltool-0.35 >=sys-devel/autoconf-2.64 >=sys-devel/libtool-2 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 >=dev-vcs/git-1.5 >=dev-libs/glib-2.18:2 >=x11-libs/gtk+-2.10:2 >=x11-libs/gtksourceview-2.8:2.0 gnome-base/gnome-common eds? ( gnome-extra/evolution-data-server ) >=gnome-base/libglade-2.4:2.0 >=x11-libs/vte-0.17:0
 0
 mirror://gnome/sources/giggle/0.5/giggle-0.5.tar.bz2
diff --git a/metadata/cache/dev-vcs/rapidsvn-0.12.0 b/metadata/cache/dev-vcs/rapidsvn-0.12.0
index 552512756c55..0e99f1d0fd01 100644
--- a/metadata/cache/dev-vcs/rapidsvn-0.12.0
+++ b/metadata/cache/dev-vcs/rapidsvn-0.12.0
@@ -1,4 +1,4 @@
-dev-libs/apr dev-libs/apr-util <dev-vcs/subversion-1.7 x11-libs/wxGTK:2.8[X] doc? ( dev-libs/libxslt app-text/docbook-sgml-utils app-doc/doxygen app-text/docbook-xsl-stylesheets ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-libs/apr dev-libs/apr-util <dev-vcs/subversion-1.7 x11-libs/wxGTK:2.8[X] doc? ( dev-libs/libxslt app-text/docbook-sgml-utils app-doc/doxygen app-text/docbook-xsl-stylesheets ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-libs/apr dev-libs/apr-util <dev-vcs/subversion-1.7 x11-libs/wxGTK:2.8[X]
 0
 http://www.rapidsvn.org/download/release/0.12/rapidsvn-0.12.0-1.tar.gz
diff --git a/metadata/cache/dev-vcs/rsvndump-0.5.2-r3 b/metadata/cache/dev-vcs/rsvndump-0.5.2-r3
index 3462518143f0..8d3810ecbf46 100644
--- a/metadata/cache/dev-vcs/rsvndump-0.5.2-r3
+++ b/metadata/cache/dev-vcs/rsvndump-0.5.2-r3
@@ -1,4 +1,4 @@
-dev-vcs/subversion doc? ( app-text/xmlto >=app-text/asciidoc-8.4 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-vcs/subversion doc? ( app-text/xmlto >=app-text/asciidoc-8.4 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-vcs/subversion
 0
 mirror://sourceforge/rsvndump/rsvndump-0.5.2.tar.bz2
diff --git a/metadata/cache/dev-vcs/rsvndump-0.5.6 b/metadata/cache/dev-vcs/rsvndump-0.5.6
index 4277d79c6268..e3d0fb019d26 100644
--- a/metadata/cache/dev-vcs/rsvndump-0.5.6
+++ b/metadata/cache/dev-vcs/rsvndump-0.5.6
@@ -1,4 +1,4 @@
-dev-vcs/subversion dev-libs/apr dev-libs/apr-util sys-devel/gettext doc? ( app-text/xmlto >=app-text/asciidoc-8.4 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-vcs/subversion dev-libs/apr dev-libs/apr-util sys-devel/gettext doc? ( app-text/xmlto >=app-text/asciidoc-8.4 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-vcs/subversion dev-libs/apr dev-libs/apr-util sys-devel/gettext
 0
 mirror://sourceforge/rsvndump/rsvndump-0.5.6.tar.bz2
diff --git a/metadata/cache/games-action/0verkill-0.16-r3 b/metadata/cache/games-action/0verkill-0.16-r3
index 6c6cb5cbaedb..6174aa691874 100644
--- a/metadata/cache/games-action/0verkill-0.16-r3
+++ b/metadata/cache/games-action/0verkill-0.16-r3
@@ -1,4 +1,4 @@
-X? ( x11-libs/libXpm ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+X? ( x11-libs/libXpm ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 X? ( x11-libs/libXpm )
 0
 http://artax.karlin.mff.cuni.cz/~brain/0verkill/release/0verkill-0.16.tgz
diff --git a/metadata/cache/games-action/abuse-0.8 b/metadata/cache/games-action/abuse-0.8
index c7d58fa65c66..e6d64298d571 100644
--- a/metadata/cache/games-action/abuse-0.8
+++ b/metadata/cache/games-action/abuse-0.8
@@ -1,4 +1,4 @@
->=media-libs/libsdl-1.1.6[audio,opengl,video] media-libs/sdl-mixer virtual/opengl || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=media-libs/libsdl-1.1.6[audio,opengl,video] media-libs/sdl-mixer virtual/opengl || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=media-libs/libsdl-1.1.6[audio,opengl,video] media-libs/sdl-mixer virtual/opengl
 0
 http://abuse.zoy.org/raw-attachment/wiki/download/abuse-0.8.tar.gz
diff --git a/metadata/cache/games-action/atanks-5.1 b/metadata/cache/games-action/atanks-5.1
deleted file mode 100644
index 94f6f49d17c3..000000000000
--- a/metadata/cache/games-action/atanks-5.1
+++ /dev/null
@@ -1,22 +0,0 @@
-media-libs/allegro:0[X]
-media-libs/allegro:0[X]
-0
-mirror://sourceforge/atanks/atanks-5.1.tar.gz
-
-http://atanks.sourceforge.net/
-GPL-2
-Worms and Scorched Earth-like game
-amd64 ~ppc x86
-base eutils games multilib toolchain-funcs user
-
-
-
-
-2
-
-compile configure install postinst preinst prepare setup unpack
-
-
-
-
-
diff --git a/metadata/cache/games-action/atanks-4.7 b/metadata/cache/games-action/atanks-5.3
similarity index 79%
rename from metadata/cache/games-action/atanks-4.7
rename to metadata/cache/games-action/atanks-5.3
index d2d87e3297f1..12f7deeee3f1 100644
--- a/metadata/cache/games-action/atanks-4.7
+++ b/metadata/cache/games-action/atanks-5.3
@@ -1,12 +1,12 @@
 media-libs/allegro:0[X]
 media-libs/allegro:0[X]
 0
-mirror://sourceforge/atanks/atanks-4.7.tar.gz
+mirror://sourceforge/atanks/atanks-5.3.tar.gz
 
 http://atanks.sourceforge.net/
 GPL-2
 Worms and Scorched Earth-like game
-amd64 ppc x86
+~amd64 ~ppc ~x86
 base eutils games multilib toolchain-funcs user
 
 
diff --git a/metadata/cache/games-action/bomberclone-0.11.8 b/metadata/cache/games-action/bomberclone-0.11.8
index 1db61c18ee40..fdeddfe403d9 100644
--- a/metadata/cache/games-action/bomberclone-0.11.8
+++ b/metadata/cache/games-action/bomberclone-0.11.8
@@ -1,4 +1,4 @@
->=media-libs/libsdl-1.1.0 media-libs/sdl-image[png] media-libs/sdl-mixer[mikmod] X? ( x11-libs/libXt ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=media-libs/libsdl-1.1.0 media-libs/sdl-image[png] media-libs/sdl-mixer[mikmod] X? ( x11-libs/libXt ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=media-libs/libsdl-1.1.0 media-libs/sdl-image[png] media-libs/sdl-mixer[mikmod] X? ( x11-libs/libXt )
 0
 mirror://sourceforge/bomberclone/bomberclone-0.11.8.tar.bz2
diff --git a/metadata/cache/games-action/clanbomber-2.1.1 b/metadata/cache/games-action/clanbomber-2.1.1
index 13db6c4acc15..b8bb44b158ed 100644
--- a/metadata/cache/games-action/clanbomber-2.1.1
+++ b/metadata/cache/games-action/clanbomber-2.1.1
@@ -1,4 +1,4 @@
-media-libs/libsdl[audio,joystick,video] media-libs/sdl-image[png] media-libs/sdl-mixer media-libs/sdl-ttf media-libs/sdl-gfx >dev-libs/boost-1.36 <dev-libs/boost-1.46 media-fonts/dejavu dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+media-libs/libsdl[audio,joystick,video] media-libs/sdl-image[png] media-libs/sdl-mixer media-libs/sdl-ttf media-libs/sdl-gfx >dev-libs/boost-1.36 <dev-libs/boost-1.46 media-fonts/dejavu dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 media-libs/libsdl[audio,joystick,video] media-libs/sdl-image[png] media-libs/sdl-mixer media-libs/sdl-ttf media-libs/sdl-gfx >dev-libs/boost-1.36 <dev-libs/boost-1.46 media-fonts/dejavu
 0
 http://download.savannah.gnu.org/releases/clanbomber/clanbomber-2.1.1.tar.lzma
diff --git a/metadata/cache/games-action/cylindrix-1.0 b/metadata/cache/games-action/cylindrix-1.0
index 666466ae639c..4c2e7b482a96 100644
--- a/metadata/cache/games-action/cylindrix-1.0
+++ b/metadata/cache/games-action/cylindrix-1.0
@@ -1,4 +1,4 @@
->=media-libs/allegro-4.0.3 <media-libs/allegro-5 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=media-libs/allegro-4.0.3 <media-libs/allegro-5 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=media-libs/allegro-4.0.3 <media-libs/allegro-5
 0
 http://www.hardgeus.com/cylindrix/cylindrix-1.0.tar.gz
diff --git a/metadata/cache/games-action/d2x-rebirth-0.50 b/metadata/cache/games-action/d2x-rebirth-0.50
index f6a0cd0351e2..ac55cfea75be 100644
--- a/metadata/cache/games-action/d2x-rebirth-0.50
+++ b/metadata/cache/games-action/d2x-rebirth-0.50
@@ -1,4 +1,4 @@
-media-libs/alsa-lib media-libs/libpng >=media-libs/libsdl-1.2.9 >=media-libs/sdl-image-1.2.3-r1 >=dev-games/physfs-1.0.1[hog,zip] virtual/glu virtual/opengl x11-libs/libX11 x11-libs/libXext x11-proto/xf86dgaproto x11-proto/xf86vidmodeproto x11-proto/xproto app-arch/unzip || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+media-libs/alsa-lib media-libs/libpng >=media-libs/libsdl-1.2.9 >=media-libs/sdl-image-1.2.3-r1 >=dev-games/physfs-1.0.1[hog,zip] virtual/glu virtual/opengl x11-libs/libX11 x11-libs/libXext x11-proto/xf86dgaproto x11-proto/xf86vidmodeproto x11-proto/xproto app-arch/unzip || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 media-libs/alsa-lib media-libs/libpng >=media-libs/libsdl-1.2.9 >=media-libs/sdl-image-1.2.3-r1 >=dev-games/physfs-1.0.1[hog,zip] virtual/glu virtual/opengl x11-libs/libX11 x11-libs/libXext games-action/descent2-data
 0
 http://www.dxx-rebirth.de/download/dxx/oss/src/d2x-rebirth_v0.50-src-20061025.tar.gz http://www.dxx-rebirth.de/download/dxx/res/dxx-rebirth_icons.zip
diff --git a/metadata/cache/games-action/garden-1.0.8 b/metadata/cache/games-action/garden-1.0.8
index 4268f66c22e1..274cd261afd7 100644
--- a/metadata/cache/games-action/garden-1.0.8
+++ b/metadata/cache/games-action/garden-1.0.8
@@ -1,4 +1,4 @@
-<media-libs/allegro-5 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+<media-libs/allegro-5 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 <media-libs/allegro-5
 0
 mirror://sourceforge/garden/garden-1.0.8.tar.gz
diff --git a/metadata/cache/games-action/heroes-0.21-r1 b/metadata/cache/games-action/heroes-0.21-r1
index ec483023da02..2f0c046eeed1 100644
--- a/metadata/cache/games-action/heroes-0.21-r1
+++ b/metadata/cache/games-action/heroes-0.21-r1
@@ -1,4 +1,4 @@
-nls? ( virtual/libintl ) sdl? ( media-libs/libsdl media-libs/sdl-mixer ) ggi? ( media-libs/libggi media-libs/libgii media-libs/libmikmod ) !sdl? ( !ggi? ( media-libs/libsdl media-libs/sdl-mixer ) ) nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+nls? ( virtual/libintl ) sdl? ( media-libs/libsdl media-libs/sdl-mixer ) ggi? ( media-libs/libggi media-libs/libgii media-libs/libmikmod ) !sdl? ( !ggi? ( media-libs/libsdl media-libs/sdl-mixer ) ) nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 nls? ( virtual/libintl ) sdl? ( media-libs/libsdl media-libs/sdl-mixer ) ggi? ( media-libs/libggi media-libs/libgii media-libs/libmikmod ) !sdl? ( !ggi? ( media-libs/libsdl media-libs/sdl-mixer ) )
 0
 mirror://sourceforge/heroes/heroes-0.21.tar.bz2 mirror://sourceforge/heroes/heroes-data-1.5.tar.bz2 mirror://sourceforge/heroes/heroes-sound-tracks-1.0.tar.bz2 mirror://sourceforge/heroes/heroes-sound-effects-1.0.tar.bz2
diff --git a/metadata/cache/games-action/luola-1.3.0-r1 b/metadata/cache/games-action/luola-1.3.0-r1
index b0a811c60950..68eb771da706 100644
--- a/metadata/cache/games-action/luola-1.3.0-r1
+++ b/metadata/cache/games-action/luola-1.3.0-r1
@@ -1,4 +1,4 @@
-media-libs/libsdl media-libs/sdl-gfx media-libs/sdl-image media-libs/sdl-mixer media-libs/sdl-ttf || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+media-libs/libsdl media-libs/sdl-gfx media-libs/sdl-image media-libs/sdl-mixer media-libs/sdl-ttf || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 media-libs/libsdl media-libs/sdl-gfx media-libs/sdl-image media-libs/sdl-mixer media-libs/sdl-ttf
 0
 http://luolamies.org/software/luola/luola-1.3.0.tar.gz http://www.luolamies.org/software/luola/stdlevels-6.0.tar.gz http://www.luolamies.org/software/luola/nostalgia-1.2.tar.gz http://luolamies.org/software/luola/luola-1.3.0-1.patch http://luolamies.org/software/luola/luola-1.3.0-2.patch
diff --git a/metadata/cache/games-action/moon-buggy-1.0.51 b/metadata/cache/games-action/moon-buggy-1.0.51
index a52688496d9c..c40acddc2c58 100644
--- a/metadata/cache/games-action/moon-buggy-1.0.51
+++ b/metadata/cache/games-action/moon-buggy-1.0.51
@@ -1,4 +1,4 @@
-sys-libs/ncurses dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+sys-libs/ncurses dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 sys-libs/ncurses
 0
 http://www.seehuhn.de/data/moon-buggy-1.0.51.tar.gz
diff --git a/metadata/cache/games-action/powermanga-0.90 b/metadata/cache/games-action/powermanga-0.90
index 4c316c41306b..f8e143eed63d 100644
--- a/metadata/cache/games-action/powermanga-0.90
+++ b/metadata/cache/games-action/powermanga-0.90
@@ -1,4 +1,4 @@
->=media-libs/libsdl-1.2[audio,joystick,video] media-libs/libpng x11-libs/libXext x11-libs/libXxf86dga media-libs/sdl-mixer[mikmod] || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=media-libs/libsdl-1.2[audio,joystick,video] media-libs/libpng x11-libs/libXext x11-libs/libXxf86dga media-libs/sdl-mixer[mikmod] || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=media-libs/libsdl-1.2[audio,joystick,video] media-libs/libpng x11-libs/libXext x11-libs/libXxf86dga media-libs/sdl-mixer[mikmod]
 0
 http://linux.tlk.fr/games/Powermanga/download/powermanga-0.90.tgz
diff --git a/metadata/cache/games-action/supertuxkart-0.7 b/metadata/cache/games-action/supertuxkart-0.7
index ec859cea4b3d..da2a2df621b4 100644
--- a/metadata/cache/games-action/supertuxkart-0.7
+++ b/metadata/cache/games-action/supertuxkart-0.7
@@ -1,4 +1,4 @@
->=dev-games/irrlicht-1.7.2 virtual/opengl media-libs/freeglut virtual/glu net-libs/enet:0 media-libs/libvorbis media-libs/openal nls? ( dev-libs/fribidi ) virtual/libintl nls? ( sys-devel/gettext ) unicode? ( dev-libs/fribidi ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-games/irrlicht-1.7.2 virtual/opengl media-libs/freeglut virtual/glu net-libs/enet:0 media-libs/libvorbis media-libs/openal nls? ( dev-libs/fribidi ) virtual/libintl nls? ( sys-devel/gettext ) unicode? ( dev-libs/fribidi ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=dev-games/irrlicht-1.7.2 virtual/opengl media-libs/freeglut virtual/glu net-libs/enet:0 media-libs/libvorbis media-libs/openal nls? ( dev-libs/fribidi ) virtual/libintl
 0
 mirror://sourceforge/supertuxkart/SuperTuxKart/0.7/supertuxkart-0.7-src.tar.bz2 mirror://gentoo/supertuxkart.png
diff --git a/metadata/cache/games-action/xblast-2.10.4 b/metadata/cache/games-action/xblast-2.10.4
index 5930edb9e648..2185841064e4 100644
--- a/metadata/cache/games-action/xblast-2.10.4
+++ b/metadata/cache/games-action/xblast-2.10.4
@@ -1,4 +1,4 @@
-x11-libs/libICE x11-libs/libX11 media-libs/libpng x11-libs/libXt || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+x11-libs/libICE x11-libs/libX11 media-libs/libpng x11-libs/libXt || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 x11-libs/libICE x11-libs/libX11 media-libs/libpng
 0
 mirror://sourceforge/xblast/xblast-2.10.4.tar.gz mirror://sourceforge/xblast/images-2005-01-06.tar.gz mirror://sourceforge/xblast/levels-2005-01-06.tar.gz mirror://sourceforge/xblast/models-2005-01-06.tar.gz mirror://sourceforge/xblast/musics-2005-01-06.tar.gz mirror://sourceforge/xblast/sounds.tar.gz
diff --git a/metadata/cache/games-arcade/afternoonstalker-1.1.4 b/metadata/cache/games-arcade/afternoonstalker-1.1.4
index 6b17dc35b5fe..ea3d08f239e0 100644
--- a/metadata/cache/games-arcade/afternoonstalker-1.1.4
+++ b/metadata/cache/games-arcade/afternoonstalker-1.1.4
@@ -1,4 +1,4 @@
->=dev-games/flatzebra-0.1.5 dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-games/flatzebra-0.1.5 dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=dev-games/flatzebra-0.1.5
 0
 http://perso.b2b2c.ca/sarrazip/dev/afternoonstalker-1.1.4.tar.gz
diff --git a/metadata/cache/games-arcade/apricots-0.2.6-r1 b/metadata/cache/games-arcade/apricots-0.2.6-r1
index 3c0d86d7499b..3b89b46e51c4 100644
--- a/metadata/cache/games-arcade/apricots-0.2.6-r1
+++ b/metadata/cache/games-arcade/apricots-0.2.6-r1
@@ -1,4 +1,4 @@
-media-libs/libsdl media-libs/openal media-libs/freealut || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+media-libs/libsdl media-libs/openal media-libs/freealut || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 media-libs/libsdl media-libs/openal media-libs/freealut
 0
 http://www.fishies.org.uk/apricots-0.2.6.tar.gz
diff --git a/metadata/cache/games-arcade/batrachians-0.1.4 b/metadata/cache/games-arcade/batrachians-0.1.4
index b395071f7ea5..b451ffad4d7f 100644
--- a/metadata/cache/games-arcade/batrachians-0.1.4
+++ b/metadata/cache/games-arcade/batrachians-0.1.4
@@ -1,4 +1,4 @@
->=dev-games/flatzebra-0.1.5 dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-games/flatzebra-0.1.5 dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=dev-games/flatzebra-0.1.5
 0
 http://perso.b2b2c.ca/sarrazip/dev/batrachians-0.1.4.tar.gz
diff --git a/metadata/cache/games-arcade/batrachians-0.1.5 b/metadata/cache/games-arcade/batrachians-0.1.5
index 12cf248fca06..fbd660b96997 100644
--- a/metadata/cache/games-arcade/batrachians-0.1.5
+++ b/metadata/cache/games-arcade/batrachians-0.1.5
@@ -1,4 +1,4 @@
->=dev-games/flatzebra-0.1.5 dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-games/flatzebra-0.1.5 dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=dev-games/flatzebra-0.1.5
 0
 http://perso.b2b2c.ca/sarrazip/dev/batrachians-0.1.5.tar.gz
diff --git a/metadata/cache/games-arcade/berusky-1.1 b/metadata/cache/games-arcade/berusky-1.1
index 19aced3ac252..98dbd4ec071f 100644
--- a/metadata/cache/games-arcade/berusky-1.1
+++ b/metadata/cache/games-arcade/berusky-1.1
@@ -1,4 +1,4 @@
-media-libs/libsdl[video] || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+media-libs/libsdl[video] || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 media-libs/libsdl[video]
 0
 http://www.anakreon.cz/download/berusky/tar.gz/berusky-1.1.tar.gz http://www.anakreon.cz/download/berusky/tar.gz/berusky-data-1.0.tar.gz
diff --git a/metadata/cache/games-arcade/bitefusion-1.0.1 b/metadata/cache/games-arcade/bitefusion-1.0.1
index a229e5cf1d15..caed1ebcdffe 100644
--- a/metadata/cache/games-arcade/bitefusion-1.0.1
+++ b/metadata/cache/games-arcade/bitefusion-1.0.1
@@ -1,4 +1,4 @@
-media-libs/libsdl || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+media-libs/libsdl || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 media-libs/libsdl
 0
 http://www.junoplay.com/files/bitefusion-1.0.1.tar.gz
diff --git a/metadata/cache/games-arcade/bomns-0.99.2 b/metadata/cache/games-arcade/bomns-0.99.2
index 0f832e920b06..2a530dde5124 100644
--- a/metadata/cache/games-arcade/bomns-0.99.2
+++ b/metadata/cache/games-arcade/bomns-0.99.2
@@ -1,4 +1,4 @@
-media-libs/libsdl[video] media-libs/sdl-mixer gtk? ( x11-libs/gtk+:2 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+media-libs/libsdl[video] media-libs/sdl-mixer gtk? ( x11-libs/gtk+:2 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 media-libs/libsdl[video] media-libs/sdl-mixer gtk? ( x11-libs/gtk+:2 )
 0
 mirror://sourceforge/greenridge/bomns-0.99.2.tar.gz
diff --git a/metadata/cache/games-arcade/burgerspace-1.9.0 b/metadata/cache/games-arcade/burgerspace-1.9.0
index 5786097b56fa..857551ce0288 100644
--- a/metadata/cache/games-arcade/burgerspace-1.9.0
+++ b/metadata/cache/games-arcade/burgerspace-1.9.0
@@ -1,4 +1,4 @@
->=dev-games/flatzebra-0.1.5 dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-games/flatzebra-0.1.5 dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=dev-games/flatzebra-0.1.5
 0
 http://perso.b2b2c.ca/sarrazip/dev/burgerspace-1.9.0.tar.gz
diff --git a/metadata/cache/games-arcade/cosmosmash-1.4.5 b/metadata/cache/games-arcade/cosmosmash-1.4.5
index 1d6934cfbcb0..fca231d8877d 100644
--- a/metadata/cache/games-arcade/cosmosmash-1.4.5
+++ b/metadata/cache/games-arcade/cosmosmash-1.4.5
@@ -1,4 +1,4 @@
->=dev-games/flatzebra-0.1.5 dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-games/flatzebra-0.1.5 dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=dev-games/flatzebra-0.1.5
 0
 http://perso.b2b2c.ca/sarrazip/dev/cosmosmash-1.4.5.tar.gz
diff --git a/metadata/cache/games-arcade/criticalmass-1.0.0-r1 b/metadata/cache/games-arcade/criticalmass-1.0.0-r1
index 2360b62d34b6..3259efeadf1c 100644
--- a/metadata/cache/games-arcade/criticalmass-1.0.0-r1
+++ b/metadata/cache/games-arcade/criticalmass-1.0.0-r1
@@ -1,4 +1,4 @@
-media-libs/sdl-mixer media-libs/sdl-image[png] media-libs/libpng virtual/opengl net-misc/curl || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+media-libs/sdl-mixer media-libs/sdl-image[png] media-libs/libpng virtual/opengl net-misc/curl || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 media-libs/sdl-mixer media-libs/sdl-image[png] media-libs/libpng virtual/opengl net-misc/curl
 0
 mirror://sourceforge/criticalmass/CriticalMass-1.0.0.tar.bz2
diff --git a/metadata/cache/games-arcade/criticalmass-1.0.2 b/metadata/cache/games-arcade/criticalmass-1.0.2
index 1217b67d2300..ed26fa41a162 100644
--- a/metadata/cache/games-arcade/criticalmass-1.0.2
+++ b/metadata/cache/games-arcade/criticalmass-1.0.2
@@ -1,4 +1,4 @@
-media-libs/sdl-mixer media-libs/sdl-image[png] media-libs/libpng virtual/opengl net-misc/curl || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+media-libs/sdl-mixer media-libs/sdl-image[png] media-libs/libpng virtual/opengl net-misc/curl || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 media-libs/sdl-mixer media-libs/sdl-image[png] media-libs/libpng virtual/opengl net-misc/curl
 0
 mirror://sourceforge/criticalmass/CriticalMass-1.0.2.tar.bz2
diff --git a/metadata/cache/games-arcade/diameter-0.4.0.3 b/metadata/cache/games-arcade/diameter-0.4.0.3
index 8fd905158ba5..4ff12e476c96 100644
--- a/metadata/cache/games-arcade/diameter-0.4.0.3
+++ b/metadata/cache/games-arcade/diameter-0.4.0.3
@@ -1,4 +1,4 @@
->=dev-games/guichan-0.8[opengl,sdl] media-libs/libpng virtual/opengl virtual/glu media-libs/libsdl[video] media-libs/sdl-image[gif,jpeg,png] media-libs/sdl-mixer dev-util/pkgconfig =dev-lang/python-2* || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-games/guichan-0.8[opengl,sdl] media-libs/libpng virtual/opengl virtual/glu media-libs/libsdl[video] media-libs/sdl-image[gif,jpeg,png] media-libs/sdl-mixer dev-util/pkgconfig =dev-lang/python-2* || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=dev-games/guichan-0.8[opengl,sdl] media-libs/libpng virtual/opengl virtual/glu media-libs/libsdl[video] media-libs/sdl-image[gif,jpeg,png] media-libs/sdl-mixer =dev-lang/python-2*
 0
 mirror://sourceforge/gamediameter/diameter-0.4.0.3.tar.bz2
diff --git a/metadata/cache/games-arcade/emilia-pinball-0.3.1-r1 b/metadata/cache/games-arcade/emilia-pinball-0.3.1-r1
index bbc106f0f613..cee555401452 100644
--- a/metadata/cache/games-arcade/emilia-pinball-0.3.1-r1
+++ b/metadata/cache/games-arcade/emilia-pinball-0.3.1-r1
@@ -1,4 +1,4 @@
-virtual/opengl x11-libs/libSM media-libs/libsdl[opengl,video,X] media-libs/sdl-image[png] media-libs/sdl-mixer[vorbis] >=sys-devel/libtool-2.2.6b x11-libs/libXt || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+virtual/opengl x11-libs/libSM media-libs/libsdl[opengl,video,X] media-libs/sdl-image[png] media-libs/sdl-mixer[vorbis] >=sys-devel/libtool-2.2.6b x11-libs/libXt || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 virtual/opengl x11-libs/libSM media-libs/libsdl[opengl,video,X] media-libs/sdl-image[png] media-libs/sdl-mixer[vorbis] >=sys-devel/libtool-2.2.6b
 0
 mirror://sourceforge/pinball/pinball-0.3.1.tar.gz
diff --git a/metadata/cache/games-arcade/jumpnbump-1.50-r1 b/metadata/cache/games-arcade/jumpnbump-1.50-r1
index 6164203f71d2..e5d9d71bd695 100644
--- a/metadata/cache/games-arcade/jumpnbump-1.50-r1
+++ b/metadata/cache/games-arcade/jumpnbump-1.50-r1
@@ -1,4 +1,4 @@
-X? ( x11-libs/libXext ) kde? ( kde-base/kdialog ) media-libs/sdl-mixer music? ( media-libs/sdl-mixer[mikmod] ) media-libs/libsdl[audio,joystick,video] media-libs/sdl-net || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+X? ( x11-libs/libXext ) kde? ( kde-base/kdialog ) media-libs/sdl-mixer music? ( media-libs/sdl-mixer[mikmod] ) media-libs/libsdl[audio,joystick,video] media-libs/sdl-net || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 X? ( x11-libs/libXext ) kde? ( kde-base/kdialog ) media-libs/sdl-mixer music? ( media-libs/sdl-mixer[mikmod] ) media-libs/libsdl[audio,joystick,video] media-libs/sdl-net tk? ( dev-lang/tcl dev-lang/tk )
 0
 http://www.jumpbump.mine.nu/port/jumpnbump-1.50.tar.gz mirror://gentoo/jumpnbump-1.50-autotool.patch.bz2
diff --git a/metadata/cache/games-arcade/lbreakout2-2.6.2 b/metadata/cache/games-arcade/lbreakout2-2.6.2
index f1f0ee49e53f..a14d913ef1c3 100644
--- a/metadata/cache/games-arcade/lbreakout2-2.6.2
+++ b/metadata/cache/games-arcade/lbreakout2-2.6.2
@@ -1,4 +1,4 @@
-media-libs/libpng sys-libs/zlib media-libs/libsdl[audio,joystick,video] media-libs/sdl-net media-libs/sdl-mixer nls? ( virtual/libintl ) nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+media-libs/libpng sys-libs/zlib media-libs/libsdl[audio,joystick,video] media-libs/sdl-net media-libs/sdl-mixer nls? ( virtual/libintl ) nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 media-libs/libpng sys-libs/zlib media-libs/libsdl[audio,joystick,video] media-libs/sdl-net media-libs/sdl-mixer nls? ( virtual/libintl )
 0
 mirror://sourceforge/lgames/lbreakout2-2.6.2.tar.gz mirror://sourceforge/lgames/lbreakout2-levelsets-20100920.tar.gz themes? ( mirror://sourceforge/lgames/lbreakout2-themes-20070514.tar.gz )
diff --git a/metadata/cache/games-arcade/lbreakout2-2.6.3 b/metadata/cache/games-arcade/lbreakout2-2.6.3
index b6c39635379a..f5e39e81dd3b 100644
--- a/metadata/cache/games-arcade/lbreakout2-2.6.3
+++ b/metadata/cache/games-arcade/lbreakout2-2.6.3
@@ -1,4 +1,4 @@
-media-libs/libpng sys-libs/zlib media-libs/libsdl[audio,joystick,video] media-libs/sdl-net media-libs/sdl-mixer nls? ( virtual/libintl ) nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+media-libs/libpng sys-libs/zlib media-libs/libsdl[audio,joystick,video] media-libs/sdl-net media-libs/sdl-mixer nls? ( virtual/libintl ) nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 media-libs/libpng sys-libs/zlib media-libs/libsdl[audio,joystick,video] media-libs/sdl-net media-libs/sdl-mixer nls? ( virtual/libintl )
 0
 mirror://sourceforge/lgames/lbreakout2-2.6.3.tar.gz mirror://sourceforge/lgames/lbreakout2-levelsets-20110610.tar.gz themes? ( mirror://sourceforge/lgames/lbreakout2-themes-20070514.tar.gz )
diff --git a/metadata/cache/games-arcade/moleinvasion-0.4-r1 b/metadata/cache/games-arcade/moleinvasion-0.4-r1
index 55ba92fc60cf..54d2ac3cf8df 100644
--- a/metadata/cache/games-arcade/moleinvasion-0.4-r1
+++ b/metadata/cache/games-arcade/moleinvasion-0.4-r1
@@ -1,5 +1,5 @@
-media-libs/libsdl media-libs/sdl-image[jpeg,png] media-libs/sdl-mixer[vorbis] media-libs/sdl-ttf
-media-libs/libsdl media-libs/sdl-image[jpeg,png] media-libs/sdl-mixer[vorbis] media-libs/sdl-ttf
+media-libs/libsdl[opengl,video] virtual/opengl media-libs/sdl-image[jpeg,png] media-libs/sdl-mixer[vorbis] media-libs/sdl-ttf
+media-libs/libsdl[opengl,video] virtual/opengl media-libs/sdl-image[jpeg,png] media-libs/sdl-mixer[vorbis] media-libs/sdl-ttf
 0
 ftp://download.tuxfamily.org/minvasion/packages/MoleInvasion-0.4.tar.bz2 music? ( mirror://gentoo/moleinvasion-music-20090731.tar.gz )
 
diff --git a/metadata/cache/games-arcade/monkey-bubble-0.4.0 b/metadata/cache/games-arcade/monkey-bubble-0.4.0
index 2b3b43f6a17f..cfd2794a5294 100644
--- a/metadata/cache/games-arcade/monkey-bubble-0.4.0
+++ b/metadata/cache/games-arcade/monkey-bubble-0.4.0
@@ -1,4 +1,4 @@
-x11-libs/gtk+:2 >=dev-libs/glib-2.12:2 >=gnome-base/libglade-2.0 >=gnome-base/libgnomeui-2.0 >=gnome-base/librsvg-2.0 >=gnome-base/gconf-2.0 media-libs/gstreamer:0.10 >=dev-libs/libxml2-2.6.7 app-text/scrollkeeper app-text/gnome-doc-utils dev-util/intltool || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+x11-libs/gtk+:2 >=dev-libs/glib-2.12:2 >=gnome-base/libglade-2.0 >=gnome-base/libgnomeui-2.0 >=gnome-base/librsvg-2.0 >=gnome-base/gconf-2.0 media-libs/gstreamer:0.10 >=dev-libs/libxml2-2.6.7 app-text/scrollkeeper app-text/gnome-doc-utils dev-util/intltool || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 x11-libs/gtk+:2 >=dev-libs/glib-2.12:2 >=gnome-base/libglade-2.0 >=gnome-base/libgnomeui-2.0 >=gnome-base/librsvg-2.0 >=gnome-base/gconf-2.0 media-libs/gstreamer:0.10 >=dev-libs/libxml2-2.6.7
 0
 http://home.gna.org/monkeybubble/downloads/monkey-bubble-0.4.0.tar.gz
diff --git a/metadata/cache/games-arcade/monster-masher-1.8.1-r1 b/metadata/cache/games-arcade/monster-masher-1.8.1-r1
index 2cb96734583b..506f925531c9 100644
--- a/metadata/cache/games-arcade/monster-masher-1.8.1-r1
+++ b/metadata/cache/games-arcade/monster-masher-1.8.1-r1
@@ -1,4 +1,4 @@
-x11-libs/libSM >=dev-cpp/gtkmm-2.6:2.4 >=dev-cpp/gconfmm-2.6 >=dev-cpp/libglademm-2.4:2.4 >=dev-cpp/libgnomecanvasmm-2.6:2.6 gnome-base/libgnome media-libs/libcanberra dev-util/intltool dev-util/pkgconfig sys-devel/gettext || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+x11-libs/libSM >=dev-cpp/gtkmm-2.6:2.4 >=dev-cpp/gconfmm-2.6 >=dev-cpp/libglademm-2.4:2.4 >=dev-cpp/libgnomecanvasmm-2.6:2.6 gnome-base/libgnome media-libs/libcanberra dev-util/intltool dev-util/pkgconfig sys-devel/gettext || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 x11-libs/libSM >=dev-cpp/gtkmm-2.6:2.4 >=dev-cpp/gconfmm-2.6 >=dev-cpp/libglademm-2.4:2.4 >=dev-cpp/libgnomecanvasmm-2.6:2.6 gnome-base/libgnome media-libs/libcanberra
 0
 http://people.iola.dk/olau/monster-masher/source/monster-masher-1.8.1.tar.bz2
diff --git a/metadata/cache/games-arcade/pacmanarena-0.15 b/metadata/cache/games-arcade/pacmanarena-0.15
index c1706cd33882..7d38676dd9d2 100644
--- a/metadata/cache/games-arcade/pacmanarena-0.15
+++ b/metadata/cache/games-arcade/pacmanarena-0.15
@@ -1,4 +1,4 @@
-virtual/opengl virtual/glu media-libs/libsdl media-libs/sdl-mixer[vorbis] media-libs/sdl-net app-arch/unzip || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+virtual/opengl virtual/glu media-libs/libsdl media-libs/sdl-mixer[vorbis] media-libs/sdl-net app-arch/unzip || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 virtual/opengl virtual/glu media-libs/libsdl media-libs/sdl-mixer[vorbis] media-libs/sdl-net
 0
 mirror://sourceforge/pacmanarena/pacman-arena-0.15.tar.bz2 mirror://sourceforge/pacmanarena/pacman-data-0.0.zip
diff --git a/metadata/cache/games-arcade/pengupop-2.2.5 b/metadata/cache/games-arcade/pengupop-2.2.5
index 0037d0a2f903..833d17d2998d 100644
--- a/metadata/cache/games-arcade/pengupop-2.2.5
+++ b/metadata/cache/games-arcade/pengupop-2.2.5
@@ -1,4 +1,4 @@
-media-libs/libsdl[audio,video] sys-libs/zlib || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+media-libs/libsdl[audio,video] sys-libs/zlib || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 media-libs/libsdl[audio,video] sys-libs/zlib
 0
 mirror://gentoo/pengupop-2.2.5.tar.gz
diff --git a/metadata/cache/games-arcade/ri-li-2.0.1 b/metadata/cache/games-arcade/ri-li-2.0.1
index 152927490799..64b9032059e3 100644
--- a/metadata/cache/games-arcade/ri-li-2.0.1
+++ b/metadata/cache/games-arcade/ri-li-2.0.1
@@ -1,4 +1,4 @@
-media-libs/libsdl media-libs/sdl-mixer[mikmod] || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+media-libs/libsdl media-libs/sdl-mixer[mikmod] || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 media-libs/libsdl media-libs/sdl-mixer[mikmod]
 0
 mirror://sourceforge/ri-li/Ri-li-2.0.1.tar.bz2
diff --git a/metadata/cache/games-arcade/tecnoballz-0.92 b/metadata/cache/games-arcade/tecnoballz-0.92
index e323f16b2f35..dbf8baf91fce 100644
--- a/metadata/cache/games-arcade/tecnoballz-0.92
+++ b/metadata/cache/games-arcade/tecnoballz-0.92
@@ -1,4 +1,4 @@
-media-libs/libsdl media-libs/sdl-mixer media-libs/sdl-image[png] media-libs/libmikmod:0 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+media-libs/libsdl media-libs/sdl-mixer media-libs/sdl-image[png] media-libs/libmikmod:0 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 media-libs/libsdl media-libs/sdl-mixer media-libs/sdl-image[png] media-libs/libmikmod:0
 0
 http://linux.tlk.fr/games/TecnoballZ/download/tecnoballz-0.92.tgz
diff --git a/metadata/cache/games-arcade/xbill-2.1-r2 b/metadata/cache/games-arcade/xbill-2.1-r2
index c59f50afea95..f68fa9381af0 100644
--- a/metadata/cache/games-arcade/xbill-2.1-r2
+++ b/metadata/cache/games-arcade/xbill-2.1-r2
@@ -1,4 +1,4 @@
-gtk? ( x11-libs/gtk+:2 ) !gtk? ( x11-libs/libXaw ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+gtk? ( x11-libs/gtk+:2 ) !gtk? ( x11-libs/libXaw ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 gtk? ( x11-libs/gtk+:2 ) !gtk? ( x11-libs/libXaw )
 0
 http://www.xbill.org/download/xbill-2.1.tar.gz
diff --git a/metadata/cache/games-board/ascal-0.1.1 b/metadata/cache/games-board/ascal-0.1.1
index 928604cd306f..71e663a85976 100644
--- a/metadata/cache/games-board/ascal-0.1.1
+++ b/metadata/cache/games-board/ascal-0.1.1
@@ -1,4 +1,4 @@
-dev-cpp/libgnomecanvasmm dev-cpp/libglademm virtual/libintl sys-devel/gettext || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-cpp/libgnomecanvasmm dev-cpp/libglademm virtual/libintl sys-devel/gettext || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-cpp/libgnomecanvasmm dev-cpp/libglademm virtual/libintl
 0
 mirror://sourceforge/ascal/ascal-0.1.1.tar.bz2
diff --git a/metadata/cache/games-board/biloba-0.6 b/metadata/cache/games-board/biloba-0.6
index dcd51202e28e..3105a0ba34f0 100644
--- a/metadata/cache/games-board/biloba-0.6
+++ b/metadata/cache/games-board/biloba-0.6
@@ -1,4 +1,4 @@
-media-libs/libsdl[X,video,audio] media-libs/sdl-image[png] media-libs/sdl-mixer || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+media-libs/libsdl[X,video,audio] media-libs/sdl-image[png] media-libs/sdl-mixer || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 media-libs/libsdl[X,video,audio] media-libs/sdl-image[png] media-libs/sdl-mixer
 0
 mirror://sourceforge/biloba/biloba-0.6.tar.gz
diff --git a/metadata/cache/games-board/biloba-0.9.3 b/metadata/cache/games-board/biloba-0.9.3
index 66887ac08726..dc6dd4757682 100644
--- a/metadata/cache/games-board/biloba-0.9.3
+++ b/metadata/cache/games-board/biloba-0.9.3
@@ -1,4 +1,4 @@
-media-libs/libsdl[X,video,audio] media-libs/sdl-image[png] media-libs/sdl-mixer || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+media-libs/libsdl[X,video,audio] media-libs/sdl-image[png] media-libs/sdl-mixer || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 media-libs/libsdl[X,video,audio] media-libs/sdl-image[png] media-libs/sdl-mixer
 0
 mirror://sourceforge/biloba/biloba-0.9.3.tar.gz
diff --git a/metadata/cache/games-board/blokish-0.9.4-r1 b/metadata/cache/games-board/blokish-0.9.4-r1
index 7ca5c145c002..6efd01945b88 100644
--- a/metadata/cache/games-board/blokish-0.9.4-r1
+++ b/metadata/cache/games-board/blokish-0.9.4-r1
@@ -1,4 +1,4 @@
-x11-libs/wxGTK:2.8[X,opengl] virtual/opengl || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+x11-libs/wxGTK:2.8[X,opengl] virtual/opengl || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 x11-libs/wxGTK:2.8[X,opengl] virtual/opengl
 0
 mirror://sourceforge/blokish/blokish_v0.9.4.tgz
diff --git a/metadata/cache/games-board/ccgo-0.3.6.4 b/metadata/cache/games-board/ccgo-0.3.6.4
index 89e4c02d7787..06c7e55beaed 100644
--- a/metadata/cache/games-board/ccgo-0.3.6.4
+++ b/metadata/cache/games-board/ccgo-0.3.6.4
@@ -1,4 +1,4 @@
->=dev-cpp/gtkmm-2.4:2.4 >=dev-cpp/gconfmm-2.6 nls? ( virtual/libintl ) dev-util/pkgconfig nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-cpp/gtkmm-2.4:2.4 >=dev-cpp/gconfmm-2.6 nls? ( virtual/libintl ) dev-util/pkgconfig nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=dev-cpp/gtkmm-2.4:2.4 >=dev-cpp/gconfmm-2.6 nls? ( virtual/libintl )
 0
 http://ccdw.org/~cjj/prog/ccgo/src/ccgo-0.3.6.4.tar.gz
diff --git a/metadata/cache/games-board/ggz-gtk-client-0.0.14.1 b/metadata/cache/games-board/ggz-gtk-client-0.0.14.1
index b86ebac1f291..deaec70ce2fd 100644
--- a/metadata/cache/games-board/ggz-gtk-client-0.0.14.1
+++ b/metadata/cache/games-board/ggz-gtk-client-0.0.14.1
@@ -1,4 +1,4 @@
-~dev-games/libggz-0.0.14.1 ~dev-games/ggz-client-libs-0.0.14.1 x11-libs/gtk+:2 virtual/libintl dev-util/pkgconfig sys-devel/gettext || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+~dev-games/libggz-0.0.14.1 ~dev-games/ggz-client-libs-0.0.14.1 x11-libs/gtk+:2 virtual/libintl dev-util/pkgconfig sys-devel/gettext || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 ~dev-games/libggz-0.0.14.1 ~dev-games/ggz-client-libs-0.0.14.1 x11-libs/gtk+:2 virtual/libintl
 0
 mirror://ggz/0.0.14.1/ggz-gtk-client-0.0.14.1.tar.gz
diff --git a/metadata/cache/games-board/gnome-hearts-0.3 b/metadata/cache/games-board/gnome-hearts-0.3
index cac894310fb8..b9aea1cacac8 100644
--- a/metadata/cache/games-board/gnome-hearts-0.3
+++ b/metadata/cache/games-board/gnome-hearts-0.3
@@ -1,4 +1,4 @@
-x11-libs/gtk+:2 >=gnome-base/libglade-2 >=gnome-base/libgnomeui-2 app-text/rarian dev-util/intltool dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool =dev-lang/python-2* >=sys-apps/sed-4
+x11-libs/gtk+:2 >=gnome-base/libglade-2 >=gnome-base/libgnomeui-2 app-text/rarian dev-util/intltool dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool =dev-lang/python-2* >=sys-apps/sed-4
 x11-libs/gtk+:2 >=gnome-base/libglade-2 >=gnome-base/libgnomeui-2 =dev-lang/python-2*
 0
 http://www.jejik.com/files/gnome-hearts/gnome-hearts-0.3.tar.gz
diff --git a/metadata/cache/games-board/gnono-1.9.1 b/metadata/cache/games-board/gnono-1.9.1
index 693386da5796..e1938e1a4f12 100644
--- a/metadata/cache/games-board/gnono-1.9.1
+++ b/metadata/cache/games-board/gnono-1.9.1
@@ -1,4 +1,4 @@
-gnome-base/libgnomeui virtual/libintl sys-devel/gettext || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+gnome-base/libgnomeui virtual/libintl sys-devel/gettext || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 gnome-base/libgnomeui virtual/libintl
 0
 mirror://sourceforge/gnono/gnono-1.9.1.tar.bz2
diff --git a/metadata/cache/games-board/gnubg-20101126 b/metadata/cache/games-board/gnubg-20101126
index ec07c18ae7ce..0ce4f1a80d7c 100644
--- a/metadata/cache/games-board/gnubg-20101126
+++ b/metadata/cache/games-board/gnubg-20101126
@@ -1,4 +1,4 @@
-dev-libs/glib:2 media-libs/libpng dev-libs/libxml2 media-libs/freetype:2 media-libs/libcanberra gtk? ( x11-libs/gtk+:2 x11-libs/cairo x11-libs/pango ) opengl? ( x11-libs/gtk+:2 x11-libs/cairo x11-libs/pango x11-libs/gtkglext >=media-libs/ftgl-2.1.2-r1 ) sys-libs/readline python? ( dev-lang/python ) media-fonts/ttf-bitstream-vera virtual/libintl dev-db/sqlite:3 dev-util/pkgconfig sys-devel/gettext || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( =dev-lang/python-2* )
+dev-libs/glib:2 media-libs/libpng dev-libs/libxml2 media-libs/freetype:2 media-libs/libcanberra gtk? ( x11-libs/gtk+:2 x11-libs/cairo x11-libs/pango ) opengl? ( x11-libs/gtk+:2 x11-libs/cairo x11-libs/pango x11-libs/gtkglext >=media-libs/ftgl-2.1.2-r1 ) sys-libs/readline python? ( dev-lang/python ) media-fonts/ttf-bitstream-vera virtual/libintl dev-db/sqlite:3 dev-util/pkgconfig sys-devel/gettext || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( =dev-lang/python-2* )
 dev-libs/glib:2 media-libs/libpng dev-libs/libxml2 media-libs/freetype:2 media-libs/libcanberra gtk? ( x11-libs/gtk+:2 x11-libs/cairo x11-libs/pango ) opengl? ( x11-libs/gtk+:2 x11-libs/cairo x11-libs/pango x11-libs/gtkglext >=media-libs/ftgl-2.1.2-r1 ) sys-libs/readline python? ( dev-lang/python ) media-fonts/ttf-bitstream-vera virtual/libintl dev-db/sqlite:3 python? ( =dev-lang/python-2* )
 0
 http://www.gnubg.org/media/sources/gnubg-source-SNAPSHOT-20101126.tar.gz
diff --git a/metadata/cache/games-board/openyahtzee-1.9 b/metadata/cache/games-board/openyahtzee-1.9
index 0141bdeaa104..a8fa9cf200bb 100644
--- a/metadata/cache/games-board/openyahtzee-1.9
+++ b/metadata/cache/games-board/openyahtzee-1.9
@@ -1,4 +1,4 @@
-x11-libs/wxGTK:2.8[X] || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+x11-libs/wxGTK:2.8[X] || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 x11-libs/wxGTK:2.8[X]
 0
 mirror://sourceforge/openyahtzee/openyahtzee-1.9.tar.bz2
diff --git a/metadata/cache/games-board/xboard-4.5.2a b/metadata/cache/games-board/xboard-4.5.2a
index f571e30ddb53..95641f27ac6d 100644
--- a/metadata/cache/games-board/xboard-4.5.2a
+++ b/metadata/cache/games-board/xboard-4.5.2a
@@ -1,4 +1,4 @@
-Xaw3d? ( x11-libs/libXaw3d ) x11-libs/libXpm x11-libs/libXaw x11-libs/libSM x11-libs/libX11 x11-libs/libXt x11-libs/libXmu x11-libs/libXext x11-libs/libICE default-font? ( media-fonts/font-adobe-100dpi ) x11-proto/xproto || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+Xaw3d? ( x11-libs/libXaw3d ) x11-libs/libXpm x11-libs/libXaw x11-libs/libSM x11-libs/libX11 x11-libs/libXt x11-libs/libXmu x11-libs/libXext x11-libs/libICE default-font? ( media-fonts/font-adobe-100dpi ) x11-proto/xproto || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 Xaw3d? ( x11-libs/libXaw3d ) x11-libs/libXpm x11-libs/libXaw x11-libs/libSM x11-libs/libX11 x11-libs/libXt x11-libs/libXmu x11-libs/libXext x11-libs/libICE default-font? ( media-fonts/font-adobe-100dpi )
 0
 mirror://gnu/xboard/xboard-4.5.2a.tar.gz mirror://gentoo/xboard.png
diff --git a/metadata/cache/games-board/xboard-4.5.3a b/metadata/cache/games-board/xboard-4.5.3a
index 481bb45a8641..9e4d084cd7ef 100644
--- a/metadata/cache/games-board/xboard-4.5.3a
+++ b/metadata/cache/games-board/xboard-4.5.3a
@@ -1,4 +1,4 @@
-Xaw3d? ( x11-libs/libXaw3d ) x11-libs/libXpm x11-libs/libXaw x11-libs/libSM x11-libs/libX11 x11-libs/libXt x11-libs/libXmu x11-libs/libXext x11-libs/libICE default-font? ( media-fonts/font-adobe-100dpi ) x11-proto/xproto || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+Xaw3d? ( x11-libs/libXaw3d ) x11-libs/libXpm x11-libs/libXaw x11-libs/libSM x11-libs/libX11 x11-libs/libXt x11-libs/libXmu x11-libs/libXext x11-libs/libICE default-font? ( media-fonts/font-adobe-100dpi ) x11-proto/xproto || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 Xaw3d? ( x11-libs/libXaw3d ) x11-libs/libXpm x11-libs/libXaw x11-libs/libSM x11-libs/libX11 x11-libs/libXt x11-libs/libXmu x11-libs/libXext x11-libs/libICE default-font? ( media-fonts/font-adobe-100dpi )
 0
 mirror://gnu/xboard/xboard-4.5.3a.tar.gz mirror://gentoo/xboard.png
diff --git a/metadata/cache/games-emulation/advancescan-1.14 b/metadata/cache/games-emulation/advancescan-1.14
index e0e3888db708..6937c300dc4c 100644
--- a/metadata/cache/games-emulation/advancescan-1.14
+++ b/metadata/cache/games-emulation/advancescan-1.14
@@ -1,4 +1,4 @@
-dev-libs/expat || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-libs/expat || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-libs/expat
 0
 mirror://sourceforge/advancemame/advancescan-1.14.tar.gz
diff --git a/metadata/cache/games-emulation/dosbox-9999 b/metadata/cache/games-emulation/dosbox-9999
index c44e207eff0c..ab4da4432948 100644
--- a/metadata/cache/games-emulation/dosbox-9999
+++ b/metadata/cache/games-emulation/dosbox-9999
@@ -1,4 +1,4 @@
-alsa? ( media-libs/alsa-lib media-libs/libsdl[alsa] ) opengl? ( virtual/opengl ) debug? ( sys-libs/ncurses ) media-libs/libpng media-libs/libsdl[joystick,video] media-libs/sdl-net media-libs/sdl-sound || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/subversion net-misc/rsync
+alsa? ( media-libs/alsa-lib media-libs/libsdl[alsa] ) opengl? ( virtual/opengl ) debug? ( sys-libs/ncurses ) media-libs/libpng media-libs/libsdl[joystick,video] media-libs/sdl-net media-libs/sdl-sound || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/subversion net-misc/rsync
 alsa? ( media-libs/alsa-lib media-libs/libsdl[alsa] ) opengl? ( virtual/opengl ) debug? ( sys-libs/ncurses ) media-libs/libpng media-libs/libsdl[joystick,video] media-libs/sdl-net media-libs/sdl-sound
 0
 
diff --git a/metadata/cache/games-emulation/generator-0.35_p3 b/metadata/cache/games-emulation/generator-0.35_p3
index 87139f2ed656..141751deb4f0 100644
--- a/metadata/cache/games-emulation/generator-0.35_p3
+++ b/metadata/cache/games-emulation/generator-0.35_p3
@@ -1,4 +1,4 @@
-virtual/jpeg media-libs/libsdl[joystick,video] sdlaudio? ( media-libs/libsdl[audio] ) svga? ( media-libs/svgalib ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+virtual/jpeg media-libs/libsdl[joystick,video] sdlaudio? ( media-libs/libsdl[audio] ) svga? ( media-libs/svgalib ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 virtual/jpeg media-libs/libsdl[joystick,video] sdlaudio? ( media-libs/libsdl[audio] ) svga? ( media-libs/svgalib )
 0
 http://www.ghostwhitecrab.com/generator/generator-0.35-cbiere-r3.tar.bz2
diff --git a/metadata/cache/games-emulation/gnuboy-1.0.3 b/metadata/cache/games-emulation/gnuboy-1.0.3
index 7ea089858651..4fd8b43eb049 100644
--- a/metadata/cache/games-emulation/gnuboy-1.0.3
+++ b/metadata/cache/games-emulation/gnuboy-1.0.3
@@ -1,4 +1,4 @@
-sdl? ( media-libs/libsdl ) !X? ( !svga? ( !fbcon? ( media-libs/libsdl ) ) ) X? ( x11-libs/libXext ) fbcon? ( sys-apps/fbset ) svga? ( media-libs/svgalib ) X? ( x11-proto/xextproto x11-proto/xproto ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+sdl? ( media-libs/libsdl ) !X? ( !svga? ( !fbcon? ( media-libs/libsdl ) ) ) X? ( x11-libs/libXext ) fbcon? ( sys-apps/fbset ) svga? ( media-libs/svgalib ) X? ( x11-proto/xextproto x11-proto/xproto ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 sdl? ( media-libs/libsdl ) !X? ( !svga? ( !fbcon? ( media-libs/libsdl ) ) ) X? ( x11-libs/libXext ) fbcon? ( sys-apps/fbset )
 0
 mirror://gentoo/gnuboy-1.0.3.tar.gz
diff --git a/metadata/cache/games-emulation/mednafen-0.8.13.3 b/metadata/cache/games-emulation/mednafen-0.8.13.3
index 065365aadeb3..84887e313f5d 100644
--- a/metadata/cache/games-emulation/mednafen-0.8.13.3
+++ b/metadata/cache/games-emulation/mednafen-0.8.13.3
@@ -1,4 +1,4 @@
-virtual/opengl media-libs/libsndfile dev-libs/libcdio media-libs/libsdl[audio,joystick,video] media-libs/sdl-net sys-libs/zlib alsa? ( media-libs/alsa-lib ) jack? ( media-sound/jack-audio-connection-kit ) nls? ( virtual/libintl ) dev-util/pkgconfig nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+virtual/opengl media-libs/libsndfile dev-libs/libcdio media-libs/libsdl[audio,joystick,video] media-libs/sdl-net sys-libs/zlib alsa? ( media-libs/alsa-lib ) jack? ( media-sound/jack-audio-connection-kit ) nls? ( virtual/libintl ) dev-util/pkgconfig nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 virtual/opengl media-libs/libsndfile dev-libs/libcdio media-libs/libsdl[audio,joystick,video] media-libs/sdl-net sys-libs/zlib alsa? ( media-libs/alsa-lib ) jack? ( media-sound/jack-audio-connection-kit ) nls? ( virtual/libintl )
 0
 mirror://sourceforge/mednafen/mednafen-0.8.D.3.tar.bz2
diff --git a/metadata/cache/games-emulation/mednafen-0.8.13.3-r1 b/metadata/cache/games-emulation/mednafen-0.8.13.3-r1
index 55158bd5ae17..9780e3163eaa 100644
--- a/metadata/cache/games-emulation/mednafen-0.8.13.3-r1
+++ b/metadata/cache/games-emulation/mednafen-0.8.13.3-r1
@@ -1,4 +1,4 @@
-virtual/opengl media-libs/libsndfile dev-libs/libcdio media-libs/libsdl[audio,joystick,video] media-libs/sdl-net sys-libs/zlib[minizip] alsa? ( media-libs/alsa-lib ) jack? ( media-sound/jack-audio-connection-kit ) nls? ( virtual/libintl ) dev-util/pkgconfig nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+virtual/opengl media-libs/libsndfile dev-libs/libcdio media-libs/libsdl[audio,joystick,video] media-libs/sdl-net sys-libs/zlib[minizip] alsa? ( media-libs/alsa-lib ) jack? ( media-sound/jack-audio-connection-kit ) nls? ( virtual/libintl ) dev-util/pkgconfig nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 virtual/opengl media-libs/libsndfile dev-libs/libcdio media-libs/libsdl[audio,joystick,video] media-libs/sdl-net sys-libs/zlib[minizip] alsa? ( media-libs/alsa-lib ) jack? ( media-sound/jack-audio-connection-kit ) nls? ( virtual/libintl )
 0
 mirror://sourceforge/mednafen/mednafen-0.8.D.3.tar.bz2
diff --git a/metadata/cache/games-emulation/snes9x-1.52-r1 b/metadata/cache/games-emulation/snes9x-1.52-r1
index 4b8bcd1b0330..f9ece393086a 100644
--- a/metadata/cache/games-emulation/snes9x-1.52-r1
+++ b/metadata/cache/games-emulation/snes9x-1.52-r1
@@ -1,4 +1,4 @@
-x11-libs/libX11 x11-libs/libXext png? ( >=media-libs/libpng-1.2.43 ) amd64? ( png? ( >=media-libs/libpng-1.4.2 ) multilib? ( >=app-emulation/emul-linux-x86-xlibs-20100611 gtk? ( >=app-emulation/emul-linux-x86-gtklibs-20100611 alsa? ( app-emulation/emul-linux-x86-soundlibs ) joystick? ( >=app-emulation/emul-linux-x86-sdl-20100611 ) ) ) ) gtk? ( >=x11-libs/gtk+-2.10:2 >=gnome-base/libglade-2.0 x11-misc/xdg-utils portaudio? ( >=media-libs/portaudio-19_pre ) joystick? ( >=media-libs/libsdl-1.2.12[joystick] ) opengl? ( virtual/opengl ) xv? ( x11-libs/libXv ) xrandr? ( x11-libs/libXrandr ) alsa? ( media-libs/alsa-lib ) pulseaudio? ( media-sound/pulseaudio ) ) x86? ( dev-lang/nasm ) x11-proto/xproto gtk? ( dev-util/pkgconfig xv? ( x11-proto/videoproto ) ) nls? ( dev-util/intltool ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+x11-libs/libX11 x11-libs/libXext png? ( >=media-libs/libpng-1.2.43 ) amd64? ( png? ( >=media-libs/libpng-1.4.2 ) multilib? ( >=app-emulation/emul-linux-x86-xlibs-20100611 gtk? ( >=app-emulation/emul-linux-x86-gtklibs-20100611 alsa? ( app-emulation/emul-linux-x86-soundlibs ) joystick? ( >=app-emulation/emul-linux-x86-sdl-20100611 ) ) ) ) gtk? ( >=x11-libs/gtk+-2.10:2 >=gnome-base/libglade-2.0 x11-misc/xdg-utils portaudio? ( >=media-libs/portaudio-19_pre ) joystick? ( >=media-libs/libsdl-1.2.12[joystick] ) opengl? ( virtual/opengl ) xv? ( x11-libs/libXv ) xrandr? ( x11-libs/libXrandr ) alsa? ( media-libs/alsa-lib ) pulseaudio? ( media-sound/pulseaudio ) ) x86? ( dev-lang/nasm ) x11-proto/xproto gtk? ( dev-util/pkgconfig xv? ( x11-proto/videoproto ) ) nls? ( dev-util/intltool ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 x11-libs/libX11 x11-libs/libXext png? ( >=media-libs/libpng-1.2.43 ) amd64? ( png? ( >=media-libs/libpng-1.4.2 ) multilib? ( >=app-emulation/emul-linux-x86-xlibs-20100611 gtk? ( >=app-emulation/emul-linux-x86-gtklibs-20100611 alsa? ( app-emulation/emul-linux-x86-soundlibs ) joystick? ( >=app-emulation/emul-linux-x86-sdl-20100611 ) ) ) ) gtk? ( >=x11-libs/gtk+-2.10:2 >=gnome-base/libglade-2.0 x11-misc/xdg-utils portaudio? ( >=media-libs/portaudio-19_pre ) joystick? ( >=media-libs/libsdl-1.2.12[joystick] ) opengl? ( virtual/opengl ) xv? ( x11-libs/libXv ) xrandr? ( x11-libs/libXrandr ) alsa? ( media-libs/alsa-lib ) pulseaudio? ( media-sound/pulseaudio ) )
 0
 http://snes9x-gtk.googlecode.com/files/snes9x-1.52-src.tar.bz2
diff --git a/metadata/cache/games-emulation/snes9x-1.53 b/metadata/cache/games-emulation/snes9x-1.53
index 0f9196d136a7..341ea5eac967 100644
--- a/metadata/cache/games-emulation/snes9x-1.53
+++ b/metadata/cache/games-emulation/snes9x-1.53
@@ -1,4 +1,4 @@
-x11-libs/libX11 x11-libs/libXext png? ( >=media-libs/libpng-1.2.43:0 ) gtk? ( >=x11-libs/gtk+-2.10:2 x11-misc/xdg-utils portaudio? ( >=media-libs/portaudio-19_pre ) joystick? ( >=media-libs/libsdl-1.2.12[joystick] ) opengl? ( virtual/opengl ) xv? ( x11-libs/libXv ) xrandr? ( x11-libs/libXrandr ) alsa? ( media-libs/alsa-lib ) pulseaudio? ( media-sound/pulseaudio ) ) x11-proto/xproto gtk? ( dev-util/pkgconfig xv? ( x11-proto/videoproto ) ) nls? ( dev-util/intltool ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+x11-libs/libX11 x11-libs/libXext png? ( >=media-libs/libpng-1.2.43:0 ) gtk? ( >=x11-libs/gtk+-2.10:2 x11-misc/xdg-utils portaudio? ( >=media-libs/portaudio-19_pre ) joystick? ( >=media-libs/libsdl-1.2.12[joystick] ) opengl? ( virtual/opengl ) xv? ( x11-libs/libXv ) xrandr? ( x11-libs/libXrandr ) alsa? ( media-libs/alsa-lib ) pulseaudio? ( media-sound/pulseaudio ) ) x11-proto/xproto gtk? ( dev-util/pkgconfig xv? ( x11-proto/videoproto ) ) nls? ( dev-util/intltool ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 x11-libs/libX11 x11-libs/libXext png? ( >=media-libs/libpng-1.2.43:0 ) gtk? ( >=x11-libs/gtk+-2.10:2 x11-misc/xdg-utils portaudio? ( >=media-libs/portaudio-19_pre ) joystick? ( >=media-libs/libsdl-1.2.12[joystick] ) opengl? ( virtual/opengl ) xv? ( x11-libs/libXv ) xrandr? ( x11-libs/libXrandr ) alsa? ( media-libs/alsa-lib ) pulseaudio? ( media-sound/pulseaudio ) )
 0
 http://snes9x-gtk.googlecode.com/files/snes9x-1.53-src.tar.bz2
diff --git a/metadata/cache/games-emulation/tuxnes-0.75-r1 b/metadata/cache/games-emulation/tuxnes-0.75-r1
index c203492c19b3..ce670e1a7523 100644
--- a/metadata/cache/games-emulation/tuxnes-0.75-r1
+++ b/metadata/cache/games-emulation/tuxnes-0.75-r1
@@ -1,4 +1,4 @@
-X? ( x11-libs/libXext x11-libs/libICE x11-libs/libX11 x11-libs/libXpm x11-libs/libSM ) ggi? ( >=media-libs/libggi-2.0.1 ) X? ( x11-proto/xextproto x11-proto/xproto ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+X? ( x11-libs/libXext x11-libs/libICE x11-libs/libX11 x11-libs/libXpm x11-libs/libSM ) ggi? ( >=media-libs/libggi-2.0.1 ) X? ( x11-proto/xextproto x11-proto/xproto ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 X? ( x11-libs/libXext x11-libs/libICE x11-libs/libX11 x11-libs/libXpm x11-libs/libSM ) ggi? ( >=media-libs/libggi-2.0.1 )
 0
 mirror://sourceforge/tuxnes/tuxnes-0.75.tar.gz
diff --git a/metadata/cache/games-emulation/visualboyadvance-1.7.2-r3 b/metadata/cache/games-emulation/visualboyadvance-1.7.2-r3
index c54f1d3a10ec..983ccbe96efb 100644
--- a/metadata/cache/games-emulation/visualboyadvance-1.7.2-r3
+++ b/metadata/cache/games-emulation/visualboyadvance-1.7.2-r3
@@ -1,4 +1,4 @@
-media-libs/libpng media-libs/libsdl sys-libs/zlib[minizip] gtk? ( >=x11-libs/gtk+-2.4:2 >=dev-cpp/gtkmm-2.4:2.4 >=dev-cpp/libglademm-2.4:2.4 ) nls? ( virtual/libintl ) dev-util/pkgconfig mmx? ( dev-lang/nasm ) nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+media-libs/libpng media-libs/libsdl sys-libs/zlib[minizip] gtk? ( >=x11-libs/gtk+-2.4:2 >=dev-cpp/gtkmm-2.4:2.4 >=dev-cpp/libglademm-2.4:2.4 ) nls? ( virtual/libintl ) dev-util/pkgconfig mmx? ( dev-lang/nasm ) nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 media-libs/libpng media-libs/libsdl sys-libs/zlib[minizip] gtk? ( >=x11-libs/gtk+-2.4:2 >=dev-cpp/gtkmm-2.4:2.4 >=dev-cpp/libglademm-2.4:2.4 ) nls? ( virtual/libintl )
 0
 mirror://sourceforge/vba/VisualBoyAdvance-src-1.7.2.tar.gz mirror://gentoo/visualboyadvance-1.7.2-deprecatedsigc++.patch.bz2
diff --git a/metadata/cache/games-emulation/zsnes-1.51-r2 b/metadata/cache/games-emulation/zsnes-1.51-r2
index 326f958fb169..cbf7279c7360 100644
--- a/metadata/cache/games-emulation/zsnes-1.51-r2
+++ b/metadata/cache/games-emulation/zsnes-1.51-r2
@@ -1,4 +1,4 @@
-media-libs/libsdl[audio,video] >=sys-libs/zlib-1.2.3-r1 amd64? ( >=app-emulation/emul-linux-x86-sdl-10.1 ) ao? ( media-libs/libao ) opengl? ( virtual/opengl ) png? ( media-libs/libpng ) dev-lang/nasm amd64? ( >=sys-apps/portage-2.1 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+media-libs/libsdl[audio,video] >=sys-libs/zlib-1.2.3-r1 amd64? ( >=app-emulation/emul-linux-x86-sdl-10.1 ) ao? ( media-libs/libao ) opengl? ( virtual/opengl ) png? ( media-libs/libpng ) dev-lang/nasm amd64? ( >=sys-apps/portage-2.1 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 media-libs/libsdl[audio,video] >=sys-libs/zlib-1.2.3-r1 amd64? ( >=app-emulation/emul-linux-x86-sdl-10.1 ) ao? ( media-libs/libao ) opengl? ( virtual/opengl ) png? ( media-libs/libpng )
 0
 mirror://sourceforge/zsnes/zsnes151src.tar.bz2
diff --git a/metadata/cache/games-engines/exult-1.2 b/metadata/cache/games-engines/exult-1.2
index ab4af1353673..1ccecfe1c880 100644
--- a/metadata/cache/games-engines/exult-1.2
+++ b/metadata/cache/games-engines/exult-1.2
@@ -1,4 +1,4 @@
->=media-libs/libpng-1.4 media-libs/libsdl[audio,video,X] media-libs/sdl-mixer[vorbis,timidity?] timidity? ( >=media-sound/timidity++-2 ) zlib? ( sys-libs/zlib ) app-arch/unzip || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=media-libs/libpng-1.4 media-libs/libsdl[audio,video,X] media-libs/sdl-mixer[vorbis,timidity?] timidity? ( >=media-sound/timidity++-2 ) zlib? ( sys-libs/zlib ) app-arch/unzip || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=media-libs/libpng-1.4 media-libs/libsdl[audio,video,X] media-libs/sdl-mixer[vorbis,timidity?] timidity? ( >=media-sound/timidity++-2 ) zlib? ( sys-libs/zlib )
 0
 mirror://sourceforge/exult/exult-1.2.tar.gz mirror://sourceforge/exult/U7MusicOGG_1of2.zip mirror://sourceforge/exult/U7MusicOGG_2of2.zip mirror://sourceforge/exult/jmsfx.zip mirror://sourceforge/exult/jmsfxsi.zip
diff --git a/metadata/cache/games-engines/love-9999 b/metadata/cache/games-engines/love-9999
index 62f843f40080..740cd201e1d0 100644
--- a/metadata/cache/games-engines/love-9999
+++ b/metadata/cache/games-engines/love-9999
@@ -1,4 +1,4 @@
-dev-games/physfs dev-lang/lua media-libs/devil[mng,tiff] media-libs/freetype media-libs/libmodplug media-libs/libsdl[joystick,opengl] media-libs/libvorbis media-libs/openal media-sound/mpg123 virtual/opengl media-libs/libmng media-libs/tiff || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/mercurial
+dev-games/physfs dev-lang/lua media-libs/devil[mng,tiff] media-libs/freetype media-libs/libmodplug media-libs/libsdl[joystick,opengl] media-libs/libvorbis media-libs/openal media-sound/mpg123 virtual/opengl media-libs/libmng media-libs/tiff || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/mercurial
 dev-games/physfs dev-lang/lua media-libs/devil[mng,tiff] media-libs/freetype media-libs/libmodplug media-libs/libsdl[joystick,opengl] media-libs/libvorbis media-libs/openal media-sound/mpg123 virtual/opengl
 0
 
diff --git a/metadata/cache/games-engines/nazghul-0.7.1 b/metadata/cache/games-engines/nazghul-0.7.1
new file mode 100644
index 000000000000..64c78f88105d
--- /dev/null
+++ b/metadata/cache/games-engines/nazghul-0.7.1
@@ -0,0 +1,22 @@
+media-libs/libpng >=media-libs/libsdl-1.2.3[X,audio,video] media-libs/sdl-image[png] media-libs/sdl-mixer[midi,vorbis,wav]
+media-libs/libpng >=media-libs/libsdl-1.2.3[X,audio,video] media-libs/sdl-image[png] media-libs/sdl-mixer[midi,vorbis,wav]
+0
+mirror://sourceforge/nazghul/nazghul-0.7.1.tar.gz
+
+http://myweb.cableone.net/gmcnutt/nazghul.html
+GPL-2
+A computer role-playing game (CRPG) engine with game called HaximA
+~amd64 ~x86
+base eutils games multilib toolchain-funcs user
+
+
+
+
+2
+
+compile configure install postinst preinst prepare setup unpack
+
+
+
+
+
diff --git a/metadata/cache/games-engines/stratagus-2.2.5.5 b/metadata/cache/games-engines/stratagus-2.2.5.5
index e8d7e345dcd7..a78e2e04ee1e 100644
--- a/metadata/cache/games-engines/stratagus-2.2.5.5
+++ b/metadata/cache/games-engines/stratagus-2.2.5.5
@@ -1,4 +1,4 @@
-x11-libs/libX11 virtual/opengl >=dev-lang/lua-5 media-libs/libpng media-libs/libsdl[audio,opengl,video] bzip2? ( app-arch/bzip2 ) mikmod? ( media-libs/libmikmod ) mng? ( media-libs/libmng ) theora? ( media-libs/libtheora media-libs/libvorbis ) vorbis? ( media-libs/libvorbis ) doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+x11-libs/libX11 virtual/opengl >=dev-lang/lua-5 media-libs/libpng media-libs/libsdl[audio,opengl,video] bzip2? ( app-arch/bzip2 ) mikmod? ( media-libs/libmikmod ) mng? ( media-libs/libmng ) theora? ( media-libs/libtheora media-libs/libvorbis ) vorbis? ( media-libs/libvorbis ) doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 x11-libs/libX11 virtual/opengl >=dev-lang/lua-5 media-libs/libpng media-libs/libsdl[audio,opengl,video] bzip2? ( app-arch/bzip2 ) mikmod? ( media-libs/libmikmod ) mng? ( media-libs/libmng ) theora? ( media-libs/libtheora media-libs/libvorbis ) vorbis? ( media-libs/libvorbis )
 0
 http://launchpad.net/stratagus/trunk/2.2.5.5/+download/stratagus_2.2.5.5.orig.tar.gz
diff --git a/metadata/cache/games-fps/alephone-20100424 b/metadata/cache/games-fps/alephone-20100424
index 247190d5eef3..3fd1b5623e5a 100644
--- a/metadata/cache/games-fps/alephone-20100424
+++ b/metadata/cache/games-fps/alephone-20100424
@@ -1,4 +1,4 @@
-media-libs/sdl-net media-libs/sdl-image media-libs/libsdl[video] dev-libs/expat dev-libs/zziplib media-libs/libpng alsa? ( media-libs/alsa-lib ) mad? ( media-libs/libmad ) mpeg? ( media-libs/smpeg ) virtual/opengl virtual/glu sndfile? ( media-libs/libsndfile ) speex? ( media-libs/speex ) truetype? ( media-libs/sdl-ttf ) vorbis? ( media-libs/libvorbis ) dev-libs/boost || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+media-libs/sdl-net media-libs/sdl-image media-libs/libsdl[video] dev-libs/expat dev-libs/zziplib media-libs/libpng alsa? ( media-libs/alsa-lib ) mad? ( media-libs/libmad ) mpeg? ( media-libs/smpeg ) virtual/opengl virtual/glu sndfile? ( media-libs/libsndfile ) speex? ( media-libs/speex ) truetype? ( media-libs/sdl-ttf ) vorbis? ( media-libs/libvorbis ) dev-libs/boost || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 media-libs/sdl-net media-libs/sdl-image media-libs/libsdl[video] dev-libs/expat dev-libs/zziplib media-libs/libpng alsa? ( media-libs/alsa-lib ) mad? ( media-libs/libmad ) mpeg? ( media-libs/smpeg ) virtual/opengl virtual/glu sndfile? ( media-libs/libsndfile ) speex? ( media-libs/speex ) truetype? ( media-libs/sdl-ttf ) vorbis? ( media-libs/libvorbis )
 0
 mirror://sourceforge/marathon/AlephOne-20100424.tar.bz2
diff --git a/metadata/cache/games-fps/alienarena-20110311 b/metadata/cache/games-fps/alienarena-20110311
index eb3c53b001fd..1f883d2e2ea7 100644
--- a/metadata/cache/games-fps/alienarena-20110311
+++ b/metadata/cache/games-fps/alienarena-20110311
@@ -1,4 +1,4 @@
-!dedicated? ( virtual/jpeg media-libs/openal media-libs/libvorbis media-libs/freetype:2 dev-games/ode[double-precision] virtual/glu virtual/opengl dga? ( x11-libs/libXxf86dga ) vidmode? ( x11-libs/libXxf86vm ) net-misc/curl ) !dedicated? ( dga? ( x11-proto/xf86dgaproto ) vidmode? ( x11-proto/xf86vidmodeproto ) ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+!dedicated? ( virtual/jpeg media-libs/openal media-libs/libvorbis media-libs/freetype:2 dev-games/ode[double-precision] virtual/glu virtual/opengl dga? ( x11-libs/libXxf86dga ) vidmode? ( x11-libs/libXxf86vm ) net-misc/curl ) !dedicated? ( dga? ( x11-proto/xf86dgaproto ) vidmode? ( x11-proto/xf86vidmodeproto ) ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 !dedicated? ( virtual/jpeg media-libs/openal media-libs/libvorbis media-libs/freetype:2 dev-games/ode[double-precision] virtual/glu virtual/opengl dga? ( x11-libs/libXxf86dga ) vidmode? ( x11-libs/libXxf86vm ) net-misc/curl )
 0
 http://icculus.org/alienarena/Files/alienarena-7_51-linux20110311.tar.gz
diff --git a/metadata/cache/games-fps/alienarena-20111227 b/metadata/cache/games-fps/alienarena-20111227
index b2b6990a2da8..f33671eb6d8e 100644
--- a/metadata/cache/games-fps/alienarena-20111227
+++ b/metadata/cache/games-fps/alienarena-20111227
@@ -1,4 +1,4 @@
-!dedicated? ( virtual/jpeg media-libs/openal media-libs/libvorbis media-libs/freetype:2 dev-games/ode[double-precision] virtual/glu virtual/opengl dga? ( x11-libs/libXxf86dga ) vidmode? ( x11-libs/libXxf86vm ) net-misc/curl ) !dedicated? ( dga? ( x11-proto/xf86dgaproto ) vidmode? ( x11-proto/xf86vidmodeproto ) ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+!dedicated? ( virtual/jpeg media-libs/openal media-libs/libvorbis media-libs/freetype:2 dev-games/ode[double-precision] virtual/glu virtual/opengl dga? ( x11-libs/libXxf86dga ) vidmode? ( x11-libs/libXxf86vm ) net-misc/curl ) !dedicated? ( dga? ( x11-proto/xf86dgaproto ) vidmode? ( x11-proto/xf86vidmodeproto ) ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 !dedicated? ( virtual/jpeg media-libs/openal media-libs/libvorbis media-libs/freetype:2 dev-games/ode[double-precision] virtual/glu virtual/opengl dga? ( x11-libs/libXxf86dga ) vidmode? ( x11-libs/libXxf86vm ) net-misc/curl )
 0
 http://icculus.org/alienarena/Files/alienarena-7.53-linux20111227.tar.gz
diff --git a/metadata/cache/games-fps/quakeforge-0.5.5-r2 b/metadata/cache/games-fps/quakeforge-0.5.5-r2
index 8d723bac31e8..ee41e31e04fa 100644
--- a/metadata/cache/games-fps/quakeforge-0.5.5-r2
+++ b/metadata/cache/games-fps/quakeforge-0.5.5-r2
@@ -1,4 +1,4 @@
-opengl? ( virtual/opengl ) sdl? ( media-libs/libsdl ) svga? ( media-libs/svgalib ) X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86vm ) ncurses? ( sys-libs/ncurses ) vorbis? ( media-libs/libogg media-libs/libvorbis ) zlib? ( sys-libs/zlib ) xv? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86vm ) dga? ( x11-libs/libXxf86dga ) alsa? ( media-libs/alsa-lib ) cdinstall? ( games-fps/quake1-data ) sys-devel/bison sys-devel/flex || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+opengl? ( virtual/opengl ) sdl? ( media-libs/libsdl ) svga? ( media-libs/svgalib ) X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86vm ) ncurses? ( sys-libs/ncurses ) vorbis? ( media-libs/libogg media-libs/libvorbis ) zlib? ( sys-libs/zlib ) xv? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86vm ) dga? ( x11-libs/libXxf86dga ) alsa? ( media-libs/alsa-lib ) cdinstall? ( games-fps/quake1-data ) sys-devel/bison sys-devel/flex || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 opengl? ( virtual/opengl ) sdl? ( media-libs/libsdl ) svga? ( media-libs/svgalib ) X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86vm ) ncurses? ( sys-libs/ncurses ) vorbis? ( media-libs/libogg media-libs/libvorbis ) zlib? ( sys-libs/zlib ) xv? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86vm ) dga? ( x11-libs/libXxf86dga ) alsa? ( media-libs/alsa-lib )
 0
 mirror://sourceforge/quake/quakeforge-0.5.5.tar.bz2
diff --git a/metadata/cache/games-kids/gcompris-12.01 b/metadata/cache/games-kids/gcompris-12.01
index 98a7dd94f22e..2f8d80baf11d 100644
--- a/metadata/cache/games-kids/gcompris-12.01
+++ b/metadata/cache/games-kids/gcompris-12.01
@@ -1,4 +1,4 @@
-x11-libs/gtk+:2 gnome-base/librsvg[gtk] media-libs/gstreamer:0.10 media-libs/gst-plugins-good media-plugins/gst-plugins-ogg media-plugins/gst-plugins-alsa media-plugins/gst-plugins-vorbis media-libs/sdl-mixer media-libs/libsdl dev-libs/libxml2 dev-libs/popt virtual/libintl games-board/gnuchess dev-db/sqlite:3 gnet? ( net-libs/gnet:2 ) python? ( dev-python/pygtk ) gnome-base/gnome-common dev-perl/XML-Parser sys-devel/gettext sys-apps/texinfo app-text/texi2html dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) ) python? ( || ( =dev-lang/python-2.7*[sqlite,threads] =dev-lang/python-2.6*[sqlite,threads] ) )
+x11-libs/gtk+:2 gnome-base/librsvg[gtk] media-libs/gstreamer:0.10 media-libs/gst-plugins-good media-plugins/gst-plugins-ogg media-plugins/gst-plugins-alsa media-plugins/gst-plugins-vorbis media-libs/sdl-mixer media-libs/libsdl dev-libs/libxml2 dev-libs/popt virtual/libintl games-board/gnuchess dev-db/sqlite:3 gnet? ( net-libs/gnet:2 ) python? ( dev-python/pygtk ) gnome-base/gnome-common dev-perl/XML-Parser sys-devel/gettext sys-apps/texinfo app-text/texi2html dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) ) python? ( || ( =dev-lang/python-2.7*[sqlite,threads] =dev-lang/python-2.6*[sqlite,threads] ) )
 x11-libs/gtk+:2 gnome-base/librsvg[gtk] media-libs/gstreamer:0.10 media-libs/gst-plugins-good media-plugins/gst-plugins-ogg media-plugins/gst-plugins-alsa media-plugins/gst-plugins-vorbis media-libs/sdl-mixer media-libs/libsdl dev-libs/libxml2 dev-libs/popt virtual/libintl games-board/gnuchess dev-db/sqlite:3 gnet? ( net-libs/gnet:2 ) python? ( dev-python/pygtk ) media-gfx/tuxpaint sci-electronics/gnucap python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) ) python? ( || ( =dev-lang/python-2.7*[sqlite,threads] =dev-lang/python-2.6*[sqlite,threads] ) )
 0
 mirror://sourceforge/gcompris/gcompris-12.01.tar.gz
diff --git a/metadata/cache/games-kids/gcompris-9.6.1 b/metadata/cache/games-kids/gcompris-9.6.1
index 5067f0aaf3d7..2935467a27a6 100644
--- a/metadata/cache/games-kids/gcompris-9.6.1
+++ b/metadata/cache/games-kids/gcompris-9.6.1
@@ -1,4 +1,4 @@
-x11-libs/gtk+:2 gnome-base/librsvg[gtk] media-libs/gstreamer:0.10 media-libs/gst-plugins-good media-plugins/gst-plugins-ogg media-plugins/gst-plugins-alsa media-plugins/gst-plugins-vorbis media-libs/sdl-mixer media-libs/libsdl dev-libs/libxml2 dev-libs/popt virtual/libintl games-board/gnuchess dev-db/sqlite:3 gnet? ( net-libs/gnet:2 ) python? ( dev-python/pygtk ) gnome-base/gnome-common dev-perl/XML-Parser sys-devel/gettext sys-apps/texinfo app-text/texi2html dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) ) python? ( || ( =dev-lang/python-2.7*[sqlite,threads] =dev-lang/python-2.6*[sqlite,threads] ) )
+x11-libs/gtk+:2 gnome-base/librsvg[gtk] media-libs/gstreamer:0.10 media-libs/gst-plugins-good media-plugins/gst-plugins-ogg media-plugins/gst-plugins-alsa media-plugins/gst-plugins-vorbis media-libs/sdl-mixer media-libs/libsdl dev-libs/libxml2 dev-libs/popt virtual/libintl games-board/gnuchess dev-db/sqlite:3 gnet? ( net-libs/gnet:2 ) python? ( dev-python/pygtk ) gnome-base/gnome-common dev-perl/XML-Parser sys-devel/gettext sys-apps/texinfo app-text/texi2html dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) ) python? ( || ( =dev-lang/python-2.7*[sqlite,threads] =dev-lang/python-2.6*[sqlite,threads] ) )
 x11-libs/gtk+:2 gnome-base/librsvg[gtk] media-libs/gstreamer:0.10 media-libs/gst-plugins-good media-plugins/gst-plugins-ogg media-plugins/gst-plugins-alsa media-plugins/gst-plugins-vorbis media-libs/sdl-mixer media-libs/libsdl dev-libs/libxml2 dev-libs/popt virtual/libintl games-board/gnuchess dev-db/sqlite:3 gnet? ( net-libs/gnet:2 ) python? ( dev-python/pygtk ) media-gfx/tuxpaint sci-electronics/gnucap python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) ) python? ( || ( =dev-lang/python-2.7*[sqlite,threads] =dev-lang/python-2.6*[sqlite,threads] ) )
 0
 mirror://sourceforge/gcompris/gcompris-9.6.1.tar.gz
diff --git a/metadata/cache/games-misc/gnurobots-1.2.0 b/metadata/cache/games-misc/gnurobots-1.2.0
index 3bb53faae232..0a9d6d93c148 100644
--- a/metadata/cache/games-misc/gnurobots-1.2.0
+++ b/metadata/cache/games-misc/gnurobots-1.2.0
@@ -1,4 +1,4 @@
-x11-libs/vte:0 dev-scheme/guile[deprecated] || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+x11-libs/vte:0 dev-scheme/guile[deprecated] || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 x11-libs/vte:0 dev-scheme/guile[deprecated]
 0
 mirror://gnu/gnurobots/gnurobots-1.2.0.tar.gz
diff --git a/metadata/cache/games-misc/lucidlife-0.9.2 b/metadata/cache/games-misc/lucidlife-0.9.2
index 007507c40471..14c65d4ae4cb 100644
--- a/metadata/cache/games-misc/lucidlife-0.9.2
+++ b/metadata/cache/games-misc/lucidlife-0.9.2
@@ -1,4 +1,4 @@
-dev-util/intltool dev-util/pkgconfig sys-devel/gettext || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-util/intltool dev-util/pkgconfig sys-devel/gettext || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 x11-libs/gtk+:2
 0
 mirror://gentoo/lucidlife-0.9.2.tar.gz
diff --git a/metadata/cache/games-misc/typespeed-0.6.5 b/metadata/cache/games-misc/typespeed-0.6.5
index 6ab7d50817d2..788723fd5900 100644
--- a/metadata/cache/games-misc/typespeed-0.6.5
+++ b/metadata/cache/games-misc/typespeed-0.6.5
@@ -1,4 +1,4 @@
-sys-libs/ncurses nls? ( virtual/libintl ) nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+sys-libs/ncurses nls? ( virtual/libintl ) nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 sys-libs/ncurses nls? ( virtual/libintl )
 0
 http://tobias.eyedacor.org/typespeed/typespeed-0.6.5.tar.gz
diff --git a/metadata/cache/games-mud/gmudix-1.0 b/metadata/cache/games-mud/gmudix-1.0
index 129c43eb4c5c..f69456865bd3 100644
--- a/metadata/cache/games-mud/gmudix-1.0
+++ b/metadata/cache/games-mud/gmudix-1.0
@@ -1,4 +1,4 @@
-x11-libs/gtk+:2 dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+x11-libs/gtk+:2 dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 x11-libs/gtk+:2
 0
 http://dw.nl.eu.org/gmudix/gmudix-1.0.tar.gz
diff --git a/metadata/cache/games-mud/kildclient-2.9.0 b/metadata/cache/games-mud/kildclient-2.9.0
index caec795e91e6..db8ac06e8d24 100644
--- a/metadata/cache/games-mud/kildclient-2.9.0
+++ b/metadata/cache/games-mud/kildclient-2.9.0
@@ -1,4 +1,4 @@
-x11-libs/gtk+:2 gnome-base/libglade dev-lang/perl sys-libs/zlib virtual/libintl spell? ( app-text/gtkspell:2 ) gnutls? ( net-libs/gnutls ) sys-devel/gettext dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+x11-libs/gtk+:2 gnome-base/libglade dev-lang/perl sys-libs/zlib virtual/libintl spell? ( app-text/gtkspell:2 ) gnutls? ( net-libs/gnutls ) sys-devel/gettext dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 x11-libs/gtk+:2 gnome-base/libglade dev-lang/perl sys-libs/zlib virtual/libintl spell? ( app-text/gtkspell:2 ) gnutls? ( net-libs/gnutls )
 0
 mirror://sourceforge/kildclient/kildclient-2.9.0.tar.gz
diff --git a/metadata/cache/games-mud/powwow-1.2.16 b/metadata/cache/games-mud/powwow-1.2.16
index f4e3b4f7e417..d55976c35678 100644
--- a/metadata/cache/games-mud/powwow-1.2.16
+++ b/metadata/cache/games-mud/powwow-1.2.16
@@ -1,4 +1,4 @@
-sys-libs/ncurses || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+sys-libs/ncurses || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 sys-libs/ncurses
 0
 http://hoopajoo.net/static/projects/powwow-1.2.16.tar.gz
diff --git a/metadata/cache/games-mud/wxmud-9999 b/metadata/cache/games-mud/wxmud-9999
index da2f4b44e4ed..5a8e5a620756 100644
--- a/metadata/cache/games-mud/wxmud-9999
+++ b/metadata/cache/games-mud/wxmud-9999
@@ -1,4 +1,4 @@
-=x11-libs/wxGTK-2.8* >=x11-libs/gtk+-2.4:2 python? ( >=dev-lang/python-2.4 ) dev-vcs/subversion net-misc/rsync || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+=x11-libs/wxGTK-2.8* >=x11-libs/gtk+-2.4:2 python? ( >=dev-lang/python-2.4 ) dev-vcs/subversion net-misc/rsync || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 =x11-libs/wxGTK-2.8* >=x11-libs/gtk+-2.4:2 python? ( >=dev-lang/python-2.4 )
 0
 
diff --git a/metadata/cache/games-puzzle/amoebax-0.2.0 b/metadata/cache/games-puzzle/amoebax-0.2.0
index d6c9d1bcc2d4..c08fa0f6dd36 100644
--- a/metadata/cache/games-puzzle/amoebax-0.2.0
+++ b/metadata/cache/games-puzzle/amoebax-0.2.0
@@ -1,4 +1,4 @@
-media-libs/libsdl[audio,joystick,video] media-libs/sdl-image[png] media-libs/sdl-mixer[vorbis] || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+media-libs/libsdl[audio,joystick,video] media-libs/sdl-image[png] media-libs/sdl-mixer[vorbis] || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 media-libs/libsdl[audio,joystick,video] media-libs/sdl-image[png] media-libs/sdl-mixer[vorbis]
 0
 http://www.emma-soft.com/games/amoebax/download/amoebax-0.2.0.tar.bz2
diff --git a/metadata/cache/games-puzzle/construo-0.2.2 b/metadata/cache/games-puzzle/construo-0.2.2
index 29bf251bd4b4..e77ac5938247 100644
--- a/metadata/cache/games-puzzle/construo-0.2.2
+++ b/metadata/cache/games-puzzle/construo-0.2.2
@@ -1,4 +1,4 @@
-virtual/opengl virtual/glu media-libs/freeglut x11-libs/libXxf86vm x11-proto/xf86vidmodeproto || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+virtual/opengl virtual/glu media-libs/freeglut x11-libs/libXxf86vm x11-proto/xf86vidmodeproto || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 virtual/opengl virtual/glu media-libs/freeglut x11-libs/libXxf86vm
 0
 http://freesoftware.fsf.org/download/construo/construo.pkg/0.2.2/construo-0.2.2.tar.gz
diff --git a/metadata/cache/games-puzzle/cuyo-2.1.1 b/metadata/cache/games-puzzle/cuyo-2.1.1
index b50b4755dff9..9650b76c41e3 100644
--- a/metadata/cache/games-puzzle/cuyo-2.1.1
+++ b/metadata/cache/games-puzzle/cuyo-2.1.1
@@ -1,4 +1,4 @@
-sys-libs/zlib media-libs/libsdl[audio,video] media-libs/sdl-mixer music? ( media-libs/sdl-mixer[mikmod] ) media-libs/sdl-image || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+sys-libs/zlib media-libs/libsdl[audio,video] media-libs/sdl-mixer music? ( media-libs/sdl-mixer[mikmod] ) media-libs/sdl-image || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 sys-libs/zlib media-libs/libsdl[audio,video] media-libs/sdl-mixer music? ( media-libs/sdl-mixer[mikmod] ) media-libs/sdl-image
 0
 http://savannah.nongnu.org/download/cuyo/cuyo-2.~-1.1.tar.gz
diff --git a/metadata/cache/games-puzzle/enigma-1.01 b/metadata/cache/games-puzzle/enigma-1.01
index 2079367f1ef6..915677116dfd 100644
--- a/metadata/cache/games-puzzle/enigma-1.01
+++ b/metadata/cache/games-puzzle/enigma-1.01
@@ -1,4 +1,4 @@
-media-libs/sdl-ttf media-libs/libsdl media-libs/sdl-mixer media-libs/sdl-image[png] media-libs/libpng || ( >=dev-libs/xerces-c-3[icu] >=dev-libs/xerces-c-3[-icu,-iconv] ) net-libs/enet:0 nls? ( virtual/libintl ) sys-devel/gettext || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+media-libs/sdl-ttf media-libs/libsdl media-libs/sdl-mixer media-libs/sdl-image[png] media-libs/libpng || ( >=dev-libs/xerces-c-3[icu] >=dev-libs/xerces-c-3[-icu,-iconv] ) net-libs/enet:0 nls? ( virtual/libintl ) sys-devel/gettext || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 media-libs/sdl-ttf media-libs/libsdl media-libs/sdl-mixer media-libs/sdl-image[png] media-libs/libpng || ( >=dev-libs/xerces-c-3[icu] >=dev-libs/xerces-c-3[-icu,-iconv] ) net-libs/enet:0 nls? ( virtual/libintl )
 0
 mirror://berlios/enigma-game/enigma-1.01-64bit.tar.gz
diff --git a/metadata/cache/games-puzzle/fish-fillets-1.0.0 b/metadata/cache/games-puzzle/fish-fillets-1.0.0
index 0e14f08521da..92f5e882d05c 100644
--- a/metadata/cache/games-puzzle/fish-fillets-1.0.0
+++ b/metadata/cache/games-puzzle/fish-fillets-1.0.0
@@ -1,4 +1,4 @@
->=media-libs/libsdl-1.2[audio,video] >=media-libs/sdl-mixer-1.2.5[vorbis] >=media-libs/sdl-image-1.2.2[png] media-libs/smpeg x11-libs/libX11 media-libs/sdl-ttf dev-libs/fribidi >=dev-lang/lua-5 dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=media-libs/libsdl-1.2[audio,video] >=media-libs/sdl-mixer-1.2.5[vorbis] >=media-libs/sdl-image-1.2.2[png] media-libs/smpeg x11-libs/libX11 media-libs/sdl-ttf dev-libs/fribidi >=dev-lang/lua-5 dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=media-libs/libsdl-1.2[audio,video] >=media-libs/sdl-mixer-1.2.5[vorbis] >=media-libs/sdl-image-1.2.2[png] media-libs/smpeg x11-libs/libX11 media-libs/sdl-ttf dev-libs/fribidi >=dev-lang/lua-5
 0
 mirror://sourceforge/fillets/fillets-ng-1.0.0.tar.gz mirror://sourceforge/fillets/fillets-ng-data-1.0.0.tar.gz
diff --git a/metadata/cache/games-puzzle/fish-fillets-1.0.1 b/metadata/cache/games-puzzle/fish-fillets-1.0.1
index f22bac439140..3cfce5183cfc 100644
--- a/metadata/cache/games-puzzle/fish-fillets-1.0.1
+++ b/metadata/cache/games-puzzle/fish-fillets-1.0.1
@@ -1,4 +1,4 @@
->=media-libs/libsdl-1.2[audio,video] >=media-libs/sdl-mixer-1.2.5[vorbis] >=media-libs/sdl-image-1.2.2[png] media-libs/smpeg x11-libs/libX11 media-libs/sdl-ttf dev-libs/fribidi >=dev-lang/lua-5 dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=media-libs/libsdl-1.2[audio,video] >=media-libs/sdl-mixer-1.2.5[vorbis] >=media-libs/sdl-image-1.2.2[png] media-libs/smpeg x11-libs/libX11 media-libs/sdl-ttf dev-libs/fribidi >=dev-lang/lua-5 dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=media-libs/libsdl-1.2[audio,video] >=media-libs/sdl-mixer-1.2.5[vorbis] >=media-libs/sdl-image-1.2.2[png] media-libs/smpeg x11-libs/libX11 media-libs/sdl-ttf dev-libs/fribidi >=dev-lang/lua-5
 0
 mirror://sourceforge/fillets/fillets-ng-1.0.1.tar.gz mirror://sourceforge/fillets/fillets-ng-data-1.0.0.tar.gz
diff --git a/metadata/cache/games-puzzle/groundhog-1.4 b/metadata/cache/games-puzzle/groundhog-1.4
index 57ae04c8fe25..af51fb6b92da 100644
--- a/metadata/cache/games-puzzle/groundhog-1.4
+++ b/metadata/cache/games-puzzle/groundhog-1.4
@@ -1,4 +1,4 @@
-x11-libs/gtk+:2 nls? ( virtual/libintl ) dev-util/pkgconfig nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+x11-libs/gtk+:2 nls? ( virtual/libintl ) dev-util/pkgconfig nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 x11-libs/gtk+:2 nls? ( virtual/libintl )
 0
 http://home-2.consunet.nl/~cb007736/groundhog-1.4.tar.gz mirror://debian/pool/main/g/groundhog/groundhog_1.4-9.diff.gz
diff --git a/metadata/cache/games-puzzle/gtetrinet-0.7.11-r1 b/metadata/cache/games-puzzle/gtetrinet-0.7.11-r1
index 9ed02fe077fe..272ff4c14f76 100644
--- a/metadata/cache/games-puzzle/gtetrinet-0.7.11-r1
+++ b/metadata/cache/games-puzzle/gtetrinet-0.7.11-r1
@@ -1,4 +1,4 @@
-dev-libs/libxml2 media-libs/libcanberra >=gnome-base/gconf-2 >=gnome-base/libgnome-2 >=gnome-base/libgnomeui-2 nls? ( virtual/libintl ) dev-util/pkgconfig nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+dev-libs/libxml2 media-libs/libcanberra >=gnome-base/gconf-2 >=gnome-base/libgnome-2 >=gnome-base/libgnomeui-2 nls? ( virtual/libintl ) dev-util/pkgconfig nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 dev-libs/libxml2 media-libs/libcanberra >=gnome-base/gconf-2 >=gnome-base/libgnome-2 >=gnome-base/libgnomeui-2 nls? ( virtual/libintl )
 0
 mirror://gnome/sources/gtetrinet/0.7/gtetrinet-0.7.11.tar.bz2 mirror://gentoo/gtetrinet-gentoo-theme-0.1.tbz2
diff --git a/metadata/cache/games-puzzle/lmarbles-1.0.8 b/metadata/cache/games-puzzle/lmarbles-1.0.8
index a982e82e17b2..7af9a29da4ab 100644
--- a/metadata/cache/games-puzzle/lmarbles-1.0.8
+++ b/metadata/cache/games-puzzle/lmarbles-1.0.8
@@ -1,4 +1,4 @@
-media-libs/libsdl[video] media-libs/sdl-mixer || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+media-libs/libsdl[video] media-libs/sdl-mixer || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 media-libs/libsdl[video] media-libs/sdl-mixer
 0
 mirror://sourceforge/lgames/lmarbles-1.0.8.tar.gz
diff --git a/metadata/cache/games-puzzle/ltris-1.0.16 b/metadata/cache/games-puzzle/ltris-1.0.16
index 0480dc4b772e..b583d2064749 100644
--- a/metadata/cache/games-puzzle/ltris-1.0.16
+++ b/metadata/cache/games-puzzle/ltris-1.0.16
@@ -1,4 +1,4 @@
-media-libs/libsdl[video] media-libs/sdl-mixer nls? ( virtual/libintl ) nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+media-libs/libsdl[video] media-libs/sdl-mixer nls? ( virtual/libintl ) nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 media-libs/libsdl[video] media-libs/sdl-mixer nls? ( virtual/libintl )
 0
 mirror://sourceforge/lgames/ltris-1.0.16.tar.gz
diff --git a/metadata/cache/games-puzzle/ltris-1.0.17 b/metadata/cache/games-puzzle/ltris-1.0.17
index 9a8efec829c9..41ad91051126 100644
--- a/metadata/cache/games-puzzle/ltris-1.0.17
+++ b/metadata/cache/games-puzzle/ltris-1.0.17
@@ -1,4 +1,4 @@
-media-libs/libsdl[video] media-libs/sdl-mixer nls? ( virtual/libintl ) nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+media-libs/libsdl[video] media-libs/sdl-mixer nls? ( virtual/libintl ) nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 media-libs/libsdl[video] media-libs/sdl-mixer nls? ( virtual/libintl )
 0
 mirror://sourceforge/lgames/ltris-1.0.17.tar.gz
diff --git a/metadata/cache/games-puzzle/ltris-1.0.18 b/metadata/cache/games-puzzle/ltris-1.0.18
index c266e40f1672..91bb2f410502 100644
--- a/metadata/cache/games-puzzle/ltris-1.0.18
+++ b/metadata/cache/games-puzzle/ltris-1.0.18
@@ -1,4 +1,4 @@
-media-libs/libsdl[video] media-libs/sdl-mixer nls? ( virtual/libintl ) nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+media-libs/libsdl[video] media-libs/sdl-mixer nls? ( virtual/libintl ) nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 media-libs/libsdl[video] media-libs/sdl-mixer nls? ( virtual/libintl )
 0
 mirror://sourceforge/lgames/ltris-1.0.18.tar.gz
diff --git a/metadata/cache/games-puzzle/mures-0.5 b/metadata/cache/games-puzzle/mures-0.5
index 64034b8b84e4..586506ad3369 100644
--- a/metadata/cache/games-puzzle/mures-0.5
+++ b/metadata/cache/games-puzzle/mures-0.5
@@ -1,4 +1,4 @@
-media-libs/libsdl media-libs/sdl-image media-libs/sdl-net media-libs/sdl-ttf opengl? ( virtual/opengl ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+media-libs/libsdl media-libs/sdl-image media-libs/sdl-net media-libs/sdl-ttf opengl? ( virtual/opengl ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 media-libs/libsdl media-libs/sdl-image media-libs/sdl-net media-libs/sdl-ttf opengl? ( virtual/opengl )
 0
 mirror://sourceforge/mures/mures-0.5.tar.gz
diff --git a/metadata/cache/games-puzzle/shaaft-0.5.0 b/metadata/cache/games-puzzle/shaaft-0.5.0
index 6024a861a34f..f4aca3bafaec 100644
--- a/metadata/cache/games-puzzle/shaaft-0.5.0
+++ b/metadata/cache/games-puzzle/shaaft-0.5.0
@@ -1,4 +1,4 @@
-virtual/opengl sys-libs/zlib media-libs/libpng media-libs/libsdl[audio,opengl,video] media-libs/sdl-mixer[mikmod] media-libs/sdl-image[png] || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+virtual/opengl sys-libs/zlib media-libs/libpng media-libs/libsdl[audio,opengl,video] media-libs/sdl-mixer[mikmod] media-libs/sdl-image[png] || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 virtual/opengl sys-libs/zlib media-libs/libpng media-libs/libsdl[audio,opengl,video] media-libs/sdl-mixer[mikmod] media-libs/sdl-image[png]
 0
 mirror://sourceforge/criticalmass/Shaaft-0.5.0.tar.bz2
diff --git a/metadata/cache/games-puzzle/xlogical-1.0.7 b/metadata/cache/games-puzzle/xlogical-1.0.7
index c50fc8a5ec9a..231a30565e5f 100644
--- a/metadata/cache/games-puzzle/xlogical-1.0.7
+++ b/metadata/cache/games-puzzle/xlogical-1.0.7
@@ -1,4 +1,4 @@
-media-libs/libsdl media-libs/sdl-image[jpeg] media-libs/sdl-mixer[mikmod] alt_gfx? ( app-arch/unzip ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+media-libs/libsdl media-libs/sdl-image[jpeg] media-libs/sdl-mixer[mikmod] alt_gfx? ( app-arch/unzip ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 media-libs/libsdl media-libs/sdl-image[jpeg] media-libs/sdl-mixer[mikmod]
 0
 http://changeling.ixionstudios.com/xlogical/downloads/xlogical-1.0-7.tar.bz2 alt_gfx? ( http://changeling.ixionstudios.com/xlogical/downloads/xlogical_gfx.zip )
diff --git a/metadata/cache/games-puzzle/xye-0.10.0 b/metadata/cache/games-puzzle/xye-0.10.0
index 8af991691d76..136f30a6e3db 100644
--- a/metadata/cache/games-puzzle/xye-0.10.0
+++ b/metadata/cache/games-puzzle/xye-0.10.0
@@ -1,4 +1,4 @@
-media-libs/libsdl[video] media-libs/sdl-ttf media-libs/sdl-image[png] media-fonts/dejavu || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+media-libs/libsdl[video] media-libs/sdl-ttf media-libs/sdl-image[png] media-fonts/dejavu || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 media-libs/libsdl[video] media-libs/sdl-ttf media-libs/sdl-image[png] media-fonts/dejavu
 0
 mirror://sourceforge/xye/xye-0.10.0.tar.gz
diff --git a/metadata/cache/games-puzzle/xye-0.12.0 b/metadata/cache/games-puzzle/xye-0.12.0
index ef56fbd38f29..8acc60ed2961 100644
--- a/metadata/cache/games-puzzle/xye-0.12.0
+++ b/metadata/cache/games-puzzle/xye-0.12.0
@@ -1,4 +1,4 @@
-media-libs/libsdl[video] media-libs/sdl-ttf media-libs/sdl-image[png] media-fonts/dejavu || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+media-libs/libsdl[video] media-libs/sdl-ttf media-libs/sdl-image[png] media-fonts/dejavu || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 media-libs/libsdl[video] media-libs/sdl-ttf media-libs/sdl-image[png] media-fonts/dejavu
 0
 mirror://sourceforge/xye/xye-0.12.0.tar.gz
diff --git a/metadata/cache/games-puzzle/zaz-1.0.0 b/metadata/cache/games-puzzle/zaz-1.0.0
index bf67ff48007d..b7dea0b77168 100644
--- a/metadata/cache/games-puzzle/zaz-1.0.0
+++ b/metadata/cache/games-puzzle/zaz-1.0.0
@@ -1,4 +1,4 @@
-virtual/opengl virtual/glu media-libs/libsdl[X,audio,video] media-libs/sdl-image[jpeg,png] media-libs/libvorbis media-libs/libtheora media-libs/ftgl virtual/libintl dev-util/pkgconfig nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+virtual/opengl virtual/glu media-libs/libsdl[X,audio,video] media-libs/sdl-image[jpeg,png] media-libs/libvorbis media-libs/libtheora media-libs/ftgl virtual/libintl dev-util/pkgconfig nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 virtual/opengl virtual/glu media-libs/libsdl[X,audio,video] media-libs/sdl-image[jpeg,png] media-libs/libvorbis media-libs/libtheora media-libs/ftgl virtual/libintl
 0
 mirror://sourceforge/zaz/zaz-1.0.0.tar.bz2
diff --git a/metadata/cache/games-roguelike/angband-3.2.0 b/metadata/cache/games-roguelike/angband-3.2.0
index c6ebd490efd3..7486f9161c12 100644
--- a/metadata/cache/games-roguelike/angband-3.2.0
+++ b/metadata/cache/games-roguelike/angband-3.2.0
@@ -1,4 +1,4 @@
-gtk? ( gnome-base/libglade x11-libs/pango x11-libs/gtk+:2 dev-libs/glib:2 ) X? ( x11-libs/libSM x11-libs/libX11 ) !ncurses? ( !X? ( !sdl? ( !gtk? ( sys-libs/ncurses ) ) ) ) sdl? ( media-libs/libsdl[video,X] media-libs/sdl-ttf media-libs/sdl-image sound? ( media-libs/sdl-mixer media-libs/libsdl[audio] ) ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+gtk? ( gnome-base/libglade x11-libs/pango x11-libs/gtk+:2 dev-libs/glib:2 ) X? ( x11-libs/libSM x11-libs/libX11 ) !ncurses? ( !X? ( !sdl? ( !gtk? ( sys-libs/ncurses ) ) ) ) sdl? ( media-libs/libsdl[video,X] media-libs/sdl-ttf media-libs/sdl-image sound? ( media-libs/sdl-mixer media-libs/libsdl[audio] ) ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 gtk? ( gnome-base/libglade x11-libs/pango x11-libs/gtk+:2 dev-libs/glib:2 ) X? ( x11-libs/libSM x11-libs/libX11 ) !ncurses? ( !X? ( !sdl? ( !gtk? ( sys-libs/ncurses ) ) ) ) sdl? ( media-libs/libsdl[video,X] media-libs/sdl-ttf media-libs/sdl-image sound? ( media-libs/sdl-mixer media-libs/libsdl[audio] ) )
 0
 http://rephial.org/downloads/3.2/angband-3.2.0.tar.gz
diff --git a/metadata/cache/games-roguelike/crossfire-client-1.12.0 b/metadata/cache/games-roguelike/crossfire-client-1.12.0
index 7fcf7f82ab1b..082df19e7ad7 100644
--- a/metadata/cache/games-roguelike/crossfire-client-1.12.0
+++ b/metadata/cache/games-roguelike/crossfire-client-1.12.0
@@ -1,4 +1,4 @@
-alsa? ( media-libs/alsa-lib ) gtk? ( x11-libs/gtk+:2 sdl? ( media-libs/libsdl[video] media-libs/sdl-image ) ) net-misc/curl media-libs/freeglut media-libs/libpng sys-libs/zlib dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+alsa? ( media-libs/alsa-lib ) gtk? ( x11-libs/gtk+:2 sdl? ( media-libs/libsdl[video] media-libs/sdl-image ) ) net-misc/curl media-libs/freeglut media-libs/libpng sys-libs/zlib dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 alsa? ( media-libs/alsa-lib ) gtk? ( x11-libs/gtk+:2 sdl? ( media-libs/libsdl[video] media-libs/sdl-image ) ) net-misc/curl media-libs/freeglut media-libs/libpng sys-libs/zlib
 0
 mirror://sourceforge/crossfire/crossfire-client-1.12.0.tar.bz2
diff --git a/metadata/cache/games-roguelike/hengband-1.6.2-r1 b/metadata/cache/games-roguelike/hengband-1.6.2-r1
index 2679be1e3561..2d500244175e 100644
--- a/metadata/cache/games-roguelike/hengband-1.6.2-r1
+++ b/metadata/cache/games-roguelike/hengband-1.6.2-r1
@@ -1,4 +1,4 @@
->=sys-libs/ncurses-5 X? ( x11-libs/libX11 ) X? ( x11-libs/libXt ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=sys-libs/ncurses-5 X? ( x11-libs/libX11 ) X? ( x11-libs/libXt ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=sys-libs/ncurses-5 X? ( x11-libs/libX11 )
 0
 mirror://sourceforge.jp/hengband/10331/hengband-1.6.2.tar.bz2 mirror://gentoo/hengband-1.6.2-mispellings.patch.gz
diff --git a/metadata/cache/games-roguelike/scourge-0.21.1 b/metadata/cache/games-roguelike/scourge-0.21.1
index c1b31c5fc7d9..5c52839e1845 100644
--- a/metadata/cache/games-roguelike/scourge-0.21.1
+++ b/metadata/cache/games-roguelike/scourge-0.21.1
@@ -1,4 +1,4 @@
-virtual/glu virtual/opengl media-libs/freetype:2 media-libs/libsdl[joystick,video] media-libs/sdl-image[png] media-libs/sdl-net media-libs/sdl-mixer[vorbis] media-libs/sdl-ttf virtual/libintl sys-devel/gettext || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+virtual/glu virtual/opengl media-libs/freetype:2 media-libs/libsdl[joystick,video] media-libs/sdl-image[png] media-libs/sdl-net media-libs/sdl-mixer[vorbis] media-libs/sdl-ttf virtual/libintl sys-devel/gettext || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 virtual/glu virtual/opengl media-libs/freetype:2 media-libs/libsdl[joystick,video] media-libs/sdl-image[png] media-libs/sdl-net media-libs/sdl-mixer[vorbis] media-libs/sdl-ttf virtual/libintl
 0
 mirror://sourceforge/scourge/scourge-0.21.1.src.tar.gz mirror://sourceforge/scourge/scourge-0.21.1.data.tar.gz
diff --git a/metadata/cache/games-roguelike/zangband-2.7.4c b/metadata/cache/games-roguelike/zangband-2.7.4c
index d74e244b13b1..eff054acf597 100644
--- a/metadata/cache/games-roguelike/zangband-2.7.4c
+++ b/metadata/cache/games-roguelike/zangband-2.7.4c
@@ -1,4 +1,4 @@
-tk? ( dev-lang/tcl dev-lang/tk ) x11-libs/libXaw x11-proto/xextproto || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+tk? ( dev-lang/tcl dev-lang/tk ) x11-libs/libXaw x11-proto/xextproto || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 tk? ( dev-lang/tcl dev-lang/tk ) x11-libs/libXaw
 0
 ftp://ftp.sunet.se/pub/games/Angband/Variant/ZAngband/zangband-2.7.4c.tar.gz
diff --git a/metadata/cache/games-rpg/adonthell-0.3.5 b/metadata/cache/games-rpg/adonthell-0.3.5
index 67a56a49c508..8d779134dd79 100644
--- a/metadata/cache/games-rpg/adonthell-0.3.5
+++ b/metadata/cache/games-rpg/adonthell-0.3.5
@@ -1,4 +1,4 @@
-media-libs/sdl-ttf media-libs/sdl-mixer[vorbis] media-libs/libsdl[X,video,audio] sys-libs/zlib media-libs/freetype media-libs/libogg media-libs/libvorbis nls? ( virtual/libintl ) dev-lang/swig doc? ( media-gfx/graphviz app-doc/doxygen ) nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool =dev-lang/python-2*
+media-libs/sdl-ttf media-libs/sdl-mixer[vorbis] media-libs/libsdl[X,video,audio] sys-libs/zlib media-libs/freetype media-libs/libogg media-libs/libvorbis nls? ( virtual/libintl ) dev-lang/swig doc? ( media-gfx/graphviz app-doc/doxygen ) nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool =dev-lang/python-2*
 media-libs/sdl-ttf media-libs/sdl-mixer[vorbis] media-libs/libsdl[X,video,audio] sys-libs/zlib media-libs/freetype media-libs/libogg media-libs/libvorbis nls? ( virtual/libintl ) =dev-lang/python-2*
 0
 http://savannah.nongnu.org/download/adonthell/adonthell-src-0.3.5.tar.gz
diff --git a/metadata/cache/games-rpg/daimonin-client-0.10.5 b/metadata/cache/games-rpg/daimonin-client-0.10.5
index 63f8e82e31bf..c5e9f92dc369 100644
--- a/metadata/cache/games-rpg/daimonin-client-0.10.5
+++ b/metadata/cache/games-rpg/daimonin-client-0.10.5
@@ -1,4 +1,4 @@
-media-libs/libsdl[audio,video] media-libs/sdl-mixer[vorbis] media-libs/sdl-image[png] dev-games/physfs net-misc/curl music? ( app-arch/unzip ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+media-libs/libsdl[audio,video] media-libs/sdl-mixer[vorbis] media-libs/sdl-image[png] dev-games/physfs net-misc/curl music? ( app-arch/unzip ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 media-libs/libsdl[audio,video] media-libs/sdl-mixer[vorbis] media-libs/sdl-image[png] dev-games/physfs net-misc/curl
 0
 http://daimonin.svn.sourceforge.net/viewvc/daimonin/main/client/?view=tar&pathrev=6021 -> daimonin-client-0.10.5.tar.gz music? ( mirror://sourceforge/daimonin/Addon%20packs/Music/AllMusic.zip -> daimonin-client-AllMusic-20100827.zip )
diff --git a/metadata/cache/games-rpg/freedroidrpg-0.14.1 b/metadata/cache/games-rpg/freedroidrpg-0.14.1
index 89ea49bf0c7c..e02b1f3f8b0a 100644
--- a/metadata/cache/games-rpg/freedroidrpg-0.14.1
+++ b/metadata/cache/games-rpg/freedroidrpg-0.14.1
@@ -1,4 +1,4 @@
-media-libs/libsdl[opengl?,video] dev-lang/lua virtual/jpeg media-libs/libpng media-libs/sdl-image[jpeg,png] media-libs/sdl-net media-libs/sdl-mixer[vorbis] >=media-libs/sdl-gfx-2.0.21 media-libs/libogg media-libs/libvorbis x11-libs/libX11 opengl? ( virtual/opengl ) x11-libs/libXt dev-lang/python || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool =dev-lang/python-2*
+media-libs/libsdl[opengl?,video] dev-lang/lua virtual/jpeg media-libs/libpng media-libs/sdl-image[jpeg,png] media-libs/sdl-net media-libs/sdl-mixer[vorbis] >=media-libs/sdl-gfx-2.0.21 media-libs/libogg media-libs/libvorbis x11-libs/libX11 opengl? ( virtual/opengl ) x11-libs/libXt dev-lang/python || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool =dev-lang/python-2*
 media-libs/libsdl[opengl?,video] dev-lang/lua virtual/jpeg media-libs/libpng media-libs/sdl-image[jpeg,png] media-libs/sdl-net media-libs/sdl-mixer[vorbis] >=media-libs/sdl-gfx-2.0.21 media-libs/libogg media-libs/libvorbis x11-libs/libX11 opengl? ( virtual/opengl ) =dev-lang/python-2*
 0
 mirror://sourceforge/freedroid/freedroidrpg-0.14.1.tar.gz
diff --git a/metadata/cache/games-rpg/freedroidrpg-0.15 b/metadata/cache/games-rpg/freedroidrpg-0.15
index 6f75a5c24a29..0e89d73158eb 100644
--- a/metadata/cache/games-rpg/freedroidrpg-0.15
+++ b/metadata/cache/games-rpg/freedroidrpg-0.15
@@ -1,4 +1,4 @@
-media-libs/libsdl[opengl?,video] dev-lang/lua virtual/jpeg media-libs/libpng media-libs/sdl-image[jpeg,png] media-libs/sdl-mixer[vorbis?] >=media-libs/sdl-gfx-2.0.21 vorbis? ( media-libs/libogg media-libs/libvorbis ) x11-libs/libX11 opengl? ( virtual/opengl ) dev-lang/python || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool =dev-lang/python-2*
+media-libs/libsdl[opengl?,video] dev-lang/lua virtual/jpeg media-libs/libpng media-libs/sdl-image[jpeg,png] media-libs/sdl-mixer[vorbis?] >=media-libs/sdl-gfx-2.0.21 vorbis? ( media-libs/libogg media-libs/libvorbis ) x11-libs/libX11 opengl? ( virtual/opengl ) dev-lang/python || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool =dev-lang/python-2*
 media-libs/libsdl[opengl?,video] dev-lang/lua virtual/jpeg media-libs/libpng media-libs/sdl-image[jpeg,png] media-libs/sdl-mixer[vorbis?] >=media-libs/sdl-gfx-2.0.21 vorbis? ( media-libs/libogg media-libs/libvorbis ) x11-libs/libX11 opengl? ( virtual/opengl ) =dev-lang/python-2*
 0
 mirror://sourceforge/freedroid/freedroidrpg-0.15.tar.gz
diff --git a/metadata/cache/games-server/crossfire-server-1.11.0 b/metadata/cache/games-server/crossfire-server-1.11.0
index 136b77fe2a94..9b34752c168a 100644
--- a/metadata/cache/games-server/crossfire-server-1.11.0
+++ b/metadata/cache/games-server/crossfire-server-1.11.0
@@ -1,4 +1,4 @@
-net-misc/curl X? ( x11-libs/libXaw media-libs/libpng ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+net-misc/curl X? ( x11-libs/libXaw media-libs/libpng ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 net-misc/curl X? ( x11-libs/libXaw media-libs/libpng )
 0
 mirror://sourceforge/crossfire/crossfire-1.11.0.tar.gz mirror://sourceforge/crossfire/crossfire-1.11.0.maps.tar.gz
diff --git a/metadata/cache/games-server/crossfire-server-1.60.0 b/metadata/cache/games-server/crossfire-server-1.60.0
index 2cc57a37d2e7..e7a344152b34 100644
--- a/metadata/cache/games-server/crossfire-server-1.60.0
+++ b/metadata/cache/games-server/crossfire-server-1.60.0
@@ -1,4 +1,4 @@
-net-misc/curl X? ( x11-libs/libXaw media-libs/libpng ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+net-misc/curl X? ( x11-libs/libXaw media-libs/libpng ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 net-misc/curl X? ( x11-libs/libXaw media-libs/libpng )
 0
 mirror://sourceforge/crossfire/crossfire-1.60.0.tar.gz mirror://sourceforge/crossfire/crossfire-1.60.0.maps.tar.gz
diff --git a/metadata/cache/games-server/cyphesis-0.5.25 b/metadata/cache/games-server/cyphesis-0.5.25
index 84379b51b2e8..768f6b68b6d6 100644
--- a/metadata/cache/games-server/cyphesis-0.5.25
+++ b/metadata/cache/games-server/cyphesis-0.5.25
@@ -1,4 +1,4 @@
->=media-libs/skstream-0.3.6 >=dev-games/wfmath-0.3.9 >=dev-games/mercator-0.2.9:0 dev-libs/libgcrypt dev-libs/libsigc++:2 sys-libs/ncurses sys-libs/readline =media-libs/atlas-c++-0.6* >=media-libs/varconf-0.6.4 dev-db/postgresql-base dev-libs/libxml2 dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool =dev-lang/python-2*
+>=media-libs/skstream-0.3.6 >=dev-games/wfmath-0.3.9 >=dev-games/mercator-0.2.9:0 dev-libs/libgcrypt dev-libs/libsigc++:2 sys-libs/ncurses sys-libs/readline =media-libs/atlas-c++-0.6* >=media-libs/varconf-0.6.4 dev-db/postgresql-base dev-libs/libxml2 dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool =dev-lang/python-2*
 >=media-libs/skstream-0.3.6 >=dev-games/wfmath-0.3.9 >=dev-games/mercator-0.2.9:0 dev-libs/libgcrypt dev-libs/libsigc++:2 sys-libs/ncurses sys-libs/readline =media-libs/atlas-c++-0.6* >=media-libs/varconf-0.6.4 dev-db/postgresql-base =dev-lang/python-2*
 0
 mirror://sourceforge/worldforge/cyphesis-0.5.25.tar.bz2
diff --git a/metadata/cache/games-server/cyphesis-0.5.26 b/metadata/cache/games-server/cyphesis-0.5.26
index 11f32c7e246b..892f719cb795 100644
--- a/metadata/cache/games-server/cyphesis-0.5.26
+++ b/metadata/cache/games-server/cyphesis-0.5.26
@@ -1,4 +1,4 @@
->=media-libs/skstream-0.3.8 >=dev-games/wfmath-0.3.11 >=dev-games/mercator-0.3.0 dev-libs/libgcrypt dev-libs/libsigc++:2 sys-libs/ncurses sys-libs/readline =media-libs/atlas-c++-0.6* >=media-libs/varconf-0.6.4 dev-db/postgresql-base dev-libs/libxml2 dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool =dev-lang/python-2*
+>=media-libs/skstream-0.3.8 >=dev-games/wfmath-0.3.11 >=dev-games/mercator-0.3.0 dev-libs/libgcrypt dev-libs/libsigc++:2 sys-libs/ncurses sys-libs/readline =media-libs/atlas-c++-0.6* >=media-libs/varconf-0.6.4 dev-db/postgresql-base dev-libs/libxml2 dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool =dev-lang/python-2*
 >=media-libs/skstream-0.3.8 >=dev-games/wfmath-0.3.11 >=dev-games/mercator-0.3.0 dev-libs/libgcrypt dev-libs/libsigc++:2 sys-libs/ncurses sys-libs/readline =media-libs/atlas-c++-0.6* >=media-libs/varconf-0.6.4 dev-db/postgresql-base =dev-lang/python-2*
 0
 mirror://sourceforge/worldforge/cyphesis-0.5.26.tar.bz2
diff --git a/metadata/cache/games-simulation/crrcsim-0.9.11 b/metadata/cache/games-simulation/crrcsim-0.9.11
index 7f77bf9a537b..2f04adbf6d3d 100644
--- a/metadata/cache/games-simulation/crrcsim-0.9.11
+++ b/metadata/cache/games-simulation/crrcsim-0.9.11
@@ -1,4 +1,4 @@
-sci-mathematics/cgal media-libs/plib media-libs/libsdl[X,audio,joystick,opengl,video] portaudio? ( media-libs/portaudio ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+sci-mathematics/cgal media-libs/plib media-libs/libsdl[X,audio,joystick,opengl,video] portaudio? ( media-libs/portaudio ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 sci-mathematics/cgal media-libs/plib media-libs/libsdl[X,audio,joystick,opengl,video] portaudio? ( media-libs/portaudio )
 0
 http://download.berlios.de/crrcsim/crrcsim-0.9.11.tar.gz
diff --git a/metadata/cache/games-simulation/fgrun-1.6.0 b/metadata/cache/games-simulation/fgrun-1.6.0
index 2cf03a60fef7..50b75d1a9c6d 100644
--- a/metadata/cache/games-simulation/fgrun-1.6.0
+++ b/metadata/cache/games-simulation/fgrun-1.6.0
@@ -1,4 +1,4 @@
->=dev-games/openscenegraph-3.0.1 sys-libs/zlib x11-libs/fltk:1[opengl,threads] >=dev-games/simgear-2 >=dev-libs/boost-1.34 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-games/openscenegraph-3.0.1 sys-libs/zlib x11-libs/fltk:1[opengl,threads] >=dev-games/simgear-2 >=dev-libs/boost-1.34 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=dev-games/openscenegraph-3.0.1 sys-libs/zlib x11-libs/fltk:1[opengl,threads] >=games-simulation/flightgear-2
 0
 mirror://sourceforge/fgrun/fgrun-1.6.0.tar.gz
diff --git a/metadata/cache/games-simulation/flightgear-1.9.1 b/metadata/cache/games-simulation/flightgear-1.9.1
index 3539b8f378ae..9cac3ef2af82 100644
--- a/metadata/cache/games-simulation/flightgear-1.9.1
+++ b/metadata/cache/games-simulation/flightgear-1.9.1
@@ -1,4 +1,4 @@
-media-libs/freeglut ~dev-games/simgear-1.9.1 dev-games/openscenegraph[png] x11-libs/libXmu || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+media-libs/freeglut ~dev-games/simgear-1.9.1 dev-games/openscenegraph[png] x11-libs/libXmu || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 media-libs/freeglut ~dev-games/simgear-1.9.1 dev-games/openscenegraph[png] x11-libs/libXmu
 0
 mirror://flightgear/Source/FlightGear-1.9.1.tar.gz mirror://flightgear/Shared/FlightGear-data-1.9.0.tar.bz2
diff --git a/metadata/cache/games-simulation/flightgear-2.0.0 b/metadata/cache/games-simulation/flightgear-2.0.0
index ee3c3ca2d529..0194775bddaf 100644
--- a/metadata/cache/games-simulation/flightgear-2.0.0
+++ b/metadata/cache/games-simulation/flightgear-2.0.0
@@ -1,4 +1,4 @@
->=media-libs/freeglut-2.6.0 ~dev-games/simgear-2.0.0 dev-games/openscenegraph[png] x11-libs/libXmu x11-libs/libXi dev-vcs/subversion || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=media-libs/freeglut-2.6.0 ~dev-games/simgear-2.0.0 dev-games/openscenegraph[png] x11-libs/libXmu x11-libs/libXi dev-vcs/subversion || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=media-libs/freeglut-2.6.0 ~dev-games/simgear-2.0.0 dev-games/openscenegraph[png] x11-libs/libXmu x11-libs/libXi dev-vcs/subversion
 0
 mirror://flightgear/Source/FlightGear-2.0.0.tar.gz mirror://flightgear/Shared/FlightGear-data-2.0.0.tar.bz2
diff --git a/metadata/cache/games-simulation/flightgear-2.4.0 b/metadata/cache/games-simulation/flightgear-2.4.0
index e1a26cb39254..f2d1ddce966b 100644
--- a/metadata/cache/games-simulation/flightgear-2.4.0
+++ b/metadata/cache/games-simulation/flightgear-2.4.0
@@ -1,4 +1,4 @@
->=dev-games/openscenegraph-3.0.1[png] dev-vcs/subversion media-libs/freealut media-libs/openal sys-libs/zlib virtual/jpeg x11-libs/libXi x11-libs/libXmu >=dev-libs/boost-1.37 ~dev-games/simgear-2.4.0 >=media-libs/plib-1.8.5 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-games/openscenegraph-3.0.1[png] dev-vcs/subversion media-libs/freealut media-libs/openal sys-libs/zlib virtual/jpeg x11-libs/libXi x11-libs/libXmu >=dev-libs/boost-1.37 ~dev-games/simgear-2.4.0 >=media-libs/plib-1.8.5 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=dev-games/openscenegraph-3.0.1[png] dev-vcs/subversion media-libs/freealut media-libs/openal sys-libs/zlib virtual/jpeg x11-libs/libXi x11-libs/libXmu
 0
 mirror://flightgear/Source/flightgear-2.4.0.tar.bz2 mirror://flightgear/Shared/FlightGear-data-2.4.0.tar.bz2
diff --git a/metadata/cache/games-sports/foobillard-3.0a b/metadata/cache/games-sports/foobillard-3.0a
index 56137227891e..6c2e5134f2ec 100644
--- a/metadata/cache/games-sports/foobillard-3.0a
+++ b/metadata/cache/games-sports/foobillard-3.0a
@@ -1,4 +1,4 @@
-x11-libs/libXaw x11-libs/libXi virtual/opengl virtual/glu >=media-libs/freetype-2.0.9 media-libs/libpng sdl? ( media-libs/libsdl ) !sdl? ( media-libs/freeglut ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+x11-libs/libXaw x11-libs/libXi virtual/opengl virtual/glu >=media-libs/freetype-2.0.9 media-libs/libpng sdl? ( media-libs/libsdl ) !sdl? ( media-libs/freeglut ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 x11-libs/libXaw x11-libs/libXi virtual/opengl virtual/glu >=media-libs/freetype-2.0.9 media-libs/libpng sdl? ( media-libs/libsdl ) !sdl? ( media-libs/freeglut )
 0
 mirror://gentoo/foobillard-3.0a.tar.gz
diff --git a/metadata/cache/games-sports/speed-dreams-1.4.0 b/metadata/cache/games-sports/speed-dreams-1.4.0
index a9f80804a30a..7e2e3e853ce8 100644
--- a/metadata/cache/games-sports/speed-dreams-1.4.0
+++ b/metadata/cache/games-sports/speed-dreams-1.4.0
@@ -1,4 +1,4 @@
-virtual/opengl virtual/glu media-libs/freeglut media-libs/openal media-libs/freealut x11-libs/libX11 x11-libs/libXxf86vm xrandr? ( x11-libs/libXrandr ) sys-libs/zlib >=media-libs/libpng-1.2.40 >=media-libs/plib-1.8.3 x11-proto/xproto x11-libs/libXext x11-libs/libICE x11-libs/libSM x11-libs/libXt x11-libs/libXi x11-libs/libXmu x11-libs/libXrender xrandr? ( x11-proto/randrproto ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+virtual/opengl virtual/glu media-libs/freeglut media-libs/openal media-libs/freealut x11-libs/libX11 x11-libs/libXxf86vm xrandr? ( x11-libs/libXrandr ) sys-libs/zlib >=media-libs/libpng-1.2.40 >=media-libs/plib-1.8.3 x11-proto/xproto x11-libs/libXext x11-libs/libICE x11-libs/libSM x11-libs/libXt x11-libs/libXi x11-libs/libXmu x11-libs/libXrender xrandr? ( x11-proto/randrproto ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 virtual/opengl virtual/glu media-libs/freeglut media-libs/openal media-libs/freealut x11-libs/libX11 x11-libs/libXxf86vm xrandr? ( x11-libs/libXrandr ) sys-libs/zlib >=media-libs/libpng-1.2.40
 0
 mirror://sourceforge/speed-dreams/speed-dreams-1.4.0-r2307-src.tar.bz2
diff --git a/metadata/cache/games-sports/torcs-1.3.1 b/metadata/cache/games-sports/torcs-1.3.1
index c5f5740c199a..4bc07b83a042 100644
--- a/metadata/cache/games-sports/torcs-1.3.1
+++ b/metadata/cache/games-sports/torcs-1.3.1
@@ -1,4 +1,4 @@
->=media-libs/plib-1.8.4 virtual/opengl virtual/glu media-libs/freeglut media-libs/openal media-libs/freealut media-libs/libpng x11-libs/libXrandr x11-libs/libXt x11-proto/xf86vidmodeproto || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=media-libs/plib-1.8.4 virtual/opengl virtual/glu media-libs/freeglut media-libs/openal media-libs/freealut media-libs/libpng x11-libs/libXrandr x11-libs/libXt x11-proto/xf86vidmodeproto || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=media-libs/plib-1.8.4 virtual/opengl virtual/glu media-libs/freeglut media-libs/openal media-libs/freealut media-libs/libpng x11-libs/libXrandr x11-libs/libXt
 0
 mirror://sourceforge/torcs/torcs-1.3.1.tar.bz2
diff --git a/metadata/cache/games-sports/trophy-1.1.5 b/metadata/cache/games-sports/trophy-1.1.5
index ae8348a4c8b3..b9fc9f3e3d0d 100644
--- a/metadata/cache/games-sports/trophy-1.1.5
+++ b/metadata/cache/games-sports/trophy-1.1.5
@@ -1,4 +1,4 @@
-dev-games/clanlib:0.8[opengl] dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-games/clanlib:0.8[opengl] dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-games/clanlib:0.8[opengl]
 0
 mirror://sourceforge/trophy/trophy-1.1.5.tar.gz
diff --git a/metadata/cache/games-sports/ultimatestunts-0.7.6 b/metadata/cache/games-sports/ultimatestunts-0.7.6
index 92d5a3acf532..a11651c420b9 100644
--- a/metadata/cache/games-sports/ultimatestunts-0.7.6
+++ b/metadata/cache/games-sports/ultimatestunts-0.7.6
@@ -1,4 +1,4 @@
-media-libs/libsdl[joystick,opengl,video] media-libs/sdl-image >=media-libs/openal-1 media-libs/libvorbis media-libs/freealut virtual/opengl virtual/glu nls? ( virtual/libintl ) sys-devel/gettext || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+media-libs/libsdl[joystick,opengl,video] media-libs/sdl-image >=media-libs/openal-1 media-libs/libvorbis media-libs/freealut virtual/opengl virtual/glu nls? ( virtual/libintl ) sys-devel/gettext || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 media-libs/libsdl[joystick,opengl,video] media-libs/sdl-image >=media-libs/openal-1 media-libs/libvorbis media-libs/freealut virtual/opengl virtual/glu nls? ( virtual/libintl )
 0
 mirror://sourceforge/ultimatestunts/ultimatestunts-srcdata-0761.tar.gz
diff --git a/metadata/cache/games-strategy/glest-3.2.2 b/metadata/cache/games-strategy/glest-3.2.2
index 94c2b04fadc8..0516fe916166 100644
--- a/metadata/cache/games-strategy/glest-3.2.2
+++ b/metadata/cache/games-strategy/glest-3.2.2
@@ -1,4 +1,4 @@
-media-libs/libsdl[joystick,video] media-libs/libogg media-libs/libvorbis media-libs/openal || ( >=dev-libs/xerces-c-3[icu] >=dev-libs/xerces-c-3[-icu,-iconv] ) virtual/opengl virtual/glu dev-lang/lua x11-libs/libX11 editor? ( x11-libs/wxGTK:2.8[X] ) app-arch/unzip dev-util/ftjam || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+media-libs/libsdl[joystick,video] media-libs/libogg media-libs/libvorbis media-libs/openal || ( >=dev-libs/xerces-c-3[icu] >=dev-libs/xerces-c-3[-icu,-iconv] ) virtual/opengl virtual/glu dev-lang/lua x11-libs/libX11 editor? ( x11-libs/wxGTK:2.8[X] ) app-arch/unzip dev-util/ftjam || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 media-libs/libsdl[joystick,video] media-libs/libogg media-libs/libvorbis media-libs/openal || ( >=dev-libs/xerces-c-3[icu] >=dev-libs/xerces-c-3[-icu,-iconv] ) virtual/opengl virtual/glu dev-lang/lua x11-libs/libX11 editor? ( x11-libs/wxGTK:2.8[X] )
 0
 http://www.titusgames.de/glest-source-3.2.2.tar.bz2 mirror://sourceforge/glest/glest_data_3.2.1.zip mirror://gentoo/glest-3.2.2-tutorial.tar.bz2
diff --git a/metadata/cache/games-strategy/lgeneral-1.2.2 b/metadata/cache/games-strategy/lgeneral-1.2.2
index b46a765164f4..a82ebc9bf3df 100644
--- a/metadata/cache/games-strategy/lgeneral-1.2.2
+++ b/metadata/cache/games-strategy/lgeneral-1.2.2
@@ -1,4 +1,4 @@
-media-libs/libsdl[audio,video] media-libs/sdl-mixer nls? ( virtual/libintl ) sys-devel/gettext || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+media-libs/libsdl[audio,video] media-libs/sdl-mixer nls? ( virtual/libintl ) sys-devel/gettext || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 media-libs/libsdl[audio,video] media-libs/sdl-mixer nls? ( virtual/libintl )
 0
 mirror://sourceforge/lgeneral/lgeneral-1.2.2.tar.gz mirror://sourceforge/lgeneral/pg-data.tar.gz
diff --git a/metadata/cache/games-strategy/liquidwar-5.6.4 b/metadata/cache/games-strategy/liquidwar-5.6.4
index de3a73b79b3c..1dc9aa4e0576 100644
--- a/metadata/cache/games-strategy/liquidwar-5.6.4
+++ b/metadata/cache/games-strategy/liquidwar-5.6.4
@@ -1,5 +1,5 @@
->=media-libs/allegro-4.2:0
->=media-libs/allegro-4.2:0
+>=media-libs/allegro-4.2:0[X]
+>=media-libs/allegro-4.2:0[X]
 0
 http://savannah.nongnu.org/download/liquidwar/liquidwar-5.6.4.tar.gz
 test
diff --git a/metadata/cache/games-strategy/openxcom-9999 b/metadata/cache/games-strategy/openxcom-9999
index 67dfacb32a99..6af12fef8f42 100644
--- a/metadata/cache/games-strategy/openxcom-9999
+++ b/metadata/cache/games-strategy/openxcom-9999
@@ -1,4 +1,4 @@
-doc? ( app-doc/doxygen ) dev-vcs/git || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+doc? ( app-doc/doxygen ) dev-vcs/git || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-cpp/yaml-cpp media-libs/libsdl media-libs/sdl-gfx media-libs/sdl-mixer
 0
 
diff --git a/metadata/cache/games-strategy/scorched3d-43.2a b/metadata/cache/games-strategy/scorched3d-43.2a
index 378ce20ea33e..3c6b1a1257f2 100644
--- a/metadata/cache/games-strategy/scorched3d-43.2a
+++ b/metadata/cache/games-strategy/scorched3d-43.2a
@@ -1,4 +1,4 @@
-media-libs/libsdl[video] media-libs/sdl-net media-libs/libpng virtual/jpeg:0 dev-libs/expat !dedicated? ( virtual/opengl virtual/glu media-libs/libogg media-libs/libvorbis media-libs/openal media-libs/freealut x11-libs/wxGTK:2.8[X] media-libs/freetype:2 sci-libs/fftw:3.0 ) mysql? ( virtual/mysql ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+media-libs/libsdl[video] media-libs/sdl-net media-libs/libpng virtual/jpeg:0 dev-libs/expat !dedicated? ( virtual/opengl virtual/glu media-libs/libogg media-libs/libvorbis media-libs/openal media-libs/freealut x11-libs/wxGTK:2.8[X] media-libs/freetype:2 sci-libs/fftw:3.0 ) mysql? ( virtual/mysql ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 media-libs/libsdl[video] media-libs/sdl-net media-libs/libpng virtual/jpeg:0 dev-libs/expat !dedicated? ( virtual/opengl virtual/glu media-libs/libogg media-libs/libvorbis media-libs/openal media-libs/freealut x11-libs/wxGTK:2.8[X] media-libs/freetype:2 sci-libs/fftw:3.0 ) mysql? ( virtual/mysql )
 0
 mirror://sourceforge/scorched3d/Scorched3D-43.2a-src.tar.gz
diff --git a/metadata/cache/games-strategy/warmux-11.01 b/metadata/cache/games-strategy/warmux-11.01
index ca97c9f8fb37..ffe548df32ba 100644
--- a/metadata/cache/games-strategy/warmux-11.01
+++ b/metadata/cache/games-strategy/warmux-11.01
@@ -1,4 +1,4 @@
-media-libs/libsdl[joystick,video] media-libs/sdl-image[jpeg,png] media-libs/sdl-mixer[vorbis] media-libs/sdl-ttf media-libs/sdl-net media-libs/sdl-gfx net-misc/curl media-fonts/dejavu dev-libs/libxml2 x11-libs/libX11 nls? ( virtual/libintl ) unicode? ( dev-libs/fribidi ) dev-util/pkgconfig nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+media-libs/libsdl[joystick,video] media-libs/sdl-image[jpeg,png] media-libs/sdl-mixer[vorbis] media-libs/sdl-ttf media-libs/sdl-net media-libs/sdl-gfx net-misc/curl media-fonts/dejavu dev-libs/libxml2 x11-libs/libX11 nls? ( virtual/libintl ) unicode? ( dev-libs/fribidi ) dev-util/pkgconfig nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 media-libs/libsdl[joystick,video] media-libs/sdl-image[jpeg,png] media-libs/sdl-mixer[vorbis] media-libs/sdl-ttf media-libs/sdl-net media-libs/sdl-gfx net-misc/curl media-fonts/dejavu dev-libs/libxml2 x11-libs/libX11 nls? ( virtual/libintl ) unicode? ( dev-libs/fribidi )
 0
 http://download.gna.org/warmux/warmux-11.01.tar.bz2
diff --git a/metadata/cache/games-strategy/warmux-11.04.1 b/metadata/cache/games-strategy/warmux-11.04.1
index 80a51ccd3cc7..db16aaf5526d 100644
--- a/metadata/cache/games-strategy/warmux-11.04.1
+++ b/metadata/cache/games-strategy/warmux-11.04.1
@@ -1,4 +1,4 @@
-media-libs/libsdl[joystick,video] media-libs/sdl-image[jpeg,png] media-libs/sdl-mixer[vorbis] media-libs/sdl-ttf media-libs/sdl-net media-libs/sdl-gfx net-misc/curl media-fonts/dejavu dev-libs/libxml2 x11-libs/libX11 nls? ( virtual/libintl ) unicode? ( dev-libs/fribidi ) dev-util/pkgconfig nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+media-libs/libsdl[joystick,video] media-libs/sdl-image[jpeg,png] media-libs/sdl-mixer[vorbis] media-libs/sdl-ttf media-libs/sdl-net media-libs/sdl-gfx net-misc/curl media-fonts/dejavu dev-libs/libxml2 x11-libs/libX11 nls? ( virtual/libintl ) unicode? ( dev-libs/fribidi ) dev-util/pkgconfig nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 media-libs/libsdl[joystick,video] media-libs/sdl-image[jpeg,png] media-libs/sdl-mixer[vorbis] media-libs/sdl-ttf media-libs/sdl-net media-libs/sdl-gfx net-misc/curl media-fonts/dejavu dev-libs/libxml2 x11-libs/libX11 nls? ( virtual/libintl ) unicode? ( dev-libs/fribidi )
 0
 http://download.gna.org/warmux/warmux-11.04.1.tar.bz2
diff --git a/metadata/cache/games-strategy/warzone2100-2.3.8 b/metadata/cache/games-strategy/warzone2100-2.3.8
index 8a344ba0439e..e7babf7ae4b8 100644
--- a/metadata/cache/games-strategy/warzone2100-2.3.8
+++ b/metadata/cache/games-strategy/warzone2100-2.3.8
@@ -1,4 +1,4 @@
-dev-db/sqlite:3 >=dev-games/physfs-2[zip] dev-libs/popt media-libs/libogg media-libs/libpng media-libs/libsdl[opengl,video] media-libs/libtheora media-libs/libvorbis media-libs/openal media-libs/sdl-net media-libs/quesoglc virtual/glu virtual/opengl nls? ( virtual/libintl ) app-arch/zip dev-util/pkgconfig nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-db/sqlite:3 >=dev-games/physfs-2[zip] dev-libs/popt media-libs/libogg media-libs/libpng media-libs/libsdl[opengl,video] media-libs/libtheora media-libs/libvorbis media-libs/openal media-libs/sdl-net media-libs/quesoglc virtual/glu virtual/opengl nls? ( virtual/libintl ) app-arch/zip dev-util/pkgconfig nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-db/sqlite:3 >=dev-games/physfs-2[zip] dev-libs/popt media-libs/libogg media-libs/libpng media-libs/libsdl[opengl,video] media-libs/libtheora media-libs/libvorbis media-libs/openal media-libs/sdl-net media-libs/quesoglc virtual/glu virtual/opengl nls? ( virtual/libintl ) media-fonts/dejavu
 0
 mirror://sourceforge/warzone2100/warzone2100-2.3.8.tar.gz videos? ( mirror://sourceforge/warzone2100/warzone2100/Videos/2.2/high-quality-en/sequences.wz -> warzone2100-videos-2.2.wz )
diff --git a/metadata/cache/games-strategy/warzone2100-2.3.9 b/metadata/cache/games-strategy/warzone2100-2.3.9
index a7a70188b458..b4ebf3896c1d 100644
--- a/metadata/cache/games-strategy/warzone2100-2.3.9
+++ b/metadata/cache/games-strategy/warzone2100-2.3.9
@@ -1,4 +1,4 @@
-dev-db/sqlite:3 >=dev-games/physfs-2[zip] dev-libs/popt media-libs/libogg media-libs/libpng media-libs/libsdl[opengl,video] media-libs/libtheora media-libs/libvorbis media-libs/openal media-libs/sdl-net media-libs/quesoglc virtual/glu virtual/opengl nls? ( virtual/libintl ) sys-devel/bison app-arch/zip dev-util/pkgconfig nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-db/sqlite:3 >=dev-games/physfs-2[zip] dev-libs/popt media-libs/libogg media-libs/libpng media-libs/libsdl[opengl,video] media-libs/libtheora media-libs/libvorbis media-libs/openal media-libs/sdl-net media-libs/quesoglc virtual/glu virtual/opengl nls? ( virtual/libintl ) sys-devel/bison app-arch/zip dev-util/pkgconfig nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-db/sqlite:3 >=dev-games/physfs-2[zip] dev-libs/popt media-libs/libogg media-libs/libpng media-libs/libsdl[opengl,video] media-libs/libtheora media-libs/libvorbis media-libs/openal media-libs/sdl-net media-libs/quesoglc virtual/glu virtual/opengl nls? ( virtual/libintl ) media-fonts/dejavu
 0
 mirror://sourceforge/warzone2100/warzone2100-2.3.9.tar.gz videos? ( mirror://sourceforge/warzone2100/warzone2100/Videos/2.2/high-quality-en/sequences.wz -> warzone2100-videos-2.2.wz )
diff --git a/metadata/cache/games-strategy/wesnoth-1.8.5 b/metadata/cache/games-strategy/wesnoth-1.10.1
similarity index 56%
rename from metadata/cache/games-strategy/wesnoth-1.8.5
rename to metadata/cache/games-strategy/wesnoth-1.10.1
index adf9e452c879..c681cb7cfb11 100644
--- a/metadata/cache/games-strategy/wesnoth-1.8.5
+++ b/metadata/cache/games-strategy/wesnoth-1.10.1
@@ -1,14 +1,14 @@
->=media-libs/libsdl-1.2.7[video,X] media-libs/sdl-net >=media-libs/sdl-ttf-2.0.8 >=media-libs/sdl-mixer-1.2[vorbis] >=media-libs/sdl-image-1.2[jpeg,png] !dedicated? ( dbus? ( sys-apps/dbus ) ) >=dev-libs/boost-1.35 sys-libs/zlib x11-libs/pango dev-lang/lua media-libs/fontconfig virtual/libintl dev-util/pkgconfig !dedicated? ( tinygui? ( || ( media-gfx/imagemagick[jpeg,png] media-gfx/graphicsmagick[imagemagick,jpeg,png] ) ) ) sys-devel/gettext >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
->=media-libs/libsdl-1.2.7[video,X] media-libs/sdl-net >=media-libs/sdl-ttf-2.0.8 >=media-libs/sdl-mixer-1.2[vorbis] >=media-libs/sdl-image-1.2[jpeg,png] !dedicated? ( dbus? ( sys-apps/dbus ) ) >=dev-libs/boost-1.35 sys-libs/zlib x11-libs/pango dev-lang/lua media-libs/fontconfig virtual/libintl
+>=media-libs/libsdl-1.2.7[video,X] media-libs/sdl-net >=media-libs/sdl-ttf-2.0.8 >=media-libs/sdl-mixer-1.2[vorbis] >=media-libs/sdl-image-1.2[jpeg,png] !dedicated? ( dbus? ( sys-apps/dbus ) ) >=dev-libs/boost-1.36 sys-libs/zlib x11-libs/pango dev-lang/lua media-libs/fontconfig virtual/libintl dev-util/pkgconfig sys-devel/gettext >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
+>=media-libs/libsdl-1.2.7[video,X] media-libs/sdl-net >=media-libs/sdl-ttf-2.0.8 >=media-libs/sdl-mixer-1.2[vorbis] >=media-libs/sdl-image-1.2[jpeg,png] !dedicated? ( dbus? ( sys-apps/dbus ) ) >=dev-libs/boost-1.36 sys-libs/zlib x11-libs/pango dev-lang/lua media-libs/fontconfig virtual/libintl
 0
-mirror://sourceforge/wesnoth/wesnoth-1.8.5.tar.bz2
+mirror://sourceforge/wesnoth/wesnoth-1.10.1.tar.bz2
 
 http://www.wesnoth.org/
 GPL-2
 Battle for Wesnoth - A fantasy turn-based strategy game
-amd64 ppc ppc64 x86 ~x86-fbsd
+~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd
 base cmake-utils eutils flag-o-matic games multilib toolchain-funcs user
-dbus dedicated doc nls server tinygui
+dbus dedicated doc nls server
 
 
 
diff --git a/metadata/cache/games-strategy/wesnoth-1.8.6 b/metadata/cache/games-strategy/wesnoth-1.8.6
deleted file mode 100644
index c490cf3cd307..000000000000
--- a/metadata/cache/games-strategy/wesnoth-1.8.6
+++ /dev/null
@@ -1,22 +0,0 @@
->=media-libs/libsdl-1.2.7[video,X] media-libs/sdl-net >=media-libs/sdl-ttf-2.0.8 >=media-libs/sdl-mixer-1.2[vorbis] >=media-libs/sdl-image-1.2[jpeg,png] !dedicated? ( dbus? ( sys-apps/dbus ) ) >=dev-libs/boost-1.35 sys-libs/zlib x11-libs/pango dev-lang/lua media-libs/fontconfig virtual/libintl dev-util/pkgconfig !dedicated? ( tinygui? ( || ( media-gfx/imagemagick[jpeg,png] media-gfx/graphicsmagick[imagemagick,jpeg,png] ) ) ) sys-devel/gettext >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
->=media-libs/libsdl-1.2.7[video,X] media-libs/sdl-net >=media-libs/sdl-ttf-2.0.8 >=media-libs/sdl-mixer-1.2[vorbis] >=media-libs/sdl-image-1.2[jpeg,png] !dedicated? ( dbus? ( sys-apps/dbus ) ) >=dev-libs/boost-1.35 sys-libs/zlib x11-libs/pango dev-lang/lua media-libs/fontconfig virtual/libintl
-0
-mirror://sourceforge/wesnoth/wesnoth-1.8.6.tar.bz2
-
-http://www.wesnoth.org/
-GPL-2
-Battle for Wesnoth - A fantasy turn-based strategy game
-amd64 ppc ppc64 x86 ~x86-fbsd
-base cmake-utils eutils flag-o-matic games multilib toolchain-funcs user
-dbus dedicated doc nls server tinygui
-
-
-
-2
-
-compile configure install postinst preinst prepare setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/games-util/atlas-0.3.1_p20101101 b/metadata/cache/games-util/atlas-0.3.1_p20101101
index 097e06745b53..831b0eb3601e 100644
--- a/metadata/cache/games-util/atlas-0.3.1_p20101101
+++ b/metadata/cache/games-util/atlas-0.3.1_p20101101
@@ -1,4 +1,4 @@
->=games-simulation/flightgear-2 media-libs/freeglut >=media-libs/libpng-1.4 media-libs/plib net-misc/curl virtual/glu virtual/jpeg virtual/opengl x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libICE x11-libs/libSM x11-libs/libXt x11-libs/libXmu || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=games-simulation/flightgear-2 media-libs/freeglut >=media-libs/libpng-1.4 media-libs/plib net-misc/curl virtual/glu virtual/jpeg virtual/opengl x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libICE x11-libs/libSM x11-libs/libXt x11-libs/libXmu || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=games-simulation/flightgear-2 media-libs/freeglut >=media-libs/libpng-1.4 media-libs/plib net-misc/curl virtual/glu virtual/jpeg virtual/opengl x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libICE x11-libs/libSM x11-libs/libXt x11-libs/libXmu
 0
 mirror://gentoo/atlas-0.3.1_p20101101.tar.bz2
diff --git a/metadata/cache/games-util/atlas-0.3.1_p20101101-r1 b/metadata/cache/games-util/atlas-0.3.1_p20101101-r1
index baa65e7c5c58..32f0af9ce8db 100644
--- a/metadata/cache/games-util/atlas-0.3.1_p20101101-r1
+++ b/metadata/cache/games-util/atlas-0.3.1_p20101101-r1
@@ -1,4 +1,4 @@
-media-libs/freeglut >=media-libs/libpng-1.4 net-misc/curl sys-libs/zlib virtual/glu virtual/jpeg virtual/opengl >=dev-games/simgear-2.4.0 media-libs/plib || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+media-libs/freeglut >=media-libs/libpng-1.4 net-misc/curl sys-libs/zlib virtual/glu virtual/jpeg virtual/opengl >=dev-games/simgear-2.4.0 media-libs/plib || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 media-libs/freeglut >=media-libs/libpng-1.4 net-misc/curl sys-libs/zlib virtual/glu virtual/jpeg virtual/opengl >=games-simulation/flightgear-2.4.0
 0
 mirror://gentoo/atlas-0.3.1_p20101101.tar.bz2
diff --git a/metadata/cache/games-util/loki_patch-20091105 b/metadata/cache/games-util/loki_patch-20091105
index 87c272e8bd2d..f0e0a2ac240f 100644
--- a/metadata/cache/games-util/loki_patch-20091105
+++ b/metadata/cache/games-util/loki_patch-20091105
@@ -1,4 +1,4 @@
-dev-util/xdelta:0 dev-libs/libxml2 dev-libs/glib:2 dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-util/xdelta:0 dev-libs/libxml2 dev-libs/glib:2 dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-util/xdelta:0 dev-libs/libxml2 dev-libs/glib:2
 0
 mirror://gentoo/loki_patch-20091105.tar.bz2 mirror://gentoo/loki_setupdb-20091105.tar.bz2
diff --git a/metadata/cache/games-util/pyfa-1.1.3 b/metadata/cache/games-util/pyfa-1.1.3
deleted file mode 100644
index c609d00abadc..000000000000
--- a/metadata/cache/games-util/pyfa-1.1.3
+++ /dev/null
@@ -1,22 +0,0 @@
->=sys-apps/sed-4 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) || ( =dev-lang/python-2.7*[sqlite,threads] =dev-lang/python-2.6*[sqlite,threads] )
-dev-python/sqlalchemy >=dev-python/wxpython-2.8 graph? ( dev-python/matplotlib[wxwidgets] dev-python/numpy ) || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) || ( =dev-lang/python-2.7*[sqlite,threads] =dev-lang/python-2.6*[sqlite,threads] )
-0
-http://dl.evefit.org/stable/1.1.3/pyfa-1.1.3-crucible-src.tar.bz2
-
-http://www.evefit.org/Pyfa
-GPL-3 LGPL-2.1 CCPL-Attribution-2.5 free-noncomm
-Python Fitting Assistant - a ship fitting application for EVE Online
-~amd64 ~x86
-eutils gnome2-utils multilib python toolchain-funcs user
-+graph
-
-
-
-4
-
-install postinst postrm preinst prepare setup
-
-
-
-
-
diff --git a/metadata/cache/games-util/pyfa-1.1.2 b/metadata/cache/games-util/pyfa-1.1.4-r1
similarity index 58%
rename from metadata/cache/games-util/pyfa-1.1.2
rename to metadata/cache/games-util/pyfa-1.1.4-r1
index ba7851dd2b86..992336765843 100644
--- a/metadata/cache/games-util/pyfa-1.1.2
+++ b/metadata/cache/games-util/pyfa-1.1.4-r1
@@ -1,7 +1,7 @@
 >=sys-apps/sed-4 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) || ( =dev-lang/python-2.7*[sqlite,threads] =dev-lang/python-2.6*[sqlite,threads] )
-dev-python/sqlalchemy >=dev-python/wxpython-2.8 graph? ( dev-python/matplotlib[wxwidgets] dev-python/numpy ) || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) || ( =dev-lang/python-2.7*[sqlite,threads] =dev-lang/python-2.6*[sqlite,threads] )
+dev-python/sqlalchemy dev-python/wxpython:2.8 graph? ( dev-python/matplotlib[wxwidgets] dev-python/numpy ) || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) || ( =dev-lang/python-2.7*[sqlite,threads] =dev-lang/python-2.6*[sqlite,threads] )
 0
-http://dl.evefit.org/stable/1.1.2/pyfa-1.1.2-crucible-src.tar.bz2
+http://dl.evefit.org/stable/1.1.4/pyfa-1.1.4-crucible-src.tar.bz2
 
 http://www.evefit.org/Pyfa
 GPL-3 LGPL-2.1 CCPL-Attribution-2.5 free-noncomm
diff --git a/metadata/cache/gnome-base/dconf-0.10.0 b/metadata/cache/gnome-base/dconf-0.10.0
index 8c6cba564458..3df43ca7e1e2 100644
--- a/metadata/cache/gnome-base/dconf-0.10.0
+++ b/metadata/cache/gnome-base/dconf-0.10.0
@@ -1,4 +1,4 @@
->=dev-libs/glib-2.29.90:2 sys-apps/dbus X? ( >=dev-libs/libxml2-2.7.7:2 x11-libs/gtk+:3 ) dev-util/gtk-doc-am doc? ( >=dev-util/gtk-doc-1.15 ) vala? ( dev-lang/vala:0.14 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
+>=dev-libs/glib-2.29.90:2 sys-apps/dbus X? ( >=dev-libs/libxml2-2.7.7:2 x11-libs/gtk+:3 ) dev-util/gtk-doc-am doc? ( >=dev-util/gtk-doc-1.15 ) vala? ( dev-lang/vala:0.14 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
 >=dev-libs/glib-2.29.90:2 sys-apps/dbus X? ( >=dev-libs/libxml2-2.7.7:2 x11-libs/gtk+:3 )
 0
 mirror://gnome/sources/dconf/0.10/dconf-0.10.0.tar.xz
diff --git a/metadata/cache/gnome-base/dconf-0.5.1-r2 b/metadata/cache/gnome-base/dconf-0.5.1-r2
index 146a9e4c976f..e9cfd7b42c40 100644
--- a/metadata/cache/gnome-base/dconf-0.5.1-r2
+++ b/metadata/cache/gnome-base/dconf-0.5.1-r2
@@ -1,4 +1,4 @@
->=dev-libs/glib-2.25.16 >=dev-libs/libgee-0.5.1:0 >=dev-libs/libxml2-2.7.7 x11-libs/gtk+:2 introspection? ( >=dev-libs/gobject-introspection-0.9.3 ) vala? ( >=dev-lang/vala-0.9.5:0.10 ) dev-util/gtk-doc-am doc? ( >=dev-util/gtk-doc-1.15 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+>=dev-libs/glib-2.25.16 >=dev-libs/libgee-0.5.1:0 >=dev-libs/libxml2-2.7.7 x11-libs/gtk+:2 introspection? ( >=dev-libs/gobject-introspection-0.9.3 ) vala? ( >=dev-lang/vala-0.9.5:0.10 ) dev-util/gtk-doc-am doc? ( >=dev-util/gtk-doc-1.15 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 >=dev-libs/glib-2.25.16 >=dev-libs/libgee-0.5.1:0 >=dev-libs/libxml2-2.7.7 x11-libs/gtk+:2 introspection? ( >=dev-libs/gobject-introspection-0.9.3 ) vala? ( >=dev-lang/vala-0.9.5:0.10 )
 0
 mirror://gnome/sources/dconf/0.5/dconf-0.5.1.tar.bz2 mirror://gentoo/introspection.m4.bz2
diff --git a/metadata/cache/gnome-base/dconf-0.8.0 b/metadata/cache/gnome-base/dconf-0.8.0
index 1ac129684334..7025d27044d9 100644
--- a/metadata/cache/gnome-base/dconf-0.8.0
+++ b/metadata/cache/gnome-base/dconf-0.8.0
@@ -1,4 +1,4 @@
->=dev-libs/glib-2.27.3:2 sys-apps/dbus X? ( >=dev-libs/libxml2-2.7.7 x11-libs/gtk+:3 ) dev-util/gtk-doc-am doc? ( >=dev-util/gtk-doc-1.15 ) vala? ( >=dev-lang/vala-0.11.7:0.12 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
+>=dev-libs/glib-2.27.3:2 sys-apps/dbus X? ( >=dev-libs/libxml2-2.7.7 x11-libs/gtk+:3 ) dev-util/gtk-doc-am doc? ( >=dev-util/gtk-doc-1.15 ) vala? ( >=dev-lang/vala-0.11.7:0.12 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
 >=dev-libs/glib-2.27.3:2 sys-apps/dbus X? ( >=dev-libs/libxml2-2.7.7 x11-libs/gtk+:3 ) bash-completion? ( app-admin/eselect )
 0
 mirror://gnome/sources/dconf/0.8/dconf-0.8.0.tar.xz
diff --git a/metadata/cache/gnome-base/gdm-2.32.1 b/metadata/cache/gnome-base/gdm-2.32.1
index 70b99089b7b7..281302168590 100644
--- a/metadata/cache/gnome-base/gdm-2.32.1
+++ b/metadata/cache/gnome-base/gdm-2.32.1
@@ -1,4 +1,4 @@
->=dev-libs/dbus-glib-0.74 >=dev-libs/glib-2.22:2 >=x11-libs/gtk+-2.20.2:2 >=x11-libs/pango-1.3 >=media-libs/libcanberra-0.4[gtk] >=gnome-base/gconf-2.31.3 >=gnome-base/gnome-panel-2[bonobo] <gnome-base/gnome-panel-2.91 >=gnome-base/gnome-session-2.28 >=x11-misc/xdg-utils-1.0.2-r3 >=sys-power/upower-0.9 app-text/iso-codes x11-base/xorg-server x11-libs/libXi x11-libs/libXau x11-libs/libX11 x11-libs/libXdmcp x11-libs/libXext x11-libs/libXft x11-apps/sessreg virtual/pam consolekit? ( sys-auth/consolekit ) accessibility? ( x11-libs/libXevie ) gnome-keyring? ( >=gnome-base/gnome-keyring-2.22[pam] ) selinux? ( sys-libs/libselinux ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) xinerama? ( x11-libs/libXinerama ) xklavier? ( >=x11-libs/libxklavier-4 ) !gnome-extra/fast-user-switch-applet test? ( >=dev-libs/check-0.9.4 ) xinerama? ( x11-proto/xineramaproto ) app-text/docbook-xml-dtd:4.1.2 sys-devel/gettext x11-proto/inputproto >=dev-util/intltool-0.40 >=dev-util/pkgconfig-0.19 >=app-text/scrollkeeper-0.1.4 >=app-text/gnome-doc-utils-0.3.2 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+>=dev-libs/dbus-glib-0.74 >=dev-libs/glib-2.22:2 >=x11-libs/gtk+-2.20.2:2 >=x11-libs/pango-1.3 >=media-libs/libcanberra-0.4[gtk] >=gnome-base/gconf-2.31.3 >=gnome-base/gnome-panel-2[bonobo] <gnome-base/gnome-panel-2.91 >=gnome-base/gnome-session-2.28 >=x11-misc/xdg-utils-1.0.2-r3 >=sys-power/upower-0.9 app-text/iso-codes x11-base/xorg-server x11-libs/libXi x11-libs/libXau x11-libs/libX11 x11-libs/libXdmcp x11-libs/libXext x11-libs/libXft x11-apps/sessreg virtual/pam consolekit? ( sys-auth/consolekit ) accessibility? ( x11-libs/libXevie ) gnome-keyring? ( >=gnome-base/gnome-keyring-2.22[pam] ) selinux? ( sys-libs/libselinux ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) xinerama? ( x11-libs/libXinerama ) xklavier? ( >=x11-libs/libxklavier-4 ) !gnome-extra/fast-user-switch-applet test? ( >=dev-libs/check-0.9.4 ) xinerama? ( x11-proto/xineramaproto ) app-text/docbook-xml-dtd:4.1.2 sys-devel/gettext x11-proto/inputproto >=dev-util/intltool-0.40 >=dev-util/pkgconfig-0.19 >=app-text/scrollkeeper-0.1.4 >=app-text/gnome-doc-utils-0.3.2 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 >=dev-libs/dbus-glib-0.74 >=dev-libs/glib-2.22:2 >=x11-libs/gtk+-2.20.2:2 >=x11-libs/pango-1.3 >=media-libs/libcanberra-0.4[gtk] >=gnome-base/gconf-2.31.3 >=gnome-base/gnome-panel-2[bonobo] <gnome-base/gnome-panel-2.91 >=gnome-base/gnome-session-2.28 >=x11-misc/xdg-utils-1.0.2-r3 >=sys-power/upower-0.9 app-text/iso-codes x11-base/xorg-server x11-libs/libXi x11-libs/libXau x11-libs/libX11 x11-libs/libXdmcp x11-libs/libXext x11-libs/libXft x11-apps/sessreg virtual/pam consolekit? ( sys-auth/consolekit ) accessibility? ( x11-libs/libXevie ) gnome-keyring? ( >=gnome-base/gnome-keyring-2.22[pam] ) selinux? ( sys-libs/libselinux ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) xinerama? ( x11-libs/libXinerama ) xklavier? ( >=x11-libs/libxklavier-4 ) !gnome-extra/fast-user-switch-applet
 0
 mirror://gnome/sources/gdm/2.32/gdm-2.32.1.tar.bz2 mirror://gentoo/gdm-2.20.9-gentoo-files-r1.tar.bz2
diff --git a/metadata/cache/gnome-base/gdm-2.32.1-r1 b/metadata/cache/gnome-base/gdm-2.32.1-r1
index 70b99089b7b7..281302168590 100644
--- a/metadata/cache/gnome-base/gdm-2.32.1-r1
+++ b/metadata/cache/gnome-base/gdm-2.32.1-r1
@@ -1,4 +1,4 @@
->=dev-libs/dbus-glib-0.74 >=dev-libs/glib-2.22:2 >=x11-libs/gtk+-2.20.2:2 >=x11-libs/pango-1.3 >=media-libs/libcanberra-0.4[gtk] >=gnome-base/gconf-2.31.3 >=gnome-base/gnome-panel-2[bonobo] <gnome-base/gnome-panel-2.91 >=gnome-base/gnome-session-2.28 >=x11-misc/xdg-utils-1.0.2-r3 >=sys-power/upower-0.9 app-text/iso-codes x11-base/xorg-server x11-libs/libXi x11-libs/libXau x11-libs/libX11 x11-libs/libXdmcp x11-libs/libXext x11-libs/libXft x11-apps/sessreg virtual/pam consolekit? ( sys-auth/consolekit ) accessibility? ( x11-libs/libXevie ) gnome-keyring? ( >=gnome-base/gnome-keyring-2.22[pam] ) selinux? ( sys-libs/libselinux ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) xinerama? ( x11-libs/libXinerama ) xklavier? ( >=x11-libs/libxklavier-4 ) !gnome-extra/fast-user-switch-applet test? ( >=dev-libs/check-0.9.4 ) xinerama? ( x11-proto/xineramaproto ) app-text/docbook-xml-dtd:4.1.2 sys-devel/gettext x11-proto/inputproto >=dev-util/intltool-0.40 >=dev-util/pkgconfig-0.19 >=app-text/scrollkeeper-0.1.4 >=app-text/gnome-doc-utils-0.3.2 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+>=dev-libs/dbus-glib-0.74 >=dev-libs/glib-2.22:2 >=x11-libs/gtk+-2.20.2:2 >=x11-libs/pango-1.3 >=media-libs/libcanberra-0.4[gtk] >=gnome-base/gconf-2.31.3 >=gnome-base/gnome-panel-2[bonobo] <gnome-base/gnome-panel-2.91 >=gnome-base/gnome-session-2.28 >=x11-misc/xdg-utils-1.0.2-r3 >=sys-power/upower-0.9 app-text/iso-codes x11-base/xorg-server x11-libs/libXi x11-libs/libXau x11-libs/libX11 x11-libs/libXdmcp x11-libs/libXext x11-libs/libXft x11-apps/sessreg virtual/pam consolekit? ( sys-auth/consolekit ) accessibility? ( x11-libs/libXevie ) gnome-keyring? ( >=gnome-base/gnome-keyring-2.22[pam] ) selinux? ( sys-libs/libselinux ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) xinerama? ( x11-libs/libXinerama ) xklavier? ( >=x11-libs/libxklavier-4 ) !gnome-extra/fast-user-switch-applet test? ( >=dev-libs/check-0.9.4 ) xinerama? ( x11-proto/xineramaproto ) app-text/docbook-xml-dtd:4.1.2 sys-devel/gettext x11-proto/inputproto >=dev-util/intltool-0.40 >=dev-util/pkgconfig-0.19 >=app-text/scrollkeeper-0.1.4 >=app-text/gnome-doc-utils-0.3.2 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 >=dev-libs/dbus-glib-0.74 >=dev-libs/glib-2.22:2 >=x11-libs/gtk+-2.20.2:2 >=x11-libs/pango-1.3 >=media-libs/libcanberra-0.4[gtk] >=gnome-base/gconf-2.31.3 >=gnome-base/gnome-panel-2[bonobo] <gnome-base/gnome-panel-2.91 >=gnome-base/gnome-session-2.28 >=x11-misc/xdg-utils-1.0.2-r3 >=sys-power/upower-0.9 app-text/iso-codes x11-base/xorg-server x11-libs/libXi x11-libs/libXau x11-libs/libX11 x11-libs/libXdmcp x11-libs/libXext x11-libs/libXft x11-apps/sessreg virtual/pam consolekit? ( sys-auth/consolekit ) accessibility? ( x11-libs/libXevie ) gnome-keyring? ( >=gnome-base/gnome-keyring-2.22[pam] ) selinux? ( sys-libs/libselinux ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) xinerama? ( x11-libs/libXinerama ) xklavier? ( >=x11-libs/libxklavier-4 ) !gnome-extra/fast-user-switch-applet
 0
 mirror://gnome/sources/gdm/2.32/gdm-2.32.1.tar.bz2 mirror://gentoo/gdm-2.20.9-gentoo-files-r1.tar.bz2
diff --git a/metadata/cache/gnome-base/gdm-3.2.1.1-r1 b/metadata/cache/gnome-base/gdm-3.2.1.1-r1
index 06c256f9e586..17835b9629f6 100644
--- a/metadata/cache/gnome-base/gdm-3.2.1.1-r1
+++ b/metadata/cache/gnome-base/gdm-3.2.1.1-r1
@@ -1,4 +1,4 @@
->=dev-libs/dbus-glib-0.74 >=dev-libs/glib-2.29.3:2 >=x11-libs/gtk+-2.91.1:3 >=x11-libs/pango-1.3 dev-libs/nspr >=dev-libs/nss-3.11.1 >=media-libs/fontconfig-2.5.0 >=media-libs/libcanberra-0.4[gtk3] >=gnome-base/gconf-2.31.3 >=x11-misc/xdg-utils-1.0.2-r3 >=sys-power/upower-0.9 >=sys-apps/accountsservice-0.6.12 gnome-base/dconf >=gnome-base/gnome-settings-daemon-3.1.4 gnome-base/gsettings-desktop-schemas sys-apps/dbus app-text/iso-codes x11-base/xorg-server x11-libs/libXi x11-libs/libXau x11-libs/libX11 x11-libs/libXdmcp x11-libs/libXext x11-libs/libXft x11-libs/libXrandr x11-apps/sessreg virtual/pam consolekit? ( sys-auth/consolekit ) accessibility? ( x11-libs/libXevie ) gnome-keyring? ( >=gnome-base/gnome-keyring-2.22[pam] ) introspection? ( >=dev-libs/gobject-introspection-0.9.12 ) selinux? ( sys-libs/libselinux ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) xinerama? ( x11-libs/libXinerama ) xklavier? ( >=x11-libs/libxklavier-4 ) test? ( >=dev-libs/check-0.9.4 ) xinerama? ( x11-proto/xineramaproto ) app-text/docbook-xml-dtd:4.1.2 sys-devel/gettext x11-proto/inputproto x11-proto/randrproto >=dev-util/intltool-0.40.0 >=dev-util/pkgconfig-0.19 >=app-text/scrollkeeper-0.1.4 >=app-text/gnome-doc-utils-0.3.2 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 !<sys-apps/systemd-29-r4 !=sys-apps/systemd-37-r1
+>=dev-libs/dbus-glib-0.74 >=dev-libs/glib-2.29.3:2 >=x11-libs/gtk+-2.91.1:3 >=x11-libs/pango-1.3 dev-libs/nspr >=dev-libs/nss-3.11.1 >=media-libs/fontconfig-2.5.0 >=media-libs/libcanberra-0.4[gtk3] >=gnome-base/gconf-2.31.3 >=x11-misc/xdg-utils-1.0.2-r3 >=sys-power/upower-0.9 >=sys-apps/accountsservice-0.6.12 gnome-base/dconf >=gnome-base/gnome-settings-daemon-3.1.4 gnome-base/gsettings-desktop-schemas sys-apps/dbus app-text/iso-codes x11-base/xorg-server x11-libs/libXi x11-libs/libXau x11-libs/libX11 x11-libs/libXdmcp x11-libs/libXext x11-libs/libXft x11-libs/libXrandr x11-apps/sessreg virtual/pam consolekit? ( sys-auth/consolekit ) accessibility? ( x11-libs/libXevie ) gnome-keyring? ( >=gnome-base/gnome-keyring-2.22[pam] ) introspection? ( >=dev-libs/gobject-introspection-0.9.12 ) selinux? ( sys-libs/libselinux ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) xinerama? ( x11-libs/libXinerama ) xklavier? ( >=x11-libs/libxklavier-4 ) test? ( >=dev-libs/check-0.9.4 ) xinerama? ( x11-proto/xineramaproto ) app-text/docbook-xml-dtd:4.1.2 sys-devel/gettext x11-proto/inputproto x11-proto/randrproto >=dev-util/intltool-0.40.0 >=dev-util/pkgconfig-0.19 >=app-text/scrollkeeper-0.1.4 >=app-text/gnome-doc-utils-0.3.2 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 !<sys-apps/systemd-29-r4 !=sys-apps/systemd-37-r1
 >=dev-libs/dbus-glib-0.74 >=dev-libs/glib-2.29.3:2 >=x11-libs/gtk+-2.91.1:3 >=x11-libs/pango-1.3 dev-libs/nspr >=dev-libs/nss-3.11.1 >=media-libs/fontconfig-2.5.0 >=media-libs/libcanberra-0.4[gtk3] >=gnome-base/gconf-2.31.3 >=x11-misc/xdg-utils-1.0.2-r3 >=sys-power/upower-0.9 >=sys-apps/accountsservice-0.6.12 gnome-base/dconf >=gnome-base/gnome-settings-daemon-3.1.4 gnome-base/gsettings-desktop-schemas sys-apps/dbus app-text/iso-codes x11-base/xorg-server x11-libs/libXi x11-libs/libXau x11-libs/libX11 x11-libs/libXdmcp x11-libs/libXext x11-libs/libXft x11-libs/libXrandr x11-apps/sessreg virtual/pam consolekit? ( sys-auth/consolekit ) accessibility? ( x11-libs/libXevie ) gnome-keyring? ( >=gnome-base/gnome-keyring-2.22[pam] ) introspection? ( >=dev-libs/gobject-introspection-0.9.12 ) selinux? ( sys-libs/libselinux ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) xinerama? ( x11-libs/libXinerama ) xklavier? ( >=x11-libs/libxklavier-4 ) >=gnome-base/gnome-session-2.91.92 x11-apps/xhost x11-themes/gnome-icon-theme-symbolic accessibility? ( app-accessibility/gnome-mag app-accessibility/gok app-accessibility/orca gnome-extra/at-spi:1 ) consolekit? ( gnome-extra/polkit-gnome ) fprint? ( sys-auth/fprintd sys-auth/pam_fprint ) gnome-shell? ( >=gnome-base/gnome-shell-3.1.90 ) !gnome-shell? ( x11-wm/metacity ) smartcard? ( app-crypt/coolkey sys-auth/pam_pkcs11 ) !gnome-extra/fast-user-switch-applet
 0
 mirror://gnome/sources/gdm/3.2/gdm-3.2.1.1.tar.xz http://dev.gentoo.org/~tetromino/distfiles/gdm/gdm-3.2.1.1-gentoo-files.tar.xz
diff --git a/metadata/cache/gnome-base/gdm-3.2.1.1-r2 b/metadata/cache/gnome-base/gdm-3.2.1.1-r2
index df60b1f8e04d..db3d5f6d5277 100644
--- a/metadata/cache/gnome-base/gdm-3.2.1.1-r2
+++ b/metadata/cache/gnome-base/gdm-3.2.1.1-r2
@@ -1,4 +1,4 @@
->=dev-libs/dbus-glib-0.74 >=dev-libs/glib-2.29.3:2 >=x11-libs/gtk+-2.91.1:3 >=x11-libs/pango-1.3 dev-libs/nspr >=dev-libs/nss-3.11.1 >=media-libs/fontconfig-2.5.0 >=media-libs/libcanberra-0.4[gtk3] >=gnome-base/gconf-2.31.3 >=x11-misc/xdg-utils-1.0.2-r3 >=sys-power/upower-0.9 >=sys-apps/accountsservice-0.6.12 gnome-base/dconf >=gnome-base/gnome-settings-daemon-3.1.4 gnome-base/gsettings-desktop-schemas sys-apps/dbus app-text/iso-codes x11-base/xorg-server x11-libs/libXi x11-libs/libXau x11-libs/libX11 x11-libs/libXdmcp x11-libs/libXext x11-libs/libXft x11-libs/libXrandr x11-apps/sessreg virtual/pam consolekit? ( sys-auth/consolekit ) accessibility? ( x11-libs/libXevie ) gnome-keyring? ( >=gnome-base/gnome-keyring-2.22[pam] ) introspection? ( >=dev-libs/gobject-introspection-0.9.12 ) selinux? ( sys-libs/libselinux ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) xinerama? ( x11-libs/libXinerama ) xklavier? ( >=x11-libs/libxklavier-4 ) test? ( >=dev-libs/check-0.9.4 ) xinerama? ( x11-proto/xineramaproto ) app-text/docbook-xml-dtd:4.1.2 sys-devel/gettext x11-proto/inputproto x11-proto/randrproto >=dev-util/intltool-0.40.0 >=dev-util/pkgconfig-0.19 >=app-text/scrollkeeper-0.1.4 >=app-text/gnome-doc-utils-0.3.2 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 !<sys-apps/systemd-29-r4 !=sys-apps/systemd-37-r1
+>=dev-libs/dbus-glib-0.74 >=dev-libs/glib-2.29.3:2 >=x11-libs/gtk+-2.91.1:3 >=x11-libs/pango-1.3 dev-libs/nspr >=dev-libs/nss-3.11.1 >=media-libs/fontconfig-2.5.0 >=media-libs/libcanberra-0.4[gtk3] >=gnome-base/gconf-2.31.3 >=x11-misc/xdg-utils-1.0.2-r3 >=sys-power/upower-0.9 >=sys-apps/accountsservice-0.6.12 gnome-base/dconf >=gnome-base/gnome-settings-daemon-3.1.4 gnome-base/gsettings-desktop-schemas sys-apps/dbus app-text/iso-codes x11-base/xorg-server x11-libs/libXi x11-libs/libXau x11-libs/libX11 x11-libs/libXdmcp x11-libs/libXext x11-libs/libXft x11-libs/libXrandr x11-apps/sessreg virtual/pam consolekit? ( sys-auth/consolekit ) accessibility? ( x11-libs/libXevie ) gnome-keyring? ( >=gnome-base/gnome-keyring-2.22[pam] ) introspection? ( >=dev-libs/gobject-introspection-0.9.12 ) selinux? ( sys-libs/libselinux ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) xinerama? ( x11-libs/libXinerama ) xklavier? ( >=x11-libs/libxklavier-4 ) test? ( >=dev-libs/check-0.9.4 ) xinerama? ( x11-proto/xineramaproto ) app-text/docbook-xml-dtd:4.1.2 sys-devel/gettext x11-proto/inputproto x11-proto/randrproto >=dev-util/intltool-0.40.0 >=dev-util/pkgconfig-0.19 >=app-text/scrollkeeper-0.1.4 >=app-text/gnome-doc-utils-0.3.2 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 !<sys-apps/systemd-29-r4 !=sys-apps/systemd-37-r1
 >=dev-libs/dbus-glib-0.74 >=dev-libs/glib-2.29.3:2 >=x11-libs/gtk+-2.91.1:3 >=x11-libs/pango-1.3 dev-libs/nspr >=dev-libs/nss-3.11.1 >=media-libs/fontconfig-2.5.0 >=media-libs/libcanberra-0.4[gtk3] >=gnome-base/gconf-2.31.3 >=x11-misc/xdg-utils-1.0.2-r3 >=sys-power/upower-0.9 >=sys-apps/accountsservice-0.6.12 gnome-base/dconf >=gnome-base/gnome-settings-daemon-3.1.4 gnome-base/gsettings-desktop-schemas sys-apps/dbus app-text/iso-codes x11-base/xorg-server x11-libs/libXi x11-libs/libXau x11-libs/libX11 x11-libs/libXdmcp x11-libs/libXext x11-libs/libXft x11-libs/libXrandr x11-apps/sessreg virtual/pam consolekit? ( sys-auth/consolekit ) accessibility? ( x11-libs/libXevie ) gnome-keyring? ( >=gnome-base/gnome-keyring-2.22[pam] ) introspection? ( >=dev-libs/gobject-introspection-0.9.12 ) selinux? ( sys-libs/libselinux ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) xinerama? ( x11-libs/libXinerama ) xklavier? ( >=x11-libs/libxklavier-4 ) >=gnome-base/gnome-session-2.91.92 x11-apps/xhost x11-themes/gnome-icon-theme-symbolic accessibility? ( app-accessibility/gnome-mag app-accessibility/gok app-accessibility/orca gnome-extra/at-spi:1 ) consolekit? ( gnome-extra/polkit-gnome ) fallback? ( x11-wm/metacity ) fprint? ( sys-auth/fprintd sys-auth/pam_fprint ) gnome-shell? ( >=gnome-base/gnome-shell-3.1.90 ) !gnome-shell? ( x11-wm/metacity ) smartcard? ( app-crypt/coolkey sys-auth/pam_pkcs11 ) !gnome-extra/fast-user-switch-applet
 0
 mirror://gnome/sources/gdm/3.2/gdm-3.2.1.1.tar.xz
diff --git a/metadata/cache/gnome-base/gnome-applets-2.32.1.1 b/metadata/cache/gnome-base/gnome-applets-2.32.1.1
index 16783d087078..98c42f38c716 100644
--- a/metadata/cache/gnome-base/gnome-applets-2.32.1.1
+++ b/metadata/cache/gnome-base/gnome-applets-2.32.1.1
@@ -1,4 +1,4 @@
->=x11-libs/gtk+-2.20:2 >=dev-libs/glib-2.22:2 >=gnome-base/gconf-2.8:2 >=gnome-base/gnome-panel-2.31.2[bonobo] >=x11-libs/libxklavier-4.0 >=x11-libs/libwnck-2.9.3:1 >=gnome-base/gnome-desktop-2.11.1:2 >=x11-libs/libnotify-0.3.2 >=sys-apps/dbus-1.1.2 >=dev-libs/dbus-glib-0.74 >=dev-libs/libxml2-2.5.0:2 >=x11-themes/gnome-icon-theme-2.15.91 >=dev-libs/libgweather-2.22.1:2 <dev-libs/libgweather-2.91:2 x11-libs/libX11 gnome? ( gnome-base/gnome-settings-daemon gnome-base/libgnome >=gnome-extra/gucharmap-2.23 >=gnome-base/libgtop-2.11.92:2 >=dev-python/pygobject-2.6:2 >=dev-python/pygtk-2.6:2 >=dev-python/gconf-python-2.10:2 >=dev-python/gnome-applets-python-2.10 ) gstreamer? ( >=media-libs/gstreamer-0.10.2:0.10 >=media-libs/gst-plugins-base-0.10.14:0.10 || ( >=media-plugins/gst-plugins-alsa-0.10.14:0.10 >=media-plugins/gst-plugins-oss-0.10.14:0.10 ) ) networkmanager? ( >=net-misc/networkmanager-0.7.0 ) policykit? ( >=sys-auth/polkit-0.92 ) >=app-text/scrollkeeper-0.1.4 >=app-text/gnome-doc-utils-0.3.2 >=dev-util/pkgconfig-0.19 >=dev-util/intltool-0.35 dev-libs/libxslt ~app-text/docbook-xml-dtd-4.3 gnome-base/gnome-common >=sys-apps/sed-4 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=x11-libs/gtk+-2.20:2 >=dev-libs/glib-2.22:2 >=gnome-base/gconf-2.8:2 >=gnome-base/gnome-panel-2.31.2[bonobo] >=x11-libs/libxklavier-4.0 >=x11-libs/libwnck-2.9.3:1 >=gnome-base/gnome-desktop-2.11.1:2 >=x11-libs/libnotify-0.3.2 >=sys-apps/dbus-1.1.2 >=dev-libs/dbus-glib-0.74 >=dev-libs/libxml2-2.5.0:2 >=x11-themes/gnome-icon-theme-2.15.91 >=dev-libs/libgweather-2.22.1:2 <dev-libs/libgweather-2.91:2 x11-libs/libX11 gnome? ( gnome-base/gnome-settings-daemon gnome-base/libgnome >=gnome-extra/gucharmap-2.23 >=gnome-base/libgtop-2.11.92:2 >=dev-python/pygobject-2.6:2 >=dev-python/pygtk-2.6:2 >=dev-python/gconf-python-2.10:2 >=dev-python/gnome-applets-python-2.10 ) gstreamer? ( >=media-libs/gstreamer-0.10.2:0.10 >=media-libs/gst-plugins-base-0.10.14:0.10 || ( >=media-plugins/gst-plugins-alsa-0.10.14:0.10 >=media-plugins/gst-plugins-oss-0.10.14:0.10 ) ) networkmanager? ( >=net-misc/networkmanager-0.7.0 ) policykit? ( >=sys-auth/polkit-0.92 ) >=app-text/scrollkeeper-0.1.4 >=app-text/gnome-doc-utils-0.3.2 >=dev-util/pkgconfig-0.19 >=dev-util/intltool-0.35 dev-libs/libxslt ~app-text/docbook-xml-dtd-4.3 gnome-base/gnome-common >=sys-apps/sed-4 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=x11-libs/gtk+-2.20:2 >=dev-libs/glib-2.22:2 >=gnome-base/gconf-2.8:2 >=gnome-base/gnome-panel-2.31.2[bonobo] >=x11-libs/libxklavier-4.0 >=x11-libs/libwnck-2.9.3:1 >=gnome-base/gnome-desktop-2.11.1:2 >=x11-libs/libnotify-0.3.2 >=sys-apps/dbus-1.1.2 >=dev-libs/dbus-glib-0.74 >=dev-libs/libxml2-2.5.0:2 >=x11-themes/gnome-icon-theme-2.15.91 >=dev-libs/libgweather-2.22.1:2 <dev-libs/libgweather-2.91:2 x11-libs/libX11 gnome? ( gnome-base/gnome-settings-daemon gnome-base/libgnome >=gnome-extra/gucharmap-2.23 >=gnome-base/libgtop-2.11.92:2 >=dev-python/pygobject-2.6:2 >=dev-python/pygtk-2.6:2 >=dev-python/gconf-python-2.10:2 >=dev-python/gnome-applets-python-2.10 ) gstreamer? ( >=media-libs/gstreamer-0.10.2:0.10 >=media-libs/gst-plugins-base-0.10.14:0.10 || ( >=media-plugins/gst-plugins-alsa-0.10.14:0.10 >=media-plugins/gst-plugins-oss-0.10.14:0.10 ) ) networkmanager? ( >=net-misc/networkmanager-0.7.0 ) policykit? ( >=sys-auth/polkit-0.92 ) || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
 0
 mirror://gnome/sources/gnome-applets/2.32/gnome-applets-2.32.1.1.tar.bz2
diff --git a/metadata/cache/gnome-base/gnome-control-center-3.2.2 b/metadata/cache/gnome-base/gnome-control-center-3.2.2
index e3ffe20a952c..e6ec810e43d5 100644
--- a/metadata/cache/gnome-base/gnome-control-center-3.2.2
+++ b/metadata/cache/gnome-base/gnome-control-center-3.2.2
@@ -1,4 +1,4 @@
->=dev-libs/glib-2.29.14:2 >=x11-libs/gdk-pixbuf-2.23.0:2 >=x11-libs/gtk+-3.1.19:3 >=gnome-base/gsettings-desktop-schemas-3.0.2 >=gnome-base/gconf-2.0:2 >=dev-libs/dbus-glib-0.73 >=gnome-base/gnome-desktop-3.1.0:3 >=gnome-base/gnome-settings-daemon-3.1.4[colord(+)?,policykit] >=gnome-base/libgnomekbd-2.91.91 app-text/iso-codes dev-libs/libxml2:2 gnome-base/gnome-menus:3 gnome-base/libgtop:2 media-libs/fontconfig net-libs/gnome-online-accounts >=media-libs/libcanberra-0.13[gtk3] >=media-sound/pulseaudio-0.9.16[glib] >=sys-auth/polkit-0.97 >=sys-power/upower-0.9.1 >=x11-libs/libnotify-0.7.3 x11-apps/xmodmap x11-libs/libX11 x11-libs/libXxf86misc >=x11-libs/libxklavier-5.1 >=x11-libs/libXi-1.2 cheese? ( media-libs/gstreamer:0.10 >=media-video/cheese-2.91.91.1 ) colord? ( >=x11-misc/colord-0.1.8 ) cups? ( >=net-print/cups-1.4[dbus] ) networkmanager? ( >=gnome-extra/nm-applet-0.9.1.90 >=net-misc/networkmanager-0.8.997 ) socialweb? ( net-libs/libsocialweb ) x11-proto/xproto x11-proto/xf86miscproto x11-proto/kbproto >=sys-devel/gettext-0.17 >=dev-util/intltool-0.40.1 >=dev-util/pkgconfig-0.19 app-text/scrollkeeper >=app-text/gnome-doc-utils-0.10.1 cups? ( sys-apps/sed ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
+>=dev-libs/glib-2.29.14:2 >=x11-libs/gdk-pixbuf-2.23.0:2 >=x11-libs/gtk+-3.1.19:3 >=gnome-base/gsettings-desktop-schemas-3.0.2 >=gnome-base/gconf-2.0:2 >=dev-libs/dbus-glib-0.73 >=gnome-base/gnome-desktop-3.1.0:3 >=gnome-base/gnome-settings-daemon-3.1.4[colord(+)?,policykit] >=gnome-base/libgnomekbd-2.91.91 app-text/iso-codes dev-libs/libxml2:2 gnome-base/gnome-menus:3 gnome-base/libgtop:2 media-libs/fontconfig net-libs/gnome-online-accounts >=media-libs/libcanberra-0.13[gtk3] >=media-sound/pulseaudio-0.9.16[glib] >=sys-auth/polkit-0.97 >=sys-power/upower-0.9.1 >=x11-libs/libnotify-0.7.3 x11-apps/xmodmap x11-libs/libX11 x11-libs/libXxf86misc >=x11-libs/libxklavier-5.1 >=x11-libs/libXi-1.2 cheese? ( media-libs/gstreamer:0.10 >=media-video/cheese-2.91.91.1 ) colord? ( >=x11-misc/colord-0.1.8 ) cups? ( >=net-print/cups-1.4[dbus] ) networkmanager? ( >=gnome-extra/nm-applet-0.9.1.90 >=net-misc/networkmanager-0.8.997 ) socialweb? ( net-libs/libsocialweb ) x11-proto/xproto x11-proto/xf86miscproto x11-proto/kbproto >=sys-devel/gettext-0.17 >=dev-util/intltool-0.40.1 >=dev-util/pkgconfig-0.19 app-text/scrollkeeper >=app-text/gnome-doc-utils-0.10.1 cups? ( sys-apps/sed ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
 >=dev-libs/glib-2.29.14:2 >=x11-libs/gdk-pixbuf-2.23.0:2 >=x11-libs/gtk+-3.1.19:3 >=gnome-base/gsettings-desktop-schemas-3.0.2 >=gnome-base/gconf-2.0:2 >=dev-libs/dbus-glib-0.73 >=gnome-base/gnome-desktop-3.1.0:3 >=gnome-base/gnome-settings-daemon-3.1.4[colord(+)?,policykit] >=gnome-base/libgnomekbd-2.91.91 app-text/iso-codes dev-libs/libxml2:2 gnome-base/gnome-menus:3 gnome-base/libgtop:2 media-libs/fontconfig net-libs/gnome-online-accounts >=media-libs/libcanberra-0.13[gtk3] >=media-sound/pulseaudio-0.9.16[glib] >=sys-auth/polkit-0.97 >=sys-power/upower-0.9.1 >=x11-libs/libnotify-0.7.3 x11-apps/xmodmap x11-libs/libX11 x11-libs/libXxf86misc >=x11-libs/libxklavier-5.1 >=x11-libs/libXi-1.2 cheese? ( media-libs/gstreamer:0.10 >=media-video/cheese-2.91.91.1 ) colord? ( >=x11-misc/colord-0.1.8 ) cups? ( >=net-print/cups-1.4[dbus] ) networkmanager? ( >=gnome-extra/nm-applet-0.9.1.90 >=net-misc/networkmanager-0.8.997 ) socialweb? ( net-libs/libsocialweb ) app-admin/apg sys-apps/accountsservice x11-themes/gnome-icon-theme-symbolic cups? ( net-print/cups-pk-helper ) !<gnome-base/gdm-2.91.94 !<gnome-extra/gnome-color-manager-3.1.2 !gnome-extra/gnome-media[pulseaudio] !<gnome-extra/gnome-media-2.32.0-r300
 2
 mirror://gnome/sources/gnome-control-center/3.2/gnome-control-center-3.2.2.tar.xz
diff --git a/metadata/cache/gnome-base/gnome-control-center-3.2.2-r1 b/metadata/cache/gnome-base/gnome-control-center-3.2.2-r1
index ecfc3f4b59c3..fda955c02978 100644
--- a/metadata/cache/gnome-base/gnome-control-center-3.2.2-r1
+++ b/metadata/cache/gnome-base/gnome-control-center-3.2.2-r1
@@ -1,4 +1,4 @@
->=dev-libs/glib-2.29.14:2 >=x11-libs/gdk-pixbuf-2.23.0:2 >=x11-libs/gtk+-3.1.19:3 >=gnome-base/gsettings-desktop-schemas-3.0.2 >=gnome-base/gconf-2.0:2 >=dev-libs/dbus-glib-0.73 >=gnome-base/gnome-desktop-3.1.0:3 >=gnome-base/gnome-settings-daemon-3.1.4[colord(+)?,policykit] >=gnome-base/libgnomekbd-2.91.91 app-text/iso-codes dev-libs/libxml2:2 gnome-base/gnome-menus:3 gnome-base/libgtop:2 media-libs/fontconfig net-libs/gnome-online-accounts >=media-libs/libcanberra-0.13[gtk3] >=media-sound/pulseaudio-0.9.16[glib] >=sys-auth/polkit-0.97 >=sys-power/upower-0.9.1 >=x11-libs/libnotify-0.7.3 x11-apps/xmodmap x11-libs/libX11 x11-libs/libXxf86misc >=x11-libs/libxklavier-5.1 >=x11-libs/libXi-1.2 cheese? ( media-libs/gstreamer:0.10 >=media-video/cheese-2.91.91.1 ) colord? ( >=x11-misc/colord-0.1.8 ) cups? ( >=net-print/cups-1.4[dbus] ) networkmanager? ( >=gnome-extra/nm-applet-0.9.1.90 >=net-misc/networkmanager-0.8.997 ) socialweb? ( net-libs/libsocialweb ) x11-proto/xproto x11-proto/xf86miscproto x11-proto/kbproto >=sys-devel/gettext-0.17 >=dev-util/intltool-0.40.1 >=dev-util/pkgconfig-0.19 app-text/scrollkeeper >=app-text/gnome-doc-utils-0.10.1 cups? ( sys-apps/sed ) gnome-base/gnome-common || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
+>=dev-libs/glib-2.29.14:2 >=x11-libs/gdk-pixbuf-2.23.0:2 >=x11-libs/gtk+-3.1.19:3 >=gnome-base/gsettings-desktop-schemas-3.0.2 >=gnome-base/gconf-2.0:2 >=dev-libs/dbus-glib-0.73 >=gnome-base/gnome-desktop-3.1.0:3 >=gnome-base/gnome-settings-daemon-3.1.4[colord(+)?,policykit] >=gnome-base/libgnomekbd-2.91.91 app-text/iso-codes dev-libs/libxml2:2 gnome-base/gnome-menus:3 gnome-base/libgtop:2 media-libs/fontconfig net-libs/gnome-online-accounts >=media-libs/libcanberra-0.13[gtk3] >=media-sound/pulseaudio-0.9.16[glib] >=sys-auth/polkit-0.97 >=sys-power/upower-0.9.1 >=x11-libs/libnotify-0.7.3 x11-apps/xmodmap x11-libs/libX11 x11-libs/libXxf86misc >=x11-libs/libxklavier-5.1 >=x11-libs/libXi-1.2 cheese? ( media-libs/gstreamer:0.10 >=media-video/cheese-2.91.91.1 ) colord? ( >=x11-misc/colord-0.1.8 ) cups? ( >=net-print/cups-1.4[dbus] ) networkmanager? ( >=gnome-extra/nm-applet-0.9.1.90 >=net-misc/networkmanager-0.8.997 ) socialweb? ( net-libs/libsocialweb ) x11-proto/xproto x11-proto/xf86miscproto x11-proto/kbproto >=sys-devel/gettext-0.17 >=dev-util/intltool-0.40.1 >=dev-util/pkgconfig-0.19 app-text/scrollkeeper >=app-text/gnome-doc-utils-0.10.1 cups? ( sys-apps/sed ) gnome-base/gnome-common || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
 >=dev-libs/glib-2.29.14:2 >=x11-libs/gdk-pixbuf-2.23.0:2 >=x11-libs/gtk+-3.1.19:3 >=gnome-base/gsettings-desktop-schemas-3.0.2 >=gnome-base/gconf-2.0:2 >=dev-libs/dbus-glib-0.73 >=gnome-base/gnome-desktop-3.1.0:3 >=gnome-base/gnome-settings-daemon-3.1.4[colord(+)?,policykit] >=gnome-base/libgnomekbd-2.91.91 app-text/iso-codes dev-libs/libxml2:2 gnome-base/gnome-menus:3 gnome-base/libgtop:2 media-libs/fontconfig net-libs/gnome-online-accounts >=media-libs/libcanberra-0.13[gtk3] >=media-sound/pulseaudio-0.9.16[glib] >=sys-auth/polkit-0.97 >=sys-power/upower-0.9.1 >=x11-libs/libnotify-0.7.3 x11-apps/xmodmap x11-libs/libX11 x11-libs/libXxf86misc >=x11-libs/libxklavier-5.1 >=x11-libs/libXi-1.2 cheese? ( media-libs/gstreamer:0.10 >=media-video/cheese-2.91.91.1 ) colord? ( >=x11-misc/colord-0.1.8 ) cups? ( >=net-print/cups-1.4[dbus] ) networkmanager? ( >=gnome-extra/nm-applet-0.9.1.90 >=net-misc/networkmanager-0.8.997 ) socialweb? ( net-libs/libsocialweb ) app-admin/apg sys-apps/accountsservice x11-themes/gnome-icon-theme-symbolic cups? ( net-print/cups-pk-helper ) !<gnome-base/gdm-2.91.94 !<gnome-extra/gnome-color-manager-3.1.2 !gnome-extra/gnome-media[pulseaudio] !<gnome-extra/gnome-media-2.32.0-r300
 2
 mirror://gnome/sources/gnome-control-center/3.2/gnome-control-center-3.2.2.tar.xz
diff --git a/metadata/cache/gnome-base/gnome-menus-3.0.1-r1 b/metadata/cache/gnome-base/gnome-menus-3.0.1-r1
index 2a49b3ca8c71..f49d3c299087 100644
--- a/metadata/cache/gnome-base/gnome-menus-3.0.1-r1
+++ b/metadata/cache/gnome-base/gnome-menus-3.0.1-r1
@@ -1,4 +1,4 @@
->=dev-libs/glib-2.18 introspection? ( >=dev-libs/gobject-introspection-0.9.5 ) sys-devel/gettext >=dev-util/pkgconfig-0.9 >=dev-util/intltool-0.40 gnome-base/gnome-common || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) )
+>=dev-libs/glib-2.18 introspection? ( >=dev-libs/gobject-introspection-0.9.5 ) sys-devel/gettext >=dev-util/pkgconfig-0.9 >=dev-util/intltool-0.40 gnome-base/gnome-common || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) )
 >=dev-libs/glib-2.18 introspection? ( >=dev-libs/gobject-introspection-0.9.5 ) python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) )
 0
 mirror://gnome/sources/gnome-menus/3.0/gnome-menus-3.0.1.tar.bz2 mirror://gentoo/introspection.m4.bz2
diff --git a/metadata/cache/gnome-base/gnome-panel-2.32.1-r1 b/metadata/cache/gnome-base/gnome-panel-2.32.1-r1
index 3f8dab8c6711..ac8328ae0246 100644
--- a/metadata/cache/gnome-base/gnome-panel-2.32.1-r1
+++ b/metadata/cache/gnome-base/gnome-panel-2.32.1-r1
@@ -1,4 +1,4 @@
->=gnome-base/gnome-desktop-2.26:2 >=x11-libs/pango-1.15.4[introspection?] >=dev-libs/glib-2.25.12:2 >=x11-libs/gtk+-2.22:2[introspection?] >=dev-libs/libgweather-2.27.90:2 <dev-libs/libgweather-2.90.1:2 dev-libs/libxml2:2 >=gnome-base/gconf-2.6.1:2[introspection?] >=media-libs/libcanberra-0.23[gtk] >=gnome-base/gnome-menus-2.27.92:0 gnome-base/librsvg:2 >=dev-libs/dbus-glib-0.80 >=sys-apps/dbus-1.1.2 >=x11-libs/cairo-1 x11-libs/libXau >=x11-libs/libXrandr-1.2 bonobo? ( >=gnome-base/libbonobo-2.20.4 >=gnome-base/libbonoboui-2.1.1 >=gnome-base/orbit-2.4 >=x11-libs/libwnck-2.19.5:1 ) eds? ( >=gnome-extra/evolution-data-server-1.6 ) introspection? ( >=dev-libs/gobject-introspection-0.6.7 ) networkmanager? ( >=net-misc/networkmanager-0.6.7 ) >=dev-lang/perl-5 >=app-text/gnome-doc-utils-0.3.2 >=dev-util/pkgconfig-0.9 >=dev-util/intltool-0.40 ~app-text/docbook-xml-dtd-4.1.2 doc? ( >=dev-util/gtk-doc-1 ) gnome-base/gnome-common dev-util/gtk-doc-am >=sys-apps/sed-4 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=gnome-base/gnome-desktop-2.26:2 >=x11-libs/pango-1.15.4[introspection?] >=dev-libs/glib-2.25.12:2 >=x11-libs/gtk+-2.22:2[introspection?] >=dev-libs/libgweather-2.27.90:2 <dev-libs/libgweather-2.90.1:2 dev-libs/libxml2:2 >=gnome-base/gconf-2.6.1:2[introspection?] >=media-libs/libcanberra-0.23[gtk] >=gnome-base/gnome-menus-2.27.92:0 gnome-base/librsvg:2 >=dev-libs/dbus-glib-0.80 >=sys-apps/dbus-1.1.2 >=x11-libs/cairo-1 x11-libs/libXau >=x11-libs/libXrandr-1.2 bonobo? ( >=gnome-base/libbonobo-2.20.4 >=gnome-base/libbonoboui-2.1.1 >=gnome-base/orbit-2.4 >=x11-libs/libwnck-2.19.5:1 ) eds? ( >=gnome-extra/evolution-data-server-1.6 ) introspection? ( >=dev-libs/gobject-introspection-0.6.7 ) networkmanager? ( >=net-misc/networkmanager-0.6.7 ) >=dev-lang/perl-5 >=app-text/gnome-doc-utils-0.3.2 >=dev-util/pkgconfig-0.9 >=dev-util/intltool-0.40 ~app-text/docbook-xml-dtd-4.1.2 doc? ( >=dev-util/gtk-doc-1 ) gnome-base/gnome-common dev-util/gtk-doc-am >=sys-apps/sed-4 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=gnome-base/gnome-desktop-2.26:2 >=x11-libs/pango-1.15.4[introspection?] >=dev-libs/glib-2.25.12:2 >=x11-libs/gtk+-2.22:2[introspection?] >=dev-libs/libgweather-2.27.90:2 <dev-libs/libgweather-2.90.1:2 dev-libs/libxml2:2 >=gnome-base/gconf-2.6.1:2[introspection?] >=media-libs/libcanberra-0.23[gtk] >=gnome-base/gnome-menus-2.27.92:0 gnome-base/librsvg:2 >=dev-libs/dbus-glib-0.80 >=sys-apps/dbus-1.1.2 >=x11-libs/cairo-1 x11-libs/libXau >=x11-libs/libXrandr-1.2 bonobo? ( >=gnome-base/libbonobo-2.20.4 >=gnome-base/libbonoboui-2.1.1 >=gnome-base/orbit-2.4 >=x11-libs/libwnck-2.19.5:1 ) eds? ( >=gnome-extra/evolution-data-server-1.6 ) introspection? ( >=dev-libs/gobject-introspection-0.6.7 ) networkmanager? ( >=net-misc/networkmanager-0.6.7 ) || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
 0
 mirror://gnome/sources/gnome-panel/2.32/gnome-panel-2.32.1.tar.bz2 mirror://gentoo/introspection-20110205.m4.tar.bz2
diff --git a/metadata/cache/gnome-base/gnome-panel-2.32.1-r2 b/metadata/cache/gnome-base/gnome-panel-2.32.1-r2
index 9a6542df9e76..bcab9d71594b 100644
--- a/metadata/cache/gnome-base/gnome-panel-2.32.1-r2
+++ b/metadata/cache/gnome-base/gnome-panel-2.32.1-r2
@@ -1,4 +1,4 @@
->=gnome-base/gnome-desktop-2.26:2 >=x11-libs/pango-1.15.4[introspection?] >=dev-libs/glib-2.25.12:2 >=x11-libs/gtk+-2.22:2[introspection?] >=dev-libs/libgweather-2.27.90:2 <dev-libs/libgweather-2.90.1:2 dev-libs/libxml2:2 >=gnome-base/gconf-2.6.1:2[introspection?] >=media-libs/libcanberra-0.23[gtk] >=gnome-base/gnome-menus-2.27.92:0 gnome-base/librsvg:2 >=dev-libs/dbus-glib-0.80 >=sys-apps/dbus-1.1.2 >=x11-libs/cairo-1 x11-libs/libXau >=x11-libs/libXrandr-1.2 bonobo? ( >=gnome-base/libbonobo-2.20.4 >=gnome-base/libbonoboui-2.1.1 >=gnome-base/orbit-2.4 >=x11-libs/libwnck-2.19.5:1 ) eds? ( >=gnome-extra/evolution-data-server-1.6 ) introspection? ( >=dev-libs/gobject-introspection-0.6.7 ) networkmanager? ( >=net-misc/networkmanager-0.6.7 ) >=dev-lang/perl-5 >=app-text/gnome-doc-utils-0.3.2 >=dev-util/pkgconfig-0.9 >=dev-util/intltool-0.40 ~app-text/docbook-xml-dtd-4.1.2 doc? ( >=dev-util/gtk-doc-1 ) gnome-base/gnome-common dev-util/gtk-doc-am >=sys-apps/sed-4 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=gnome-base/gnome-desktop-2.26:2 >=x11-libs/pango-1.15.4[introspection?] >=dev-libs/glib-2.25.12:2 >=x11-libs/gtk+-2.22:2[introspection?] >=dev-libs/libgweather-2.27.90:2 <dev-libs/libgweather-2.90.1:2 dev-libs/libxml2:2 >=gnome-base/gconf-2.6.1:2[introspection?] >=media-libs/libcanberra-0.23[gtk] >=gnome-base/gnome-menus-2.27.92:0 gnome-base/librsvg:2 >=dev-libs/dbus-glib-0.80 >=sys-apps/dbus-1.1.2 >=x11-libs/cairo-1 x11-libs/libXau >=x11-libs/libXrandr-1.2 bonobo? ( >=gnome-base/libbonobo-2.20.4 >=gnome-base/libbonoboui-2.1.1 >=gnome-base/orbit-2.4 >=x11-libs/libwnck-2.19.5:1 ) eds? ( >=gnome-extra/evolution-data-server-1.6 ) introspection? ( >=dev-libs/gobject-introspection-0.6.7 ) networkmanager? ( >=net-misc/networkmanager-0.6.7 ) >=dev-lang/perl-5 >=app-text/gnome-doc-utils-0.3.2 >=dev-util/pkgconfig-0.9 >=dev-util/intltool-0.40 ~app-text/docbook-xml-dtd-4.1.2 doc? ( >=dev-util/gtk-doc-1 ) gnome-base/gnome-common dev-util/gtk-doc-am >=sys-apps/sed-4 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=gnome-base/gnome-desktop-2.26:2 >=x11-libs/pango-1.15.4[introspection?] >=dev-libs/glib-2.25.12:2 >=x11-libs/gtk+-2.22:2[introspection?] >=dev-libs/libgweather-2.27.90:2 <dev-libs/libgweather-2.90.1:2 dev-libs/libxml2:2 >=gnome-base/gconf-2.6.1:2[introspection?] >=media-libs/libcanberra-0.23[gtk] >=gnome-base/gnome-menus-2.27.92:0 gnome-base/librsvg:2 >=dev-libs/dbus-glib-0.80 >=sys-apps/dbus-1.1.2 >=x11-libs/cairo-1 x11-libs/libXau >=x11-libs/libXrandr-1.2 bonobo? ( >=gnome-base/libbonobo-2.20.4 >=gnome-base/libbonoboui-2.1.1 >=gnome-base/orbit-2.4 >=x11-libs/libwnck-2.19.5:1 ) eds? ( >=gnome-extra/evolution-data-server-1.6 ) introspection? ( >=dev-libs/gobject-introspection-0.6.7 ) networkmanager? ( >=net-misc/networkmanager-0.6.7 ) || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
 0
 mirror://gnome/sources/gnome-panel/2.32/gnome-panel-2.32.1.tar.bz2 mirror://gentoo/introspection-20110205.m4.tar.bz2 http://dev.gentoo.org/~pacho/gnome/gnome-panel-2.32.1-patches.tar.bz2
diff --git a/metadata/cache/gnome-base/gnome-panel-2.32.1-r3 b/metadata/cache/gnome-base/gnome-panel-2.32.1-r3
index 9a6542df9e76..bcab9d71594b 100644
--- a/metadata/cache/gnome-base/gnome-panel-2.32.1-r3
+++ b/metadata/cache/gnome-base/gnome-panel-2.32.1-r3
@@ -1,4 +1,4 @@
->=gnome-base/gnome-desktop-2.26:2 >=x11-libs/pango-1.15.4[introspection?] >=dev-libs/glib-2.25.12:2 >=x11-libs/gtk+-2.22:2[introspection?] >=dev-libs/libgweather-2.27.90:2 <dev-libs/libgweather-2.90.1:2 dev-libs/libxml2:2 >=gnome-base/gconf-2.6.1:2[introspection?] >=media-libs/libcanberra-0.23[gtk] >=gnome-base/gnome-menus-2.27.92:0 gnome-base/librsvg:2 >=dev-libs/dbus-glib-0.80 >=sys-apps/dbus-1.1.2 >=x11-libs/cairo-1 x11-libs/libXau >=x11-libs/libXrandr-1.2 bonobo? ( >=gnome-base/libbonobo-2.20.4 >=gnome-base/libbonoboui-2.1.1 >=gnome-base/orbit-2.4 >=x11-libs/libwnck-2.19.5:1 ) eds? ( >=gnome-extra/evolution-data-server-1.6 ) introspection? ( >=dev-libs/gobject-introspection-0.6.7 ) networkmanager? ( >=net-misc/networkmanager-0.6.7 ) >=dev-lang/perl-5 >=app-text/gnome-doc-utils-0.3.2 >=dev-util/pkgconfig-0.9 >=dev-util/intltool-0.40 ~app-text/docbook-xml-dtd-4.1.2 doc? ( >=dev-util/gtk-doc-1 ) gnome-base/gnome-common dev-util/gtk-doc-am >=sys-apps/sed-4 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=gnome-base/gnome-desktop-2.26:2 >=x11-libs/pango-1.15.4[introspection?] >=dev-libs/glib-2.25.12:2 >=x11-libs/gtk+-2.22:2[introspection?] >=dev-libs/libgweather-2.27.90:2 <dev-libs/libgweather-2.90.1:2 dev-libs/libxml2:2 >=gnome-base/gconf-2.6.1:2[introspection?] >=media-libs/libcanberra-0.23[gtk] >=gnome-base/gnome-menus-2.27.92:0 gnome-base/librsvg:2 >=dev-libs/dbus-glib-0.80 >=sys-apps/dbus-1.1.2 >=x11-libs/cairo-1 x11-libs/libXau >=x11-libs/libXrandr-1.2 bonobo? ( >=gnome-base/libbonobo-2.20.4 >=gnome-base/libbonoboui-2.1.1 >=gnome-base/orbit-2.4 >=x11-libs/libwnck-2.19.5:1 ) eds? ( >=gnome-extra/evolution-data-server-1.6 ) introspection? ( >=dev-libs/gobject-introspection-0.6.7 ) networkmanager? ( >=net-misc/networkmanager-0.6.7 ) >=dev-lang/perl-5 >=app-text/gnome-doc-utils-0.3.2 >=dev-util/pkgconfig-0.9 >=dev-util/intltool-0.40 ~app-text/docbook-xml-dtd-4.1.2 doc? ( >=dev-util/gtk-doc-1 ) gnome-base/gnome-common dev-util/gtk-doc-am >=sys-apps/sed-4 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=gnome-base/gnome-desktop-2.26:2 >=x11-libs/pango-1.15.4[introspection?] >=dev-libs/glib-2.25.12:2 >=x11-libs/gtk+-2.22:2[introspection?] >=dev-libs/libgweather-2.27.90:2 <dev-libs/libgweather-2.90.1:2 dev-libs/libxml2:2 >=gnome-base/gconf-2.6.1:2[introspection?] >=media-libs/libcanberra-0.23[gtk] >=gnome-base/gnome-menus-2.27.92:0 gnome-base/librsvg:2 >=dev-libs/dbus-glib-0.80 >=sys-apps/dbus-1.1.2 >=x11-libs/cairo-1 x11-libs/libXau >=x11-libs/libXrandr-1.2 bonobo? ( >=gnome-base/libbonobo-2.20.4 >=gnome-base/libbonoboui-2.1.1 >=gnome-base/orbit-2.4 >=x11-libs/libwnck-2.19.5:1 ) eds? ( >=gnome-extra/evolution-data-server-1.6 ) introspection? ( >=dev-libs/gobject-introspection-0.6.7 ) networkmanager? ( >=net-misc/networkmanager-0.6.7 ) || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
 0
 mirror://gnome/sources/gnome-panel/2.32/gnome-panel-2.32.1.tar.bz2 mirror://gentoo/introspection-20110205.m4.tar.bz2 http://dev.gentoo.org/~pacho/gnome/gnome-panel-2.32.1-patches.tar.bz2
diff --git a/metadata/cache/gnome-base/gnome-session-2.32.1-r2 b/metadata/cache/gnome-base/gnome-session-2.32.1-r2
index 43f208e384ca..4561e1ed330b 100644
--- a/metadata/cache/gnome-base/gnome-session-2.32.1-r2
+++ b/metadata/cache/gnome-base/gnome-session-2.32.1-r2
@@ -1,4 +1,4 @@
->=dev-libs/glib-2.16:2 >=x11-libs/gtk+-2.22.0:2 >=dev-libs/dbus-glib-0.76 >=gnome-base/gconf-2:2 >=sys-power/upower-0.9.0 elibc_FreeBSD? ( dev-libs/libexecinfo ) x11-libs/libSM x11-libs/libICE x11-libs/libX11 x11-libs/libXext x11-libs/libXtst x11-apps/xdpyinfo >=dev-lang/perl-5 >=sys-devel/gettext-0.10.40 >=dev-util/pkgconfig-0.17 >=dev-util/intltool-0.40 gnome-base/gnome-common !<gnome-base/gdm-2.20.4 doc? ( app-text/xmlto dev-libs/libxslt ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+>=dev-libs/glib-2.16:2 >=x11-libs/gtk+-2.22.0:2 >=dev-libs/dbus-glib-0.76 >=gnome-base/gconf-2:2 >=sys-power/upower-0.9.0 elibc_FreeBSD? ( dev-libs/libexecinfo ) x11-libs/libSM x11-libs/libICE x11-libs/libX11 x11-libs/libXext x11-libs/libXtst x11-apps/xdpyinfo >=dev-lang/perl-5 >=sys-devel/gettext-0.10.40 >=dev-util/pkgconfig-0.17 >=dev-util/intltool-0.40 gnome-base/gnome-common !<gnome-base/gdm-2.20.4 doc? ( app-text/xmlto dev-libs/libxslt ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 >=dev-libs/glib-2.16:2 >=x11-libs/gtk+-2.22.0:2 >=dev-libs/dbus-glib-0.76 >=gnome-base/gconf-2:2 >=sys-power/upower-0.9.0 elibc_FreeBSD? ( dev-libs/libexecinfo ) x11-libs/libSM x11-libs/libICE x11-libs/libX11 x11-libs/libXext x11-libs/libXtst x11-apps/xdpyinfo
 0
 mirror://gnome/sources/gnome-session/2.32/gnome-session-2.32.1.tar.bz2
diff --git a/metadata/cache/gnome-base/gnome-session-2.32.1-r3 b/metadata/cache/gnome-base/gnome-session-2.32.1-r3
index cd66e0142e6d..2c504aa2cc36 100644
--- a/metadata/cache/gnome-base/gnome-session-2.32.1-r3
+++ b/metadata/cache/gnome-base/gnome-session-2.32.1-r3
@@ -1,4 +1,4 @@
->=dev-libs/glib-2.16:2 >=x11-libs/gtk+-2.22.0:2 >=dev-libs/dbus-glib-0.76 >=gnome-base/gconf-2:2 >=sys-power/upower-0.9.0 elibc_FreeBSD? ( dev-libs/libexecinfo ) x11-libs/libSM x11-libs/libICE x11-libs/libX11 x11-libs/libXext x11-libs/libXtst x11-apps/xdpyinfo x11-misc/xdg-user-dirs x11-misc/xdg-user-dirs-gtk >=dev-lang/perl-5 >=sys-devel/gettext-0.10.40 >=dev-util/pkgconfig-0.17 >=dev-util/intltool-0.40 gnome-base/gnome-common !<gnome-base/gdm-2.20.4 doc? ( app-text/xmlto dev-libs/libxslt ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+>=dev-libs/glib-2.16:2 >=x11-libs/gtk+-2.22.0:2 >=dev-libs/dbus-glib-0.76 >=gnome-base/gconf-2:2 >=sys-power/upower-0.9.0 elibc_FreeBSD? ( dev-libs/libexecinfo ) x11-libs/libSM x11-libs/libICE x11-libs/libX11 x11-libs/libXext x11-libs/libXtst x11-apps/xdpyinfo x11-misc/xdg-user-dirs x11-misc/xdg-user-dirs-gtk >=dev-lang/perl-5 >=sys-devel/gettext-0.10.40 >=dev-util/pkgconfig-0.17 >=dev-util/intltool-0.40 gnome-base/gnome-common !<gnome-base/gdm-2.20.4 doc? ( app-text/xmlto dev-libs/libxslt ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 >=dev-libs/glib-2.16:2 >=x11-libs/gtk+-2.22.0:2 >=dev-libs/dbus-glib-0.76 >=gnome-base/gconf-2:2 >=sys-power/upower-0.9.0 elibc_FreeBSD? ( dev-libs/libexecinfo ) x11-libs/libSM x11-libs/libICE x11-libs/libX11 x11-libs/libXext x11-libs/libXtst x11-apps/xdpyinfo x11-misc/xdg-user-dirs x11-misc/xdg-user-dirs-gtk
 0
 mirror://gnome/sources/gnome-session/2.32/gnome-session-2.32.1.tar.bz2
diff --git a/metadata/cache/gnome-base/gnome-settings-daemon-2.32.1-r2 b/metadata/cache/gnome-base/gnome-settings-daemon-2.32.1-r2
index d6c0f2b5fb5c..61ac052f3aa7 100644
--- a/metadata/cache/gnome-base/gnome-settings-daemon-2.32.1-r2
+++ b/metadata/cache/gnome-base/gnome-settings-daemon-2.32.1-r2
@@ -1,4 +1,4 @@
->=dev-libs/dbus-glib-0.74 >=dev-libs/glib-2.18:2 >=x11-libs/gtk+-2.21.2:2 >=gnome-base/gconf-2.6.1:2 >=gnome-base/libgnomekbd-2.32.0-r1 <gnome-base/libgnomekbd-2.91.0 >=gnome-base/gnome-desktop-2.29.92:2 x11-libs/libX11 x11-libs/libXi x11-libs/libXext x11-libs/libXxf86misc >=x11-libs/libxklavier-5.0 media-libs/fontconfig libnotify? ( >=x11-libs/libnotify-0.4.3 ) policykit? ( >=sys-auth/polkit-0.91 >=dev-libs/dbus-glib-0.71 >=sys-apps/dbus-1.1.2 ) pulseaudio? ( >=media-sound/pulseaudio-0.9.15 media-libs/libcanberra[gtk] ) !pulseaudio? ( >=media-libs/gstreamer-0.10.1.2:0.10 >=media-libs/gst-plugins-base-0.10.1.2:0.10 ) smartcard? ( >=dev-libs/nss-3.11.2 ) !<gnome-base/gnome-control-center-2.22 sys-devel/gettext >=dev-util/intltool-0.40 >=dev-util/pkgconfig-0.19 x11-proto/inputproto x11-proto/xproto || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+>=dev-libs/dbus-glib-0.74 >=dev-libs/glib-2.18:2 >=x11-libs/gtk+-2.21.2:2 >=gnome-base/gconf-2.6.1:2 >=gnome-base/libgnomekbd-2.32.0-r1 <gnome-base/libgnomekbd-2.91.0 >=gnome-base/gnome-desktop-2.29.92:2 x11-libs/libX11 x11-libs/libXi x11-libs/libXext x11-libs/libXxf86misc >=x11-libs/libxklavier-5.0 media-libs/fontconfig libnotify? ( >=x11-libs/libnotify-0.4.3 ) policykit? ( >=sys-auth/polkit-0.91 >=dev-libs/dbus-glib-0.71 >=sys-apps/dbus-1.1.2 ) pulseaudio? ( >=media-sound/pulseaudio-0.9.15 media-libs/libcanberra[gtk] ) !pulseaudio? ( >=media-libs/gstreamer-0.10.1.2:0.10 >=media-libs/gst-plugins-base-0.10.1.2:0.10 ) smartcard? ( >=dev-libs/nss-3.11.2 ) !<gnome-base/gnome-control-center-2.22 sys-devel/gettext >=dev-util/intltool-0.40 >=dev-util/pkgconfig-0.19 x11-proto/inputproto x11-proto/xproto || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 >=dev-libs/dbus-glib-0.74 >=dev-libs/glib-2.18:2 >=x11-libs/gtk+-2.21.2:2 >=gnome-base/gconf-2.6.1:2 >=gnome-base/libgnomekbd-2.32.0-r1 <gnome-base/libgnomekbd-2.91.0 >=gnome-base/gnome-desktop-2.29.92:2 x11-libs/libX11 x11-libs/libXi x11-libs/libXext x11-libs/libXxf86misc >=x11-libs/libxklavier-5.0 media-libs/fontconfig libnotify? ( >=x11-libs/libnotify-0.4.3 ) policykit? ( >=sys-auth/polkit-0.91 >=dev-libs/dbus-glib-0.71 >=sys-apps/dbus-1.1.2 ) pulseaudio? ( >=media-sound/pulseaudio-0.9.15 media-libs/libcanberra[gtk] ) !pulseaudio? ( >=media-libs/gstreamer-0.10.1.2:0.10 >=media-libs/gst-plugins-base-0.10.1.2:0.10 ) smartcard? ( >=dev-libs/nss-3.11.2 ) !>=gnome-base/gnome-control-center-2.91.90
 0
 mirror://gnome/sources/gnome-settings-daemon/2.32/gnome-settings-daemon-2.32.1.tar.bz2 http://dev.gentoo.org/~pacho/gnome/gnome-settings-daemon-2.32.1-gst-vol-control-support.patch
diff --git a/metadata/cache/gnome-base/gnome-settings-daemon-3.2.2 b/metadata/cache/gnome-base/gnome-settings-daemon-3.2.2
index 842be891c392..bee98ef987ef 100644
--- a/metadata/cache/gnome-base/gnome-settings-daemon-3.2.2
+++ b/metadata/cache/gnome-base/gnome-settings-daemon-3.2.2
@@ -1,4 +1,4 @@
->=dev-libs/dbus-glib-0.74 >=dev-libs/glib-2.29.14:2 >=x11-libs/gtk+-3.1.10:3 >=gnome-base/gconf-2.6.1:2 >=gnome-base/libgnomekbd-2.91.1 >=gnome-base/gnome-desktop-3.2.0-r1:3 >=gnome-base/gsettings-desktop-schemas-0.1.7.1 media-fonts/cantarell media-libs/fontconfig >=media-libs/lcms-2.2:2 media-libs/libcanberra[gtk3] >=media-sound/pulseaudio-0.9.16 >=sys-power/upower-0.9.11 x11-libs/cairo x11-libs/gdk-pixbuf:2 >=x11-libs/libnotify-0.7.3 x11-libs/libX11 x11-libs/libXi x11-libs/libXext x11-libs/libXfixes x11-libs/libXxf86misc >=x11-libs/libxklavier-5.0 >=media-sound/pulseaudio-0.9.16 colord? ( >=x11-misc/colord-0.1.13 ) cups? ( >=net-print/cups-1.4[dbus] ) packagekit? ( || ( sys-fs/udev[gudev] sys-fs/udev[extras] ) >=app-admin/packagekit-base-0.6.12 ) policykit? ( >=sys-auth/polkit-0.97 >=sys-apps/dbus-1.1.2[X] ) smartcard? ( >=dev-libs/nss-3.11.2 ) udev? ( || ( sys-fs/udev[gudev] sys-fs/udev[extras] ) ) cups? ( sys-apps/sed ) sys-devel/gettext >=dev-util/intltool-0.40 >=dev-util/pkgconfig-0.19 x11-proto/inputproto x11-proto/kbproto x11-proto/xf86miscproto >=x11-proto/xproto-7.0.15 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+>=dev-libs/dbus-glib-0.74 >=dev-libs/glib-2.29.14:2 >=x11-libs/gtk+-3.1.10:3 >=gnome-base/gconf-2.6.1:2 >=gnome-base/libgnomekbd-2.91.1 >=gnome-base/gnome-desktop-3.2.0-r1:3 >=gnome-base/gsettings-desktop-schemas-0.1.7.1 media-fonts/cantarell media-libs/fontconfig >=media-libs/lcms-2.2:2 media-libs/libcanberra[gtk3] >=media-sound/pulseaudio-0.9.16 >=sys-power/upower-0.9.11 x11-libs/cairo x11-libs/gdk-pixbuf:2 >=x11-libs/libnotify-0.7.3 x11-libs/libX11 x11-libs/libXi x11-libs/libXext x11-libs/libXfixes x11-libs/libXxf86misc >=x11-libs/libxklavier-5.0 >=media-sound/pulseaudio-0.9.16 colord? ( >=x11-misc/colord-0.1.13 ) cups? ( >=net-print/cups-1.4[dbus] ) packagekit? ( || ( sys-fs/udev[gudev] sys-fs/udev[extras] ) >=app-admin/packagekit-base-0.6.12 ) policykit? ( >=sys-auth/polkit-0.97 >=sys-apps/dbus-1.1.2[X] ) smartcard? ( >=dev-libs/nss-3.11.2 ) udev? ( || ( sys-fs/udev[gudev] sys-fs/udev[extras] ) ) cups? ( sys-apps/sed ) sys-devel/gettext >=dev-util/intltool-0.40 >=dev-util/pkgconfig-0.19 x11-proto/inputproto x11-proto/kbproto x11-proto/xf86miscproto >=x11-proto/xproto-7.0.15 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 >=dev-libs/dbus-glib-0.74 >=dev-libs/glib-2.29.14:2 >=x11-libs/gtk+-3.1.10:3 >=gnome-base/gconf-2.6.1:2 >=gnome-base/libgnomekbd-2.91.1 >=gnome-base/gnome-desktop-3.2.0-r1:3 >=gnome-base/gsettings-desktop-schemas-0.1.7.1 media-fonts/cantarell media-libs/fontconfig >=media-libs/lcms-2.2:2 media-libs/libcanberra[gtk3] >=media-sound/pulseaudio-0.9.16 >=sys-power/upower-0.9.11 x11-libs/cairo x11-libs/gdk-pixbuf:2 >=x11-libs/libnotify-0.7.3 x11-libs/libX11 x11-libs/libXi x11-libs/libXext x11-libs/libXfixes x11-libs/libXxf86misc >=x11-libs/libxklavier-5.0 >=media-sound/pulseaudio-0.9.16 colord? ( >=x11-misc/colord-0.1.13 ) cups? ( >=net-print/cups-1.4[dbus] ) packagekit? ( || ( sys-fs/udev[gudev] sys-fs/udev[extras] ) >=app-admin/packagekit-base-0.6.12 ) policykit? ( >=sys-auth/polkit-0.97 >=sys-apps/dbus-1.1.2[X] ) smartcard? ( >=dev-libs/nss-3.11.2 ) udev? ( || ( sys-fs/udev[gudev] sys-fs/udev[extras] ) ) gnome-base/dconf >=x11-themes/gnome-themes-standard-2.91 >=x11-themes/gnome-icon-theme-2.91 >=x11-themes/gnome-icon-theme-symbolic-2.91 !<gnome-base/gnome-control-center-2.22 !<gnome-extra/gnome-color-manager-3.1.1 !<gnome-extra/gnome-power-manager-3.1.3
 0
 mirror://gnome/sources/gnome-settings-daemon/3.2/gnome-settings-daemon-3.2.2.tar.xz
diff --git a/metadata/cache/gnome-base/gnome-settings-daemon-3.2.2-r1 b/metadata/cache/gnome-base/gnome-settings-daemon-3.2.2-r1
index 842be891c392..bee98ef987ef 100644
--- a/metadata/cache/gnome-base/gnome-settings-daemon-3.2.2-r1
+++ b/metadata/cache/gnome-base/gnome-settings-daemon-3.2.2-r1
@@ -1,4 +1,4 @@
->=dev-libs/dbus-glib-0.74 >=dev-libs/glib-2.29.14:2 >=x11-libs/gtk+-3.1.10:3 >=gnome-base/gconf-2.6.1:2 >=gnome-base/libgnomekbd-2.91.1 >=gnome-base/gnome-desktop-3.2.0-r1:3 >=gnome-base/gsettings-desktop-schemas-0.1.7.1 media-fonts/cantarell media-libs/fontconfig >=media-libs/lcms-2.2:2 media-libs/libcanberra[gtk3] >=media-sound/pulseaudio-0.9.16 >=sys-power/upower-0.9.11 x11-libs/cairo x11-libs/gdk-pixbuf:2 >=x11-libs/libnotify-0.7.3 x11-libs/libX11 x11-libs/libXi x11-libs/libXext x11-libs/libXfixes x11-libs/libXxf86misc >=x11-libs/libxklavier-5.0 >=media-sound/pulseaudio-0.9.16 colord? ( >=x11-misc/colord-0.1.13 ) cups? ( >=net-print/cups-1.4[dbus] ) packagekit? ( || ( sys-fs/udev[gudev] sys-fs/udev[extras] ) >=app-admin/packagekit-base-0.6.12 ) policykit? ( >=sys-auth/polkit-0.97 >=sys-apps/dbus-1.1.2[X] ) smartcard? ( >=dev-libs/nss-3.11.2 ) udev? ( || ( sys-fs/udev[gudev] sys-fs/udev[extras] ) ) cups? ( sys-apps/sed ) sys-devel/gettext >=dev-util/intltool-0.40 >=dev-util/pkgconfig-0.19 x11-proto/inputproto x11-proto/kbproto x11-proto/xf86miscproto >=x11-proto/xproto-7.0.15 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+>=dev-libs/dbus-glib-0.74 >=dev-libs/glib-2.29.14:2 >=x11-libs/gtk+-3.1.10:3 >=gnome-base/gconf-2.6.1:2 >=gnome-base/libgnomekbd-2.91.1 >=gnome-base/gnome-desktop-3.2.0-r1:3 >=gnome-base/gsettings-desktop-schemas-0.1.7.1 media-fonts/cantarell media-libs/fontconfig >=media-libs/lcms-2.2:2 media-libs/libcanberra[gtk3] >=media-sound/pulseaudio-0.9.16 >=sys-power/upower-0.9.11 x11-libs/cairo x11-libs/gdk-pixbuf:2 >=x11-libs/libnotify-0.7.3 x11-libs/libX11 x11-libs/libXi x11-libs/libXext x11-libs/libXfixes x11-libs/libXxf86misc >=x11-libs/libxklavier-5.0 >=media-sound/pulseaudio-0.9.16 colord? ( >=x11-misc/colord-0.1.13 ) cups? ( >=net-print/cups-1.4[dbus] ) packagekit? ( || ( sys-fs/udev[gudev] sys-fs/udev[extras] ) >=app-admin/packagekit-base-0.6.12 ) policykit? ( >=sys-auth/polkit-0.97 >=sys-apps/dbus-1.1.2[X] ) smartcard? ( >=dev-libs/nss-3.11.2 ) udev? ( || ( sys-fs/udev[gudev] sys-fs/udev[extras] ) ) cups? ( sys-apps/sed ) sys-devel/gettext >=dev-util/intltool-0.40 >=dev-util/pkgconfig-0.19 x11-proto/inputproto x11-proto/kbproto x11-proto/xf86miscproto >=x11-proto/xproto-7.0.15 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 >=dev-libs/dbus-glib-0.74 >=dev-libs/glib-2.29.14:2 >=x11-libs/gtk+-3.1.10:3 >=gnome-base/gconf-2.6.1:2 >=gnome-base/libgnomekbd-2.91.1 >=gnome-base/gnome-desktop-3.2.0-r1:3 >=gnome-base/gsettings-desktop-schemas-0.1.7.1 media-fonts/cantarell media-libs/fontconfig >=media-libs/lcms-2.2:2 media-libs/libcanberra[gtk3] >=media-sound/pulseaudio-0.9.16 >=sys-power/upower-0.9.11 x11-libs/cairo x11-libs/gdk-pixbuf:2 >=x11-libs/libnotify-0.7.3 x11-libs/libX11 x11-libs/libXi x11-libs/libXext x11-libs/libXfixes x11-libs/libXxf86misc >=x11-libs/libxklavier-5.0 >=media-sound/pulseaudio-0.9.16 colord? ( >=x11-misc/colord-0.1.13 ) cups? ( >=net-print/cups-1.4[dbus] ) packagekit? ( || ( sys-fs/udev[gudev] sys-fs/udev[extras] ) >=app-admin/packagekit-base-0.6.12 ) policykit? ( >=sys-auth/polkit-0.97 >=sys-apps/dbus-1.1.2[X] ) smartcard? ( >=dev-libs/nss-3.11.2 ) udev? ( || ( sys-fs/udev[gudev] sys-fs/udev[extras] ) ) gnome-base/dconf >=x11-themes/gnome-themes-standard-2.91 >=x11-themes/gnome-icon-theme-2.91 >=x11-themes/gnome-icon-theme-symbolic-2.91 !<gnome-base/gnome-control-center-2.22 !<gnome-extra/gnome-color-manager-3.1.1 !<gnome-extra/gnome-power-manager-3.1.3
 0
 mirror://gnome/sources/gnome-settings-daemon/3.2/gnome-settings-daemon-3.2.2.tar.xz
diff --git a/metadata/cache/gnome-base/gnome-shell-3.2.1-r3 b/metadata/cache/gnome-base/gnome-shell-3.2.1-r3
index aed894160f19..29bc6f54d1e3 100644
--- a/metadata/cache/gnome-base/gnome-shell-3.2.1-r3
+++ b/metadata/cache/gnome-base/gnome-shell-3.2.1-r3
@@ -1,4 +1,4 @@
->=dev-libs/glib-2.25.9:2 >=dev-libs/gjs-1.29.18 >=dev-libs/gobject-introspection-0.10.1 x11-libs/gdk-pixbuf:2[introspection] >=x11-libs/gtk+-3.0.0:3[introspection] >=media-libs/clutter-1.7.5:1.0[introspection] app-misc/ca-certificates >=dev-libs/folks-0.5.2 >=dev-libs/json-glib-0.13.2 >=gnome-base/gnome-desktop-2.91.2:3 >=gnome-base/gsettings-desktop-schemas-2.91.91 >=gnome-extra/evolution-data-server-2.91.6 >=media-libs/gstreamer-0.10.16:0.10 >=media-libs/gst-plugins-base-0.10.16:0.10 >=net-im/telepathy-logger-0.2.4[introspection] net-libs/libsoup:2.4[introspection] >=net-libs/telepathy-glib-0.15.5[introspection] >=sys-auth/polkit-0.100[introspection] >=x11-wm/mutter-3.2.1[introspection] dev-libs/dbus-glib dev-libs/libxml2:2 x11-libs/pango[introspection] >=dev-libs/libcroco-0.6.2:0.6 gnome-base/gconf:2[introspection] >=gnome-base/gnome-menus-2.29.10:3[introspection] gnome-base/librsvg media-libs/libcanberra media-sound/pulseaudio >=x11-libs/startup-notification-0.11 x11-libs/libX11 >=x11-libs/libXfixes-5.0 x11-apps/mesa-progs bluetooth? ( >=net-wireless/gnome-bluetooth-3.1.0[introspection] ) networkmanager? ( gnome-base/libgnome-keyring >=net-misc/networkmanager-0.8.999[introspection] ) >=sys-devel/gettext-0.17 >=dev-util/pkgconfig-0.22 >=dev-util/intltool-0.40 gnome-base/gnome-common !!=dev-lang/spidermonkey-1.8.2* || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
+>=dev-libs/glib-2.25.9:2 >=dev-libs/gjs-1.29.18 >=dev-libs/gobject-introspection-0.10.1 x11-libs/gdk-pixbuf:2[introspection] >=x11-libs/gtk+-3.0.0:3[introspection] >=media-libs/clutter-1.7.5:1.0[introspection] app-misc/ca-certificates >=dev-libs/folks-0.5.2 >=dev-libs/json-glib-0.13.2 >=gnome-base/gnome-desktop-2.91.2:3 >=gnome-base/gsettings-desktop-schemas-2.91.91 >=gnome-extra/evolution-data-server-2.91.6 >=media-libs/gstreamer-0.10.16:0.10 >=media-libs/gst-plugins-base-0.10.16:0.10 >=net-im/telepathy-logger-0.2.4[introspection] net-libs/libsoup:2.4[introspection] >=net-libs/telepathy-glib-0.15.5[introspection] >=sys-auth/polkit-0.100[introspection] >=x11-wm/mutter-3.2.1[introspection] dev-libs/dbus-glib dev-libs/libxml2:2 x11-libs/pango[introspection] >=dev-libs/libcroco-0.6.2:0.6 gnome-base/gconf:2[introspection] >=gnome-base/gnome-menus-2.29.10:3[introspection] gnome-base/librsvg media-libs/libcanberra media-sound/pulseaudio >=x11-libs/startup-notification-0.11 x11-libs/libX11 >=x11-libs/libXfixes-5.0 x11-apps/mesa-progs bluetooth? ( >=net-wireless/gnome-bluetooth-3.1.0[introspection] ) networkmanager? ( gnome-base/libgnome-keyring >=net-misc/networkmanager-0.8.999[introspection] ) >=sys-devel/gettext-0.17 >=dev-util/pkgconfig-0.22 >=dev-util/intltool-0.40 gnome-base/gnome-common !!=dev-lang/spidermonkey-1.8.2* || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
 >=dev-libs/glib-2.25.9:2 >=dev-libs/gjs-1.29.18 >=dev-libs/gobject-introspection-0.10.1 x11-libs/gdk-pixbuf:2[introspection] >=x11-libs/gtk+-3.0.0:3[introspection] >=media-libs/clutter-1.7.5:1.0[introspection] app-misc/ca-certificates >=dev-libs/folks-0.5.2 >=dev-libs/json-glib-0.13.2 >=gnome-base/gnome-desktop-2.91.2:3 >=gnome-base/gsettings-desktop-schemas-2.91.91 >=gnome-extra/evolution-data-server-2.91.6 >=media-libs/gstreamer-0.10.16:0.10 >=media-libs/gst-plugins-base-0.10.16:0.10 >=net-im/telepathy-logger-0.2.4[introspection] net-libs/libsoup:2.4[introspection] >=net-libs/telepathy-glib-0.15.5[introspection] >=sys-auth/polkit-0.100[introspection] >=x11-wm/mutter-3.2.1[introspection] dev-libs/dbus-glib dev-libs/libxml2:2 x11-libs/pango[introspection] >=dev-libs/libcroco-0.6.2:0.6 gnome-base/gconf:2[introspection] >=gnome-base/gnome-menus-2.29.10:3[introspection] gnome-base/librsvg media-libs/libcanberra media-sound/pulseaudio >=x11-libs/startup-notification-0.11 x11-libs/libX11 >=x11-libs/libXfixes-5.0 x11-apps/mesa-progs bluetooth? ( >=net-wireless/gnome-bluetooth-3.1.0[introspection] ) networkmanager? ( gnome-base/libgnome-keyring >=net-misc/networkmanager-0.8.999[introspection] ) >=sys-auth/polkit-0.101[introspection] >=gnome-base/dconf-0.4.1 >=gnome-base/libgnomekbd-2.91.4[introspection] sys-power/upower[introspection] >=gnome-base/gnome-session-2.91.91 >=gnome-base/gnome-settings-daemon-2.91 >=gnome-base/gnome-control-center-2.91.92-r1 >=sys-apps/accountsservice-0.6.14[introspection] >=app-accessibility/caribou-0.3 x11-misc/xdg-utils x11-themes/gnome-icon-theme-symbolic networkmanager? ( net-misc/mobile-broadband-provider-info sys-libs/timezone-data ) || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
 0
 mirror://gnome/sources/gnome-shell/3.2/gnome-shell-3.2.1.tar.xz http://dev.gentoo.org/~tetromino/distfiles/gnome-shell/gnome-shell-3.2.1-patches-1.tar.xz
diff --git a/metadata/cache/gnome-base/gnome-shell-3.2.2.1 b/metadata/cache/gnome-base/gnome-shell-3.2.2.1
index 0735de814f7e..67c15788c610 100644
--- a/metadata/cache/gnome-base/gnome-shell-3.2.2.1
+++ b/metadata/cache/gnome-base/gnome-shell-3.2.2.1
@@ -1,4 +1,4 @@
->=dev-libs/glib-2.25.9:2 >=dev-libs/gjs-1.29.18 >=dev-libs/gobject-introspection-0.10.1 x11-libs/gdk-pixbuf:2[introspection] >=x11-libs/gtk+-3.0.0:3[introspection] >=media-libs/clutter-1.7.5:1.0[introspection] app-misc/ca-certificates >=dev-libs/folks-0.5.2 >=dev-libs/json-glib-0.13.2 >=gnome-base/gnome-desktop-2.91.2:3 >=gnome-base/gsettings-desktop-schemas-2.91.91 >=gnome-extra/evolution-data-server-2.91.6 >=media-libs/gstreamer-0.10.16:0.10 >=media-libs/gst-plugins-base-0.10.16:0.10 >=net-im/telepathy-logger-0.2.4[introspection] net-libs/libsoup:2.4[introspection] >=net-libs/telepathy-glib-0.15.5[introspection] >=sys-auth/polkit-0.100[introspection] >=x11-wm/mutter-3.2.1[introspection] dev-libs/dbus-glib dev-libs/libxml2:2 x11-libs/pango[introspection] >=dev-libs/libcroco-0.6.2:0.6 gnome-base/gconf:2[introspection] >=gnome-base/gnome-menus-2.29.10:3[introspection] gnome-base/librsvg media-libs/libcanberra media-sound/pulseaudio >=x11-libs/startup-notification-0.11 x11-libs/libX11 >=x11-libs/libXfixes-5.0 x11-apps/mesa-progs bluetooth? ( >=net-wireless/gnome-bluetooth-3.1.0[introspection] ) networkmanager? ( gnome-base/libgnome-keyring >=net-misc/networkmanager-0.8.999[introspection] ) >=sys-devel/gettext-0.17 >=dev-util/pkgconfig-0.22 >=dev-util/intltool-0.40 gnome-base/gnome-common !!=dev-lang/spidermonkey-1.8.2* || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
+>=dev-libs/glib-2.25.9:2 >=dev-libs/gjs-1.29.18 >=dev-libs/gobject-introspection-0.10.1 x11-libs/gdk-pixbuf:2[introspection] >=x11-libs/gtk+-3.0.0:3[introspection] >=media-libs/clutter-1.7.5:1.0[introspection] app-misc/ca-certificates >=dev-libs/folks-0.5.2 >=dev-libs/json-glib-0.13.2 >=gnome-base/gnome-desktop-2.91.2:3 >=gnome-base/gsettings-desktop-schemas-2.91.91 >=gnome-extra/evolution-data-server-2.91.6 >=media-libs/gstreamer-0.10.16:0.10 >=media-libs/gst-plugins-base-0.10.16:0.10 >=net-im/telepathy-logger-0.2.4[introspection] net-libs/libsoup:2.4[introspection] >=net-libs/telepathy-glib-0.15.5[introspection] >=sys-auth/polkit-0.100[introspection] >=x11-wm/mutter-3.2.1[introspection] dev-libs/dbus-glib dev-libs/libxml2:2 x11-libs/pango[introspection] >=dev-libs/libcroco-0.6.2:0.6 gnome-base/gconf:2[introspection] >=gnome-base/gnome-menus-2.29.10:3[introspection] gnome-base/librsvg media-libs/libcanberra media-sound/pulseaudio >=x11-libs/startup-notification-0.11 x11-libs/libX11 >=x11-libs/libXfixes-5.0 x11-apps/mesa-progs bluetooth? ( >=net-wireless/gnome-bluetooth-3.1.0[introspection] ) networkmanager? ( gnome-base/libgnome-keyring >=net-misc/networkmanager-0.8.999[introspection] ) >=sys-devel/gettext-0.17 >=dev-util/pkgconfig-0.22 >=dev-util/intltool-0.40 gnome-base/gnome-common !!=dev-lang/spidermonkey-1.8.2* || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
 >=dev-libs/glib-2.25.9:2 >=dev-libs/gjs-1.29.18 >=dev-libs/gobject-introspection-0.10.1 x11-libs/gdk-pixbuf:2[introspection] >=x11-libs/gtk+-3.0.0:3[introspection] >=media-libs/clutter-1.7.5:1.0[introspection] app-misc/ca-certificates >=dev-libs/folks-0.5.2 >=dev-libs/json-glib-0.13.2 >=gnome-base/gnome-desktop-2.91.2:3 >=gnome-base/gsettings-desktop-schemas-2.91.91 >=gnome-extra/evolution-data-server-2.91.6 >=media-libs/gstreamer-0.10.16:0.10 >=media-libs/gst-plugins-base-0.10.16:0.10 >=net-im/telepathy-logger-0.2.4[introspection] net-libs/libsoup:2.4[introspection] >=net-libs/telepathy-glib-0.15.5[introspection] >=sys-auth/polkit-0.100[introspection] >=x11-wm/mutter-3.2.1[introspection] dev-libs/dbus-glib dev-libs/libxml2:2 x11-libs/pango[introspection] >=dev-libs/libcroco-0.6.2:0.6 gnome-base/gconf:2[introspection] >=gnome-base/gnome-menus-2.29.10:3[introspection] gnome-base/librsvg media-libs/libcanberra media-sound/pulseaudio >=x11-libs/startup-notification-0.11 x11-libs/libX11 >=x11-libs/libXfixes-5.0 x11-apps/mesa-progs bluetooth? ( >=net-wireless/gnome-bluetooth-3.1.0[introspection] ) networkmanager? ( gnome-base/libgnome-keyring >=net-misc/networkmanager-0.8.999[introspection] ) >=sys-auth/polkit-0.101[introspection] >=gnome-base/dconf-0.4.1 >=gnome-base/libgnomekbd-2.91.4[introspection] sys-power/upower[introspection] >=gnome-base/gnome-session-2.91.91 >=gnome-base/gnome-settings-daemon-2.91 >=gnome-base/gnome-control-center-2.91.92-r1 >=sys-apps/accountsservice-0.6.14[introspection] >=app-accessibility/caribou-0.3 x11-misc/xdg-utils x11-themes/gnome-icon-theme-symbolic networkmanager? ( net-misc/mobile-broadband-provider-info sys-libs/timezone-data ) || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
 0
 mirror://gnome/sources/gnome-shell/3.2/gnome-shell-3.2.2.1.tar.xz http://dev.gentoo.org/~tetromino/distfiles/gnome-shell/gnome-shell-3.2.2.1-patches-1.tar.xz
diff --git a/metadata/cache/gnome-base/gnome-vfs-2.24.4-r1 b/metadata/cache/gnome-base/gnome-vfs-2.24.4-r1
index 14076e588e59..723be781ca5b 100644
--- a/metadata/cache/gnome-base/gnome-vfs-2.24.4-r1
+++ b/metadata/cache/gnome-base/gnome-vfs-2.24.4-r1
@@ -1,4 +1,4 @@
->=gnome-base/gconf-2 >=dev-libs/glib-2.9.3 >=dev-libs/libxml2-2.6 app-arch/bzip2 gnome-base/gnome-mime-data >=x11-misc/shared-mime-info-0.14 >=dev-libs/dbus-glib-0.71 acl? ( sys-apps/acl sys-apps/attr ) avahi? ( >=net-dns/avahi-0.6 ) kerberos? ( virtual/krb5 ) fam? ( virtual/fam ) samba? ( >=net-fs/samba-3 ) ssl? ( gnutls? ( net-libs/gnutls !gnome-extra/gnome-vfs-sftp ) !gnutls? ( >=dev-libs/openssl-0.9.5 !gnome-extra/gnome-vfs-sftp ) ) sys-devel/gettext gnome-base/gnome-common >=dev-util/intltool-0.40 >=dev-util/pkgconfig-0.9 >=dev-util/gtk-doc-am-1.13 doc? ( >=dev-util/gtk-doc-1 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+>=gnome-base/gconf-2 >=dev-libs/glib-2.9.3 >=dev-libs/libxml2-2.6 app-arch/bzip2 gnome-base/gnome-mime-data >=x11-misc/shared-mime-info-0.14 >=dev-libs/dbus-glib-0.71 acl? ( sys-apps/acl sys-apps/attr ) avahi? ( >=net-dns/avahi-0.6 ) kerberos? ( virtual/krb5 ) fam? ( virtual/fam ) samba? ( >=net-fs/samba-3 ) ssl? ( gnutls? ( net-libs/gnutls !gnome-extra/gnome-vfs-sftp ) !gnutls? ( >=dev-libs/openssl-0.9.5 !gnome-extra/gnome-vfs-sftp ) ) sys-devel/gettext gnome-base/gnome-common >=dev-util/intltool-0.40 >=dev-util/pkgconfig-0.9 >=dev-util/gtk-doc-am-1.13 doc? ( >=dev-util/gtk-doc-1 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 >=gnome-base/gconf-2 >=dev-libs/glib-2.9.3 >=dev-libs/libxml2-2.6 app-arch/bzip2 gnome-base/gnome-mime-data >=x11-misc/shared-mime-info-0.14 >=dev-libs/dbus-glib-0.71 acl? ( sys-apps/acl sys-apps/attr ) avahi? ( >=net-dns/avahi-0.6 ) kerberos? ( virtual/krb5 ) fam? ( virtual/fam ) samba? ( >=net-fs/samba-3 ) ssl? ( gnutls? ( net-libs/gnutls !gnome-extra/gnome-vfs-sftp ) !gnutls? ( >=dev-libs/openssl-0.9.5 !gnome-extra/gnome-vfs-sftp ) )
 2
 mirror://gnome/sources/gnome-vfs/2.24/gnome-vfs-2.24.4.tar.bz2
diff --git a/metadata/cache/gnome-base/gvfs-1.10.1 b/metadata/cache/gnome-base/gvfs-1.10.1
index 473574eb1369..1d3cf1f62c27 100644
--- a/metadata/cache/gnome-base/gvfs-1.10.1
+++ b/metadata/cache/gnome-base/gvfs-1.10.1
@@ -1,4 +1,4 @@
->=dev-libs/glib-2.29.14 sys-apps/dbus dev-libs/libxml2 net-misc/openssh !prefix? ( >=sys-fs/udev-164-r2 ) afp? ( >=dev-libs/libgcrypt-1.2.2 ) archive? ( app-arch/libarchive ) avahi? ( >=net-dns/avahi-0.6 ) bluetooth? ( >=app-mobilephone/obex-data-server-0.4.5 dev-libs/dbus-glib net-wireless/bluez dev-libs/expat ) bluray? ( media-libs/libbluray ) fuse? ( >=sys-fs/fuse-2.8.0 ) gdu? ( >=sys-apps/gnome-disk-utility-3.0.2 ) gnome-keyring? ( >=gnome-base/gnome-keyring-1.0 ) gphoto2? ( >=media-libs/libgphoto2-2.4.7 ) ios? ( >=app-pda/libimobiledevice-1.1.0 >=app-pda/libplist-1 ) udev? ( cdda? ( >=dev-libs/libcdio-0.78.2[-minimal] ) || ( >=sys-fs/udev-171[gudev] >=sys-fs/udev-145[extras] ) ) http? ( >=net-libs/libsoup-gnome-2.26.0 ) samba? ( >=net-fs/samba-3.4.6[smbclient] ) >=dev-util/intltool-0.40 dev-util/pkgconfig dev-util/gtk-doc-am doc? ( >=dev-util/gtk-doc-1 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
+>=dev-libs/glib-2.29.14 sys-apps/dbus dev-libs/libxml2 net-misc/openssh !prefix? ( >=sys-fs/udev-164-r2 ) afp? ( >=dev-libs/libgcrypt-1.2.2 ) archive? ( app-arch/libarchive ) avahi? ( >=net-dns/avahi-0.6 ) bluetooth? ( >=app-mobilephone/obex-data-server-0.4.5 dev-libs/dbus-glib net-wireless/bluez dev-libs/expat ) bluray? ( media-libs/libbluray ) fuse? ( >=sys-fs/fuse-2.8.0 ) gdu? ( >=sys-apps/gnome-disk-utility-3.0.2 ) gnome-keyring? ( >=gnome-base/gnome-keyring-1.0 ) gphoto2? ( >=media-libs/libgphoto2-2.4.7 ) ios? ( >=app-pda/libimobiledevice-1.1.0 >=app-pda/libplist-1 ) udev? ( cdda? ( >=dev-libs/libcdio-0.78.2[-minimal] ) || ( >=sys-fs/udev-171[gudev] >=sys-fs/udev-145[extras] ) ) http? ( >=net-libs/libsoup-gnome-2.26.0 ) samba? ( >=net-fs/samba-3.4.6[smbclient] ) >=dev-util/intltool-0.40 dev-util/pkgconfig dev-util/gtk-doc-am doc? ( >=dev-util/gtk-doc-1 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
 >=dev-libs/glib-2.29.14 sys-apps/dbus dev-libs/libxml2 net-misc/openssh !prefix? ( >=sys-fs/udev-164-r2 ) afp? ( >=dev-libs/libgcrypt-1.2.2 ) archive? ( app-arch/libarchive ) avahi? ( >=net-dns/avahi-0.6 ) bluetooth? ( >=app-mobilephone/obex-data-server-0.4.5 dev-libs/dbus-glib net-wireless/bluez dev-libs/expat ) bluray? ( media-libs/libbluray ) fuse? ( >=sys-fs/fuse-2.8.0 ) gdu? ( >=sys-apps/gnome-disk-utility-3.0.2 ) gnome-keyring? ( >=gnome-base/gnome-keyring-1.0 ) gphoto2? ( >=media-libs/libgphoto2-2.4.7 ) ios? ( >=app-pda/libimobiledevice-1.1.0 >=app-pda/libplist-1 ) udev? ( cdda? ( >=dev-libs/libcdio-0.78.2[-minimal] ) || ( >=sys-fs/udev-171[gudev] >=sys-fs/udev-145[extras] ) ) http? ( >=net-libs/libsoup-gnome-2.26.0 ) samba? ( >=net-fs/samba-3.4.6[smbclient] )
 0
 mirror://gnome/sources/gvfs/1.10/gvfs-1.10.1.tar.xz http://dev.gentoo.org/~tetromino/distfiles/aclocal/libgcrypt.m4.bz2
diff --git a/metadata/cache/gnome-base/gvfs-1.6.7-r1 b/metadata/cache/gnome-base/gvfs-1.6.7-r1
index 3e2835feee97..d0bd5b0a3444 100644
--- a/metadata/cache/gnome-base/gvfs-1.6.7-r1
+++ b/metadata/cache/gnome-base/gvfs-1.6.7-r1
@@ -1,4 +1,4 @@
->=dev-libs/glib-2.23.4:2 >=sys-apps/dbus-1.0 dev-libs/libxml2 net-misc/openssh !prefix? ( >=sys-fs/udev-138 ) archive? ( app-arch/libarchive ) avahi? ( >=net-dns/avahi-0.6 ) bluetooth? ( >=app-mobilephone/obex-data-server-0.4.5 dev-libs/dbus-glib net-wireless/bluez dev-libs/expat ) fuse? ( >=sys-fs/fuse-2.8.0 ) gdu? ( >=sys-apps/gnome-disk-utility-2.29 ) gnome? ( >=gnome-base/gconf-2.0 ) gnome-keyring? ( >=gnome-base/gnome-keyring-1.0 ) gphoto2? ( >=media-libs/libgphoto2-2.4.7 ) ios? ( app-pda/libimobiledevice ) udev? ( cdda? ( >=dev-libs/libcdio-0.78.2[-minimal] ) || ( >=sys-fs/udev-171[gudev] >=sys-fs/udev-145[extras] ) ) http? ( >=net-libs/libsoup-gnome-2.26.0 ) samba? ( >=net-fs/samba-3.4.6[smbclient] ) >=dev-util/intltool-0.40 >=dev-util/pkgconfig-0.19 dev-util/gtk-doc-am doc? ( >=dev-util/gtk-doc-1 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+>=dev-libs/glib-2.23.4:2 >=sys-apps/dbus-1.0 dev-libs/libxml2 net-misc/openssh !prefix? ( >=sys-fs/udev-138 ) archive? ( app-arch/libarchive ) avahi? ( >=net-dns/avahi-0.6 ) bluetooth? ( >=app-mobilephone/obex-data-server-0.4.5 dev-libs/dbus-glib net-wireless/bluez dev-libs/expat ) fuse? ( >=sys-fs/fuse-2.8.0 ) gdu? ( >=sys-apps/gnome-disk-utility-2.29 ) gnome? ( >=gnome-base/gconf-2.0 ) gnome-keyring? ( >=gnome-base/gnome-keyring-1.0 ) gphoto2? ( >=media-libs/libgphoto2-2.4.7 ) ios? ( app-pda/libimobiledevice ) udev? ( cdda? ( >=dev-libs/libcdio-0.78.2[-minimal] ) || ( >=sys-fs/udev-171[gudev] >=sys-fs/udev-145[extras] ) ) http? ( >=net-libs/libsoup-gnome-2.26.0 ) samba? ( >=net-fs/samba-3.4.6[smbclient] ) >=dev-util/intltool-0.40 >=dev-util/pkgconfig-0.19 dev-util/gtk-doc-am doc? ( >=dev-util/gtk-doc-1 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 >=dev-libs/glib-2.23.4:2 >=sys-apps/dbus-1.0 dev-libs/libxml2 net-misc/openssh !prefix? ( >=sys-fs/udev-138 ) archive? ( app-arch/libarchive ) avahi? ( >=net-dns/avahi-0.6 ) bluetooth? ( >=app-mobilephone/obex-data-server-0.4.5 dev-libs/dbus-glib net-wireless/bluez dev-libs/expat ) fuse? ( >=sys-fs/fuse-2.8.0 ) gdu? ( >=sys-apps/gnome-disk-utility-2.29 ) gnome? ( >=gnome-base/gconf-2.0 ) gnome-keyring? ( >=gnome-base/gnome-keyring-1.0 ) gphoto2? ( >=media-libs/libgphoto2-2.4.7 ) ios? ( app-pda/libimobiledevice ) udev? ( cdda? ( >=dev-libs/libcdio-0.78.2[-minimal] ) || ( >=sys-fs/udev-171[gudev] >=sys-fs/udev-145[extras] ) ) http? ( >=net-libs/libsoup-gnome-2.26.0 ) samba? ( >=net-fs/samba-3.4.6[smbclient] ) bash-completion? ( app-admin/eselect )
 0
 mirror://gnome/sources/gvfs/1.6/gvfs-1.6.7.tar.bz2
diff --git a/metadata/cache/gnome-base/libgnome-keyring-2.32.0 b/metadata/cache/gnome-base/libgnome-keyring-2.32.0
index cd6dee7738ff..662d38a545d0 100644
--- a/metadata/cache/gnome-base/libgnome-keyring-2.32.0
+++ b/metadata/cache/gnome-base/libgnome-keyring-2.32.0
@@ -1,4 +1,4 @@
->=sys-apps/dbus-1.0 >=gnome-base/gnome-keyring-2.29[test?] !<gnome-base/gnome-keyring-2.29 sys-devel/gettext >=dev-util/intltool-0.35 >=dev-util/pkgconfig-0.9 doc? ( >=dev-util/gtk-doc-1.9 ) >=sys-apps/sed-4 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=sys-apps/dbus-1.0 >=gnome-base/gnome-keyring-2.29[test?] !<gnome-base/gnome-keyring-2.29 sys-devel/gettext >=dev-util/intltool-0.35 >=dev-util/pkgconfig-0.9 doc? ( >=dev-util/gtk-doc-1.9 ) >=sys-apps/sed-4 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=sys-apps/dbus-1.0 >=gnome-base/gnome-keyring-2.29[test?] !<gnome-base/gnome-keyring-2.29
 0
 mirror://gnome/sources/libgnome-keyring/2.32/libgnome-keyring-2.32.0.tar.bz2
diff --git a/metadata/cache/gnome-base/librsvg-2.34.1 b/metadata/cache/gnome-base/librsvg-2.34.1
index 22565d9d3d2d..76b0e97bdeb2 100644
--- a/metadata/cache/gnome-base/librsvg-2.34.1
+++ b/metadata/cache/gnome-base/librsvg-2.34.1
@@ -1,4 +1,4 @@
->=media-libs/fontconfig-1.0.1 >=media-libs/freetype-2 >=dev-libs/glib-2.24:2 >=x11-libs/cairo-1.2 >=x11-libs/pango-1.10 >=dev-libs/libxml2-2.4.7:2 >=dev-libs/libcroco-0.6.1 || ( x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 ) gtk? ( >=x11-libs/gtk+-2.16:2 ) >=dev-util/pkgconfig-0.12 doc? ( >=dev-util/gtk-doc-1.13 ) >=dev-util/gtk-doc-am-1.13 app-arch/xz-utils >=sys-apps/sed-4 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=media-libs/fontconfig-1.0.1 >=media-libs/freetype-2 >=dev-libs/glib-2.24:2 >=x11-libs/cairo-1.2 >=x11-libs/pango-1.10 >=dev-libs/libxml2-2.4.7:2 >=dev-libs/libcroco-0.6.1 || ( x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 ) gtk? ( >=x11-libs/gtk+-2.16:2 ) >=dev-util/pkgconfig-0.12 doc? ( >=dev-util/gtk-doc-1.13 ) >=dev-util/gtk-doc-am-1.13 app-arch/xz-utils >=sys-apps/sed-4 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=media-libs/fontconfig-1.0.1 >=media-libs/freetype-2 >=dev-libs/glib-2.24:2 >=x11-libs/cairo-1.2 >=x11-libs/pango-1.10 >=dev-libs/libxml2-2.4.7:2 >=dev-libs/libcroco-0.6.1 || ( x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 ) gtk? ( >=x11-libs/gtk+-2.16:2 )
 2
 mirror://gnome/sources/librsvg/2.34/librsvg-2.34.1.tar.xz
diff --git a/metadata/cache/gnome-base/librsvg-2.34.1-r1 b/metadata/cache/gnome-base/librsvg-2.34.1-r1
index a48aafc6fd06..c561538321fb 100644
--- a/metadata/cache/gnome-base/librsvg-2.34.1-r1
+++ b/metadata/cache/gnome-base/librsvg-2.34.1-r1
@@ -1,4 +1,4 @@
->=media-libs/fontconfig-1.0.1 >=media-libs/freetype-2 >=dev-libs/glib-2.24:2 >=x11-libs/cairo-1.2 >=x11-libs/pango-1.10 >=dev-libs/libxml2-2.4.7:2 >=dev-libs/libcroco-0.6.1 || ( x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 ) gtk? ( >=x11-libs/gtk+-2.16:2 ) gtk3? ( >=x11-libs/gtk+-2.90.0:3 ) >=dev-util/pkgconfig-0.12 doc? ( >=dev-util/gtk-doc-1.13 ) >=dev-util/gtk-doc-am-1.13 app-arch/xz-utils >=sys-apps/sed-4 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=media-libs/fontconfig-1.0.1 >=media-libs/freetype-2 >=dev-libs/glib-2.24:2 >=x11-libs/cairo-1.2 >=x11-libs/pango-1.10 >=dev-libs/libxml2-2.4.7:2 >=dev-libs/libcroco-0.6.1 || ( x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 ) gtk? ( >=x11-libs/gtk+-2.16:2 ) gtk3? ( >=x11-libs/gtk+-2.90.0:3 ) >=dev-util/pkgconfig-0.12 doc? ( >=dev-util/gtk-doc-1.13 ) >=dev-util/gtk-doc-am-1.13 app-arch/xz-utils >=sys-apps/sed-4 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=media-libs/fontconfig-1.0.1 >=media-libs/freetype-2 >=dev-libs/glib-2.24:2 >=x11-libs/cairo-1.2 >=x11-libs/pango-1.10 >=dev-libs/libxml2-2.4.7:2 >=dev-libs/libcroco-0.6.1 || ( x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 ) gtk? ( >=x11-libs/gtk+-2.16:2 ) gtk3? ( >=x11-libs/gtk+-2.90.0:3 )
 2
 mirror://gnome/sources/librsvg/2.34/librsvg-2.34.1.tar.xz
diff --git a/metadata/cache/gnome-base/librsvg-2.34.2 b/metadata/cache/gnome-base/librsvg-2.34.2
index 352a8fa95b57..907ed5360ec4 100644
--- a/metadata/cache/gnome-base/librsvg-2.34.2
+++ b/metadata/cache/gnome-base/librsvg-2.34.2
@@ -1,4 +1,4 @@
->=media-libs/fontconfig-1.0.1 >=media-libs/freetype-2 >=dev-libs/glib-2.24:2 >=x11-libs/cairo-1.2 >=x11-libs/pango-1.10 >=dev-libs/libxml2-2.4.7:2 >=dev-libs/libcroco-0.6.1 x11-libs/gdk-pixbuf:2[introspection?] gtk? ( >=x11-libs/gtk+-2.16:2 ) gtk3? ( >=x11-libs/gtk+-2.90.0:3 ) introspection? ( >=dev-libs/gobject-introspection-0.10.8 ) >=dev-util/pkgconfig-0.12 doc? ( >=dev-util/gtk-doc-1.13 ) >=dev-util/gtk-doc-am-1.13 app-arch/xz-utils >=sys-apps/sed-4 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool =dev-lang/python-2*
+>=media-libs/fontconfig-1.0.1 >=media-libs/freetype-2 >=dev-libs/glib-2.24:2 >=x11-libs/cairo-1.2 >=x11-libs/pango-1.10 >=dev-libs/libxml2-2.4.7:2 >=dev-libs/libcroco-0.6.1 x11-libs/gdk-pixbuf:2[introspection?] gtk? ( >=x11-libs/gtk+-2.16:2 ) gtk3? ( >=x11-libs/gtk+-2.90.0:3 ) introspection? ( >=dev-libs/gobject-introspection-0.10.8 ) >=dev-util/pkgconfig-0.12 doc? ( >=dev-util/gtk-doc-1.13 ) >=dev-util/gtk-doc-am-1.13 app-arch/xz-utils >=sys-apps/sed-4 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool =dev-lang/python-2*
 >=media-libs/fontconfig-1.0.1 >=media-libs/freetype-2 >=dev-libs/glib-2.24:2 >=x11-libs/cairo-1.2 >=x11-libs/pango-1.10 >=dev-libs/libxml2-2.4.7:2 >=dev-libs/libcroco-0.6.1 x11-libs/gdk-pixbuf:2[introspection?] gtk? ( >=x11-libs/gtk+-2.16:2 ) gtk3? ( >=x11-libs/gtk+-2.90.0:3 ) introspection? ( >=dev-libs/gobject-introspection-0.10.8 ) =dev-lang/python-2*
 2
 mirror://gnome/sources/librsvg/2.34/librsvg-2.34.2.tar.xz mirror://gentoo/introspection.m4.bz2
diff --git a/metadata/cache/gnome-base/orbit-2.14.19-r1 b/metadata/cache/gnome-base/orbit-2.14.19-r1
index bafccaa00eeb..1dd7706ed56d 100644
--- a/metadata/cache/gnome-base/orbit-2.14.19-r1
+++ b/metadata/cache/gnome-base/orbit-2.14.19-r1
@@ -1,4 +1,4 @@
->=dev-libs/glib-2.8:2 >=dev-libs/libIDL-0.8.2 >=dev-util/pkgconfig-0.18 dev-util/gtk-doc-am doc? ( >=dev-util/gtk-doc-1 ) >=sys-apps/sed-4 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-libs/glib-2.8:2 >=dev-libs/libIDL-0.8.2 >=dev-util/pkgconfig-0.18 dev-util/gtk-doc-am doc? ( >=dev-util/gtk-doc-1 ) >=sys-apps/sed-4 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=dev-libs/glib-2.8:2 >=dev-libs/libIDL-0.8.2
 2
 mirror://gnome/sources/ORBit2/2.14/ORBit2-2.14.19.tar.bz2
diff --git a/metadata/cache/gnome-extra/activity-log-manager-0.9.2 b/metadata/cache/gnome-extra/activity-log-manager-0.9.2
index abb610639294..6b932dfd4c6b 100644
--- a/metadata/cache/gnome-extra/activity-log-manager-0.9.2
+++ b/metadata/cache/gnome-extra/activity-log-manager-0.9.2
@@ -1,4 +1,4 @@
-dev-libs/libzeitgeist dev-libs/libgee:0 dev-libs/glib:2 gnome-extra/zeitgeist x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/pango dev-lang/vala:0.10 dev-util/intltool sys-devel/gettext || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
+dev-libs/libzeitgeist dev-libs/libgee:0 dev-libs/glib:2 gnome-extra/zeitgeist x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/pango dev-lang/vala:0.10 dev-util/intltool sys-devel/gettext || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
 dev-libs/libzeitgeist dev-libs/libgee:0 dev-libs/glib:2 gnome-extra/zeitgeist x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/pango
 0
 http://launchpad.net/history-manager/0.9/0.9.2/+download/activity-log-manager-0.9.2.tar.gz
diff --git a/metadata/cache/gnome-extra/activity-log-manager-0.9.3 b/metadata/cache/gnome-extra/activity-log-manager-0.9.3
index 332a510b2d6a..b5d45421e97a 100644
--- a/metadata/cache/gnome-extra/activity-log-manager-0.9.3
+++ b/metadata/cache/gnome-extra/activity-log-manager-0.9.3
@@ -1,4 +1,4 @@
-dev-libs/libzeitgeist dev-libs/libgee:0 dev-libs/glib:2 gnome-extra/zeitgeist x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/pango dev-lang/vala:0.10 dev-util/intltool sys-devel/gettext || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
+dev-libs/libzeitgeist dev-libs/libgee:0 dev-libs/glib:2 gnome-extra/zeitgeist x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/pango dev-lang/vala:0.10 dev-util/intltool sys-devel/gettext || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
 dev-libs/libzeitgeist dev-libs/libgee:0 dev-libs/glib:2 gnome-extra/zeitgeist x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/pango
 0
 http://launchpad.net/history-manager/0.9/0.9.3/+download/activity-log-manager-0.9.3.tar.gz
diff --git a/metadata/cache/gnome-extra/cinnamon-1.3.1 b/metadata/cache/gnome-extra/cinnamon-1.3.1
index 6bc7805da6c5..97d5a69eaccb 100644
--- a/metadata/cache/gnome-extra/cinnamon-1.3.1
+++ b/metadata/cache/gnome-extra/cinnamon-1.3.1
@@ -1,4 +1,4 @@
->=dev-libs/glib-2.29.10:2 >=dev-libs/gjs-1.29.18 >=dev-libs/gobject-introspection-0.10.1 x11-libs/gdk-pixbuf:2[introspection] >=x11-libs/gtk+-3.0.0:3[introspection] >=media-libs/clutter-1.7.5:1.0[introspection] app-misc/ca-certificates >=dev-libs/folks-0.5.2 >=dev-libs/json-glib-0.13.2 >=gnome-base/gnome-desktop-2.91.2:3 >=gnome-base/gsettings-desktop-schemas-2.91.91 >=gnome-extra/evolution-data-server-2.91.6 >=media-libs/gstreamer-0.10.16:0.10 >=media-libs/gst-plugins-base-0.10.16:0.10 >=net-im/telepathy-logger-0.2.4[introspection] net-libs/libsoup:2.4[introspection] >=net-libs/telepathy-glib-0.15.5[introspection] >=sys-auth/polkit-0.100[introspection] >=x11-wm/muffin-1.0.1[introspection] dev-libs/dbus-glib dev-libs/libxml2:2 x11-libs/pango[introspection] >=dev-libs/libcroco-0.6.2:0.6 gnome-base/gconf:2[introspection] >=gnome-base/gnome-menus-3.2.0.1-r1:3[introspection] gnome-base/librsvg media-libs/libcanberra media-sound/pulseaudio >=x11-libs/startup-notification-0.11 x11-libs/libX11 >=x11-libs/libXfixes-5.0 x11-apps/mesa-progs bluetooth? ( >=net-wireless/gnome-bluetooth-3.1.0[introspection] ) networkmanager? ( gnome-base/libgnome-keyring >=net-misc/networkmanager-0.8.999[introspection] ) >=sys-devel/gettext-0.17 >=dev-util/pkgconfig-0.22 >=dev-util/intltool-0.40 gnome-base/gnome-common !!=dev-lang/spidermonkey-1.8.2* || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
+>=dev-libs/glib-2.29.10:2 >=dev-libs/gjs-1.29.18 >=dev-libs/gobject-introspection-0.10.1 x11-libs/gdk-pixbuf:2[introspection] >=x11-libs/gtk+-3.0.0:3[introspection] >=media-libs/clutter-1.7.5:1.0[introspection] app-misc/ca-certificates >=dev-libs/folks-0.5.2 >=dev-libs/json-glib-0.13.2 >=gnome-base/gnome-desktop-2.91.2:3 >=gnome-base/gsettings-desktop-schemas-2.91.91 >=gnome-extra/evolution-data-server-2.91.6 >=media-libs/gstreamer-0.10.16:0.10 >=media-libs/gst-plugins-base-0.10.16:0.10 >=net-im/telepathy-logger-0.2.4[introspection] net-libs/libsoup:2.4[introspection] >=net-libs/telepathy-glib-0.15.5[introspection] >=sys-auth/polkit-0.100[introspection] >=x11-wm/muffin-1.0.1[introspection] dev-libs/dbus-glib dev-libs/libxml2:2 x11-libs/pango[introspection] >=dev-libs/libcroco-0.6.2:0.6 gnome-base/gconf:2[introspection] >=gnome-base/gnome-menus-3.2.0.1-r1:3[introspection] gnome-base/librsvg media-libs/libcanberra media-sound/pulseaudio >=x11-libs/startup-notification-0.11 x11-libs/libX11 >=x11-libs/libXfixes-5.0 x11-apps/mesa-progs bluetooth? ( >=net-wireless/gnome-bluetooth-3.1.0[introspection] ) networkmanager? ( gnome-base/libgnome-keyring >=net-misc/networkmanager-0.8.999[introspection] ) >=sys-devel/gettext-0.17 >=dev-util/pkgconfig-0.22 >=dev-util/intltool-0.40 gnome-base/gnome-common !!=dev-lang/spidermonkey-1.8.2* || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
 >=dev-libs/glib-2.29.10:2 >=dev-libs/gjs-1.29.18 >=dev-libs/gobject-introspection-0.10.1 x11-libs/gdk-pixbuf:2[introspection] >=x11-libs/gtk+-3.0.0:3[introspection] >=media-libs/clutter-1.7.5:1.0[introspection] app-misc/ca-certificates >=dev-libs/folks-0.5.2 >=dev-libs/json-glib-0.13.2 >=gnome-base/gnome-desktop-2.91.2:3 >=gnome-base/gsettings-desktop-schemas-2.91.91 >=gnome-extra/evolution-data-server-2.91.6 >=media-libs/gstreamer-0.10.16:0.10 >=media-libs/gst-plugins-base-0.10.16:0.10 >=net-im/telepathy-logger-0.2.4[introspection] net-libs/libsoup:2.4[introspection] >=net-libs/telepathy-glib-0.15.5[introspection] >=sys-auth/polkit-0.100[introspection] >=x11-wm/muffin-1.0.1[introspection] dev-libs/dbus-glib dev-libs/libxml2:2 x11-libs/pango[introspection] >=dev-libs/libcroco-0.6.2:0.6 gnome-base/gconf:2[introspection] >=gnome-base/gnome-menus-3.2.0.1-r1:3[introspection] gnome-base/librsvg media-libs/libcanberra media-sound/pulseaudio >=x11-libs/startup-notification-0.11 x11-libs/libX11 >=x11-libs/libXfixes-5.0 x11-apps/mesa-progs bluetooth? ( >=net-wireless/gnome-bluetooth-3.1.0[introspection] ) networkmanager? ( gnome-base/libgnome-keyring >=net-misc/networkmanager-0.8.999[introspection] ) >=gnome-base/dconf-0.4.1 >=gnome-base/libgnomekbd-2.91.4[introspection] sys-power/upower[introspection] >=gnome-base/gnome-session-3.2.1-r1 >=gnome-base/gnome-settings-daemon-2.91 >=gnome-base/gnome-control-center-2.91.92-r1 >=sys-apps/accountsservice-0.6.14[introspection] >=app-accessibility/caribou-0.3 x11-misc/xdg-utils dev-python/dbus-python dev-python/gconf-python:2 x11-themes/gnome-icon-theme-symbolic networkmanager? ( net-misc/mobile-broadband-provider-info sys-libs/timezone-data ) || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
 0
 https://github.com/linuxmint/Cinnamon/tarball/1.3.1 -> cinnamon-1.3.1.tar.gz
diff --git a/metadata/cache/gnome-extra/cinnamon-1.4 b/metadata/cache/gnome-extra/cinnamon-1.4
index 38f793b1390a..fe619ca3c0d1 100644
--- a/metadata/cache/gnome-extra/cinnamon-1.4
+++ b/metadata/cache/gnome-extra/cinnamon-1.4
@@ -1,4 +1,4 @@
->=dev-libs/glib-2.29.10:2 >=dev-libs/gjs-1.29.18 >=dev-libs/gobject-introspection-0.10.1 x11-libs/gdk-pixbuf:2[introspection] >=x11-libs/gtk+-3.0.0:3[introspection] >=media-libs/clutter-1.7.5:1.0[introspection] app-misc/ca-certificates >=dev-libs/folks-0.5.2 >=dev-libs/json-glib-0.13.2 >=gnome-base/gnome-desktop-2.91.2:3[introspection] >=gnome-base/gsettings-desktop-schemas-2.91.91 >=gnome-extra/evolution-data-server-2.91.6 >=media-libs/gstreamer-0.10.16:0.10 >=media-libs/gst-plugins-base-0.10.16:0.10 >=net-im/telepathy-logger-0.2.4[introspection] net-libs/libsoup:2.4[introspection] >=net-libs/telepathy-glib-0.15.5[introspection] >=sys-auth/polkit-0.100[introspection] >=x11-wm/muffin-1.0.2[introspection] dev-libs/dbus-glib dev-libs/libxml2:2 x11-libs/pango[introspection] >=dev-libs/libcroco-0.6.2:0.6 gnome-base/gconf:2[introspection] >=gnome-base/gnome-menus-3.2.0.1-r1:3[introspection] gnome-base/librsvg media-libs/libcanberra media-sound/pulseaudio >=x11-libs/startup-notification-0.11 x11-libs/libX11 >=x11-libs/libXfixes-5.0 x11-apps/mesa-progs bluetooth? ( >=net-wireless/gnome-bluetooth-3.1.0[introspection] ) networkmanager? ( gnome-base/libgnome-keyring >=net-misc/networkmanager-0.8.999[introspection] ) >=sys-devel/gettext-0.17 >=dev-util/pkgconfig-0.22 >=dev-util/intltool-0.40 gnome-base/gnome-common !!=dev-lang/spidermonkey-1.8.2* || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) || ( =dev-lang/python-2.7*[xml] =dev-lang/python-2.6*[xml] =dev-lang/python-2.5*[xml] )
+>=dev-libs/glib-2.29.10:2 >=dev-libs/gjs-1.29.18 >=dev-libs/gobject-introspection-0.10.1 x11-libs/gdk-pixbuf:2[introspection] >=x11-libs/gtk+-3.0.0:3[introspection] >=media-libs/clutter-1.7.5:1.0[introspection] app-misc/ca-certificates >=dev-libs/folks-0.5.2 >=dev-libs/json-glib-0.13.2 >=gnome-base/gnome-desktop-2.91.2:3[introspection] >=gnome-base/gsettings-desktop-schemas-2.91.91 >=gnome-extra/evolution-data-server-2.91.6 >=media-libs/gstreamer-0.10.16:0.10 >=media-libs/gst-plugins-base-0.10.16:0.10 >=net-im/telepathy-logger-0.2.4[introspection] net-libs/libsoup:2.4[introspection] >=net-libs/telepathy-glib-0.15.5[introspection] >=sys-auth/polkit-0.100[introspection] >=x11-wm/muffin-1.0.2[introspection] dev-libs/dbus-glib dev-libs/libxml2:2 x11-libs/pango[introspection] >=dev-libs/libcroco-0.6.2:0.6 gnome-base/gconf:2[introspection] >=gnome-base/gnome-menus-3.2.0.1-r1:3[introspection] gnome-base/librsvg media-libs/libcanberra media-sound/pulseaudio >=x11-libs/startup-notification-0.11 x11-libs/libX11 >=x11-libs/libXfixes-5.0 x11-apps/mesa-progs bluetooth? ( >=net-wireless/gnome-bluetooth-3.1.0[introspection] ) networkmanager? ( gnome-base/libgnome-keyring >=net-misc/networkmanager-0.8.999[introspection] ) >=sys-devel/gettext-0.17 >=dev-util/pkgconfig-0.22 >=dev-util/intltool-0.40 gnome-base/gnome-common !!=dev-lang/spidermonkey-1.8.2* || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) || ( =dev-lang/python-2.7*[xml] =dev-lang/python-2.6*[xml] =dev-lang/python-2.5*[xml] )
 >=dev-libs/glib-2.29.10:2 >=dev-libs/gjs-1.29.18 >=dev-libs/gobject-introspection-0.10.1 x11-libs/gdk-pixbuf:2[introspection] >=x11-libs/gtk+-3.0.0:3[introspection] >=media-libs/clutter-1.7.5:1.0[introspection] app-misc/ca-certificates >=dev-libs/folks-0.5.2 >=dev-libs/json-glib-0.13.2 >=gnome-base/gnome-desktop-2.91.2:3[introspection] >=gnome-base/gsettings-desktop-schemas-2.91.91 >=gnome-extra/evolution-data-server-2.91.6 >=media-libs/gstreamer-0.10.16:0.10 >=media-libs/gst-plugins-base-0.10.16:0.10 >=net-im/telepathy-logger-0.2.4[introspection] net-libs/libsoup:2.4[introspection] >=net-libs/telepathy-glib-0.15.5[introspection] >=sys-auth/polkit-0.100[introspection] >=x11-wm/muffin-1.0.2[introspection] dev-libs/dbus-glib dev-libs/libxml2:2 x11-libs/pango[introspection] >=dev-libs/libcroco-0.6.2:0.6 gnome-base/gconf:2[introspection] >=gnome-base/gnome-menus-3.2.0.1-r1:3[introspection] gnome-base/librsvg media-libs/libcanberra media-sound/pulseaudio >=x11-libs/startup-notification-0.11 x11-libs/libX11 >=x11-libs/libXfixes-5.0 x11-apps/mesa-progs bluetooth? ( >=net-wireless/gnome-bluetooth-3.1.0[introspection] ) networkmanager? ( gnome-base/libgnome-keyring >=net-misc/networkmanager-0.8.999[introspection] ) >=gnome-base/dconf-0.4.1 >=gnome-base/libgnomekbd-2.91.4[introspection] sys-power/upower[introspection] >=gnome-base/gnome-session-3.2.1-r1 >=gnome-base/gnome-settings-daemon-2.91 >=gnome-base/gnome-control-center-2.91.92-r1 >=sys-apps/accountsservice-0.6.14[introspection] >=app-accessibility/caribou-0.3 x11-misc/xdg-utils dev-python/dbus-python dev-python/gconf-python:2 x11-themes/gnome-icon-theme-symbolic dev-python/pygtk gnome-base/gnome-menus:0[python] networkmanager? ( net-misc/mobile-broadband-provider-info sys-libs/timezone-data ) || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) || ( =dev-lang/python-2.7*[xml] =dev-lang/python-2.6*[xml] =dev-lang/python-2.5*[xml] )
 0
 https://github.com/linuxmint/Cinnamon/tarball/1.4 -> cinnamon-1.4.tar.gz
diff --git a/metadata/cache/gnome-extra/contacts-0.12 b/metadata/cache/gnome-extra/contacts-0.12
index 7c106df6de54..9a91faa69267 100644
--- a/metadata/cache/gnome-extra/contacts-0.12
+++ b/metadata/cache/gnome-extra/contacts-0.12
@@ -1,4 +1,4 @@
->=gnome-extra/evolution-data-server-1.8 >=x11-libs/gtk+-2.6:2 dbus? ( dev-libs/dbus-glib sys-apps/dbus ) gnome? ( >=gnome-base/gconf-2 >=gnome-base/gnome-vfs-2 ) sys-devel/gettext >=dev-util/intltool-0.35.0 >=dev-util/pkgconfig-0.9 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+>=gnome-extra/evolution-data-server-1.8 >=x11-libs/gtk+-2.6:2 dbus? ( dev-libs/dbus-glib sys-apps/dbus ) gnome? ( >=gnome-base/gconf-2 >=gnome-base/gnome-vfs-2 ) sys-devel/gettext >=dev-util/intltool-0.35.0 >=dev-util/pkgconfig-0.9 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 >=gnome-extra/evolution-data-server-1.8 >=x11-libs/gtk+-2.6:2 dbus? ( dev-libs/dbus-glib sys-apps/dbus ) gnome? ( >=gnome-base/gconf-2 >=gnome-base/gnome-vfs-2 )
 0
 mirror://gnome/sources/contacts/0.12/contacts-0.12.tar.bz2
diff --git a/metadata/cache/gnome-extra/evolution-data-server-2.32.3-r1 b/metadata/cache/gnome-extra/evolution-data-server-2.32.3-r1
index 19c76a7c27af..62358fc3220b 100644
--- a/metadata/cache/gnome-extra/evolution-data-server-2.32.3-r1
+++ b/metadata/cache/gnome-extra/evolution-data-server-2.32.3-r1
@@ -1,4 +1,4 @@
->=dev-libs/glib-2.25.12:2 >=x11-libs/gtk+-2.24:2 >=gnome-base/gconf-2 >=dev-db/sqlite-3.5 >=dev-libs/libgdata-0.6.3 >=dev-libs/libical-0.43 >=net-libs/libsoup-2.4:2.4 >=dev-libs/libxml2-2 >=sys-libs/db-4 sys-libs/zlib virtual/libiconv >=dev-libs/nspr-4.4 >=dev-libs/nss-3.9 gnome-keyring? ( >=gnome-base/gnome-keyring-2.20.1 ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-2 ) weather? ( >=dev-libs/libgweather-2.25.4:2 <dev-libs/libgweather-2.91:2 ) dev-util/gperf >=dev-util/pkgconfig-0.9 >=dev-util/intltool-0.35.5 sys-devel/bison >=gnome-base/gnome-common-2 >=dev-util/gtk-doc-am-1.9 doc? ( >=dev-util/gtk-doc-1.9 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+>=dev-libs/glib-2.25.12:2 >=x11-libs/gtk+-2.24:2 >=gnome-base/gconf-2 >=dev-db/sqlite-3.5 >=dev-libs/libgdata-0.6.3 >=dev-libs/libical-0.43 >=net-libs/libsoup-2.4:2.4 >=dev-libs/libxml2-2 >=sys-libs/db-4 sys-libs/zlib virtual/libiconv >=dev-libs/nspr-4.4 >=dev-libs/nss-3.9 gnome-keyring? ( >=gnome-base/gnome-keyring-2.20.1 ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-2 ) weather? ( >=dev-libs/libgweather-2.25.4:2 <dev-libs/libgweather-2.91:2 ) dev-util/gperf >=dev-util/pkgconfig-0.9 >=dev-util/intltool-0.35.5 sys-devel/bison >=gnome-base/gnome-common-2 >=dev-util/gtk-doc-am-1.9 doc? ( >=dev-util/gtk-doc-1.9 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 >=dev-libs/glib-2.25.12:2 >=x11-libs/gtk+-2.24:2 >=gnome-base/gconf-2 >=dev-db/sqlite-3.5 >=dev-libs/libgdata-0.6.3 >=dev-libs/libical-0.43 >=net-libs/libsoup-2.4:2.4 >=dev-libs/libxml2-2 >=sys-libs/db-4 sys-libs/zlib virtual/libiconv >=dev-libs/nspr-4.4 >=dev-libs/nss-3.9 gnome-keyring? ( >=gnome-base/gnome-keyring-2.20.1 ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-2 ) weather? ( >=dev-libs/libgweather-2.25.4:2 <dev-libs/libgweather-2.91:2 )
 0
 mirror://gnome/sources/evolution-data-server/2.32/evolution-data-server-2.32.3.tar.bz2 http://dev.gentoo.org/~pacho/gnome/evolution-data-server-2.32.3-patches.tar.xz
diff --git a/metadata/cache/gnome-extra/evolution-data-server-2.32.3-r2 b/metadata/cache/gnome-extra/evolution-data-server-2.32.3-r2
index 25dc7a5f03a5..c509d219d2b8 100644
--- a/metadata/cache/gnome-extra/evolution-data-server-2.32.3-r2
+++ b/metadata/cache/gnome-extra/evolution-data-server-2.32.3-r2
@@ -1,4 +1,4 @@
->=dev-libs/glib-2.25.12:2 >=x11-libs/gtk+-2.24:2 >=gnome-base/gconf-2 >=dev-db/sqlite-3.5 >=dev-libs/libgdata-0.6.3 >=dev-libs/libical-0.43 >=net-libs/libsoup-2.4:2.4 >=dev-libs/libxml2-2 >=sys-libs/db-4 sys-libs/zlib virtual/libiconv >=dev-libs/nspr-4.4 >=dev-libs/nss-3.9 gnome-keyring? ( >=gnome-base/gnome-keyring-2.20.1 ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-2 ) weather? ( >=dev-libs/libgweather-2.25.4:2 <dev-libs/libgweather-2.91:2 ) dev-util/gperf >=dev-util/pkgconfig-0.9 >=dev-util/intltool-0.35.5 sys-devel/bison >=gnome-base/gnome-common-2 >=dev-util/gtk-doc-am-1.9 doc? ( >=dev-util/gtk-doc-1.9 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+>=dev-libs/glib-2.25.12:2 >=x11-libs/gtk+-2.24:2 >=gnome-base/gconf-2 >=dev-db/sqlite-3.5 >=dev-libs/libgdata-0.6.3 >=dev-libs/libical-0.43 >=net-libs/libsoup-2.4:2.4 >=dev-libs/libxml2-2 >=sys-libs/db-4 sys-libs/zlib virtual/libiconv >=dev-libs/nspr-4.4 >=dev-libs/nss-3.9 gnome-keyring? ( >=gnome-base/gnome-keyring-2.20.1 ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-2 ) weather? ( >=dev-libs/libgweather-2.25.4:2 <dev-libs/libgweather-2.91:2 ) dev-util/gperf >=dev-util/pkgconfig-0.9 >=dev-util/intltool-0.35.5 sys-devel/bison >=gnome-base/gnome-common-2 >=dev-util/gtk-doc-am-1.9 doc? ( >=dev-util/gtk-doc-1.9 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 >=dev-libs/glib-2.25.12:2 >=x11-libs/gtk+-2.24:2 >=gnome-base/gconf-2 >=dev-db/sqlite-3.5 >=dev-libs/libgdata-0.6.3 >=dev-libs/libical-0.43 >=net-libs/libsoup-2.4:2.4 >=dev-libs/libxml2-2 >=sys-libs/db-4 sys-libs/zlib virtual/libiconv >=dev-libs/nspr-4.4 >=dev-libs/nss-3.9 gnome-keyring? ( >=gnome-base/gnome-keyring-2.20.1 ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-2 ) weather? ( >=dev-libs/libgweather-2.25.4:2 <dev-libs/libgweather-2.91:2 )
 0
 mirror://gnome/sources/evolution-data-server/2.32/evolution-data-server-2.32.3.tar.bz2 http://dev.gentoo.org/~pacho/gnome/evolution-data-server-2.32.3-patches.tar.xz
diff --git a/metadata/cache/gnome-extra/evolution-data-server-3.2.3 b/metadata/cache/gnome-extra/evolution-data-server-3.2.3
index 9693cf05d529..cafab38edd0e 100644
--- a/metadata/cache/gnome-extra/evolution-data-server-3.2.3
+++ b/metadata/cache/gnome-extra/evolution-data-server-3.2.3
@@ -1,4 +1,4 @@
->=dev-libs/glib-2.28:2 >=x11-libs/gtk+-3.0:3 >=gnome-base/gconf-2 >=dev-db/sqlite-3.5 >=dev-libs/libgdata-0.9.1 >=gnome-base/gnome-keyring-2.20.1 >=dev-libs/libical-0.43 >=net-libs/libsoup-2.31.2:2.4 >=dev-libs/libxml2-2 >=dev-libs/nspr-4.4 >=dev-libs/nss-3.9 >=sys-libs/db-4 sys-libs/zlib virtual/libiconv gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.1.1 >=net-libs/liboauth-0.9.4 ) introspection? ( >=dev-libs/gobject-introspection-0.9.12 ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-2 ) weather? ( >=dev-libs/libgweather-2.90.0:2 ) dev-lang/perl dev-util/gperf >=dev-util/pkgconfig-0.9 >=dev-util/intltool-0.35.5 sys-devel/bison >=gnome-base/gnome-common-2 >=dev-util/gtk-doc-am-1.9 >=sys-devel/gettext-0.17 doc? ( >=dev-util/gtk-doc-1.9 ) vala? ( >=dev-lang/vala-0.13.0:0.14[vapigen] ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+>=dev-libs/glib-2.28:2 >=x11-libs/gtk+-3.0:3 >=gnome-base/gconf-2 >=dev-db/sqlite-3.5 >=dev-libs/libgdata-0.9.1 >=gnome-base/gnome-keyring-2.20.1 >=dev-libs/libical-0.43 >=net-libs/libsoup-2.31.2:2.4 >=dev-libs/libxml2-2 >=dev-libs/nspr-4.4 >=dev-libs/nss-3.9 >=sys-libs/db-4 sys-libs/zlib virtual/libiconv gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.1.1 >=net-libs/liboauth-0.9.4 ) introspection? ( >=dev-libs/gobject-introspection-0.9.12 ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-2 ) weather? ( >=dev-libs/libgweather-2.90.0:2 ) dev-lang/perl dev-util/gperf >=dev-util/pkgconfig-0.9 >=dev-util/intltool-0.35.5 sys-devel/bison >=gnome-base/gnome-common-2 >=dev-util/gtk-doc-am-1.9 >=sys-devel/gettext-0.17 doc? ( >=dev-util/gtk-doc-1.9 ) vala? ( >=dev-lang/vala-0.13.0:0.14[vapigen] ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 >=dev-libs/glib-2.28:2 >=x11-libs/gtk+-3.0:3 >=gnome-base/gconf-2 >=dev-db/sqlite-3.5 >=dev-libs/libgdata-0.9.1 >=gnome-base/gnome-keyring-2.20.1 >=dev-libs/libical-0.43 >=net-libs/libsoup-2.31.2:2.4 >=dev-libs/libxml2-2 >=dev-libs/nspr-4.4 >=dev-libs/nss-3.9 >=sys-libs/db-4 sys-libs/zlib virtual/libiconv gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.1.1 >=net-libs/liboauth-0.9.4 ) introspection? ( >=dev-libs/gobject-introspection-0.9.12 ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-2 ) weather? ( >=dev-libs/libgweather-2.90.0:2 )
 0
 mirror://gnome/sources/evolution-data-server/3.2/evolution-data-server-3.2.3.tar.xz
diff --git a/metadata/cache/gnome-extra/evolution-data-server-3.2.3-r1 b/metadata/cache/gnome-extra/evolution-data-server-3.2.3-r1
index 9693cf05d529..cafab38edd0e 100644
--- a/metadata/cache/gnome-extra/evolution-data-server-3.2.3-r1
+++ b/metadata/cache/gnome-extra/evolution-data-server-3.2.3-r1
@@ -1,4 +1,4 @@
->=dev-libs/glib-2.28:2 >=x11-libs/gtk+-3.0:3 >=gnome-base/gconf-2 >=dev-db/sqlite-3.5 >=dev-libs/libgdata-0.9.1 >=gnome-base/gnome-keyring-2.20.1 >=dev-libs/libical-0.43 >=net-libs/libsoup-2.31.2:2.4 >=dev-libs/libxml2-2 >=dev-libs/nspr-4.4 >=dev-libs/nss-3.9 >=sys-libs/db-4 sys-libs/zlib virtual/libiconv gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.1.1 >=net-libs/liboauth-0.9.4 ) introspection? ( >=dev-libs/gobject-introspection-0.9.12 ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-2 ) weather? ( >=dev-libs/libgweather-2.90.0:2 ) dev-lang/perl dev-util/gperf >=dev-util/pkgconfig-0.9 >=dev-util/intltool-0.35.5 sys-devel/bison >=gnome-base/gnome-common-2 >=dev-util/gtk-doc-am-1.9 >=sys-devel/gettext-0.17 doc? ( >=dev-util/gtk-doc-1.9 ) vala? ( >=dev-lang/vala-0.13.0:0.14[vapigen] ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+>=dev-libs/glib-2.28:2 >=x11-libs/gtk+-3.0:3 >=gnome-base/gconf-2 >=dev-db/sqlite-3.5 >=dev-libs/libgdata-0.9.1 >=gnome-base/gnome-keyring-2.20.1 >=dev-libs/libical-0.43 >=net-libs/libsoup-2.31.2:2.4 >=dev-libs/libxml2-2 >=dev-libs/nspr-4.4 >=dev-libs/nss-3.9 >=sys-libs/db-4 sys-libs/zlib virtual/libiconv gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.1.1 >=net-libs/liboauth-0.9.4 ) introspection? ( >=dev-libs/gobject-introspection-0.9.12 ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-2 ) weather? ( >=dev-libs/libgweather-2.90.0:2 ) dev-lang/perl dev-util/gperf >=dev-util/pkgconfig-0.9 >=dev-util/intltool-0.35.5 sys-devel/bison >=gnome-base/gnome-common-2 >=dev-util/gtk-doc-am-1.9 >=sys-devel/gettext-0.17 doc? ( >=dev-util/gtk-doc-1.9 ) vala? ( >=dev-lang/vala-0.13.0:0.14[vapigen] ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 >=dev-libs/glib-2.28:2 >=x11-libs/gtk+-3.0:3 >=gnome-base/gconf-2 >=dev-db/sqlite-3.5 >=dev-libs/libgdata-0.9.1 >=gnome-base/gnome-keyring-2.20.1 >=dev-libs/libical-0.43 >=net-libs/libsoup-2.31.2:2.4 >=dev-libs/libxml2-2 >=dev-libs/nspr-4.4 >=dev-libs/nss-3.9 >=sys-libs/db-4 sys-libs/zlib virtual/libiconv gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.1.1 >=net-libs/liboauth-0.9.4 ) introspection? ( >=dev-libs/gobject-introspection-0.9.12 ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-2 ) weather? ( >=dev-libs/libgweather-2.90.0:2 )
 0
 mirror://gnome/sources/evolution-data-server/3.2/evolution-data-server-3.2.3.tar.xz
diff --git a/metadata/cache/gnome-extra/fast-user-switch-applet-2.24.0 b/metadata/cache/gnome-extra/fast-user-switch-applet-2.24.0
index a0e5cbb6c8cf..eab53ae33562 100644
--- a/metadata/cache/gnome-extra/fast-user-switch-applet-2.24.0
+++ b/metadata/cache/gnome-extra/fast-user-switch-applet-2.24.0
@@ -1,4 +1,4 @@
->=dev-libs/glib-2.16:2 >=x11-libs/gtk+-2.8:2 || ( gnome-base/gnome-panel[bonobo] <gnome-base/gnome-panel-2.32 ) >=gnome-base/libglade-2.0:2.0 gnome-base/libgnomeui gnome-base/gconf:2 gnome-base/gdm x11-libs/libXmu x11-libs/libXau x11-libs/libSM dev-libs/libxslt >=dev-util/pkgconfig-0.9 >=sys-devel/autoconf-2.53 >=dev-util/intltool-0.35 >=app-text/scrollkeeper-0.1.4 >=app-text/gnome-doc-utils-0.3.2 ~app-text/docbook-xml-dtd-4.3 >=sys-apps/sed-4 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-libs/glib-2.16:2 >=x11-libs/gtk+-2.8:2 || ( gnome-base/gnome-panel[bonobo] <gnome-base/gnome-panel-2.32 ) >=gnome-base/libglade-2.0:2.0 gnome-base/libgnomeui gnome-base/gconf:2 gnome-base/gdm x11-libs/libXmu x11-libs/libXau x11-libs/libSM dev-libs/libxslt >=dev-util/pkgconfig-0.9 >=sys-devel/autoconf-2.53 >=dev-util/intltool-0.35 >=app-text/scrollkeeper-0.1.4 >=app-text/gnome-doc-utils-0.3.2 ~app-text/docbook-xml-dtd-4.3 >=sys-apps/sed-4 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=dev-libs/glib-2.16:2 >=x11-libs/gtk+-2.8:2 || ( gnome-base/gnome-panel[bonobo] <gnome-base/gnome-panel-2.32 ) >=gnome-base/libglade-2.0:2.0 gnome-base/libgnomeui gnome-base/gconf:2 gnome-base/gdm x11-libs/libXmu x11-libs/libXau x11-libs/libSM
 0
 mirror://gnome/sources/fast-user-switch-applet/2.24/fast-user-switch-applet-2.24.0.tar.bz2
diff --git a/metadata/cache/gnome-extra/gdesklets-core-0.36.3-r3 b/metadata/cache/gnome-extra/gdesklets-core-0.36.3-r3
index 4d846a31e93b..446cebcd1997 100644
--- a/metadata/cache/gnome-extra/gdesklets-core-0.36.3-r3
+++ b/metadata/cache/gnome-extra/gdesklets-core-0.36.3-r3
@@ -1,4 +1,4 @@
->=dev-libs/glib-2.4 >=gnome-base/librsvg-2.8 >=gnome-base/libgtop-2.8.2 >=dev-python/pygtk-2.10 >=dev-python/libbonobo-python-2.6 >=dev-python/gconf-python-2.6 >=dev-python/pygobject-2.6:2 >=dev-python/pyorbit-2.0.1 || ( >=dev-python/gnome-vfs-python-2.6 >=dev-python/libgnome-python-2.6 ) >=dev-libs/expat-1.95.8 dbus? ( dev-python/dbus-python ) sys-devel/gettext dev-util/pkgconfig dev-util/intltool >=sys-apps/sed-4 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) || ( =dev-lang/python-2.7*[xml] =dev-lang/python-2.6*[xml] =dev-lang/python-2.5*[xml] ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-libs/glib-2.4 >=gnome-base/librsvg-2.8 >=gnome-base/libgtop-2.8.2 >=dev-python/pygtk-2.10 >=dev-python/libbonobo-python-2.6 >=dev-python/gconf-python-2.6 >=dev-python/pygobject-2.6:2 >=dev-python/pyorbit-2.0.1 || ( >=dev-python/gnome-vfs-python-2.6 >=dev-python/libgnome-python-2.6 ) >=dev-libs/expat-1.95.8 dbus? ( dev-python/dbus-python ) sys-devel/gettext dev-util/pkgconfig dev-util/intltool >=sys-apps/sed-4 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) || ( =dev-lang/python-2.7*[xml] =dev-lang/python-2.6*[xml] =dev-lang/python-2.5*[xml] ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=dev-libs/glib-2.4 >=gnome-base/librsvg-2.8 >=gnome-base/libgtop-2.8.2 >=dev-python/pygtk-2.10 >=dev-python/libbonobo-python-2.6 >=dev-python/gconf-python-2.6 >=dev-python/pygobject-2.6:2 >=dev-python/pyorbit-2.0.1 || ( >=dev-python/gnome-vfs-python-2.6 >=dev-python/libgnome-python-2.6 ) >=dev-libs/expat-1.95.8 dbus? ( dev-python/dbus-python ) || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) || ( =dev-lang/python-2.7*[xml] =dev-lang/python-2.6*[xml] =dev-lang/python-2.5*[xml] )
 0
 http://gdesklets.de/files/gdesklets-0.36.3.tar.bz2
diff --git a/metadata/cache/gnome-extra/gnome-do-0.8.5 b/metadata/cache/gnome-extra/gnome-do-0.8.5
index 10deb46ca196..347f9f044124 100644
--- a/metadata/cache/gnome-extra/gnome-do-0.8.5
+++ b/metadata/cache/gnome-extra/gnome-do-0.8.5
@@ -1,4 +1,4 @@
->=dev-lang/mono-2.0 >=dev-dotnet/gconf-sharp-2.24.0 >=dev-dotnet/gtk-sharp-2.12.6 >=dev-dotnet/glade-sharp-2.12.6 dev-dotnet/ndesk-dbus dev-dotnet/ndesk-dbus-glib >=dev-dotnet/gnome-desktop-sharp-2.26.0 >=dev-dotnet/gnome-keyring-sharp-1.0.0 >=dev-dotnet/gnome-sharp-2.24.0 >=dev-dotnet/gnomevfs-sharp-2.24.0 >=dev-dotnet/wnck-sharp-2.24.0 >=dev-dotnet/art-sharp-2.24.0 >=dev-dotnet/rsvg-sharp-2.24.0 dev-dotnet/mono-addins[gtk] dev-dotnet/notify-sharp !<gnome-extra/gnome-do-plugins-0.8 >=dev-util/intltool-0.35 dev-util/pkgconfig >=sys-apps/sed-4 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-lang/mono-2.0 >=dev-dotnet/gconf-sharp-2.24.0 >=dev-dotnet/gtk-sharp-2.12.6 >=dev-dotnet/glade-sharp-2.12.6 dev-dotnet/ndesk-dbus dev-dotnet/ndesk-dbus-glib >=dev-dotnet/gnome-desktop-sharp-2.26.0 >=dev-dotnet/gnome-keyring-sharp-1.0.0 >=dev-dotnet/gnome-sharp-2.24.0 >=dev-dotnet/gnomevfs-sharp-2.24.0 >=dev-dotnet/wnck-sharp-2.24.0 >=dev-dotnet/art-sharp-2.24.0 >=dev-dotnet/rsvg-sharp-2.24.0 dev-dotnet/mono-addins[gtk] dev-dotnet/notify-sharp !<gnome-extra/gnome-do-plugins-0.8 >=dev-util/intltool-0.35 dev-util/pkgconfig >=sys-apps/sed-4 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=dev-lang/mono-2.0 >=dev-dotnet/gconf-sharp-2.24.0 >=dev-dotnet/gtk-sharp-2.12.6 >=dev-dotnet/glade-sharp-2.12.6 dev-dotnet/ndesk-dbus dev-dotnet/ndesk-dbus-glib >=dev-dotnet/gnome-desktop-sharp-2.26.0 >=dev-dotnet/gnome-keyring-sharp-1.0.0 >=dev-dotnet/gnome-sharp-2.24.0 >=dev-dotnet/gnomevfs-sharp-2.24.0 >=dev-dotnet/wnck-sharp-2.24.0 >=dev-dotnet/art-sharp-2.24.0 >=dev-dotnet/rsvg-sharp-2.24.0 dev-dotnet/mono-addins[gtk] dev-dotnet/notify-sharp !<gnome-extra/gnome-do-plugins-0.8
 0
 https://launchpad.net/do/trunk/0.8.5/+download/gnome-do-0.8.5.tar.gz
diff --git a/metadata/cache/gnome-extra/gnome-do-plugins-0.8.2-r1 b/metadata/cache/gnome-extra/gnome-do-plugins-0.8.2-r1
index ab593dc8ac23..a151dacd84b5 100644
--- a/metadata/cache/gnome-extra/gnome-do-plugins-0.8.2-r1
+++ b/metadata/cache/gnome-extra/gnome-do-plugins-0.8.2-r1
@@ -1,4 +1,4 @@
->=gnome-extra/gnome-do-0.8.2 dev-dotnet/wnck-sharp banshee? ( >=media-sound/banshee-1.4.2 ) evo? ( dev-dotnet/evolution-sharp ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+>=gnome-extra/gnome-do-0.8.2 dev-dotnet/wnck-sharp banshee? ( >=media-sound/banshee-1.4.2 ) evo? ( dev-dotnet/evolution-sharp ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 >=gnome-extra/gnome-do-0.8.2 dev-dotnet/wnck-sharp banshee? ( >=media-sound/banshee-1.4.2 ) evo? ( dev-dotnet/evolution-sharp )
 0
 https://launchpad.net/do-plugins/0.8/0.8.2/+download/gnome-do-plugins-0.8.2.tar.gz
diff --git a/metadata/cache/gnome-extra/gnome-do-plugins-0.8.3 b/metadata/cache/gnome-extra/gnome-do-plugins-0.8.3
index 3ca04b6a3115..587d75bef420 100644
--- a/metadata/cache/gnome-extra/gnome-do-plugins-0.8.3
+++ b/metadata/cache/gnome-extra/gnome-do-plugins-0.8.3
@@ -1,4 +1,4 @@
->=gnome-extra/gnome-do-0.8.3 dev-dotnet/wnck-sharp banshee? ( >=media-sound/banshee-1.4.2 ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+>=gnome-extra/gnome-do-0.8.3 dev-dotnet/wnck-sharp banshee? ( >=media-sound/banshee-1.4.2 ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 >=gnome-extra/gnome-do-0.8.3 dev-dotnet/wnck-sharp banshee? ( >=media-sound/banshee-1.4.2 )
 0
 https://launchpad.net/do-plugins/trunk/0.8.3/+download/gnome-do-plugins-0.8.3.tar.gz
diff --git a/metadata/cache/gnome-extra/gnome-media-2.32.0-r300 b/metadata/cache/gnome-extra/gnome-media-2.32.0-r300
index 6e5d8ee7f2a3..3a117eb2e71c 100644
--- a/metadata/cache/gnome-extra/gnome-media-2.32.0-r300
+++ b/metadata/cache/gnome-extra/gnome-media-2.32.0-r300
@@ -1,4 +1,4 @@
-dev-libs/libxml2:2 >=dev-libs/glib-2.18.2:2 >=x11-libs/gtk+-2.18.0:2 >=gnome-base/gconf-2.6.1:2 >=media-libs/gstreamer-0.10.23:0.10 >=media-libs/gst-plugins-base-0.10.23:0.10 >=media-libs/gst-plugins-good-0.10:0.10 >=media-libs/libcanberra-0.13[gtk] >=media-plugins/gst-plugins-meta-0.10-r2:0.10 >=media-plugins/gst-plugins-gconf-0.10.1:0.10 >=dev-libs/libunique-1:1 app-text/docbook-xml-dtd:4.1.2 app-text/rarian >=dev-util/pkgconfig-0.9 >=app-text/gnome-doc-utils-0.3.2 >=dev-util/intltool-0.35.0 gnome-base/gnome-common || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+dev-libs/libxml2:2 >=dev-libs/glib-2.18.2:2 >=x11-libs/gtk+-2.18.0:2 >=gnome-base/gconf-2.6.1:2 >=media-libs/gstreamer-0.10.23:0.10 >=media-libs/gst-plugins-base-0.10.23:0.10 >=media-libs/gst-plugins-good-0.10:0.10 >=media-libs/libcanberra-0.13[gtk] >=media-plugins/gst-plugins-meta-0.10-r2:0.10 >=media-plugins/gst-plugins-gconf-0.10.1:0.10 >=dev-libs/libunique-1:1 app-text/docbook-xml-dtd:4.1.2 app-text/rarian >=dev-util/pkgconfig-0.9 >=app-text/gnome-doc-utils-0.3.2 >=dev-util/intltool-0.35.0 gnome-base/gnome-common || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 dev-libs/libxml2:2 >=dev-libs/glib-2.18.2:2 >=x11-libs/gtk+-2.18.0:2 >=gnome-base/gconf-2.6.1:2 >=media-libs/gstreamer-0.10.23:0.10 >=media-libs/gst-plugins-base-0.10.23:0.10 >=media-libs/gst-plugins-good-0.10:0.10 >=media-libs/libcanberra-0.13[gtk] >=media-plugins/gst-plugins-meta-0.10-r2:0.10 >=media-plugins/gst-plugins-gconf-0.10.1:0.10 >=dev-libs/libunique-1:1
 2
 mirror://gnome/sources/gnome-media/2.32/gnome-media-2.32.0.tar.bz2
diff --git a/metadata/cache/gnome-extra/gnome-power-manager-2.32.0-r2 b/metadata/cache/gnome-extra/gnome-power-manager-2.32.0-r2
index 26d8e25c1881..bfb89d6962c1 100644
--- a/metadata/cache/gnome-extra/gnome-power-manager-2.32.0-r2
+++ b/metadata/cache/gnome-extra/gnome-power-manager-2.32.0-r2
@@ -1,4 +1,4 @@
->=dev-libs/glib-2.13.0:2 >=x11-libs/gtk+-2.17.7:2 >=gnome-base/gnome-keyring-0.6.0 >=dev-libs/dbus-glib-0.71 >=x11-libs/libnotify-0.4.3 >=x11-libs/libwnck-2.10.0:1 >=x11-libs/cairo-1 >=gnome-base/gconf-2.10:2[policykit?] >=media-libs/libcanberra-0.10[gtk] >=sys-power/upower-0.9.1 >=dev-libs/libunique-1.1:1 >=x11-apps/xrandr-1.3 >=x11-proto/xproto-7.0.15 x11-libs/libX11 x11-libs/libXext applet? ( || ( gnome-base/gnome-panel[bonobo] <gnome-base/gnome-panel-2.32 ) ) x11-proto/randrproto sys-devel/gettext app-text/scrollkeeper app-text/docbook-xml-dtd:4.3 >=dev-util/pkgconfig-0.9 >=dev-util/intltool-0.35 >=app-text/gnome-doc-utils-0.3.2 doc? ( app-text/xmlto app-text/docbook-sgml-utils app-text/docbook-xml-dtd:4.4 app-text/docbook-sgml-dtd:4.1 app-text/docbook-xml-dtd:4.1.2 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+>=dev-libs/glib-2.13.0:2 >=x11-libs/gtk+-2.17.7:2 >=gnome-base/gnome-keyring-0.6.0 >=dev-libs/dbus-glib-0.71 >=x11-libs/libnotify-0.4.3 >=x11-libs/libwnck-2.10.0:1 >=x11-libs/cairo-1 >=gnome-base/gconf-2.10:2[policykit?] >=media-libs/libcanberra-0.10[gtk] >=sys-power/upower-0.9.1 >=dev-libs/libunique-1.1:1 >=x11-apps/xrandr-1.3 >=x11-proto/xproto-7.0.15 x11-libs/libX11 x11-libs/libXext applet? ( || ( gnome-base/gnome-panel[bonobo] <gnome-base/gnome-panel-2.32 ) ) x11-proto/randrproto sys-devel/gettext app-text/scrollkeeper app-text/docbook-xml-dtd:4.3 >=dev-util/pkgconfig-0.9 >=dev-util/intltool-0.35 >=app-text/gnome-doc-utils-0.3.2 doc? ( app-text/xmlto app-text/docbook-sgml-utils app-text/docbook-xml-dtd:4.4 app-text/docbook-sgml-dtd:4.1 app-text/docbook-xml-dtd:4.1.2 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 >=dev-libs/glib-2.13.0:2 >=x11-libs/gtk+-2.17.7:2 >=gnome-base/gnome-keyring-0.6.0 >=dev-libs/dbus-glib-0.71 >=x11-libs/libnotify-0.4.3 >=x11-libs/libwnck-2.10.0:1 >=x11-libs/cairo-1 >=gnome-base/gconf-2.10:2[policykit?] >=media-libs/libcanberra-0.10[gtk] >=sys-power/upower-0.9.1 >=dev-libs/libunique-1.1:1 >=x11-apps/xrandr-1.3 >=x11-proto/xproto-7.0.15 x11-libs/libX11 x11-libs/libXext applet? ( || ( gnome-base/gnome-panel[bonobo] <gnome-base/gnome-panel-2.32 ) ) >=sys-auth/consolekit-0.4[policykit?] policykit? ( gnome-extra/polkit-gnome )
 0
 mirror://gnome/sources/gnome-power-manager/2.32/gnome-power-manager-2.32.0.tar.bz2 http://dev.gentoo.org/~pacho/gnome/gnome-power-manager-2.32.0-keyboard-backlight.patch.xz
diff --git a/metadata/cache/gnome-extra/gnome-power-manager-2.32.0-r3 b/metadata/cache/gnome-extra/gnome-power-manager-2.32.0-r3
index d3daf4097642..74d959983e4e 100644
--- a/metadata/cache/gnome-extra/gnome-power-manager-2.32.0-r3
+++ b/metadata/cache/gnome-extra/gnome-power-manager-2.32.0-r3
@@ -1,4 +1,4 @@
->=dev-libs/glib-2.13.0:2 >=x11-libs/gtk+-2.17.7:2 >=gnome-base/gnome-keyring-0.6.0 >=dev-libs/dbus-glib-0.71 >=x11-libs/libnotify-0.4.3 >=x11-libs/libwnck-2.10.0:1 >=x11-libs/cairo-1 >=gnome-base/gconf-2.10:2[policykit?] >=media-libs/libcanberra-0.10[gtk] >=sys-power/upower-0.9.1 >=dev-libs/libunique-1.1:1 >=x11-apps/xrandr-1.3 >=x11-proto/xproto-7.0.15 x11-libs/libX11 x11-libs/libXext applet? ( || ( gnome-base/gnome-panel[bonobo] <gnome-base/gnome-panel-2.32 ) ) x11-proto/randrproto sys-devel/gettext app-text/scrollkeeper app-text/docbook-xml-dtd:4.3 >=dev-util/pkgconfig-0.9 >=dev-util/intltool-0.35 >=app-text/gnome-doc-utils-0.3.2 doc? ( app-text/xmlto app-text/docbook-sgml-utils app-text/docbook-xml-dtd:4.4 app-text/docbook-sgml-dtd:4.1 app-text/docbook-xml-dtd:4.1.2 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+>=dev-libs/glib-2.13.0:2 >=x11-libs/gtk+-2.17.7:2 >=gnome-base/gnome-keyring-0.6.0 >=dev-libs/dbus-glib-0.71 >=x11-libs/libnotify-0.4.3 >=x11-libs/libwnck-2.10.0:1 >=x11-libs/cairo-1 >=gnome-base/gconf-2.10:2[policykit?] >=media-libs/libcanberra-0.10[gtk] >=sys-power/upower-0.9.1 >=dev-libs/libunique-1.1:1 >=x11-apps/xrandr-1.3 >=x11-proto/xproto-7.0.15 x11-libs/libX11 x11-libs/libXext applet? ( || ( gnome-base/gnome-panel[bonobo] <gnome-base/gnome-panel-2.32 ) ) x11-proto/randrproto sys-devel/gettext app-text/scrollkeeper app-text/docbook-xml-dtd:4.3 >=dev-util/pkgconfig-0.9 >=dev-util/intltool-0.35 >=app-text/gnome-doc-utils-0.3.2 doc? ( app-text/xmlto app-text/docbook-sgml-utils app-text/docbook-xml-dtd:4.4 app-text/docbook-sgml-dtd:4.1 app-text/docbook-xml-dtd:4.1.2 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 >=dev-libs/glib-2.13.0:2 >=x11-libs/gtk+-2.17.7:2 >=gnome-base/gnome-keyring-0.6.0 >=dev-libs/dbus-glib-0.71 >=x11-libs/libnotify-0.4.3 >=x11-libs/libwnck-2.10.0:1 >=x11-libs/cairo-1 >=gnome-base/gconf-2.10:2[policykit?] >=media-libs/libcanberra-0.10[gtk] >=sys-power/upower-0.9.1 >=dev-libs/libunique-1.1:1 >=x11-apps/xrandr-1.3 >=x11-proto/xproto-7.0.15 x11-libs/libX11 x11-libs/libXext applet? ( || ( gnome-base/gnome-panel[bonobo] <gnome-base/gnome-panel-2.32 ) ) >=sys-auth/consolekit-0.4[policykit?] policykit? ( gnome-extra/polkit-gnome )
 0
 mirror://gnome/sources/gnome-power-manager/2.32/gnome-power-manager-2.32.0.tar.bz2 http://dev.gentoo.org/~pacho/gnome/gnome-power-manager-2.32.0-keyboard-backlight.patch.xz
diff --git a/metadata/cache/gnome-extra/gnome-screensaver-2.30.2-r1 b/metadata/cache/gnome-extra/gnome-screensaver-2.30.2-r1
index 514dc459f545..d9029e3c77ec 100644
--- a/metadata/cache/gnome-extra/gnome-screensaver-2.30.2-r1
+++ b/metadata/cache/gnome-extra/gnome-screensaver-2.30.2-r1
@@ -1,4 +1,4 @@
->=gnome-base/gconf-2.6.1:2 >=x11-libs/gtk+-2.14.0:2 >=gnome-base/gnome-desktop-2.29.0:2 >=gnome-base/gnome-menus-2.12:0 >=dev-libs/glib-2.15:2 >=gnome-base/libgnomekbd-0.1 >=dev-libs/dbus-glib-0.71 libnotify? ( x11-libs/libnotify ) opengl? ( virtual/opengl ) pam? ( virtual/pam ) !pam? ( kernel_linux? ( sys-apps/shadow ) ) x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr x11-libs/libXScrnSaver x11-libs/libXxf86misc x11-libs/libXxf86vm >=dev-util/pkgconfig-0.9 >=dev-util/intltool-0.40 doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.1.2 ~app-text/docbook-xml-dtd-4.4 ) x11-proto/xextproto x11-proto/randrproto x11-proto/scrnsaverproto x11-proto/xf86miscproto gnome-base/gnome-common >=sys-apps/sed-4 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=gnome-base/gconf-2.6.1:2 >=x11-libs/gtk+-2.14.0:2 >=gnome-base/gnome-desktop-2.29.0:2 >=gnome-base/gnome-menus-2.12:0 >=dev-libs/glib-2.15:2 >=gnome-base/libgnomekbd-0.1 >=dev-libs/dbus-glib-0.71 libnotify? ( x11-libs/libnotify ) opengl? ( virtual/opengl ) pam? ( virtual/pam ) !pam? ( kernel_linux? ( sys-apps/shadow ) ) x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr x11-libs/libXScrnSaver x11-libs/libXxf86misc x11-libs/libXxf86vm >=dev-util/pkgconfig-0.9 >=dev-util/intltool-0.40 doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.1.2 ~app-text/docbook-xml-dtd-4.4 ) x11-proto/xextproto x11-proto/randrproto x11-proto/scrnsaverproto x11-proto/xf86miscproto gnome-base/gnome-common >=sys-apps/sed-4 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=gnome-base/gconf-2.6.1:2 >=x11-libs/gtk+-2.14.0:2 >=gnome-base/gnome-desktop-2.29.0:2 >=gnome-base/gnome-menus-2.12:0 >=dev-libs/glib-2.15:2 >=gnome-base/libgnomekbd-0.1 >=dev-libs/dbus-glib-0.71 libnotify? ( x11-libs/libnotify ) opengl? ( virtual/opengl ) pam? ( virtual/pam ) !pam? ( kernel_linux? ( sys-apps/shadow ) ) x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr x11-libs/libXScrnSaver x11-libs/libXxf86misc x11-libs/libXxf86vm
 0
 mirror://gnome/sources/gnome-screensaver/2.30/gnome-screensaver-2.30.2.tar.bz2 branding? ( http://www.gentoo.org/images/gentoo-logo.svg )
diff --git a/metadata/cache/gnome-extra/gnome-swallow-1.2 b/metadata/cache/gnome-extra/gnome-swallow-1.2
index 8d369d41e4ec..aa7a14198c5c 100644
--- a/metadata/cache/gnome-extra/gnome-swallow-1.2
+++ b/metadata/cache/gnome-extra/gnome-swallow-1.2
@@ -1,4 +1,4 @@
->=gnome-base/libgnomeui-2 >=gnome-base/libgtop-2:2 || ( gnome-base/gnome-panel[bonobo] <gnome-base/gnome-panel-2.32 ) >=x11-libs/gtk+-2.2.1:2 dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+>=gnome-base/libgnomeui-2 >=gnome-base/libgtop-2:2 || ( gnome-base/gnome-panel[bonobo] <gnome-base/gnome-panel-2.32 ) >=x11-libs/gtk+-2.2.1:2 dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 >=gnome-base/libgnomeui-2 >=gnome-base/libgtop-2:2 || ( gnome-base/gnome-panel[bonobo] <gnome-base/gnome-panel-2.32 ) >=x11-libs/gtk+-2.2.1:2
 0
 http://interreality.org/~tetron/technology/swallow/gnome-swallow-1.2.tar.gz
diff --git a/metadata/cache/gnome-extra/gnome-utils-2.32.0-r2 b/metadata/cache/gnome-extra/gnome-utils-2.32.0-r2
index 7fb82382abd5..a18a7fb076f8 100644
--- a/metadata/cache/gnome-extra/gnome-utils-2.32.0-r2
+++ b/metadata/cache/gnome-extra/gnome-utils-2.32.0-r2
@@ -1,4 +1,4 @@
->=dev-libs/glib-2.20:2 >=x11-libs/gtk+-2.20:2 >=gnome-base/libgtop-2.12 >=gnome-base/gconf-2:2 >=media-libs/libcanberra-0.4[gtk] x11-libs/libXext x11-libs/libX11 bonobo? ( || ( gnome-base/gnome-panel[bonobo] <gnome-base/gnome-panel-2.32 ) ) x11-proto/xextproto app-text/gnome-doc-utils app-text/scrollkeeper >=dev-util/intltool-0.40 >=dev-util/pkgconfig-0.9 doc? ( >=dev-util/gtk-doc-1.10 ) dev-util/gtk-doc-am gnome-base/gnome-common >=sys-apps/sed-4 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-libs/glib-2.20:2 >=x11-libs/gtk+-2.20:2 >=gnome-base/libgtop-2.12 >=gnome-base/gconf-2:2 >=media-libs/libcanberra-0.4[gtk] x11-libs/libXext x11-libs/libX11 bonobo? ( || ( gnome-base/gnome-panel[bonobo] <gnome-base/gnome-panel-2.32 ) ) x11-proto/xextproto app-text/gnome-doc-utils app-text/scrollkeeper >=dev-util/intltool-0.40 >=dev-util/pkgconfig-0.9 doc? ( >=dev-util/gtk-doc-1.10 ) dev-util/gtk-doc-am gnome-base/gnome-common >=sys-apps/sed-4 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=dev-libs/glib-2.20:2 >=x11-libs/gtk+-2.20:2 >=gnome-base/libgtop-2.12 >=gnome-base/gconf-2:2 >=media-libs/libcanberra-0.4[gtk] x11-libs/libXext x11-libs/libX11 bonobo? ( || ( gnome-base/gnome-panel[bonobo] <gnome-base/gnome-panel-2.32 ) )
 0
 mirror://gnome/sources/gnome-utils/2.32/gnome-utils-2.32.0.tar.bz2 http://dev.gentoo.org/~pacho/gnome/gnome-utils-2.32.0-icons.tar.xz
diff --git a/metadata/cache/gnome-extra/gnome-web-photo-0.9 b/metadata/cache/gnome-extra/gnome-web-photo-0.9
index 5b4096dc18f2..1057272b93fa 100644
--- a/metadata/cache/gnome-extra/gnome-web-photo-0.9
+++ b/metadata/cache/gnome-extra/gnome-web-photo-0.9
@@ -1,4 +1,4 @@
->=dev-libs/glib-2.6:2 >=x11-libs/gtk+-2.6.3:2 >=dev-libs/libxml2-2.6.12:2 media-libs/libpng:0 gnome-base/gconf:2 jpeg? ( virtual/jpeg:0 ) >=net-libs/xulrunner-1.9.2:1.9 >=dev-util/pkgconfig-0.19 sys-devel/gettext || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+>=dev-libs/glib-2.6:2 >=x11-libs/gtk+-2.6.3:2 >=dev-libs/libxml2-2.6.12:2 media-libs/libpng:0 gnome-base/gconf:2 jpeg? ( virtual/jpeg:0 ) >=net-libs/xulrunner-1.9.2:1.9 >=dev-util/pkgconfig-0.19 sys-devel/gettext || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 >=dev-libs/glib-2.6:2 >=x11-libs/gtk+-2.6.3:2 >=dev-libs/libxml2-2.6.12:2 media-libs/libpng:0 gnome-base/gconf:2 jpeg? ( virtual/jpeg:0 ) >=net-libs/xulrunner-1.9.2:1.9
 0
 mirror://gnome/sources/gnome-web-photo/0.9/gnome-web-photo-0.9.tar.bz2
diff --git a/metadata/cache/gnome-extra/gpointing-device-settings-1.5.1-r2 b/metadata/cache/gnome-extra/gpointing-device-settings-1.5.1-r2
index 7d41775b2da0..b9174d363f87 100644
--- a/metadata/cache/gnome-extra/gpointing-device-settings-1.5.1-r2
+++ b/metadata/cache/gnome-extra/gpointing-device-settings-1.5.1-r2
@@ -1,4 +1,4 @@
->=dev-libs/glib-2.10:2 >=x11-libs/gtk+-2.14.0:2 >=gnome-base/gconf-2.24:2 >=gnome-base/gnome-settings-daemon-2.28 >=x11-libs/libXi-1.2 >=x11-libs/libX11-1.2.0 !<=x11-base/xorg-server-1.6.0 !gnome-extra/gsynaptics >=dev-util/pkgconfig-0.19 >=dev-util/intltool-0.35.5 >=sys-apps/sed-4 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-libs/glib-2.10:2 >=x11-libs/gtk+-2.14.0:2 >=gnome-base/gconf-2.24:2 >=gnome-base/gnome-settings-daemon-2.28 >=x11-libs/libXi-1.2 >=x11-libs/libX11-1.2.0 !<=x11-base/xorg-server-1.6.0 !gnome-extra/gsynaptics >=dev-util/pkgconfig-0.19 >=dev-util/intltool-0.35.5 >=sys-apps/sed-4 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=dev-libs/glib-2.10:2 >=x11-libs/gtk+-2.14.0:2 >=gnome-base/gconf-2.24:2 >=gnome-base/gnome-settings-daemon-2.28 >=x11-libs/libXi-1.2 >=x11-libs/libX11-1.2.0 !<=x11-base/xorg-server-1.6.0 !gnome-extra/gsynaptics
 0
 mirror://sourceforge.jp/gsynaptics/45812/gpointing-device-settings-1.5.1.tar.gz
diff --git a/metadata/cache/gnome-extra/gtkhtml-2.11.1 b/metadata/cache/gnome-extra/gtkhtml-2.11.1
index eea019760d7d..720c6d555637 100644
--- a/metadata/cache/gnome-extra/gtkhtml-2.11.1
+++ b/metadata/cache/gnome-extra/gtkhtml-2.11.1
@@ -1,4 +1,4 @@
->=x11-libs/gtk+-2.13.0:2 >=dev-libs/libxml2-2.4.16:2 test? ( >=gnome-base/gnome-vfs-2:2 ) >=dev-util/pkgconfig-0.12.0 >=sys-apps/sed-4 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=x11-libs/gtk+-2.13.0:2 >=dev-libs/libxml2-2.4.16:2 test? ( >=gnome-base/gnome-vfs-2:2 ) >=dev-util/pkgconfig-0.12.0 >=sys-apps/sed-4 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=x11-libs/gtk+-2.13.0:2 >=dev-libs/libxml2-2.4.16:2 test? ( >=gnome-base/gnome-vfs-2:2 )
 2
 mirror://gnome/sources/libgtkhtml/2.11/libgtkhtml-2.11.1.tar.bz2
diff --git a/metadata/cache/gnome-extra/hardware-monitor-1.4.3 b/metadata/cache/gnome-extra/hardware-monitor-1.4.3
index 95bb113b50fa..016c9b415205 100644
--- a/metadata/cache/gnome-extra/hardware-monitor-1.4.3
+++ b/metadata/cache/gnome-extra/hardware-monitor-1.4.3
@@ -1,4 +1,4 @@
->=dev-cpp/gconfmm-2.28.2 dev-cpp/gtkmm:2.4 dev-cpp/libgnomecanvasmm:2.6 dev-cpp/libglademm:2.4 || ( gnome-base/gnome-panel[bonobo] <gnome-base/gnome-panel-2.32 ) >=gnome-base/libgnomeui-2.24.3 gnome-base/libgtop:2 lm_sensors? ( >=sys-apps/lm_sensors-3 ) dev-util/pkgconfig >=dev-util/intltool-0.41.1 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+>=dev-cpp/gconfmm-2.28.2 dev-cpp/gtkmm:2.4 dev-cpp/libgnomecanvasmm:2.6 dev-cpp/libglademm:2.4 || ( gnome-base/gnome-panel[bonobo] <gnome-base/gnome-panel-2.32 ) >=gnome-base/libgnomeui-2.24.3 gnome-base/libgtop:2 lm_sensors? ( >=sys-apps/lm_sensors-3 ) dev-util/pkgconfig >=dev-util/intltool-0.41.1 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 >=dev-cpp/gconfmm-2.28.2 dev-cpp/gtkmm:2.4 dev-cpp/libgnomecanvasmm:2.6 dev-cpp/libglademm:2.4 || ( gnome-base/gnome-panel[bonobo] <gnome-base/gnome-panel-2.32 ) >=gnome-base/libgnomeui-2.24.3 gnome-base/libgtop:2 lm_sensors? ( >=sys-apps/lm_sensors-3 )
 0
 http://www.fnxweb.com/software/hardware-monitor/hardware-monitor-1.4.3.tar.bz2
diff --git a/metadata/cache/gnome-extra/libgda-4.2.9 b/metadata/cache/gnome-extra/libgda-4.2.9
index 66f318d41176..3dd65be92910 100644
--- a/metadata/cache/gnome-extra/libgda-4.2.9
+++ b/metadata/cache/gnome-extra/libgda-4.2.9
@@ -1,4 +1,4 @@
-app-text/iso-codes >=dev-libs/glib-2.16:2 >=dev-libs/libxml2-2:2 dev-libs/libxslt dev-libs/libunique:1 sys-libs/readline sys-libs/ncurses berkdb? ( sys-libs/db ) !bindist? ( firebird? ( dev-db/firebird ) ) gtk? ( || ( >=x11-libs/gtk+-2.12:2 x11-libs/gdk-pixbuf:2 ) canvas? ( x11-libs/goocanvas:0 ) sourceview? ( x11-libs/gtksourceview:2.0 ) graphviz? ( media-gfx/graphviz ) ) gnome-keyring? ( gnome-base/libgnome-keyring ) http? ( >=net-libs/libsoup-2.24:2.4 ) introspection? ( >=dev-libs/gobject-introspection-0.6.5 ) json? ( dev-libs/json-glib ) ldap? ( net-nds/openldap ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-base ) ssl? ( dev-libs/openssl ) >=dev-db/sqlite-3.6.22:3 >=dev-util/pkgconfig-0.18 >=dev-util/intltool-0.35.5 >=app-text/gnome-doc-utils-0.9 >=dev-util/gtk-doc-am-1 doc? ( >=dev-util/gtk-doc-1 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 java? ( >=dev-java/java-config-2.1.9-r1 )
+app-text/iso-codes >=dev-libs/glib-2.16:2 >=dev-libs/libxml2-2:2 dev-libs/libxslt dev-libs/libunique:1 sys-libs/readline sys-libs/ncurses berkdb? ( sys-libs/db ) !bindist? ( firebird? ( dev-db/firebird ) ) gtk? ( || ( >=x11-libs/gtk+-2.12:2 x11-libs/gdk-pixbuf:2 ) canvas? ( x11-libs/goocanvas:0 ) sourceview? ( x11-libs/gtksourceview:2.0 ) graphviz? ( media-gfx/graphviz ) ) gnome-keyring? ( gnome-base/libgnome-keyring ) http? ( >=net-libs/libsoup-2.24:2.4 ) introspection? ( >=dev-libs/gobject-introspection-0.6.5 ) json? ( dev-libs/json-glib ) ldap? ( net-nds/openldap ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-base ) ssl? ( dev-libs/openssl ) >=dev-db/sqlite-3.6.22:3 >=dev-util/pkgconfig-0.18 >=dev-util/intltool-0.35.5 >=app-text/gnome-doc-utils-0.9 >=dev-util/gtk-doc-am-1 doc? ( >=dev-util/gtk-doc-1 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 java? ( >=dev-java/java-config-2.1.9-r1 )
 app-text/iso-codes >=dev-libs/glib-2.16:2 >=dev-libs/libxml2-2:2 dev-libs/libxslt dev-libs/libunique:1 sys-libs/readline sys-libs/ncurses berkdb? ( sys-libs/db ) !bindist? ( firebird? ( dev-db/firebird ) ) gtk? ( || ( >=x11-libs/gtk+-2.12:2 x11-libs/gdk-pixbuf:2 ) canvas? ( x11-libs/goocanvas:0 ) sourceview? ( x11-libs/gtksourceview:2.0 ) graphviz? ( media-gfx/graphviz ) ) gnome-keyring? ( gnome-base/libgnome-keyring ) http? ( >=net-libs/libsoup-2.24:2.4 ) introspection? ( >=dev-libs/gobject-introspection-0.6.5 ) json? ( dev-libs/json-glib ) ldap? ( net-nds/openldap ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-base ) ssl? ( dev-libs/openssl ) >=dev-db/sqlite-3.6.22:3 java? ( >=dev-java/java-config-2.1.9-r1 )
 4
 mirror://gnome/sources/libgda/4.2/libgda-4.2.9.tar.xz
diff --git a/metadata/cache/gnome-extra/libgda-5.0.2 b/metadata/cache/gnome-extra/libgda-5.0.2
index 81d19f06cd80..697f9047d83f 100644
--- a/metadata/cache/gnome-extra/libgda-5.0.2
+++ b/metadata/cache/gnome-extra/libgda-5.0.2
@@ -1,4 +1,4 @@
-app-text/iso-codes >=dev-libs/glib-2.16:2 >=dev-libs/libxml2-2 dev-libs/libxslt sys-libs/readline sys-libs/ncurses berkdb? ( sys-libs/db ) !bindist? ( firebird? ( dev-db/firebird ) ) gtk? ( >=x11-libs/gtk+-3.0.0:3 canvas? ( x11-libs/goocanvas:2.0 ) sourceview? ( x11-libs/gtksourceview:3.0 ) graphviz? ( media-gfx/graphviz ) ) gnome-keyring? ( || ( gnome-base/libgnome-keyring <gnome-base/gnome-keyring-2.29.4 ) ) http? ( >=net-libs/libsoup-2.24:2.4 ) introspection? ( >=dev-libs/gobject-introspection-0.6.5 ) json? ( dev-libs/json-glib ) ldap? ( net-nds/openldap ) mdb? ( >app-office/mdbtools-0.5 ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-base ) ssl? ( dev-libs/openssl ) >=dev-db/sqlite-3.6.22:3 >=dev-util/pkgconfig-0.18 >=dev-util/intltool-0.35.5 >=app-text/gnome-doc-utils-0.9 doc? ( >=dev-util/gtk-doc-1 ) vala? ( >=dev-lang/vala-0.14:0.14[vapigen] ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 java? ( >=dev-java/java-config-2.1.9-r1 ) =dev-lang/python-2*
+app-text/iso-codes >=dev-libs/glib-2.16:2 >=dev-libs/libxml2-2 dev-libs/libxslt sys-libs/readline sys-libs/ncurses berkdb? ( sys-libs/db ) !bindist? ( firebird? ( dev-db/firebird ) ) gtk? ( >=x11-libs/gtk+-3.0.0:3 canvas? ( x11-libs/goocanvas:2.0 ) sourceview? ( x11-libs/gtksourceview:3.0 ) graphviz? ( media-gfx/graphviz ) ) gnome-keyring? ( || ( gnome-base/libgnome-keyring <gnome-base/gnome-keyring-2.29.4 ) ) http? ( >=net-libs/libsoup-2.24:2.4 ) introspection? ( >=dev-libs/gobject-introspection-0.6.5 ) json? ( dev-libs/json-glib ) ldap? ( net-nds/openldap ) mdb? ( >app-office/mdbtools-0.5 ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-base ) ssl? ( dev-libs/openssl ) >=dev-db/sqlite-3.6.22:3 >=dev-util/pkgconfig-0.18 >=dev-util/intltool-0.35.5 >=app-text/gnome-doc-utils-0.9 doc? ( >=dev-util/gtk-doc-1 ) vala? ( >=dev-lang/vala-0.14:0.14[vapigen] ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 java? ( >=dev-java/java-config-2.1.9-r1 ) =dev-lang/python-2*
 app-text/iso-codes >=dev-libs/glib-2.16:2 >=dev-libs/libxml2-2 dev-libs/libxslt sys-libs/readline sys-libs/ncurses berkdb? ( sys-libs/db ) !bindist? ( firebird? ( dev-db/firebird ) ) gtk? ( >=x11-libs/gtk+-3.0.0:3 canvas? ( x11-libs/goocanvas:2.0 ) sourceview? ( x11-libs/gtksourceview:3.0 ) graphviz? ( media-gfx/graphviz ) ) gnome-keyring? ( || ( gnome-base/libgnome-keyring <gnome-base/gnome-keyring-2.29.4 ) ) http? ( >=net-libs/libsoup-2.24:2.4 ) introspection? ( >=dev-libs/gobject-introspection-0.6.5 ) json? ( dev-libs/json-glib ) ldap? ( net-nds/openldap ) mdb? ( >app-office/mdbtools-0.5 ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-base ) ssl? ( dev-libs/openssl ) >=dev-db/sqlite-3.6.22:3 java? ( >=dev-java/java-config-2.1.9-r1 ) =dev-lang/python-2*
 5
 mirror://gnome/sources/libgda/5.0/libgda-5.0.2.tar.xz
diff --git a/metadata/cache/gnome-extra/libgda-5.0.3 b/metadata/cache/gnome-extra/libgda-5.0.3
index 9c3b6314576b..4a9158032998 100644
--- a/metadata/cache/gnome-extra/libgda-5.0.3
+++ b/metadata/cache/gnome-extra/libgda-5.0.3
@@ -1,4 +1,4 @@
-app-text/iso-codes >=dev-libs/glib-2.16:2 >=dev-libs/libxml2-2 dev-libs/libxslt sys-libs/readline sys-libs/ncurses berkdb? ( sys-libs/db ) !bindist? ( firebird? ( dev-db/firebird ) ) gtk? ( >=x11-libs/gtk+-3.0.0:3 canvas? ( x11-libs/goocanvas:2.0 ) sourceview? ( x11-libs/gtksourceview:3.0 ) graphviz? ( media-gfx/graphviz ) ) gnome-keyring? ( || ( gnome-base/libgnome-keyring <gnome-base/gnome-keyring-2.29.4 ) ) http? ( >=net-libs/libsoup-2.24:2.4 ) introspection? ( >=dev-libs/gobject-introspection-0.6.5 ) json? ( dev-libs/json-glib ) ldap? ( net-nds/openldap ) mdb? ( >app-office/mdbtools-0.5 ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-base ) ssl? ( dev-libs/openssl ) >=dev-db/sqlite-3.6.22:3 >=dev-util/pkgconfig-0.18 >=dev-util/intltool-0.35.5 >=app-text/gnome-doc-utils-0.9 doc? ( >=dev-util/gtk-doc-1 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 java? ( >=dev-java/java-config-2.1.9-r1 ) =dev-lang/python-2*
+app-text/iso-codes >=dev-libs/glib-2.16:2 >=dev-libs/libxml2-2 dev-libs/libxslt sys-libs/readline sys-libs/ncurses berkdb? ( sys-libs/db ) !bindist? ( firebird? ( dev-db/firebird ) ) gtk? ( >=x11-libs/gtk+-3.0.0:3 canvas? ( x11-libs/goocanvas:2.0 ) sourceview? ( x11-libs/gtksourceview:3.0 ) graphviz? ( media-gfx/graphviz ) ) gnome-keyring? ( || ( gnome-base/libgnome-keyring <gnome-base/gnome-keyring-2.29.4 ) ) http? ( >=net-libs/libsoup-2.24:2.4 ) introspection? ( >=dev-libs/gobject-introspection-0.6.5 ) json? ( dev-libs/json-glib ) ldap? ( net-nds/openldap ) mdb? ( >app-office/mdbtools-0.5 ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-base ) ssl? ( dev-libs/openssl ) >=dev-db/sqlite-3.6.22:3 >=dev-util/pkgconfig-0.18 >=dev-util/intltool-0.35.5 >=app-text/gnome-doc-utils-0.9 doc? ( >=dev-util/gtk-doc-1 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 java? ( >=dev-java/java-config-2.1.9-r1 ) =dev-lang/python-2*
 app-text/iso-codes >=dev-libs/glib-2.16:2 >=dev-libs/libxml2-2 dev-libs/libxslt sys-libs/readline sys-libs/ncurses berkdb? ( sys-libs/db ) !bindist? ( firebird? ( dev-db/firebird ) ) gtk? ( >=x11-libs/gtk+-3.0.0:3 canvas? ( x11-libs/goocanvas:2.0 ) sourceview? ( x11-libs/gtksourceview:3.0 ) graphviz? ( media-gfx/graphviz ) ) gnome-keyring? ( || ( gnome-base/libgnome-keyring <gnome-base/gnome-keyring-2.29.4 ) ) http? ( >=net-libs/libsoup-2.24:2.4 ) introspection? ( >=dev-libs/gobject-introspection-0.6.5 ) json? ( dev-libs/json-glib ) ldap? ( net-nds/openldap ) mdb? ( >app-office/mdbtools-0.5 ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-base ) ssl? ( dev-libs/openssl ) >=dev-db/sqlite-3.6.22:3 java? ( >=dev-java/java-config-2.1.9-r1 ) =dev-lang/python-2*
 5
 mirror://gnome/sources/libgda/5.0/libgda-5.0.3.tar.xz
diff --git a/metadata/cache/gnome-extra/libgsf-1.14.21 b/metadata/cache/gnome-extra/libgsf-1.14.21
index f3062b881902..6a9baf537a4a 100644
--- a/metadata/cache/gnome-extra/libgsf-1.14.21
+++ b/metadata/cache/gnome-extra/libgsf-1.14.21
@@ -1,4 +1,4 @@
->=dev-libs/glib-2.16:2 >=dev-libs/libxml2-2.4.16:2 sys-libs/zlib bzip2? ( app-arch/bzip2 ) gnome? ( >=gnome-base/libbonobo-2 ) gtk? ( x11-libs/gtk+:2 ) python? ( >=dev-python/pygobject-2.10:2 >=dev-python/pygtk-2.10:2 ) thumbnail? ( >=gnome-base/gconf-2:2 ) dev-util/pkgconfig >=dev-util/intltool-0.35.0 dev-util/gtk-doc-am doc? ( >=dev-util/gtk-doc-1 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) )
+>=dev-libs/glib-2.16:2 >=dev-libs/libxml2-2.4.16:2 sys-libs/zlib bzip2? ( app-arch/bzip2 ) gnome? ( >=gnome-base/libbonobo-2 ) gtk? ( x11-libs/gtk+:2 ) python? ( >=dev-python/pygobject-2.10:2 >=dev-python/pygtk-2.10:2 ) thumbnail? ( >=gnome-base/gconf-2:2 ) dev-util/pkgconfig >=dev-util/intltool-0.35.0 dev-util/gtk-doc-am doc? ( >=dev-util/gtk-doc-1 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) )
 >=dev-libs/glib-2.16:2 >=dev-libs/libxml2-2.4.16:2 sys-libs/zlib bzip2? ( app-arch/bzip2 ) gnome? ( >=gnome-base/libbonobo-2 ) gtk? ( x11-libs/gtk+:2 ) python? ( >=dev-python/pygobject-2.10:2 >=dev-python/pygtk-2.10:2 ) thumbnail? ( >=gnome-base/gconf-2:2 ) python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) )
 0
 mirror://gnome/sources/libgsf/1.14/libgsf-1.14.21.tar.bz2 mirror://gentoo/gnome-mplayer-0.9.6-gconf-2.m4.tgz
diff --git a/metadata/cache/gnome-extra/libgsf-1.14.22 b/metadata/cache/gnome-extra/libgsf-1.14.22
index 7937ef0a08cf..3c4c675167fa 100644
--- a/metadata/cache/gnome-extra/libgsf-1.14.22
+++ b/metadata/cache/gnome-extra/libgsf-1.14.22
@@ -1,4 +1,4 @@
->=dev-libs/glib-2.16:2 >=dev-libs/libxml2-2.4.16:2 sys-libs/zlib bzip2? ( app-arch/bzip2 ) gtk? ( x11-libs/gtk+:2 ) python? ( >=dev-python/pygobject-2.10:2 >=dev-python/pygtk-2.10:2 ) dev-util/pkgconfig >=dev-util/intltool-0.35.0 dev-util/gtk-doc-am doc? ( >=dev-util/gtk-doc-1 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) )
+>=dev-libs/glib-2.16:2 >=dev-libs/libxml2-2.4.16:2 sys-libs/zlib bzip2? ( app-arch/bzip2 ) gtk? ( x11-libs/gtk+:2 ) python? ( >=dev-python/pygobject-2.10:2 >=dev-python/pygtk-2.10:2 ) dev-util/pkgconfig >=dev-util/intltool-0.35.0 dev-util/gtk-doc-am doc? ( >=dev-util/gtk-doc-1 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) )
 >=dev-libs/glib-2.16:2 >=dev-libs/libxml2-2.4.16:2 sys-libs/zlib bzip2? ( app-arch/bzip2 ) gtk? ( x11-libs/gtk+:2 ) python? ( >=dev-python/pygobject-2.10:2 >=dev-python/pygtk-2.10:2 ) python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) )
 0
 mirror://gnome/sources/libgsf/1.14/libgsf-1.14.22.tar.xz
diff --git a/metadata/cache/gnome-extra/nautilus-dropbox-0.6.9 b/metadata/cache/gnome-extra/nautilus-dropbox-0.6.9
index cc6d085e8bcc..8a6cf1e9d125 100644
--- a/metadata/cache/gnome-extra/nautilus-dropbox-0.6.9
+++ b/metadata/cache/gnome-extra/nautilus-dropbox-0.6.9
@@ -1,4 +1,4 @@
-gnome-base/nautilus dev-libs/glib:2 dev-python/pygtk:2 net-misc/dropbox x11-libs/gtk+:2 x11-libs/libnotify x11-libs/libXinerama dev-util/pkgconfig dev-python/docutils || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool =dev-lang/python-2* >=sys-apps/sed-4
+gnome-base/nautilus dev-libs/glib:2 dev-python/pygtk:2 net-misc/dropbox x11-libs/gtk+:2 x11-libs/libnotify x11-libs/libXinerama dev-util/pkgconfig dev-python/docutils || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool =dev-lang/python-2* >=sys-apps/sed-4
 gnome-base/nautilus dev-libs/glib:2 dev-python/pygtk:2 net-misc/dropbox x11-libs/gtk+:2 x11-libs/libnotify x11-libs/libXinerama =dev-lang/python-2*
 0
 http://www.dropbox.com/download?dl=packages/nautilus-dropbox-0.6.9.tar.bz2
diff --git a/metadata/cache/gnome-extra/nautilus-dropbox-0.7.0 b/metadata/cache/gnome-extra/nautilus-dropbox-0.7.0
index cddfe86b941c..0feaa52791b0 100644
--- a/metadata/cache/gnome-extra/nautilus-dropbox-0.7.0
+++ b/metadata/cache/gnome-extra/nautilus-dropbox-0.7.0
@@ -1,4 +1,4 @@
-gnome-base/nautilus dev-libs/glib:2 dev-python/pygtk:2 net-misc/dropbox x11-libs/gtk+:2 x11-libs/libnotify x11-libs/libXinerama dev-util/pkgconfig dev-python/docutils || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool =dev-lang/python-2* >=sys-apps/sed-4
+gnome-base/nautilus dev-libs/glib:2 dev-python/pygtk:2 net-misc/dropbox x11-libs/gtk+:2 x11-libs/libnotify x11-libs/libXinerama dev-util/pkgconfig dev-python/docutils || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool =dev-lang/python-2* >=sys-apps/sed-4
 gnome-base/nautilus dev-libs/glib:2 dev-python/pygtk:2 net-misc/dropbox x11-libs/gtk+:2 x11-libs/libnotify x11-libs/libXinerama =dev-lang/python-2*
 0
 http://www.dropbox.com/download?dl=packages/nautilus-dropbox-0.7.0.tar.bz2
diff --git a/metadata/cache/gnome-extra/nautilus-dropbox-0.7.1 b/metadata/cache/gnome-extra/nautilus-dropbox-0.7.1
index 8d9577631321..eefb4b58669c 100644
--- a/metadata/cache/gnome-extra/nautilus-dropbox-0.7.1
+++ b/metadata/cache/gnome-extra/nautilus-dropbox-0.7.1
@@ -1,4 +1,4 @@
-gnome-base/nautilus dev-libs/glib:2 dev-python/pygtk:2 net-misc/dropbox x11-libs/gtk+:2 x11-libs/libnotify x11-libs/libXinerama dev-util/pkgconfig dev-python/docutils || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool =dev-lang/python-2* >=sys-apps/sed-4
+gnome-base/nautilus dev-libs/glib:2 dev-python/pygtk:2 net-misc/dropbox x11-libs/gtk+:2 x11-libs/libnotify x11-libs/libXinerama dev-util/pkgconfig dev-python/docutils || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool =dev-lang/python-2* >=sys-apps/sed-4
 gnome-base/nautilus dev-libs/glib:2 dev-python/pygtk:2 net-misc/dropbox x11-libs/gtk+:2 x11-libs/libnotify x11-libs/libXinerama =dev-lang/python-2*
 0
 http://www.dropbox.com/download?dl=packages/nautilus-dropbox-0.7.1.tar.bz2
diff --git a/metadata/cache/gnome-extra/polkit-gnome-0.101-r1 b/metadata/cache/gnome-extra/polkit-gnome-0.101-r1
index a02e11832ecf..1c69cb8a0a9b 100644
--- a/metadata/cache/gnome-extra/polkit-gnome-0.101-r1
+++ b/metadata/cache/gnome-extra/polkit-gnome-0.101-r1
@@ -1,4 +1,4 @@
->=x11-libs/gtk+-2.17.1:2[introspection?] >=sys-auth/polkit-0.101[introspection?] introspection? ( >=dev-libs/gobject-introspection-0.6.2 ) !lxde-base/lxpolkit dev-util/gtk-doc-am >=dev-util/intltool-0.35.0 dev-util/pkgconfig gnome-base/gnome-common sys-devel/gettext doc? ( >=dev-util/gtk-doc-1.3 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=x11-libs/gtk+-2.17.1:2[introspection?] >=sys-auth/polkit-0.101[introspection?] introspection? ( >=dev-libs/gobject-introspection-0.6.2 ) !lxde-base/lxpolkit dev-util/gtk-doc-am >=dev-util/intltool-0.35.0 dev-util/pkgconfig gnome-base/gnome-common sys-devel/gettext doc? ( >=dev-util/gtk-doc-1.3 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=x11-libs/gtk+-2.17.1:2[introspection?] >=sys-auth/polkit-0.101[introspection?] introspection? ( >=dev-libs/gobject-introspection-0.6.2 ) !lxde-base/lxpolkit
 0
 http://hal.freedesktop.org/releases/polkit-gnome-0.101.tar.bz2
diff --git a/metadata/cache/gnome-extra/synapse-0.2.10 b/metadata/cache/gnome-extra/synapse-0.2.10
index c197f8c40308..fef9f15e3d89 100644
--- a/metadata/cache/gnome-extra/synapse-0.2.10
+++ b/metadata/cache/gnome-extra/synapse-0.2.10
@@ -1,4 +1,4 @@
-dev-lang/vala:0.14 dev-libs/dbus-glib dev-libs/libgee:0 dev-libs/glib:2 dev-libs/json-glib dev-libs/libunique:1 sys-apps/dbus x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtkhotkey x11-libs/gtk+:2 x11-libs/libnotify x11-libs/pango x11-themes/gnome-icon-theme ayatana? ( dev-libs/libappindicator ) plugins? ( net-libs/rest ) zeitgeist? ( dev-libs/libzeitgeist gnome-extra/zeitgeist gnome-extra/zeitgeist-extensions[fts] ) dev-util/intltool dev-util/pkgconfig app-arch/xz-utils >=sys-apps/sed-4 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+dev-lang/vala:0.14 dev-libs/dbus-glib dev-libs/libgee:0 dev-libs/glib:2 dev-libs/json-glib dev-libs/libunique:1 sys-apps/dbus x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtkhotkey x11-libs/gtk+:2 x11-libs/libnotify x11-libs/pango x11-themes/gnome-icon-theme ayatana? ( dev-libs/libappindicator ) plugins? ( net-libs/rest ) zeitgeist? ( dev-libs/libzeitgeist gnome-extra/zeitgeist gnome-extra/zeitgeist-extensions[fts] ) dev-util/intltool dev-util/pkgconfig app-arch/xz-utils >=sys-apps/sed-4 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 dev-lang/vala:0.14 dev-libs/dbus-glib dev-libs/libgee:0 dev-libs/glib:2 dev-libs/json-glib dev-libs/libunique:1 sys-apps/dbus x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtkhotkey x11-libs/gtk+:2 x11-libs/libnotify x11-libs/pango x11-themes/gnome-icon-theme ayatana? ( dev-libs/libappindicator ) plugins? ( net-libs/rest ) zeitgeist? ( dev-libs/libzeitgeist gnome-extra/zeitgeist gnome-extra/zeitgeist-extensions[fts] )
 0
 http://launchpad.net/synapse-project/0.2/0.2.10/+download/synapse-0.2.10.tar.gz
diff --git a/metadata/cache/gnome-extra/synapse-0.2.8.2 b/metadata/cache/gnome-extra/synapse-0.2.8.2
index 31ee239a60b9..8cddd967349c 100644
--- a/metadata/cache/gnome-extra/synapse-0.2.8.2
+++ b/metadata/cache/gnome-extra/synapse-0.2.8.2
@@ -1,4 +1,4 @@
-dev-lang/vala:0.12 dev-libs/dbus-glib dev-libs/libgee:0 dev-libs/glib:2 dev-libs/json-glib dev-libs/libunique:1 sys-apps/dbus x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtkhotkey x11-libs/gtk+:2 x11-libs/libnotify x11-libs/pango x11-themes/gnome-icon-theme ayatana? ( dev-libs/libappindicator ) plugins? ( net-libs/rest ) zeitgeist? ( dev-libs/libzeitgeist gnome-extra/zeitgeist gnome-extra/zeitgeist-extensions[fts] ) dev-util/intltool dev-util/pkgconfig app-arch/xz-utils >=sys-apps/sed-4 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+dev-lang/vala:0.12 dev-libs/dbus-glib dev-libs/libgee:0 dev-libs/glib:2 dev-libs/json-glib dev-libs/libunique:1 sys-apps/dbus x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtkhotkey x11-libs/gtk+:2 x11-libs/libnotify x11-libs/pango x11-themes/gnome-icon-theme ayatana? ( dev-libs/libappindicator ) plugins? ( net-libs/rest ) zeitgeist? ( dev-libs/libzeitgeist gnome-extra/zeitgeist gnome-extra/zeitgeist-extensions[fts] ) dev-util/intltool dev-util/pkgconfig app-arch/xz-utils >=sys-apps/sed-4 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 dev-lang/vala:0.12 dev-libs/dbus-glib dev-libs/libgee:0 dev-libs/glib:2 dev-libs/json-glib dev-libs/libunique:1 sys-apps/dbus x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtkhotkey x11-libs/gtk+:2 x11-libs/libnotify x11-libs/pango x11-themes/gnome-icon-theme ayatana? ( dev-libs/libappindicator ) plugins? ( net-libs/rest ) zeitgeist? ( dev-libs/libzeitgeist gnome-extra/zeitgeist gnome-extra/zeitgeist-extensions[fts] )
 0
 http://launchpad.net/synapse-project/0.2/0.2.8.2/+download/synapse-0.2.8.2.tar.gz
diff --git a/metadata/cache/gnome-extra/tasks-0.19 b/metadata/cache/gnome-extra/tasks-0.19
index c5d1fda004b0..bc13928f89d6 100644
--- a/metadata/cache/gnome-extra/tasks-0.19
+++ b/metadata/cache/gnome-extra/tasks-0.19
@@ -1,4 +1,4 @@
->=gnome-extra/evolution-data-server-1.8 >=x11-libs/gtk+-2.16:2 >=dev-libs/glib-2.14:2 >=dev-libs/libunique-1:1 >=dev-util/pkgconfig-0.9 >=dev-util/intltool-0.33 sys-devel/gettext || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+>=gnome-extra/evolution-data-server-1.8 >=x11-libs/gtk+-2.16:2 >=dev-libs/glib-2.14:2 >=dev-libs/libunique-1:1 >=dev-util/pkgconfig-0.9 >=dev-util/intltool-0.33 sys-devel/gettext || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 >=gnome-extra/evolution-data-server-1.8 >=x11-libs/gtk+-2.16:2 >=dev-libs/glib-2.14:2 >=dev-libs/libunique-1:1
 0
 http://pimlico-project.org/sources/tasks/tasks-0.19.tar.gz
diff --git a/metadata/cache/gnome-extra/tasks-0.20 b/metadata/cache/gnome-extra/tasks-0.20
index 98e5db80815d..953e5ad925d7 100644
--- a/metadata/cache/gnome-extra/tasks-0.20
+++ b/metadata/cache/gnome-extra/tasks-0.20
@@ -1,4 +1,4 @@
->=gnome-extra/evolution-data-server-1.8 >=x11-libs/gtk+-2.16:2 >=dev-libs/glib-2.14:2 >=dev-libs/libunique-1:1 >=dev-util/pkgconfig-0.9 >=dev-util/intltool-0.33 sys-devel/gettext || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
+>=gnome-extra/evolution-data-server-1.8 >=x11-libs/gtk+-2.16:2 >=dev-libs/glib-2.14:2 >=dev-libs/libunique-1:1 >=dev-util/pkgconfig-0.9 >=dev-util/intltool-0.33 sys-devel/gettext || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
 >=gnome-extra/evolution-data-server-1.8 >=x11-libs/gtk+-2.16:2 >=dev-libs/glib-2.14:2 >=dev-libs/libunique-1:1
 0
 mirror://gnome/sources/tasks/0.20/tasks-0.20.tar.xz
diff --git a/metadata/cache/gnome-extra/yelp-2.30.2-r5 b/metadata/cache/gnome-extra/yelp-2.30.2-r5
index 1978b2589b91..285b74a469f6 100644
--- a/metadata/cache/gnome-extra/yelp-2.30.2-r5
+++ b/metadata/cache/gnome-extra/yelp-2.30.2-r5
@@ -1,4 +1,4 @@
->=gnome-base/gconf-2:2 >=app-text/gnome-doc-utils-0.19.1 >=x11-libs/gtk+-2.18:2 >=dev-libs/glib-2.16:2 >=dev-libs/libxml2-2.6.5:2 >=dev-libs/libxslt-1.1.4 >=x11-libs/startup-notification-0.8 >=dev-libs/dbus-glib-0.71 net-libs/xulrunner:1.9 sys-libs/zlib app-arch/bzip2 >=app-text/rarian-0.7 >=app-text/scrollkeeper-9999 sys-devel/gettext >=dev-util/intltool-0.35 >=dev-util/pkgconfig-0.9 gnome-base/gnome-common || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+>=gnome-base/gconf-2:2 >=app-text/gnome-doc-utils-0.19.1 >=x11-libs/gtk+-2.18:2 >=dev-libs/glib-2.16:2 >=dev-libs/libxml2-2.6.5:2 >=dev-libs/libxslt-1.1.4 >=x11-libs/startup-notification-0.8 >=dev-libs/dbus-glib-0.71 net-libs/xulrunner:1.9 sys-libs/zlib app-arch/bzip2 >=app-text/rarian-0.7 >=app-text/scrollkeeper-9999 sys-devel/gettext >=dev-util/intltool-0.35 >=dev-util/pkgconfig-0.9 gnome-base/gnome-common || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 >=gnome-base/gconf-2:2 >=app-text/gnome-doc-utils-0.19.1 >=x11-libs/gtk+-2.18:2 >=dev-libs/glib-2.16:2 >=dev-libs/libxml2-2.6.5:2 >=dev-libs/libxslt-1.1.4 >=x11-libs/startup-notification-0.8 >=dev-libs/dbus-glib-0.71 net-libs/xulrunner:1.9 sys-libs/zlib app-arch/bzip2 >=app-text/rarian-0.7 >=app-text/scrollkeeper-9999
 0
 mirror://gnome/sources/yelp/2.30/yelp-2.30.2.tar.bz2
diff --git a/metadata/cache/gnome-extra/yelp-2.30.2-r6 b/metadata/cache/gnome-extra/yelp-2.30.2-r6
index b9e7e88b79b3..8dbdc8af9d34 100644
--- a/metadata/cache/gnome-extra/yelp-2.30.2-r6
+++ b/metadata/cache/gnome-extra/yelp-2.30.2-r6
@@ -1,4 +1,4 @@
->=gnome-base/gconf-2:2 >=app-text/gnome-doc-utils-0.19.1 >=x11-libs/gtk+-2.18:2 >=dev-libs/glib-2.16:2 >=dev-libs/libxml2-2.6.5:2 >=dev-libs/libxslt-1.1.4 >=x11-libs/startup-notification-0.8 >=dev-libs/dbus-glib-0.71 net-libs/xulrunner:1.9 sys-libs/zlib app-arch/bzip2 >=app-text/rarian-0.7 >=app-text/scrollkeeper-9999 sys-devel/gettext >=dev-util/intltool-0.35 >=dev-util/pkgconfig-0.9 gnome-base/gnome-common || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+>=gnome-base/gconf-2:2 >=app-text/gnome-doc-utils-0.19.1 >=x11-libs/gtk+-2.18:2 >=dev-libs/glib-2.16:2 >=dev-libs/libxml2-2.6.5:2 >=dev-libs/libxslt-1.1.4 >=x11-libs/startup-notification-0.8 >=dev-libs/dbus-glib-0.71 net-libs/xulrunner:1.9 sys-libs/zlib app-arch/bzip2 >=app-text/rarian-0.7 >=app-text/scrollkeeper-9999 sys-devel/gettext >=dev-util/intltool-0.35 >=dev-util/pkgconfig-0.9 gnome-base/gnome-common || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 >=gnome-base/gconf-2:2 >=app-text/gnome-doc-utils-0.19.1 >=x11-libs/gtk+-2.18:2 >=dev-libs/glib-2.16:2 >=dev-libs/libxml2-2.6.5:2 >=dev-libs/libxslt-1.1.4 >=x11-libs/startup-notification-0.8 >=dev-libs/dbus-glib-0.71 net-libs/xulrunner:1.9 sys-libs/zlib app-arch/bzip2 >=app-text/rarian-0.7 >=app-text/scrollkeeper-9999
 0
 mirror://gnome/sources/yelp/2.30/yelp-2.30.2.tar.bz2
diff --git a/metadata/cache/gnome-extra/yelp-3.2.1 b/metadata/cache/gnome-extra/yelp-3.2.1
index f0628da37a4e..a204cf2ffbd1 100644
--- a/metadata/cache/gnome-extra/yelp-3.2.1
+++ b/metadata/cache/gnome-extra/yelp-3.2.1
@@ -1,4 +1,4 @@
->=x11-libs/gtk+-2.91.8:3 >=dev-libs/glib-2.25.11:2 >=dev-libs/libxml2-2.6.5:2 >=dev-libs/libxslt-1.1.4 >=dev-libs/dbus-glib-0.71 >=gnome-extra/yelp-xsl-3.1.1 >=net-libs/webkit-gtk-1.3.2:3 >=app-arch/xz-utils-4.9 app-arch/bzip2 dev-db/sqlite:3 x11-themes/gnome-icon-theme-symbolic >=sys-devel/gettext-0.17 >=dev-util/intltool-0.41.0 >=dev-util/pkgconfig-0.9 gnome-base/gnome-common || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
+>=x11-libs/gtk+-2.91.8:3 >=dev-libs/glib-2.25.11:2 >=dev-libs/libxml2-2.6.5:2 >=dev-libs/libxslt-1.1.4 >=dev-libs/dbus-glib-0.71 >=gnome-extra/yelp-xsl-3.1.1 >=net-libs/webkit-gtk-1.3.2:3 >=app-arch/xz-utils-4.9 app-arch/bzip2 dev-db/sqlite:3 x11-themes/gnome-icon-theme-symbolic >=sys-devel/gettext-0.17 >=dev-util/intltool-0.41.0 >=dev-util/pkgconfig-0.9 gnome-base/gnome-common || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
 >=x11-libs/gtk+-2.91.8:3 >=dev-libs/glib-2.25.11:2 >=dev-libs/libxml2-2.6.5:2 >=dev-libs/libxslt-1.1.4 >=dev-libs/dbus-glib-0.71 >=gnome-extra/yelp-xsl-3.1.1 >=net-libs/webkit-gtk-1.3.2:3 >=app-arch/xz-utils-4.9 app-arch/bzip2 dev-db/sqlite:3 x11-themes/gnome-icon-theme-symbolic
 0
 mirror://gnome/sources/yelp/3.2/yelp-3.2.1.tar.xz
diff --git a/metadata/cache/gnome-extra/zeitgeist-0.7 b/metadata/cache/gnome-extra/zeitgeist-0.7
index f46f6edc4b40..feb17215e2a6 100644
--- a/metadata/cache/gnome-extra/zeitgeist-0.7
+++ b/metadata/cache/gnome-extra/zeitgeist-0.7
@@ -1,4 +1,4 @@
-media-libs/raptor:2 dev-python/rdflib dev-python/dbus-python dev-python/pyxdg fts? ( dev-libs/xapian-bindings[python] ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool =dev-lang/python-2* =dev-lang/python-2*[sqlite]
+media-libs/raptor:2 dev-python/rdflib dev-python/dbus-python dev-python/pyxdg fts? ( dev-libs/xapian-bindings[python] ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool =dev-lang/python-2* =dev-lang/python-2*[sqlite]
 media-libs/raptor:2 dev-python/rdflib dev-python/dbus-python dev-python/pyxdg fts? ( dev-libs/xapian-bindings[python] ) =dev-lang/python-2* =dev-lang/python-2*[sqlite]
 0
 http://launchpad.net/zeitgeist/0.7/0.7/+download/zeitgeist-0.7.tar.gz http://launchpad.net/zeitgeist-extensions/trunk/0.0.6/+download/zeitgeist-extensions-0.0.6.tar.gz
diff --git a/metadata/cache/gnome-extra/zeitgeist-0.7.1 b/metadata/cache/gnome-extra/zeitgeist-0.7.1
index 56b8a40fd3f6..8d7f8ed62c31 100644
--- a/metadata/cache/gnome-extra/zeitgeist-0.7.1
+++ b/metadata/cache/gnome-extra/zeitgeist-0.7.1
@@ -1,4 +1,4 @@
-media-libs/raptor:2 dev-python/rdflib dev-python/dbus-python dev-python/pyxdg fts? ( dev-libs/xapian-bindings[python] ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool =dev-lang/python-2* =dev-lang/python-2*[sqlite]
+media-libs/raptor:2 dev-python/rdflib dev-python/dbus-python dev-python/pyxdg fts? ( dev-libs/xapian-bindings[python] ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool =dev-lang/python-2* =dev-lang/python-2*[sqlite]
 media-libs/raptor:2 dev-python/rdflib dev-python/dbus-python dev-python/pyxdg fts? ( dev-libs/xapian-bindings[python] ) =dev-lang/python-2* =dev-lang/python-2*[sqlite]
 0
 http://launchpad.net/zeitgeist/0.7/0.7.1/+download/zeitgeist-0.7.1.tar.gz http://launchpad.net/zeitgeist-extensions/trunk/0.0.6/+download/zeitgeist-extensions-0.0.6.tar.gz
diff --git a/metadata/cache/gnome-extra/zeitgeist-0.7.1-r1 b/metadata/cache/gnome-extra/zeitgeist-0.7.1-r1
index 47fea071ff51..8f42c51c789a 100644
--- a/metadata/cache/gnome-extra/zeitgeist-0.7.1-r1
+++ b/metadata/cache/gnome-extra/zeitgeist-0.7.1-r1
@@ -1,4 +1,4 @@
-media-libs/raptor:2 dev-python/rdflib dev-python/dbus-python dev-python/pyxdg fts? ( dev-libs/xapian-bindings[python] ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool =dev-lang/python-2* =dev-lang/python-2*[sqlite]
+media-libs/raptor:2 dev-python/rdflib dev-python/dbus-python dev-python/pyxdg fts? ( dev-libs/xapian-bindings[python] ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool =dev-lang/python-2* =dev-lang/python-2*[sqlite]
 media-libs/raptor:2 dev-python/rdflib dev-python/dbus-python dev-python/pyxdg fts? ( dev-libs/xapian-bindings[python] ) =dev-lang/python-2* =dev-lang/python-2*[sqlite]
 0
 http://launchpad.net/zeitgeist/0.7/0.7.1/+download/zeitgeist-0.7.1.tar.gz http://launchpad.net/zeitgeist-extensions/trunk/0.0.7/+download/zeitgeist-extensions-0.0.7.tar.gz
diff --git a/metadata/cache/gnome-extra/zeitgeist-0.7.1-r2 b/metadata/cache/gnome-extra/zeitgeist-0.7.1-r2
index 47fea071ff51..8f42c51c789a 100644
--- a/metadata/cache/gnome-extra/zeitgeist-0.7.1-r2
+++ b/metadata/cache/gnome-extra/zeitgeist-0.7.1-r2
@@ -1,4 +1,4 @@
-media-libs/raptor:2 dev-python/rdflib dev-python/dbus-python dev-python/pyxdg fts? ( dev-libs/xapian-bindings[python] ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool =dev-lang/python-2* =dev-lang/python-2*[sqlite]
+media-libs/raptor:2 dev-python/rdflib dev-python/dbus-python dev-python/pyxdg fts? ( dev-libs/xapian-bindings[python] ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool =dev-lang/python-2* =dev-lang/python-2*[sqlite]
 media-libs/raptor:2 dev-python/rdflib dev-python/dbus-python dev-python/pyxdg fts? ( dev-libs/xapian-bindings[python] ) =dev-lang/python-2* =dev-lang/python-2*[sqlite]
 0
 http://launchpad.net/zeitgeist/0.7/0.7.1/+download/zeitgeist-0.7.1.tar.gz http://launchpad.net/zeitgeist-extensions/trunk/0.0.7/+download/zeitgeist-extensions-0.0.7.tar.gz
diff --git a/metadata/cache/gnome-extra/zeitgeist-0.8.2 b/metadata/cache/gnome-extra/zeitgeist-0.8.2
index 21ebdd30ff81..90968dfc11ed 100644
--- a/metadata/cache/gnome-extra/zeitgeist-0.8.2
+++ b/metadata/cache/gnome-extra/zeitgeist-0.8.2
@@ -1,4 +1,4 @@
-dev-python/dbus-python dev-python/pygobject:2 dev-python/pyxdg dev-python/rdflib media-libs/raptor:2 extensions? ( gnome-extra/zeitgeist-extensions ) passiv? ( gnome-extra/zeitgeist-datahub ) plugins? ( gnome-extra/zeitgeist-datasources ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool =dev-lang/python-2* =dev-lang/python-2*[sqlite]
+dev-python/dbus-python dev-python/pygobject:2 dev-python/pyxdg dev-python/rdflib media-libs/raptor:2 extensions? ( gnome-extra/zeitgeist-extensions ) passiv? ( gnome-extra/zeitgeist-datahub ) plugins? ( gnome-extra/zeitgeist-datasources ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool =dev-lang/python-2* =dev-lang/python-2*[sqlite]
 dev-python/dbus-python dev-python/pygobject:2 dev-python/pyxdg dev-python/rdflib media-libs/raptor:2 extensions? ( gnome-extra/zeitgeist-extensions ) passiv? ( gnome-extra/zeitgeist-datahub ) plugins? ( gnome-extra/zeitgeist-datasources ) =dev-lang/python-2* =dev-lang/python-2*[sqlite]
 0
 http://launchpad.net/zeitgeist/0.8/0.8.2/+download/zeitgeist-0.8.2.tar.gz
diff --git a/metadata/cache/gnome-extra/zeitgeist-0.8.2-r1 b/metadata/cache/gnome-extra/zeitgeist-0.8.2-r1
index 21ebdd30ff81..90968dfc11ed 100644
--- a/metadata/cache/gnome-extra/zeitgeist-0.8.2-r1
+++ b/metadata/cache/gnome-extra/zeitgeist-0.8.2-r1
@@ -1,4 +1,4 @@
-dev-python/dbus-python dev-python/pygobject:2 dev-python/pyxdg dev-python/rdflib media-libs/raptor:2 extensions? ( gnome-extra/zeitgeist-extensions ) passiv? ( gnome-extra/zeitgeist-datahub ) plugins? ( gnome-extra/zeitgeist-datasources ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool =dev-lang/python-2* =dev-lang/python-2*[sqlite]
+dev-python/dbus-python dev-python/pygobject:2 dev-python/pyxdg dev-python/rdflib media-libs/raptor:2 extensions? ( gnome-extra/zeitgeist-extensions ) passiv? ( gnome-extra/zeitgeist-datahub ) plugins? ( gnome-extra/zeitgeist-datasources ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool =dev-lang/python-2* =dev-lang/python-2*[sqlite]
 dev-python/dbus-python dev-python/pygobject:2 dev-python/pyxdg dev-python/rdflib media-libs/raptor:2 extensions? ( gnome-extra/zeitgeist-extensions ) passiv? ( gnome-extra/zeitgeist-datahub ) plugins? ( gnome-extra/zeitgeist-datasources ) =dev-lang/python-2* =dev-lang/python-2*[sqlite]
 0
 http://launchpad.net/zeitgeist/0.8/0.8.2/+download/zeitgeist-0.8.2.tar.gz
diff --git a/metadata/cache/gnome-extra/zeitgeist-datasources-0.8.0.1 b/metadata/cache/gnome-extra/zeitgeist-datasources-0.8.0.1
index 47b21bea2b39..0801addf7b3e 100644
--- a/metadata/cache/gnome-extra/zeitgeist-datasources-0.8.0.1
+++ b/metadata/cache/gnome-extra/zeitgeist-datasources-0.8.0.1
@@ -1,4 +1,4 @@
-dev-libs/libzeitgeist x11-libs/gtk+:2 chromium? ( www-client/chromium ) eog? ( media-gfx/eog[python] ) geany? ( dev-util/geany ) gedit? ( app-editors/gedit[zeitgeist] ) vim? ( app-editors/vim ) emacs? ( virtual/emacs ) tomboy? ( app-misc/tomboy dev-dotnet/gtk-sharp dev-dotnet/mono-addins dev-dotnet/zeitgeist-sharp dev-python/dbus-python ) telepathy? ( dev-python/telepathy-python dev-python/dbus-python dev-python/pygobject ) xchat? ( net-irc/xchat-gnome ) rhythmbox? ( media-sound/rhythmbox[zeitgeist] ) firefox? ( || ( >=www-client/firefox-4.0 >=www-client/firefox-bin-4.0 ) net-libs/xulrunner ) totem? ( media-video/totem[zeitgeist] ) dev-lang/vala:0.14 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-libs/libzeitgeist x11-libs/gtk+:2 chromium? ( www-client/chromium ) eog? ( media-gfx/eog[python] ) geany? ( dev-util/geany ) gedit? ( app-editors/gedit[zeitgeist] ) vim? ( app-editors/vim ) emacs? ( virtual/emacs ) tomboy? ( app-misc/tomboy dev-dotnet/gtk-sharp dev-dotnet/mono-addins dev-dotnet/zeitgeist-sharp dev-python/dbus-python ) telepathy? ( dev-python/telepathy-python dev-python/dbus-python dev-python/pygobject ) xchat? ( net-irc/xchat-gnome ) rhythmbox? ( media-sound/rhythmbox[zeitgeist] ) firefox? ( || ( >=www-client/firefox-4.0 >=www-client/firefox-bin-4.0 ) net-libs/xulrunner ) totem? ( media-video/totem[zeitgeist] ) dev-lang/vala:0.14 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-libs/libzeitgeist x11-libs/gtk+:2 chromium? ( www-client/chromium ) eog? ( media-gfx/eog[python] ) geany? ( dev-util/geany ) gedit? ( app-editors/gedit[zeitgeist] ) vim? ( app-editors/vim ) emacs? ( virtual/emacs ) tomboy? ( app-misc/tomboy dev-dotnet/gtk-sharp dev-dotnet/mono-addins dev-dotnet/zeitgeist-sharp dev-python/dbus-python ) telepathy? ( dev-python/telepathy-python dev-python/dbus-python dev-python/pygobject ) xchat? ( net-irc/xchat-gnome ) rhythmbox? ( media-sound/rhythmbox[zeitgeist] ) firefox? ( || ( >=www-client/firefox-4.0 >=www-client/firefox-bin-4.0 ) net-libs/xulrunner ) totem? ( media-video/totem[zeitgeist] )
 0
 http://launchpad.net/zeitgeist-datasources/0.8/0.8.0/+download/zeitgeist-datasources-0.8.0.1.tar.gz
diff --git a/metadata/cache/gnustep-libs/dbuskit-0.1 b/metadata/cache/gnustep-libs/dbuskit-0.1
index f5379615938f..b664da6ce2b4 100644
--- a/metadata/cache/gnustep-libs/dbuskit-0.1
+++ b/metadata/cache/gnustep-libs/dbuskit-0.1
@@ -1,4 +1,4 @@
->=sys-apps/dbus-1.2.1 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
+>=sys-apps/dbus-1.2.1 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back
 >=sys-apps/dbus-1.2.1 >=gnustep-base/gnustep-make-2.0 virtual/gnustep-back debug? ( >=sys-devel/gdb-6.0 )
 0
 http://download.gna.org/gnustep/dbuskit-0.1.tar.bz2
diff --git a/metadata/cache/gpe-base/libgpepimc-0.9 b/metadata/cache/gpe-base/libgpepimc-0.9
index bac87e0109bc..bf26f2ae4ff2 100644
--- a/metadata/cache/gpe-base/libgpepimc-0.9
+++ b/metadata/cache/gpe-base/libgpepimc-0.9
@@ -1,4 +1,4 @@
-x11-libs/gtk+:2 >=dev-libs/glib-2.2 gpe-base/libgpewidget dev-db/sqlite doc? ( >=dev-util/gtk-doc-1.2 ) dev-util/gtk-doc-am >=dev-util/intltool-0.29 >=dev-util/pkgconfig-0.12.0 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+x11-libs/gtk+:2 >=dev-libs/glib-2.2 gpe-base/libgpewidget dev-db/sqlite doc? ( >=dev-util/gtk-doc-1.2 ) dev-util/gtk-doc-am >=dev-util/intltool-0.29 >=dev-util/pkgconfig-0.12.0 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 x11-libs/gtk+:2 >=dev-libs/glib-2.2 gpe-base/libgpewidget dev-db/sqlite
 0
 http://gpe.linuxtogo.org/download/source/libgpepimc-0.9.tar.bz2
diff --git a/metadata/cache/gpe-base/libgpewidget-0.117-r1 b/metadata/cache/gpe-base/libgpewidget-0.117-r1
index f7fa899311fa..e3e3a6cac69f 100644
--- a/metadata/cache/gpe-base/libgpewidget-0.117-r1
+++ b/metadata/cache/gpe-base/libgpewidget-0.117-r1
@@ -1,4 +1,4 @@
-x11-libs/gtk+:2 media-libs/libpng cairo? ( x11-libs/cairo[X] x11-libs/pango[X] ) >=gpe-base/gpe-icons-0.25 sys-devel/gettext x11-proto/kbproto x11-proto/renderproto x11-proto/xproto >=dev-util/intltool-0.29 >=dev-util/pkgconfig-0.12.0 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+x11-libs/gtk+:2 media-libs/libpng cairo? ( x11-libs/cairo[X] x11-libs/pango[X] ) >=gpe-base/gpe-icons-0.25 sys-devel/gettext x11-proto/kbproto x11-proto/renderproto x11-proto/xproto >=dev-util/intltool-0.29 >=dev-util/pkgconfig-0.12.0 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 x11-libs/gtk+:2 media-libs/libpng cairo? ( x11-libs/cairo[X] x11-libs/pango[X] )
 0
 http://gpe.linuxtogo.org/download/source/libgpewidget-0.117.tar.bz2
diff --git a/metadata/cache/kde-misc/kanyremote-5.11.9 b/metadata/cache/kde-misc/kanyremote-5.11.9
index 3ff1a24d171a..d050800ab6c5 100644
--- a/metadata/cache/kde-misc/kanyremote-5.11.9
+++ b/metadata/cache/kde-misc/kanyremote-5.11.9
@@ -1,4 +1,4 @@
->=app-mobilephone/anyremote-4.4[bluetooth?] dev-python/PyQt4[X] kde-base/pykde4 bluetooth? ( dev-python/pybluez ) sys-devel/gettext || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool =dev-lang/python-2*
+>=app-mobilephone/anyremote-4.4[bluetooth?] dev-python/PyQt4[X] kde-base/pykde4 bluetooth? ( dev-python/pybluez ) sys-devel/gettext || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool =dev-lang/python-2*
 >=app-mobilephone/anyremote-4.4[bluetooth?] dev-python/PyQt4[X] kde-base/pykde4 bluetooth? ( dev-python/pybluez ) =dev-lang/python-2*
 0
 mirror://sourceforge/anyremote/kanyremote-5.11.9.tar.gz
diff --git a/metadata/cache/kde-misc/kanyremote-5.12 b/metadata/cache/kde-misc/kanyremote-5.12
index e34f888cf52f..3bbf9ab09218 100644
--- a/metadata/cache/kde-misc/kanyremote-5.12
+++ b/metadata/cache/kde-misc/kanyremote-5.12
@@ -1,4 +1,4 @@
->=app-mobilephone/anyremote-4.4[bluetooth?] dev-python/PyQt4[X] kde-base/pykde4 bluetooth? ( dev-python/pybluez ) sys-devel/gettext || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool =dev-lang/python-2*
+>=app-mobilephone/anyremote-4.4[bluetooth?] dev-python/PyQt4[X] kde-base/pykde4 bluetooth? ( dev-python/pybluez ) sys-devel/gettext || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool =dev-lang/python-2*
 >=app-mobilephone/anyremote-4.4[bluetooth?] dev-python/PyQt4[X] kde-base/pykde4 bluetooth? ( dev-python/pybluez ) =dev-lang/python-2*
 0
 mirror://sourceforge/anyremote/kanyremote-5.12.tar.gz
diff --git a/metadata/cache/kde-misc/kanyremote-5.13 b/metadata/cache/kde-misc/kanyremote-5.13
index 2e4ab6752c57..1b40137bc4fb 100644
--- a/metadata/cache/kde-misc/kanyremote-5.13
+++ b/metadata/cache/kde-misc/kanyremote-5.13
@@ -1,4 +1,4 @@
->=app-mobilephone/anyremote-4.4[bluetooth?] dev-python/PyQt4[X] kde-base/pykde4 bluetooth? ( dev-python/pybluez ) sys-devel/gettext || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool =dev-lang/python-2*
+>=app-mobilephone/anyremote-4.4[bluetooth?] dev-python/PyQt4[X] kde-base/pykde4 bluetooth? ( dev-python/pybluez ) sys-devel/gettext || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool =dev-lang/python-2*
 >=app-mobilephone/anyremote-4.4[bluetooth?] dev-python/PyQt4[X] kde-base/pykde4 bluetooth? ( dev-python/pybluez ) =dev-lang/python-2*
 0
 mirror://sourceforge/anyremote/kanyremote-5.13.tar.gz
diff --git a/metadata/cache/lxde-base/lxappearance-0.2.1 b/metadata/cache/lxde-base/lxappearance-0.2.1
index 1e4ba775bdbe..43dbf7a566d6 100644
--- a/metadata/cache/lxde-base/lxappearance-0.2.1
+++ b/metadata/cache/lxde-base/lxappearance-0.2.1
@@ -1,4 +1,4 @@
-x11-libs/gtk+:2 dev-util/pkgconfig dev-util/intltool sys-devel/gettext || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+x11-libs/gtk+:2 dev-util/pkgconfig dev-util/intltool sys-devel/gettext || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 x11-libs/gtk+:2
 0
 mirror://sourceforge/lxde/lxappearance-0.2.1.tar.gz
diff --git a/metadata/cache/lxde-base/lxde-common-0.5.5-r1 b/metadata/cache/lxde-base/lxde-common-0.5.5-r1
index 49ce0509dc85..5285f4f84ebe 100644
--- a/metadata/cache/lxde-base/lxde-common-0.5.5-r1
+++ b/metadata/cache/lxde-base/lxde-common-0.5.5-r1
@@ -1,4 +1,4 @@
-x11-libs/gtk+:2 dev-util/pkgconfig sys-devel/gettext || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+x11-libs/gtk+:2 dev-util/pkgconfig sys-devel/gettext || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 x11-libs/gtk+:2
 0
 mirror://sourceforge/lxde/lxde-common-0.5.5.tar.gz
diff --git a/metadata/cache/lxde-base/lxde-common-0.5.5-r2 b/metadata/cache/lxde-base/lxde-common-0.5.5-r2
index e362e4398368..95994436a6fd 100644
--- a/metadata/cache/lxde-base/lxde-common-0.5.5-r2
+++ b/metadata/cache/lxde-base/lxde-common-0.5.5-r2
@@ -1,4 +1,4 @@
-x11-libs/gtk+:2 dev-util/pkgconfig sys-devel/gettext || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+x11-libs/gtk+:2 dev-util/pkgconfig sys-devel/gettext || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 x11-libs/gtk+:2
 0
 mirror://sourceforge/lxde/lxde-common-0.5.5.tar.gz
diff --git a/metadata/cache/lxde-base/lxdm-0.3.0-r1 b/metadata/cache/lxde-base/lxdm-0.3.0-r1
index ce8b51b302b1..a64f50beb4d5 100644
--- a/metadata/cache/lxde-base/lxdm-0.3.0-r1
+++ b/metadata/cache/lxde-base/lxdm-0.3.0-r1
@@ -1,4 +1,4 @@
-sys-libs/pam x11-libs/gtk+:2 consolekit? ( sys-auth/consolekit ) nls? ( sys-devel/gettext ) >=dev-util/intltool-0.40 dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+sys-libs/pam x11-libs/gtk+:2 consolekit? ( sys-auth/consolekit ) nls? ( sys-devel/gettext ) >=dev-util/intltool-0.40 dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 sys-libs/pam x11-libs/gtk+:2 consolekit? ( sys-auth/consolekit ) nls? ( sys-devel/gettext ) gnome-base/librsvg
 0
 mirror://sourceforge/lxde/lxdm-0.3.0.tar.gz
diff --git a/metadata/cache/lxde-base/lxdm-0.3.0-r3 b/metadata/cache/lxde-base/lxdm-0.3.0-r3
index ce8b51b302b1..a64f50beb4d5 100644
--- a/metadata/cache/lxde-base/lxdm-0.3.0-r3
+++ b/metadata/cache/lxde-base/lxdm-0.3.0-r3
@@ -1,4 +1,4 @@
-sys-libs/pam x11-libs/gtk+:2 consolekit? ( sys-auth/consolekit ) nls? ( sys-devel/gettext ) >=dev-util/intltool-0.40 dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+sys-libs/pam x11-libs/gtk+:2 consolekit? ( sys-auth/consolekit ) nls? ( sys-devel/gettext ) >=dev-util/intltool-0.40 dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 sys-libs/pam x11-libs/gtk+:2 consolekit? ( sys-auth/consolekit ) nls? ( sys-devel/gettext ) gnome-base/librsvg
 0
 mirror://sourceforge/lxde/lxdm-0.3.0.tar.gz
diff --git a/metadata/cache/lxde-base/lxdm-0.4.1-r1 b/metadata/cache/lxde-base/lxdm-0.4.1-r1
index 9d1749bd67f4..05371f34823b 100644
--- a/metadata/cache/lxde-base/lxdm-0.4.1-r1
+++ b/metadata/cache/lxde-base/lxdm-0.4.1-r1
@@ -1,4 +1,4 @@
-sys-libs/pam sys-auth/consolekit x11-libs/libxcb gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) nls? ( sys-devel/gettext ) >=dev-util/intltool-0.40 dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+sys-libs/pam sys-auth/consolekit x11-libs/libxcb gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) nls? ( sys-devel/gettext ) >=dev-util/intltool-0.40 dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 sys-libs/pam sys-auth/consolekit x11-libs/libxcb gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) nls? ( sys-devel/gettext )
 0
 mirror://sourceforge/lxde/lxdm-0.4.1.tar.gz
diff --git a/metadata/cache/lxde-base/lxdm-0.4.1-r2 b/metadata/cache/lxde-base/lxdm-0.4.1-r2
index 9d1749bd67f4..05371f34823b 100644
--- a/metadata/cache/lxde-base/lxdm-0.4.1-r2
+++ b/metadata/cache/lxde-base/lxdm-0.4.1-r2
@@ -1,4 +1,4 @@
-sys-libs/pam sys-auth/consolekit x11-libs/libxcb gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) nls? ( sys-devel/gettext ) >=dev-util/intltool-0.40 dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+sys-libs/pam sys-auth/consolekit x11-libs/libxcb gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) nls? ( sys-devel/gettext ) >=dev-util/intltool-0.40 dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 sys-libs/pam sys-auth/consolekit x11-libs/libxcb gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) nls? ( sys-devel/gettext )
 0
 mirror://sourceforge/lxde/lxdm-0.4.1.tar.gz
diff --git a/metadata/cache/lxde-base/lxdm-0.4.1-r4 b/metadata/cache/lxde-base/lxdm-0.4.1-r4
index ec6679d6bcaa..1cbf9c3199dc 100644
--- a/metadata/cache/lxde-base/lxdm-0.4.1-r4
+++ b/metadata/cache/lxde-base/lxdm-0.4.1-r4
@@ -1,4 +1,4 @@
-sys-auth/consolekit x11-libs/libxcb gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) nls? ( sys-devel/gettext ) pam? ( virtual/pam ) >=dev-util/intltool-0.40 dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+sys-auth/consolekit x11-libs/libxcb gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) nls? ( sys-devel/gettext ) pam? ( virtual/pam ) >=dev-util/intltool-0.40 dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 sys-auth/consolekit x11-libs/libxcb gtk3? ( x11-libs/gtk+:3 ) !gtk3? ( x11-libs/gtk+:2 ) nls? ( sys-devel/gettext ) pam? ( virtual/pam )
 0
 mirror://sourceforge/lxde/lxdm-0.4.1.tar.gz
diff --git a/metadata/cache/lxde-base/lxlauncher-0.2.1 b/metadata/cache/lxde-base/lxlauncher-0.2.1
index ad040565c244..be8d9d4bdcdf 100644
--- a/metadata/cache/lxde-base/lxlauncher-0.2.1
+++ b/metadata/cache/lxde-base/lxlauncher-0.2.1
@@ -1,4 +1,4 @@
-dev-libs/glib:2 x11-libs/gtk+:2 gnome-base/gnome-menus x11-libs/startup-notification dev-util/pkgconfig dev-util/intltool sys-devel/gettext lxde-base/menu-cache !lxde-base/lxlauncher-gmenu || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-libs/glib:2 x11-libs/gtk+:2 gnome-base/gnome-menus x11-libs/startup-notification dev-util/pkgconfig dev-util/intltool sys-devel/gettext lxde-base/menu-cache !lxde-base/lxlauncher-gmenu || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-libs/glib:2 x11-libs/gtk+:2 gnome-base/gnome-menus x11-libs/startup-notification
 0
 mirror://sourceforge/lxde/lxlauncher-0.2.1.tar.gz
diff --git a/metadata/cache/lxde-base/lxlauncher-0.2.1-r1 b/metadata/cache/lxde-base/lxlauncher-0.2.1-r1
index 28fd8ee2f72a..89b4f67bd74d 100644
--- a/metadata/cache/lxde-base/lxlauncher-0.2.1-r1
+++ b/metadata/cache/lxde-base/lxlauncher-0.2.1-r1
@@ -1,4 +1,4 @@
-dev-libs/glib:2 x11-libs/gtk+:2 gnome-base/gnome-menus x11-libs/startup-notification dev-util/pkgconfig dev-util/intltool sys-devel/gettext lxde-base/menu-cache !lxde-base/lxlauncher-gmenu || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-libs/glib:2 x11-libs/gtk+:2 gnome-base/gnome-menus x11-libs/startup-notification dev-util/pkgconfig dev-util/intltool sys-devel/gettext lxde-base/menu-cache !lxde-base/lxlauncher-gmenu || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-libs/glib:2 x11-libs/gtk+:2 gnome-base/gnome-menus x11-libs/startup-notification
 0
 mirror://sourceforge/lxde/lxlauncher-0.2.1.tar.gz
diff --git a/metadata/cache/lxde-base/lxpanel-0.5.6 b/metadata/cache/lxde-base/lxpanel-0.5.6
index 2a8d47fe70ca..82968253a963 100644
--- a/metadata/cache/lxde-base/lxpanel-0.5.6
+++ b/metadata/cache/lxde-base/lxpanel-0.5.6
@@ -1,4 +1,4 @@
-x11-libs/gtk+:2 x11-libs/libXmu x11-libs/libXpm lxde-base/lxmenu-data lxde-base/menu-cache alsa? ( media-libs/alsa-lib ) dev-util/pkgconfig sys-devel/gettext || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+x11-libs/gtk+:2 x11-libs/libXmu x11-libs/libXpm lxde-base/lxmenu-data lxde-base/menu-cache alsa? ( media-libs/alsa-lib ) dev-util/pkgconfig sys-devel/gettext || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 x11-libs/gtk+:2 x11-libs/libXmu x11-libs/libXpm lxde-base/lxmenu-data lxde-base/menu-cache alsa? ( media-libs/alsa-lib )
 0
 mirror://sourceforge/lxde/lxpanel-0.5.6.tar.gz
diff --git a/metadata/cache/lxde-base/lxpanel-0.5.7-r1 b/metadata/cache/lxde-base/lxpanel-0.5.7-r1
index df09beeb2def..a81d6cb020aa 100644
--- a/metadata/cache/lxde-base/lxpanel-0.5.7-r1
+++ b/metadata/cache/lxde-base/lxpanel-0.5.7-r1
@@ -1,4 +1,4 @@
-x11-libs/gtk+:2 x11-libs/libXmu x11-libs/libXpm lxde-base/lxmenu-data lxde-base/menu-cache alsa? ( media-libs/alsa-lib ) dev-util/pkgconfig sys-devel/gettext || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+x11-libs/gtk+:2 x11-libs/libXmu x11-libs/libXpm lxde-base/lxmenu-data lxde-base/menu-cache alsa? ( media-libs/alsa-lib ) dev-util/pkgconfig sys-devel/gettext || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 x11-libs/gtk+:2 x11-libs/libXmu x11-libs/libXpm lxde-base/lxmenu-data lxde-base/menu-cache alsa? ( media-libs/alsa-lib )
 0
 mirror://sourceforge/lxde/lxpanel-0.5.7.tar.gz
diff --git a/metadata/cache/lxde-base/lxpanel-0.5.8 b/metadata/cache/lxde-base/lxpanel-0.5.8
index 65c7a19060b1..b690748d48c4 100644
--- a/metadata/cache/lxde-base/lxpanel-0.5.8
+++ b/metadata/cache/lxde-base/lxpanel-0.5.8
@@ -1,4 +1,4 @@
-x11-libs/gtk+:2 x11-libs/libXmu x11-libs/libXpm lxde-base/lxmenu-data lxde-base/menu-cache alsa? ( media-libs/alsa-lib ) dev-util/pkgconfig sys-devel/gettext || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+x11-libs/gtk+:2 x11-libs/libXmu x11-libs/libXpm lxde-base/lxmenu-data lxde-base/menu-cache alsa? ( media-libs/alsa-lib ) dev-util/pkgconfig sys-devel/gettext || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 x11-libs/gtk+:2 x11-libs/libXmu x11-libs/libXpm lxde-base/lxmenu-data lxde-base/menu-cache alsa? ( media-libs/alsa-lib )
 0
 mirror://sourceforge/lxde/lxpanel-0.5.8.tar.gz
diff --git a/metadata/cache/lxde-base/lxpanel-0.5.8-r1 b/metadata/cache/lxde-base/lxpanel-0.5.8-r1
index 1e1b87962264..e169be2cc01b 100644
--- a/metadata/cache/lxde-base/lxpanel-0.5.8-r1
+++ b/metadata/cache/lxde-base/lxpanel-0.5.8-r1
@@ -1,4 +1,4 @@
-x11-libs/gtk+:2 x11-libs/libXmu x11-libs/libXpm lxde-base/lxmenu-data lxde-base/menu-cache alsa? ( media-libs/alsa-lib ) dev-util/pkgconfig sys-devel/gettext || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+x11-libs/gtk+:2 x11-libs/libXmu x11-libs/libXpm lxde-base/lxmenu-data lxde-base/menu-cache alsa? ( media-libs/alsa-lib ) dev-util/pkgconfig sys-devel/gettext || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 x11-libs/gtk+:2 x11-libs/libXmu x11-libs/libXpm lxde-base/lxmenu-data lxde-base/menu-cache alsa? ( media-libs/alsa-lib )
 0
 mirror://sourceforge/lxde/lxpanel-0.5.8.tar.gz
diff --git a/metadata/cache/lxde-base/lxpanel-0.5.8-r2 b/metadata/cache/lxde-base/lxpanel-0.5.8-r2
index 1e1b87962264..e169be2cc01b 100644
--- a/metadata/cache/lxde-base/lxpanel-0.5.8-r2
+++ b/metadata/cache/lxde-base/lxpanel-0.5.8-r2
@@ -1,4 +1,4 @@
-x11-libs/gtk+:2 x11-libs/libXmu x11-libs/libXpm lxde-base/lxmenu-data lxde-base/menu-cache alsa? ( media-libs/alsa-lib ) dev-util/pkgconfig sys-devel/gettext || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+x11-libs/gtk+:2 x11-libs/libXmu x11-libs/libXpm lxde-base/lxmenu-data lxde-base/menu-cache alsa? ( media-libs/alsa-lib ) dev-util/pkgconfig sys-devel/gettext || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 x11-libs/gtk+:2 x11-libs/libXmu x11-libs/libXpm lxde-base/lxmenu-data lxde-base/menu-cache alsa? ( media-libs/alsa-lib )
 0
 mirror://sourceforge/lxde/lxpanel-0.5.8.tar.gz
diff --git a/metadata/cache/lxde-base/lxrandr-0.1.1 b/metadata/cache/lxde-base/lxrandr-0.1.1
index ba525af50d89..495e64d41d32 100644
--- a/metadata/cache/lxde-base/lxrandr-0.1.1
+++ b/metadata/cache/lxde-base/lxrandr-0.1.1
@@ -1,4 +1,4 @@
-x11-libs/gtk+:2 x11-libs/libXrandr x11-apps/xrandr x11-proto/randrproto dev-util/pkgconfig sys-devel/gettext >=dev-util/intltool-0.40.0 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+x11-libs/gtk+:2 x11-libs/libXrandr x11-apps/xrandr x11-proto/randrproto dev-util/pkgconfig sys-devel/gettext >=dev-util/intltool-0.40.0 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 x11-libs/gtk+:2 x11-libs/libXrandr x11-apps/xrandr
 0
 mirror://sourceforge/lxde/lxrandr-0.1.1.tar.gz
diff --git a/metadata/cache/lxde-base/lxrandr-0.1.2 b/metadata/cache/lxde-base/lxrandr-0.1.2
index 2f6bab6c0231..8bdedb0e4e82 100644
--- a/metadata/cache/lxde-base/lxrandr-0.1.2
+++ b/metadata/cache/lxde-base/lxrandr-0.1.2
@@ -1,4 +1,4 @@
-x11-libs/gtk+:2 x11-libs/libXrandr x11-apps/xrandr x11-proto/randrproto dev-util/pkgconfig sys-devel/gettext >=dev-util/intltool-0.40.0 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+x11-libs/gtk+:2 x11-libs/libXrandr x11-apps/xrandr x11-proto/randrproto dev-util/pkgconfig sys-devel/gettext >=dev-util/intltool-0.40.0 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 x11-libs/gtk+:2 x11-libs/libXrandr x11-apps/xrandr
 0
 mirror://sourceforge/lxde/lxrandr-0.1.2.tar.gz
diff --git a/metadata/cache/lxde-base/lxsession-edit-0.1.1 b/metadata/cache/lxde-base/lxsession-edit-0.1.1
index 8fa5f93ba706..a89598760915 100644
--- a/metadata/cache/lxde-base/lxsession-edit-0.1.1
+++ b/metadata/cache/lxde-base/lxsession-edit-0.1.1
@@ -1,4 +1,4 @@
-dev-libs/glib:2 x11-libs/gtk+:2 sys-devel/gettext dev-util/intltool dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-libs/glib:2 x11-libs/gtk+:2 sys-devel/gettext dev-util/intltool dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-libs/glib:2 x11-libs/gtk+:2 lxde-base/lxde-common lxde-base/lxsession
 0
 mirror://sourceforge/lxde/lxsession-edit-0.1.1.tar.gz
diff --git a/metadata/cache/lxde-base/lxshortcut-0.1.1 b/metadata/cache/lxde-base/lxshortcut-0.1.1
index a62931af762e..c80380ad83dd 100644
--- a/metadata/cache/lxde-base/lxshortcut-0.1.1
+++ b/metadata/cache/lxde-base/lxshortcut-0.1.1
@@ -1,4 +1,4 @@
-x11-libs/gtk+:2 dev-libs/glib:2 sys-devel/gettext dev-util/intltool dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+x11-libs/gtk+:2 dev-libs/glib:2 sys-devel/gettext dev-util/intltool dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 x11-libs/gtk+:2 dev-libs/glib:2
 0
 mirror://sourceforge/lxde/lxshortcut-0.1.1.tar.gz
diff --git a/metadata/cache/lxde-base/lxshortcut-0.1.2 b/metadata/cache/lxde-base/lxshortcut-0.1.2
index 8531d0f9f155..4f76e07271ab 100644
--- a/metadata/cache/lxde-base/lxshortcut-0.1.2
+++ b/metadata/cache/lxde-base/lxshortcut-0.1.2
@@ -1,4 +1,4 @@
-x11-libs/gtk+:2 dev-libs/glib:2 sys-devel/gettext dev-util/intltool dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+x11-libs/gtk+:2 dev-libs/glib:2 sys-devel/gettext dev-util/intltool dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 x11-libs/gtk+:2 dev-libs/glib:2
 0
 mirror://sourceforge/lxde/lxshortcut-0.1.2.tar.gz
diff --git a/metadata/cache/lxde-base/lxtask-0.1.4 b/metadata/cache/lxde-base/lxtask-0.1.4
index b67d929e7e97..cccc7647af22 100644
--- a/metadata/cache/lxde-base/lxtask-0.1.4
+++ b/metadata/cache/lxde-base/lxtask-0.1.4
@@ -1,4 +1,4 @@
-x11-libs/gtk+:2 dev-libs/glib:2 dev-util/pkgconfig sys-devel/gettext >=dev-util/intltool-0.40.0 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+x11-libs/gtk+:2 dev-libs/glib:2 dev-util/pkgconfig sys-devel/gettext >=dev-util/intltool-0.40.0 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 x11-libs/gtk+:2 dev-libs/glib:2
 0
 mirror://sourceforge/lxde/lxtask-0.1.4.tar.gz
diff --git a/metadata/cache/mail-client/cone-0.89 b/metadata/cache/mail-client/cone-0.89
index aab7a9bb5ce8..c80c028c0837 100644
--- a/metadata/cache/mail-client/cone-0.89
+++ b/metadata/cache/mail-client/cone-0.89
@@ -1,4 +1,4 @@
->=dev-libs/openssl-0.9.6 dev-libs/libxml2 sys-libs/ncurses crypt? ( >=app-crypt/gnupg-1.0.4 ) fam? ( virtual/fam ) gnutls? ( net-libs/gnutls ) idn? ( net-dns/libidn ) ipv6? ( net-dns/libidn ) ldap? ( net-nds/openldap ) spell? ( app-text/aspell ) dev-lang/perl || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-libs/openssl-0.9.6 dev-libs/libxml2 sys-libs/ncurses crypt? ( >=app-crypt/gnupg-1.0.4 ) fam? ( virtual/fam ) gnutls? ( net-libs/gnutls ) idn? ( net-dns/libidn ) ipv6? ( net-dns/libidn ) ldap? ( net-nds/openldap ) spell? ( app-text/aspell ) dev-lang/perl || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=dev-libs/openssl-0.9.6 dev-libs/libxml2 sys-libs/ncurses crypt? ( >=app-crypt/gnupg-1.0.4 ) fam? ( virtual/fam ) gnutls? ( net-libs/gnutls ) idn? ( net-dns/libidn ) ipv6? ( net-dns/libidn ) ldap? ( net-nds/openldap ) spell? ( app-text/aspell )
 0
 mirror://sourceforge/courier/cone-0.89.tar.bz2
diff --git a/metadata/cache/mail-client/evolution-2.32.2-r3 b/metadata/cache/mail-client/evolution-2.32.2-r3
index ae74efa034c8..0a417989e650 100644
--- a/metadata/cache/mail-client/evolution-2.32.2-r3
+++ b/metadata/cache/mail-client/evolution-2.32.2-r3
@@ -1,4 +1,4 @@
->=dev-libs/glib-2.25.12:2 >=x11-libs/gtk+-2.20.0:2 >=dev-libs/libunique-1.1.2:1 >=gnome-base/gnome-desktop-2.26:2 >=dev-libs/libgweather-2.25.3:2 <dev-libs/libgweather-2.91:2 media-libs/libcanberra[gtk] >=x11-libs/libnotify-0.3 >=gnome-extra/evolution-data-server-2.32.2[weather] >=gnome-extra/gtkhtml-3.31.90:3.14 >=gnome-base/gconf-2:2 dev-libs/atk >=dev-libs/libxml2-2.7.3:2 >=net-libs/libsoup-2.4:2.4 >=media-gfx/gtkimageview-1.6 >=x11-misc/shared-mime-info-0.22 >=x11-themes/gnome-icon-theme-2.30.2.1 >=dev-libs/libgdata-0.4 clutter? ( >=media-libs/clutter-1.0.0:1.0 >=media-libs/clutter-gtk-0.90:1.0 x11-libs/mx:1.0 ) crypt? ( || ( ( >=app-crypt/gnupg-2.0.1-r2 || ( app-crypt/pinentry[gtk] app-crypt/pinentry-qt app-crypt/pinentry[qt4] ) ) =app-crypt/gnupg-1.4* ) ) gstreamer? ( >=media-libs/gstreamer-0.10:0.10 >=media-libs/gst-plugins-base-0.10:0.10 ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-2 ) networkmanager? ( >=net-misc/networkmanager-0.7 ) ssl? ( >=dev-libs/nspr-4.6.1 >=dev-libs/nss-3.11 ) !<gnome-extra/evolution-exchange-2.32 >=dev-util/pkgconfig-0.16 >=dev-util/intltool-0.35.5 sys-devel/gettext sys-devel/bison app-text/scrollkeeper >=app-text/gnome-doc-utils-0.9.1 app-text/docbook-xml-dtd:4.1.2 >=gnome-base/gnome-common-2.12 >=dev-util/gtk-doc-am-1.9 doc? ( >=dev-util/gtk-doc-1.9 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) )
+>=dev-libs/glib-2.25.12:2 >=x11-libs/gtk+-2.20.0:2 >=dev-libs/libunique-1.1.2:1 >=gnome-base/gnome-desktop-2.26:2 >=dev-libs/libgweather-2.25.3:2 <dev-libs/libgweather-2.91:2 media-libs/libcanberra[gtk] >=x11-libs/libnotify-0.3 >=gnome-extra/evolution-data-server-2.32.2[weather] >=gnome-extra/gtkhtml-3.31.90:3.14 >=gnome-base/gconf-2:2 dev-libs/atk >=dev-libs/libxml2-2.7.3:2 >=net-libs/libsoup-2.4:2.4 >=media-gfx/gtkimageview-1.6 >=x11-misc/shared-mime-info-0.22 >=x11-themes/gnome-icon-theme-2.30.2.1 >=dev-libs/libgdata-0.4 clutter? ( >=media-libs/clutter-1.0.0:1.0 >=media-libs/clutter-gtk-0.90:1.0 x11-libs/mx:1.0 ) crypt? ( || ( ( >=app-crypt/gnupg-2.0.1-r2 || ( app-crypt/pinentry[gtk] app-crypt/pinentry-qt app-crypt/pinentry[qt4] ) ) =app-crypt/gnupg-1.4* ) ) gstreamer? ( >=media-libs/gstreamer-0.10:0.10 >=media-libs/gst-plugins-base-0.10:0.10 ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-2 ) networkmanager? ( >=net-misc/networkmanager-0.7 ) ssl? ( >=dev-libs/nspr-4.6.1 >=dev-libs/nss-3.11 ) !<gnome-extra/evolution-exchange-2.32 >=dev-util/pkgconfig-0.16 >=dev-util/intltool-0.35.5 sys-devel/gettext sys-devel/bison app-text/scrollkeeper >=app-text/gnome-doc-utils-0.9.1 app-text/docbook-xml-dtd:4.1.2 >=gnome-base/gnome-common-2.12 >=dev-util/gtk-doc-am-1.9 doc? ( >=dev-util/gtk-doc-1.9 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) )
 >=dev-libs/glib-2.25.12:2 >=x11-libs/gtk+-2.20.0:2 >=dev-libs/libunique-1.1.2:1 >=gnome-base/gnome-desktop-2.26:2 >=dev-libs/libgweather-2.25.3:2 <dev-libs/libgweather-2.91:2 media-libs/libcanberra[gtk] >=x11-libs/libnotify-0.3 >=gnome-extra/evolution-data-server-2.32.2[weather] >=gnome-extra/gtkhtml-3.31.90:3.14 >=gnome-base/gconf-2:2 dev-libs/atk >=dev-libs/libxml2-2.7.3:2 >=net-libs/libsoup-2.4:2.4 >=media-gfx/gtkimageview-1.6 >=x11-misc/shared-mime-info-0.22 >=x11-themes/gnome-icon-theme-2.30.2.1 >=dev-libs/libgdata-0.4 clutter? ( >=media-libs/clutter-1.0.0:1.0 >=media-libs/clutter-gtk-0.90:1.0 x11-libs/mx:1.0 ) crypt? ( || ( ( >=app-crypt/gnupg-2.0.1-r2 || ( app-crypt/pinentry[gtk] app-crypt/pinentry-qt app-crypt/pinentry[qt4] ) ) =app-crypt/gnupg-1.4* ) ) gstreamer? ( >=media-libs/gstreamer-0.10:0.10 >=media-libs/gst-plugins-base-0.10:0.10 ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-2 ) networkmanager? ( >=net-misc/networkmanager-0.7 ) ssl? ( >=dev-libs/nspr-4.6.1 >=dev-libs/nss-3.11 ) !<gnome-extra/evolution-exchange-2.32 python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) )
 2.0
 mirror://gnome/sources/evolution/2.32/evolution-2.32.2.tar.bz2 http://dev.gentoo.org/~pacho/gnome/evolution-2.32.2-patches-r1.tar.bz2
diff --git a/metadata/cache/mail-client/evolution-2.32.3 b/metadata/cache/mail-client/evolution-2.32.3
index 18e56d03e6e1..a73ec63c37af 100644
--- a/metadata/cache/mail-client/evolution-2.32.3
+++ b/metadata/cache/mail-client/evolution-2.32.3
@@ -1,4 +1,4 @@
->=dev-libs/glib-2.25.12:2 >=x11-libs/gtk+-2.20.0:2 >=dev-libs/libunique-1.1.2:1 >=gnome-base/gnome-desktop-2.26:2 >=dev-libs/libgweather-2.25.3:2 <dev-libs/libgweather-2.91:2 media-libs/libcanberra[gtk] >=x11-libs/libnotify-0.3 >=gnome-extra/evolution-data-server-2.32.3[weather] >=gnome-extra/gtkhtml-3.31.90:3.14 >=gnome-base/gconf-2:2 dev-libs/atk >=dev-libs/libxml2-2.7.3:2 >=net-libs/libsoup-2.4:2.4 >=media-gfx/gtkimageview-1.6 >=x11-misc/shared-mime-info-0.22 >=x11-themes/gnome-icon-theme-2.30.2.1 >=dev-libs/libgdata-0.4 clutter? ( >=media-libs/clutter-1.0.0:1.0 >=media-libs/clutter-gtk-0.90:1.0 x11-libs/mx:1.0 ) crypt? ( || ( ( >=app-crypt/gnupg-2.0.1-r2 || ( app-crypt/pinentry[gtk] app-crypt/pinentry-qt app-crypt/pinentry[qt4] ) ) =app-crypt/gnupg-1.4* ) ) gstreamer? ( >=media-libs/gstreamer-0.10:0.10 >=media-libs/gst-plugins-base-0.10:0.10 ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-2 ) networkmanager? ( >=net-misc/networkmanager-0.7 ) ssl? ( >=dev-libs/nspr-4.6.1 >=dev-libs/nss-3.11 ) !<gnome-extra/evolution-exchange-2.32 >=dev-util/pkgconfig-0.16 >=dev-util/intltool-0.35.5 sys-devel/gettext sys-devel/bison app-text/scrollkeeper >=app-text/gnome-doc-utils-0.9.1 app-text/docbook-xml-dtd:4.1.2 >=gnome-base/gnome-common-2.12 >=dev-util/gtk-doc-am-1.9 doc? ( >=dev-util/gtk-doc-1.9 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) )
+>=dev-libs/glib-2.25.12:2 >=x11-libs/gtk+-2.20.0:2 >=dev-libs/libunique-1.1.2:1 >=gnome-base/gnome-desktop-2.26:2 >=dev-libs/libgweather-2.25.3:2 <dev-libs/libgweather-2.91:2 media-libs/libcanberra[gtk] >=x11-libs/libnotify-0.3 >=gnome-extra/evolution-data-server-2.32.3[weather] >=gnome-extra/gtkhtml-3.31.90:3.14 >=gnome-base/gconf-2:2 dev-libs/atk >=dev-libs/libxml2-2.7.3:2 >=net-libs/libsoup-2.4:2.4 >=media-gfx/gtkimageview-1.6 >=x11-misc/shared-mime-info-0.22 >=x11-themes/gnome-icon-theme-2.30.2.1 >=dev-libs/libgdata-0.4 clutter? ( >=media-libs/clutter-1.0.0:1.0 >=media-libs/clutter-gtk-0.90:1.0 x11-libs/mx:1.0 ) crypt? ( || ( ( >=app-crypt/gnupg-2.0.1-r2 || ( app-crypt/pinentry[gtk] app-crypt/pinentry-qt app-crypt/pinentry[qt4] ) ) =app-crypt/gnupg-1.4* ) ) gstreamer? ( >=media-libs/gstreamer-0.10:0.10 >=media-libs/gst-plugins-base-0.10:0.10 ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-2 ) networkmanager? ( >=net-misc/networkmanager-0.7 ) ssl? ( >=dev-libs/nspr-4.6.1 >=dev-libs/nss-3.11 ) !<gnome-extra/evolution-exchange-2.32 >=dev-util/pkgconfig-0.16 >=dev-util/intltool-0.35.5 sys-devel/gettext sys-devel/bison app-text/scrollkeeper >=app-text/gnome-doc-utils-0.9.1 app-text/docbook-xml-dtd:4.1.2 >=gnome-base/gnome-common-2.12 >=dev-util/gtk-doc-am-1.9 doc? ( >=dev-util/gtk-doc-1.9 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) )
 >=dev-libs/glib-2.25.12:2 >=x11-libs/gtk+-2.20.0:2 >=dev-libs/libunique-1.1.2:1 >=gnome-base/gnome-desktop-2.26:2 >=dev-libs/libgweather-2.25.3:2 <dev-libs/libgweather-2.91:2 media-libs/libcanberra[gtk] >=x11-libs/libnotify-0.3 >=gnome-extra/evolution-data-server-2.32.3[weather] >=gnome-extra/gtkhtml-3.31.90:3.14 >=gnome-base/gconf-2:2 dev-libs/atk >=dev-libs/libxml2-2.7.3:2 >=net-libs/libsoup-2.4:2.4 >=media-gfx/gtkimageview-1.6 >=x11-misc/shared-mime-info-0.22 >=x11-themes/gnome-icon-theme-2.30.2.1 >=dev-libs/libgdata-0.4 clutter? ( >=media-libs/clutter-1.0.0:1.0 >=media-libs/clutter-gtk-0.90:1.0 x11-libs/mx:1.0 ) crypt? ( || ( ( >=app-crypt/gnupg-2.0.1-r2 || ( app-crypt/pinentry[gtk] app-crypt/pinentry-qt app-crypt/pinentry[qt4] ) ) =app-crypt/gnupg-1.4* ) ) gstreamer? ( >=media-libs/gstreamer-0.10:0.10 >=media-libs/gst-plugins-base-0.10:0.10 ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-2 ) networkmanager? ( >=net-misc/networkmanager-0.7 ) ssl? ( >=dev-libs/nspr-4.6.1 >=dev-libs/nss-3.11 ) !<gnome-extra/evolution-exchange-2.32 python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) )
 2.0
 mirror://gnome/sources/evolution/2.32/evolution-2.32.3.tar.bz2 http://dev.gentoo.org/~pacho/gnome/evolution-2.32.3-patches.tar.xz
diff --git a/metadata/cache/mail-client/evolution-2.32.3-r1 b/metadata/cache/mail-client/evolution-2.32.3-r1
index f157875375bf..63ecf4b210df 100644
--- a/metadata/cache/mail-client/evolution-2.32.3-r1
+++ b/metadata/cache/mail-client/evolution-2.32.3-r1
@@ -1,4 +1,4 @@
->=dev-libs/glib-2.25.12:2 >=x11-libs/gtk+-2.20.0:2 >=dev-libs/libunique-1.1.2:1 >=gnome-base/gnome-desktop-2.26:2 >=dev-libs/libgweather-2.25.3:2 <dev-libs/libgweather-2.91:2 media-libs/libcanberra[gtk] >=x11-libs/libnotify-0.3 >=gnome-extra/evolution-data-server-2.32.3[weather] >=gnome-extra/gtkhtml-3.31.90:3.14 >=gnome-base/gconf-2:2 dev-libs/atk >=dev-libs/libxml2-2.7.3:2 >=net-libs/libsoup-2.4:2.4 >=media-gfx/gtkimageview-1.6 >=x11-misc/shared-mime-info-0.22 >=x11-themes/gnome-icon-theme-2.30.2.1 >=dev-libs/libgdata-0.4 clutter? ( >=media-libs/clutter-1.0.0:1.0 >=media-libs/clutter-gtk-0.90:1.0 x11-libs/mx:1.0 ) connman? ( net-misc/connman ) crypt? ( || ( ( >=app-crypt/gnupg-2.0.1-r2 || ( app-crypt/pinentry[gtk] app-crypt/pinentry-qt app-crypt/pinentry[qt4] ) ) =app-crypt/gnupg-1.4* ) ) gstreamer? ( >=media-libs/gstreamer-0.10:0.10 >=media-libs/gst-plugins-base-0.10:0.10 ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-2 ) networkmanager? ( >=net-misc/networkmanager-0.7 ) ssl? ( >=dev-libs/nspr-4.6.1 >=dev-libs/nss-3.11 ) !<gnome-extra/evolution-exchange-2.32 >=dev-util/pkgconfig-0.16 >=dev-util/intltool-0.35.5 sys-devel/gettext sys-devel/bison app-text/scrollkeeper >=app-text/gnome-doc-utils-0.9.1 app-text/docbook-xml-dtd:4.1.2 >=gnome-base/gnome-common-2.12 >=dev-util/gtk-doc-am-1.9 doc? ( >=dev-util/gtk-doc-1.9 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) )
+>=dev-libs/glib-2.25.12:2 >=x11-libs/gtk+-2.20.0:2 >=dev-libs/libunique-1.1.2:1 >=gnome-base/gnome-desktop-2.26:2 >=dev-libs/libgweather-2.25.3:2 <dev-libs/libgweather-2.91:2 media-libs/libcanberra[gtk] >=x11-libs/libnotify-0.3 >=gnome-extra/evolution-data-server-2.32.3[weather] >=gnome-extra/gtkhtml-3.31.90:3.14 >=gnome-base/gconf-2:2 dev-libs/atk >=dev-libs/libxml2-2.7.3:2 >=net-libs/libsoup-2.4:2.4 >=media-gfx/gtkimageview-1.6 >=x11-misc/shared-mime-info-0.22 >=x11-themes/gnome-icon-theme-2.30.2.1 >=dev-libs/libgdata-0.4 clutter? ( >=media-libs/clutter-1.0.0:1.0 >=media-libs/clutter-gtk-0.90:1.0 x11-libs/mx:1.0 ) connman? ( net-misc/connman ) crypt? ( || ( ( >=app-crypt/gnupg-2.0.1-r2 || ( app-crypt/pinentry[gtk] app-crypt/pinentry-qt app-crypt/pinentry[qt4] ) ) =app-crypt/gnupg-1.4* ) ) gstreamer? ( >=media-libs/gstreamer-0.10:0.10 >=media-libs/gst-plugins-base-0.10:0.10 ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-2 ) networkmanager? ( >=net-misc/networkmanager-0.7 ) ssl? ( >=dev-libs/nspr-4.6.1 >=dev-libs/nss-3.11 ) !<gnome-extra/evolution-exchange-2.32 >=dev-util/pkgconfig-0.16 >=dev-util/intltool-0.35.5 sys-devel/gettext sys-devel/bison app-text/scrollkeeper >=app-text/gnome-doc-utils-0.9.1 app-text/docbook-xml-dtd:4.1.2 >=gnome-base/gnome-common-2.12 >=dev-util/gtk-doc-am-1.9 doc? ( >=dev-util/gtk-doc-1.9 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) )
 >=dev-libs/glib-2.25.12:2 >=x11-libs/gtk+-2.20.0:2 >=dev-libs/libunique-1.1.2:1 >=gnome-base/gnome-desktop-2.26:2 >=dev-libs/libgweather-2.25.3:2 <dev-libs/libgweather-2.91:2 media-libs/libcanberra[gtk] >=x11-libs/libnotify-0.3 >=gnome-extra/evolution-data-server-2.32.3[weather] >=gnome-extra/gtkhtml-3.31.90:3.14 >=gnome-base/gconf-2:2 dev-libs/atk >=dev-libs/libxml2-2.7.3:2 >=net-libs/libsoup-2.4:2.4 >=media-gfx/gtkimageview-1.6 >=x11-misc/shared-mime-info-0.22 >=x11-themes/gnome-icon-theme-2.30.2.1 >=dev-libs/libgdata-0.4 clutter? ( >=media-libs/clutter-1.0.0:1.0 >=media-libs/clutter-gtk-0.90:1.0 x11-libs/mx:1.0 ) connman? ( net-misc/connman ) crypt? ( || ( ( >=app-crypt/gnupg-2.0.1-r2 || ( app-crypt/pinentry[gtk] app-crypt/pinentry-qt app-crypt/pinentry[qt4] ) ) =app-crypt/gnupg-1.4* ) ) gstreamer? ( >=media-libs/gstreamer-0.10:0.10 >=media-libs/gst-plugins-base-0.10:0.10 ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-2 ) networkmanager? ( >=net-misc/networkmanager-0.7 ) ssl? ( >=dev-libs/nspr-4.6.1 >=dev-libs/nss-3.11 ) !<gnome-extra/evolution-exchange-2.32 python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) )
 2.0
 mirror://gnome/sources/evolution/2.32/evolution-2.32.3.tar.bz2 http://dev.gentoo.org/~pacho/gnome/evolution-2.32.3-patches.tar.xz
diff --git a/metadata/cache/mail-client/evolution-3.2.2 b/metadata/cache/mail-client/evolution-3.2.2
index 941db0090c3e..972de58ded8d 100644
--- a/metadata/cache/mail-client/evolution-3.2.2
+++ b/metadata/cache/mail-client/evolution-3.2.2
@@ -1,4 +1,4 @@
->=dev-libs/glib-2.28:2 >=x11-libs/cairo-1.9.15[glib] >=x11-libs/gtk+-3.0.2:3 >=gnome-base/gnome-desktop-2.91.3:3 >=gnome-base/gsettings-desktop-schemas-2.91.92 >=dev-libs/libgweather-2.90.0:2 >=media-libs/libcanberra-0.25[gtk3] >=x11-libs/libnotify-0.7 >=gnome-extra/evolution-data-server-3.2.2[gnome-online-accounts?,weather] >=gnome-extra/gtkhtml-4.1.2:4.0 >=gnome-base/gconf-2:2 dev-libs/atk >=dev-libs/libxml2-2.7.3:2 >=net-libs/libsoup-gnome-2.31.2:2.4 >=x11-misc/shared-mime-info-0.22 >=x11-themes/gnome-icon-theme-2.30.2.1 >=dev-libs/libgdata-0.9.1 x11-libs/libSM x11-libs/libICE clutter? ( >=media-libs/clutter-1.0.0:1.0 >=media-libs/clutter-gtk-0.90:1.0 x11-libs/mx:1.0 ) connman? ( net-misc/connman ) crypt? ( || ( ( >=app-crypt/gnupg-2.0.1-r2 || ( app-crypt/pinentry[gtk] app-crypt/pinentry-qt app-crypt/pinentry[qt4] ) ) =app-crypt/gnupg-1.4* ) ) gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.1.1 ) gstreamer? ( >=media-libs/gstreamer-0.10:0.10 >=media-libs/gst-plugins-base-0.10:0.10 ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-2 ) map? ( >=app-misc/geoclue-0.11.1 media-libs/libchamplain:0.10 ) networkmanager? ( >=net-misc/networkmanager-0.7 ) ssl? ( >=dev-libs/nspr-4.6.1 >=dev-libs/nss-3.11 ) >=dev-util/pkgconfig-0.16 >=dev-util/intltool-0.40.0 >=sys-devel/gettext-0.17 sys-devel/bison app-text/scrollkeeper >=app-text/gnome-doc-utils-0.9.1 app-text/docbook-xml-dtd:4.1.2 >=gnome-base/gnome-common-2.12 >=dev-util/gtk-doc-am-1.9 doc? ( >=dev-util/gtk-doc-1.9 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) )
+>=dev-libs/glib-2.28:2 >=x11-libs/cairo-1.9.15[glib] >=x11-libs/gtk+-3.0.2:3 >=gnome-base/gnome-desktop-2.91.3:3 >=gnome-base/gsettings-desktop-schemas-2.91.92 >=dev-libs/libgweather-2.90.0:2 >=media-libs/libcanberra-0.25[gtk3] >=x11-libs/libnotify-0.7 >=gnome-extra/evolution-data-server-3.2.2[gnome-online-accounts?,weather] >=gnome-extra/gtkhtml-4.1.2:4.0 >=gnome-base/gconf-2:2 dev-libs/atk >=dev-libs/libxml2-2.7.3:2 >=net-libs/libsoup-gnome-2.31.2:2.4 >=x11-misc/shared-mime-info-0.22 >=x11-themes/gnome-icon-theme-2.30.2.1 >=dev-libs/libgdata-0.9.1 x11-libs/libSM x11-libs/libICE clutter? ( >=media-libs/clutter-1.0.0:1.0 >=media-libs/clutter-gtk-0.90:1.0 x11-libs/mx:1.0 ) connman? ( net-misc/connman ) crypt? ( || ( ( >=app-crypt/gnupg-2.0.1-r2 || ( app-crypt/pinentry[gtk] app-crypt/pinentry-qt app-crypt/pinentry[qt4] ) ) =app-crypt/gnupg-1.4* ) ) gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.1.1 ) gstreamer? ( >=media-libs/gstreamer-0.10:0.10 >=media-libs/gst-plugins-base-0.10:0.10 ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-2 ) map? ( >=app-misc/geoclue-0.11.1 media-libs/libchamplain:0.10 ) networkmanager? ( >=net-misc/networkmanager-0.7 ) ssl? ( >=dev-libs/nspr-4.6.1 >=dev-libs/nss-3.11 ) >=dev-util/pkgconfig-0.16 >=dev-util/intltool-0.40.0 >=sys-devel/gettext-0.17 sys-devel/bison app-text/scrollkeeper >=app-text/gnome-doc-utils-0.9.1 app-text/docbook-xml-dtd:4.1.2 >=gnome-base/gnome-common-2.12 >=dev-util/gtk-doc-am-1.9 doc? ( >=dev-util/gtk-doc-1.9 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) )
 >=dev-libs/glib-2.28:2 >=x11-libs/cairo-1.9.15[glib] >=x11-libs/gtk+-3.0.2:3 >=gnome-base/gnome-desktop-2.91.3:3 >=gnome-base/gsettings-desktop-schemas-2.91.92 >=dev-libs/libgweather-2.90.0:2 >=media-libs/libcanberra-0.25[gtk3] >=x11-libs/libnotify-0.7 >=gnome-extra/evolution-data-server-3.2.2[gnome-online-accounts?,weather] >=gnome-extra/gtkhtml-4.1.2:4.0 >=gnome-base/gconf-2:2 dev-libs/atk >=dev-libs/libxml2-2.7.3:2 >=net-libs/libsoup-gnome-2.31.2:2.4 >=x11-misc/shared-mime-info-0.22 >=x11-themes/gnome-icon-theme-2.30.2.1 >=dev-libs/libgdata-0.9.1 x11-libs/libSM x11-libs/libICE clutter? ( >=media-libs/clutter-1.0.0:1.0 >=media-libs/clutter-gtk-0.90:1.0 x11-libs/mx:1.0 ) connman? ( net-misc/connman ) crypt? ( || ( ( >=app-crypt/gnupg-2.0.1-r2 || ( app-crypt/pinentry[gtk] app-crypt/pinentry-qt app-crypt/pinentry[qt4] ) ) =app-crypt/gnupg-1.4* ) ) gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.1.1 ) gstreamer? ( >=media-libs/gstreamer-0.10:0.10 >=media-libs/gst-plugins-base-0.10:0.10 ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-2 ) map? ( >=app-misc/geoclue-0.11.1 media-libs/libchamplain:0.10 ) networkmanager? ( >=net-misc/networkmanager-0.7 ) ssl? ( >=dev-libs/nspr-4.6.1 >=dev-libs/nss-3.11 ) !<gnome-extra/evolution-exchange-2.32 python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) )
 2.0
 mirror://gnome/sources/evolution/3.2/evolution-3.2.2.tar.xz
diff --git a/metadata/cache/mail-client/evolution-3.2.3 b/metadata/cache/mail-client/evolution-3.2.3
index 5dfcd0b9e6cd..c2220cbd0d37 100644
--- a/metadata/cache/mail-client/evolution-3.2.3
+++ b/metadata/cache/mail-client/evolution-3.2.3
@@ -1,4 +1,4 @@
->=dev-libs/glib-2.28:2 >=x11-libs/cairo-1.9.15[glib] >=x11-libs/gtk+-3.0.2:3 >=gnome-base/gnome-desktop-2.91.3:3 >=gnome-base/gsettings-desktop-schemas-2.91.92 >=dev-libs/libgweather-2.90.0:2 >=media-libs/libcanberra-0.25[gtk3] >=x11-libs/libnotify-0.7 >=gnome-extra/evolution-data-server-3.2.3[gnome-online-accounts?,weather] >=gnome-extra/gtkhtml-4.1.2:4.0 >=gnome-base/gconf-2:2 dev-libs/atk >=dev-libs/libxml2-2.7.3:2 >=net-libs/libsoup-gnome-2.31.2:2.4 >=x11-misc/shared-mime-info-0.22 >=x11-themes/gnome-icon-theme-2.30.2.1 >=dev-libs/libgdata-0.9.1 x11-libs/libSM x11-libs/libICE clutter? ( >=media-libs/clutter-1.0.0:1.0 >=media-libs/clutter-gtk-0.90:1.0 x11-libs/mx:1.0 ) connman? ( net-misc/connman ) crypt? ( || ( ( >=app-crypt/gnupg-2.0.1-r2 || ( app-crypt/pinentry[gtk] app-crypt/pinentry-qt app-crypt/pinentry[qt4] ) ) =app-crypt/gnupg-1.4* ) ) gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.1.1 ) gstreamer? ( >=media-libs/gstreamer-0.10:0.10 >=media-libs/gst-plugins-base-0.10:0.10 ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-2 ) map? ( >=app-misc/geoclue-0.11.1 media-libs/libchamplain:0.10 ) networkmanager? ( >=net-misc/networkmanager-0.7 ) ssl? ( >=dev-libs/nspr-4.6.1 >=dev-libs/nss-3.11 ) >=dev-util/pkgconfig-0.16 >=dev-util/intltool-0.40.0 >=sys-devel/gettext-0.17 sys-devel/bison app-text/scrollkeeper >=app-text/gnome-doc-utils-0.9.1 app-text/docbook-xml-dtd:4.1.2 >=gnome-base/gnome-common-2.12 >=dev-util/gtk-doc-am-1.9 doc? ( >=dev-util/gtk-doc-1.9 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) )
+>=dev-libs/glib-2.28:2 >=x11-libs/cairo-1.9.15[glib] >=x11-libs/gtk+-3.0.2:3 >=gnome-base/gnome-desktop-2.91.3:3 >=gnome-base/gsettings-desktop-schemas-2.91.92 >=dev-libs/libgweather-2.90.0:2 >=media-libs/libcanberra-0.25[gtk3] >=x11-libs/libnotify-0.7 >=gnome-extra/evolution-data-server-3.2.3[gnome-online-accounts?,weather] >=gnome-extra/gtkhtml-4.1.2:4.0 >=gnome-base/gconf-2:2 dev-libs/atk >=dev-libs/libxml2-2.7.3:2 >=net-libs/libsoup-gnome-2.31.2:2.4 >=x11-misc/shared-mime-info-0.22 >=x11-themes/gnome-icon-theme-2.30.2.1 >=dev-libs/libgdata-0.9.1 x11-libs/libSM x11-libs/libICE clutter? ( >=media-libs/clutter-1.0.0:1.0 >=media-libs/clutter-gtk-0.90:1.0 x11-libs/mx:1.0 ) connman? ( net-misc/connman ) crypt? ( || ( ( >=app-crypt/gnupg-2.0.1-r2 || ( app-crypt/pinentry[gtk] app-crypt/pinentry-qt app-crypt/pinentry[qt4] ) ) =app-crypt/gnupg-1.4* ) ) gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.1.1 ) gstreamer? ( >=media-libs/gstreamer-0.10:0.10 >=media-libs/gst-plugins-base-0.10:0.10 ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-2 ) map? ( >=app-misc/geoclue-0.11.1 media-libs/libchamplain:0.10 ) networkmanager? ( >=net-misc/networkmanager-0.7 ) ssl? ( >=dev-libs/nspr-4.6.1 >=dev-libs/nss-3.11 ) >=dev-util/pkgconfig-0.16 >=dev-util/intltool-0.40.0 >=sys-devel/gettext-0.17 sys-devel/bison app-text/scrollkeeper >=app-text/gnome-doc-utils-0.9.1 app-text/docbook-xml-dtd:4.1.2 >=gnome-base/gnome-common-2.12 >=dev-util/gtk-doc-am-1.9 doc? ( >=dev-util/gtk-doc-1.9 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) )
 >=dev-libs/glib-2.28:2 >=x11-libs/cairo-1.9.15[glib] >=x11-libs/gtk+-3.0.2:3 >=gnome-base/gnome-desktop-2.91.3:3 >=gnome-base/gsettings-desktop-schemas-2.91.92 >=dev-libs/libgweather-2.90.0:2 >=media-libs/libcanberra-0.25[gtk3] >=x11-libs/libnotify-0.7 >=gnome-extra/evolution-data-server-3.2.3[gnome-online-accounts?,weather] >=gnome-extra/gtkhtml-4.1.2:4.0 >=gnome-base/gconf-2:2 dev-libs/atk >=dev-libs/libxml2-2.7.3:2 >=net-libs/libsoup-gnome-2.31.2:2.4 >=x11-misc/shared-mime-info-0.22 >=x11-themes/gnome-icon-theme-2.30.2.1 >=dev-libs/libgdata-0.9.1 x11-libs/libSM x11-libs/libICE clutter? ( >=media-libs/clutter-1.0.0:1.0 >=media-libs/clutter-gtk-0.90:1.0 x11-libs/mx:1.0 ) connman? ( net-misc/connman ) crypt? ( || ( ( >=app-crypt/gnupg-2.0.1-r2 || ( app-crypt/pinentry[gtk] app-crypt/pinentry-qt app-crypt/pinentry[qt4] ) ) =app-crypt/gnupg-1.4* ) ) gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.1.1 ) gstreamer? ( >=media-libs/gstreamer-0.10:0.10 >=media-libs/gst-plugins-base-0.10:0.10 ) kerberos? ( virtual/krb5 ) ldap? ( >=net-nds/openldap-2 ) map? ( >=app-misc/geoclue-0.11.1 media-libs/libchamplain:0.10 ) networkmanager? ( >=net-misc/networkmanager-0.7 ) ssl? ( >=dev-libs/nspr-4.6.1 >=dev-libs/nss-3.11 ) !<gnome-extra/evolution-exchange-2.32 python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) )
 2.0
 mirror://gnome/sources/evolution/3.2/evolution-3.2.3.tar.xz
diff --git a/metadata/cache/mail-client/hap-3.7-r1 b/metadata/cache/mail-client/hap-3.7-r1
index 854a14763ab0..52a03b81de98 100644
--- a/metadata/cache/mail-client/hap-3.7-r1
+++ b/metadata/cache/mail-client/hap-3.7-r1
@@ -1,4 +1,4 @@
-sys-libs/ncurses || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+sys-libs/ncurses || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 sys-libs/ncurses
 0
 http://www.transbay.net/~enf/hap-3.7.tar
diff --git a/metadata/cache/mail-client/mutt-1.5.21-r1 b/metadata/cache/mail-client/mutt-1.5.21-r1
index 2748799561ec..f5a0f6d93cc8 100644
--- a/metadata/cache/mail-client/mutt-1.5.21-r1
+++ b/metadata/cache/mail-client/mutt-1.5.21-r1
@@ -1,4 +1,4 @@
->=sys-libs/ncurses-5.2 tokyocabinet? ( dev-db/tokyocabinet ) !tokyocabinet? ( qdbm? ( dev-db/qdbm ) !qdbm? ( gdbm? ( sys-libs/gdbm ) !gdbm? ( berkdb? ( >=sys-libs/db-4 ) ) ) ) imap? ( gnutls? ( >=net-libs/gnutls-1.0.17 ) !gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6 ) ) sasl? ( >=dev-libs/cyrus-sasl-2 ) ) pop? ( gnutls? ( >=net-libs/gnutls-1.0.17 ) !gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6 ) ) sasl? ( >=dev-libs/cyrus-sasl-2 ) ) smtp? ( gnutls? ( >=net-libs/gnutls-1.0.17 ) !gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6 ) ) sasl? ( >=dev-libs/cyrus-sasl-2 ) ) idn? ( net-dns/libidn ) gpg? ( >=app-crypt/gpgme-0.9.0 ) smime? ( >=dev-libs/openssl-0.9.6 ) app-misc/mime-types net-mail/mailbase doc? ( dev-libs/libxml2 dev-libs/libxslt app-text/docbook-xsl-stylesheets || ( www-client/lynx www-client/w3m www-client/elinks ) ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=sys-libs/ncurses-5.2 tokyocabinet? ( dev-db/tokyocabinet ) !tokyocabinet? ( qdbm? ( dev-db/qdbm ) !qdbm? ( gdbm? ( sys-libs/gdbm ) !gdbm? ( berkdb? ( >=sys-libs/db-4 ) ) ) ) imap? ( gnutls? ( >=net-libs/gnutls-1.0.17 ) !gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6 ) ) sasl? ( >=dev-libs/cyrus-sasl-2 ) ) pop? ( gnutls? ( >=net-libs/gnutls-1.0.17 ) !gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6 ) ) sasl? ( >=dev-libs/cyrus-sasl-2 ) ) smtp? ( gnutls? ( >=net-libs/gnutls-1.0.17 ) !gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6 ) ) sasl? ( >=dev-libs/cyrus-sasl-2 ) ) idn? ( net-dns/libidn ) gpg? ( >=app-crypt/gpgme-0.9.0 ) smime? ( >=dev-libs/openssl-0.9.6 ) app-misc/mime-types net-mail/mailbase doc? ( dev-libs/libxml2 dev-libs/libxslt app-text/docbook-xsl-stylesheets || ( www-client/lynx www-client/w3m www-client/elinks ) ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=sys-libs/ncurses-5.2 tokyocabinet? ( dev-db/tokyocabinet ) !tokyocabinet? ( qdbm? ( dev-db/qdbm ) !qdbm? ( gdbm? ( sys-libs/gdbm ) !gdbm? ( berkdb? ( >=sys-libs/db-4 ) ) ) ) imap? ( gnutls? ( >=net-libs/gnutls-1.0.17 ) !gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6 ) ) sasl? ( >=dev-libs/cyrus-sasl-2 ) ) pop? ( gnutls? ( >=net-libs/gnutls-1.0.17 ) !gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6 ) ) sasl? ( >=dev-libs/cyrus-sasl-2 ) ) smtp? ( gnutls? ( >=net-libs/gnutls-1.0.17 ) !gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6 ) ) sasl? ( >=dev-libs/cyrus-sasl-2 ) ) idn? ( net-dns/libidn ) gpg? ( >=app-crypt/gpgme-0.9.0 ) smime? ( >=dev-libs/openssl-0.9.6 ) app-misc/mime-types
 0
 ftp://ftp.mutt.org/mutt/devel/mutt-1.5.21.tar.gz mirror://gentoo/mutt-1.5.21-gentoo-patches-r1.tar.bz2 http://dev.gentoo.org/~grobian/distfiles/mutt-1.5.21-gentoo-patches-r1.tar.bz2
diff --git a/metadata/cache/mail-client/mutt-1.5.21-r7 b/metadata/cache/mail-client/mutt-1.5.21-r7
index f8a498859f19..1cf15d3f25cd 100644
--- a/metadata/cache/mail-client/mutt-1.5.21-r7
+++ b/metadata/cache/mail-client/mutt-1.5.21-r7
@@ -1,4 +1,4 @@
->=sys-libs/ncurses-5.2 tokyocabinet? ( dev-db/tokyocabinet ) !tokyocabinet? ( qdbm? ( dev-db/qdbm ) !qdbm? ( gdbm? ( sys-libs/gdbm ) !gdbm? ( berkdb? ( >=sys-libs/db-4 ) ) ) ) imap? ( gnutls? ( >=net-libs/gnutls-1.0.17 ) !gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6 ) ) sasl? ( >=dev-libs/cyrus-sasl-2 ) ) pop? ( gnutls? ( >=net-libs/gnutls-1.0.17 ) !gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6 ) ) sasl? ( >=dev-libs/cyrus-sasl-2 ) ) smtp? ( gnutls? ( >=net-libs/gnutls-1.0.17 ) !gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6 ) ) sasl? ( >=dev-libs/cyrus-sasl-2 ) ) idn? ( net-dns/libidn ) gpg? ( >=app-crypt/gpgme-0.9.0 ) smime? ( >=dev-libs/openssl-0.9.6 ) selinux? ( sec-policy/selinux-mutt ) app-misc/mime-types net-mail/mailbase doc? ( dev-libs/libxml2 dev-libs/libxslt app-text/docbook-xsl-stylesheets || ( www-client/lynx www-client/w3m www-client/elinks ) ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=sys-libs/ncurses-5.2 tokyocabinet? ( dev-db/tokyocabinet ) !tokyocabinet? ( qdbm? ( dev-db/qdbm ) !qdbm? ( gdbm? ( sys-libs/gdbm ) !gdbm? ( berkdb? ( >=sys-libs/db-4 ) ) ) ) imap? ( gnutls? ( >=net-libs/gnutls-1.0.17 ) !gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6 ) ) sasl? ( >=dev-libs/cyrus-sasl-2 ) ) pop? ( gnutls? ( >=net-libs/gnutls-1.0.17 ) !gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6 ) ) sasl? ( >=dev-libs/cyrus-sasl-2 ) ) smtp? ( gnutls? ( >=net-libs/gnutls-1.0.17 ) !gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6 ) ) sasl? ( >=dev-libs/cyrus-sasl-2 ) ) idn? ( net-dns/libidn ) gpg? ( >=app-crypt/gpgme-0.9.0 ) smime? ( >=dev-libs/openssl-0.9.6 ) selinux? ( sec-policy/selinux-mutt ) app-misc/mime-types net-mail/mailbase doc? ( dev-libs/libxml2 dev-libs/libxslt app-text/docbook-xsl-stylesheets || ( www-client/lynx www-client/w3m www-client/elinks ) ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=sys-libs/ncurses-5.2 tokyocabinet? ( dev-db/tokyocabinet ) !tokyocabinet? ( qdbm? ( dev-db/qdbm ) !qdbm? ( gdbm? ( sys-libs/gdbm ) !gdbm? ( berkdb? ( >=sys-libs/db-4 ) ) ) ) imap? ( gnutls? ( >=net-libs/gnutls-1.0.17 ) !gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6 ) ) sasl? ( >=dev-libs/cyrus-sasl-2 ) ) pop? ( gnutls? ( >=net-libs/gnutls-1.0.17 ) !gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6 ) ) sasl? ( >=dev-libs/cyrus-sasl-2 ) ) smtp? ( gnutls? ( >=net-libs/gnutls-1.0.17 ) !gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6 ) ) sasl? ( >=dev-libs/cyrus-sasl-2 ) ) idn? ( net-dns/libidn ) gpg? ( >=app-crypt/gpgme-0.9.0 ) smime? ( >=dev-libs/openssl-0.9.6 ) selinux? ( sec-policy/selinux-mutt ) app-misc/mime-types
 0
 ftp://ftp.mutt.org/mutt/devel/mutt-1.5.21.tar.gz mirror://gentoo/mutt-1.5.21-gentoo-patches-r7.tar.bz2 http://dev.gentoo.org/~grobian/distfiles/mutt-1.5.21-gentoo-patches-r7.tar.bz2
diff --git a/metadata/cache/mail-client/mutt-1.5.21-r8 b/metadata/cache/mail-client/mutt-1.5.21-r8
index a914f4b366f5..3c326768cdb7 100644
--- a/metadata/cache/mail-client/mutt-1.5.21-r8
+++ b/metadata/cache/mail-client/mutt-1.5.21-r8
@@ -1,4 +1,4 @@
->=sys-libs/ncurses-5.2 tokyocabinet? ( dev-db/tokyocabinet ) !tokyocabinet? ( qdbm? ( dev-db/qdbm ) !qdbm? ( gdbm? ( sys-libs/gdbm ) !gdbm? ( berkdb? ( >=sys-libs/db-4 ) ) ) ) imap? ( gnutls? ( >=net-libs/gnutls-1.0.17 ) !gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6 ) ) sasl? ( >=dev-libs/cyrus-sasl-2 ) ) pop? ( gnutls? ( >=net-libs/gnutls-1.0.17 ) !gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6 ) ) sasl? ( >=dev-libs/cyrus-sasl-2 ) ) smtp? ( gnutls? ( >=net-libs/gnutls-1.0.17 ) !gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6 ) ) sasl? ( >=dev-libs/cyrus-sasl-2 ) ) idn? ( net-dns/libidn ) gpg? ( >=app-crypt/gpgme-0.9.0 ) smime? ( >=dev-libs/openssl-0.9.6 ) selinux? ( sec-policy/selinux-mutt ) app-misc/mime-types net-mail/mailbase doc? ( dev-libs/libxml2 dev-libs/libxslt app-text/docbook-xsl-stylesheets || ( www-client/lynx www-client/w3m www-client/elinks ) ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=sys-libs/ncurses-5.2 tokyocabinet? ( dev-db/tokyocabinet ) !tokyocabinet? ( qdbm? ( dev-db/qdbm ) !qdbm? ( gdbm? ( sys-libs/gdbm ) !gdbm? ( berkdb? ( >=sys-libs/db-4 ) ) ) ) imap? ( gnutls? ( >=net-libs/gnutls-1.0.17 ) !gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6 ) ) sasl? ( >=dev-libs/cyrus-sasl-2 ) ) pop? ( gnutls? ( >=net-libs/gnutls-1.0.17 ) !gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6 ) ) sasl? ( >=dev-libs/cyrus-sasl-2 ) ) smtp? ( gnutls? ( >=net-libs/gnutls-1.0.17 ) !gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6 ) ) sasl? ( >=dev-libs/cyrus-sasl-2 ) ) idn? ( net-dns/libidn ) gpg? ( >=app-crypt/gpgme-0.9.0 ) smime? ( >=dev-libs/openssl-0.9.6 ) selinux? ( sec-policy/selinux-mutt ) app-misc/mime-types net-mail/mailbase doc? ( dev-libs/libxml2 dev-libs/libxslt app-text/docbook-xsl-stylesheets || ( www-client/lynx www-client/w3m www-client/elinks ) ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=sys-libs/ncurses-5.2 tokyocabinet? ( dev-db/tokyocabinet ) !tokyocabinet? ( qdbm? ( dev-db/qdbm ) !qdbm? ( gdbm? ( sys-libs/gdbm ) !gdbm? ( berkdb? ( >=sys-libs/db-4 ) ) ) ) imap? ( gnutls? ( >=net-libs/gnutls-1.0.17 ) !gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6 ) ) sasl? ( >=dev-libs/cyrus-sasl-2 ) ) pop? ( gnutls? ( >=net-libs/gnutls-1.0.17 ) !gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6 ) ) sasl? ( >=dev-libs/cyrus-sasl-2 ) ) smtp? ( gnutls? ( >=net-libs/gnutls-1.0.17 ) !gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6 ) ) sasl? ( >=dev-libs/cyrus-sasl-2 ) ) idn? ( net-dns/libidn ) gpg? ( >=app-crypt/gpgme-0.9.0 ) smime? ( >=dev-libs/openssl-0.9.6 ) selinux? ( sec-policy/selinux-mutt ) app-misc/mime-types
 0
 ftp://ftp.mutt.org/mutt/devel/mutt-1.5.21.tar.gz mirror://gentoo/mutt-1.5.21-gentoo-patches-r11.tar.bz2 http://dev.gentoo.org/~grobian/distfiles/mutt-1.5.21-gentoo-patches-r11.tar.bz2
diff --git a/metadata/cache/mail-client/sylpheed-2.6.0 b/metadata/cache/mail-client/sylpheed-2.6.0
index 6ef7ab8a4c93..6fc7ade6fa89 100644
--- a/metadata/cache/mail-client/sylpheed-2.6.0
+++ b/metadata/cache/mail-client/sylpheed-2.6.0
@@ -1,4 +1,4 @@
-x11-libs/gtk+:2 nls? ( sys-devel/gettext ) crypt? ( app-crypt/gpgme ) ldap? ( net-nds/openldap ) pda? ( app-pda/jpilot ) spell? ( app-text/gtkspell:2 ) ssl? ( dev-libs/openssl ) dev-util/pkgconfig xface? ( media-libs/compface ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+x11-libs/gtk+:2 nls? ( sys-devel/gettext ) crypt? ( app-crypt/gpgme ) ldap? ( net-nds/openldap ) pda? ( app-pda/jpilot ) spell? ( app-text/gtkspell:2 ) ssl? ( dev-libs/openssl ) dev-util/pkgconfig xface? ( media-libs/compface ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 x11-libs/gtk+:2 nls? ( sys-devel/gettext ) crypt? ( app-crypt/gpgme ) ldap? ( net-nds/openldap ) pda? ( app-pda/jpilot ) spell? ( app-text/gtkspell:2 ) ssl? ( dev-libs/openssl ) app-misc/mime-types x11-misc/shared-mime-info
 0
 http://sylpheed.sraoss.jp/sylpheed/v2.6/sylpheed-2.6.0.tar.bz2
diff --git a/metadata/cache/mail-client/thunderbird-10.0 b/metadata/cache/mail-client/thunderbird-10.0
index 7234ffd27791..c81adc363717 100644
--- a/metadata/cache/mail-client/thunderbird-10.0
+++ b/metadata/cache/mail-client/thunderbird-10.0
@@ -1,4 +1,4 @@
->=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.13.1 >=dev-libs/nspr-4.8.8 >=dev-libs/glib-2.26 crashreporter? ( net-misc/curl ) gconf? ( >=gnome-base/gconf-1.2.1:2 ) media-libs/libpng[apng] >=x11-libs/cairo-1.10 >=x11-libs/pango-1.14.0 >=x11-libs/gtk+-2.14 webm? ( >=media-libs/libvpx-0.9.7 media-libs/alsa-lib ) virtual/libffi !x11-plugins/enigmail system-sqlite? ( >=dev-db/sqlite-3.7.7.1[fts3,secure-delete,unlock-notify,debug=] ) crypt? ( || ( ( >=app-crypt/gnupg-2.0 || ( app-crypt/pinentry[gtk] app-crypt/pinentry[qt4] ) ) =app-crypt/gnupg-1.4* ) ) dev-util/pkgconfig webm? ( x86? ( >=dev-lang/yasm-1.1 ) amd64? ( >=dev-lang/yasm-1.1 ) ) x11-libs/libXrender x11-libs/libXt x11-libs/libXmu >=sys-libs/zlib-1.1.4 dev-util/pkgconfig =dev-lang/python-2*[threads] app-arch/zip app-arch/unzip >=app-text/hunspell-1.2 dev-libs/expat >=dev-libs/libIDL-0.8.0 >=dev-libs/libevent-1.4.7 >=x11-libs/cairo-1.8[X] >=x11-libs/gtk+-2.8.6:2 >=x11-libs/pango-1.10.1[X] virtual/jpeg virtual/freedesktop-icon-theme alsa? ( media-libs/alsa-lib ) dbus? ( >=dev-libs/dbus-glib-0.72 ) libnotify? ( >=x11-libs/libnotify-0.4 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) wifi? ( net-wireless/wireless-tools ) || ( >=sys-devel/automake-1.11.1 ) =sys-devel/autoconf-2.1* sys-devel/libtool app-arch/unzip
+>=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.13.1 >=dev-libs/nspr-4.8.8 >=dev-libs/glib-2.26 crashreporter? ( net-misc/curl ) gconf? ( >=gnome-base/gconf-1.2.1:2 ) media-libs/libpng[apng] >=x11-libs/cairo-1.10 >=x11-libs/pango-1.14.0 >=x11-libs/gtk+-2.14 webm? ( >=media-libs/libvpx-0.9.7 media-libs/alsa-lib ) virtual/libffi !x11-plugins/enigmail system-sqlite? ( >=dev-db/sqlite-3.7.7.1[fts3,secure-delete,unlock-notify,debug=] ) crypt? ( || ( ( >=app-crypt/gnupg-2.0 || ( app-crypt/pinentry[gtk] app-crypt/pinentry[qt4] ) ) =app-crypt/gnupg-1.4* ) ) dev-util/pkgconfig webm? ( x86? ( >=dev-lang/yasm-1.1 ) amd64? ( >=dev-lang/yasm-1.1 ) ) x11-libs/libXrender x11-libs/libXt x11-libs/libXmu >=sys-libs/zlib-1.1.4 dev-util/pkgconfig =dev-lang/python-2*[threads] app-arch/zip app-arch/unzip >=app-text/hunspell-1.2 dev-libs/expat >=dev-libs/libIDL-0.8.0 >=dev-libs/libevent-1.4.7 >=x11-libs/cairo-1.8[X] >=x11-libs/gtk+-2.8.6:2 >=x11-libs/pango-1.10.1[X] virtual/jpeg virtual/freedesktop-icon-theme alsa? ( media-libs/alsa-lib ) dbus? ( >=dev-libs/dbus-glib-0.72 ) libnotify? ( >=x11-libs/libnotify-0.4 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) wifi? ( net-wireless/wireless-tools ) || ( >=sys-devel/automake-1.11.1:1.11 ) =sys-devel/autoconf-2.1* sys-devel/libtool app-arch/unzip
 >=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.13.1 >=dev-libs/nspr-4.8.8 >=dev-libs/glib-2.26 crashreporter? ( net-misc/curl ) gconf? ( >=gnome-base/gconf-1.2.1:2 ) media-libs/libpng[apng] >=x11-libs/cairo-1.10 >=x11-libs/pango-1.14.0 >=x11-libs/gtk+-2.14 webm? ( >=media-libs/libvpx-0.9.7 media-libs/alsa-lib ) virtual/libffi !x11-plugins/enigmail system-sqlite? ( >=dev-db/sqlite-3.7.7.1[fts3,secure-delete,unlock-notify,debug=] ) crypt? ( || ( ( >=app-crypt/gnupg-2.0 || ( app-crypt/pinentry[gtk] app-crypt/pinentry[qt4] ) ) =app-crypt/gnupg-1.4* ) ) x11-libs/libXrender x11-libs/libXt x11-libs/libXmu >=sys-libs/zlib-1.1.4 app-arch/zip app-arch/unzip >=app-text/hunspell-1.2 dev-libs/expat >=dev-libs/libIDL-0.8.0 >=dev-libs/libevent-1.4.7 >=x11-libs/cairo-1.8[X] >=x11-libs/gtk+-2.8.6:2 >=x11-libs/pango-1.10.1[X] virtual/jpeg virtual/freedesktop-icon-theme alsa? ( media-libs/alsa-lib ) dbus? ( >=dev-libs/dbus-glib-0.72 ) libnotify? ( >=x11-libs/libnotify-0.4 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) wifi? ( net-wireless/wireless-tools )
 0
 linguas_ar? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0-real/linux-i686/xpi/ar.xpi -> thunderbird-10.0-ar.xpi ) linguas_be? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0-real/linux-i686/xpi/be.xpi -> thunderbird-10.0-be.xpi ) linguas_bg? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0-real/linux-i686/xpi/bg.xpi -> thunderbird-10.0-bg.xpi ) linguas_bn_BD? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0-real/linux-i686/xpi/bn-BD.xpi -> thunderbird-10.0-bn-BD.xpi ) linguas_br? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0-real/linux-i686/xpi/br.xpi -> thunderbird-10.0-br.xpi ) linguas_ca? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0-real/linux-i686/xpi/ca.xpi -> thunderbird-10.0-ca.xpi ) linguas_cs? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0-real/linux-i686/xpi/cs.xpi -> thunderbird-10.0-cs.xpi ) linguas_da? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0-real/linux-i686/xpi/da.xpi -> thunderbird-10.0-da.xpi ) linguas_de? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0-real/linux-i686/xpi/de.xpi -> thunderbird-10.0-de.xpi ) linguas_el? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0-real/linux-i686/xpi/el.xpi -> thunderbird-10.0-el.xpi ) linguas_en_GB? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0-real/linux-i686/xpi/en-GB.xpi -> thunderbird-10.0-en-GB.xpi ) linguas_es_AR? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0-real/linux-i686/xpi/es-AR.xpi -> thunderbird-10.0-es-AR.xpi ) linguas_es_ES? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0-real/linux-i686/xpi/es-ES.xpi -> thunderbird-10.0-es-ES.xpi ) linguas_et? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0-real/linux-i686/xpi/et.xpi -> thunderbird-10.0-et.xpi ) linguas_eu? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0-real/linux-i686/xpi/eu.xpi -> thunderbird-10.0-eu.xpi ) linguas_fi? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0-real/linux-i686/xpi/fi.xpi -> thunderbird-10.0-fi.xpi ) linguas_fr? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0-real/linux-i686/xpi/fr.xpi -> thunderbird-10.0-fr.xpi ) linguas_fy_NL? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0-real/linux-i686/xpi/fy-NL.xpi -> thunderbird-10.0-fy-NL.xpi ) linguas_ga_IE? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0-real/linux-i686/xpi/ga-IE.xpi -> thunderbird-10.0-ga-IE.xpi ) linguas_gd? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0-real/linux-i686/xpi/gd.xpi -> thunderbird-10.0-gd.xpi ) linguas_gl? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0-real/linux-i686/xpi/gl.xpi -> thunderbird-10.0-gl.xpi ) linguas_he? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0-real/linux-i686/xpi/he.xpi -> thunderbird-10.0-he.xpi ) linguas_hu? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0-real/linux-i686/xpi/hu.xpi -> thunderbird-10.0-hu.xpi ) linguas_id? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0-real/linux-i686/xpi/id.xpi -> thunderbird-10.0-id.xpi ) linguas_is? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0-real/linux-i686/xpi/is.xpi -> thunderbird-10.0-is.xpi ) linguas_it? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0-real/linux-i686/xpi/it.xpi -> thunderbird-10.0-it.xpi ) linguas_ja? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0-real/linux-i686/xpi/ja.xpi -> thunderbird-10.0-ja.xpi ) linguas_ko? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0-real/linux-i686/xpi/ko.xpi -> thunderbird-10.0-ko.xpi ) linguas_lt? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0-real/linux-i686/xpi/lt.xpi -> thunderbird-10.0-lt.xpi ) linguas_nb_NO? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0-real/linux-i686/xpi/nb-NO.xpi -> thunderbird-10.0-nb-NO.xpi ) linguas_nl? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0-real/linux-i686/xpi/nl.xpi -> thunderbird-10.0-nl.xpi ) linguas_nn_NO? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0-real/linux-i686/xpi/nn-NO.xpi -> thunderbird-10.0-nn-NO.xpi ) linguas_pa_IN? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0-real/linux-i686/xpi/pa-IN.xpi -> thunderbird-10.0-pa-IN.xpi ) linguas_pl? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0-real/linux-i686/xpi/pl.xpi -> thunderbird-10.0-pl.xpi ) linguas_pt_BR? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0-real/linux-i686/xpi/pt-BR.xpi -> thunderbird-10.0-pt-BR.xpi ) linguas_pt_PT? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0-real/linux-i686/xpi/pt-PT.xpi -> thunderbird-10.0-pt-PT.xpi ) linguas_rm? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0-real/linux-i686/xpi/rm.xpi -> thunderbird-10.0-rm.xpi ) linguas_ro? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0-real/linux-i686/xpi/ro.xpi -> thunderbird-10.0-ro.xpi ) linguas_ru? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0-real/linux-i686/xpi/ru.xpi -> thunderbird-10.0-ru.xpi ) linguas_si? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0-real/linux-i686/xpi/si.xpi -> thunderbird-10.0-si.xpi ) linguas_sk? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0-real/linux-i686/xpi/sk.xpi -> thunderbird-10.0-sk.xpi ) linguas_sl? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0-real/linux-i686/xpi/sl.xpi -> thunderbird-10.0-sl.xpi ) linguas_sq? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0-real/linux-i686/xpi/sq.xpi -> thunderbird-10.0-sq.xpi ) linguas_sv_SE? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0-real/linux-i686/xpi/sv-SE.xpi -> thunderbird-10.0-sv-SE.xpi ) linguas_ta_LK? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0-real/linux-i686/xpi/ta-LK.xpi -> thunderbird-10.0-ta-LK.xpi ) linguas_tr? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0-real/linux-i686/xpi/tr.xpi -> thunderbird-10.0-tr.xpi ) linguas_uk? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0-real/linux-i686/xpi/uk.xpi -> thunderbird-10.0-uk.xpi ) linguas_vi? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0-real/linux-i686/xpi/vi.xpi -> thunderbird-10.0-vi.xpi ) linguas_zh_CN? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0-real/linux-i686/xpi/zh-CN.xpi -> thunderbird-10.0-zh-CN.xpi ) linguas_zh_TW? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0-real/linux-i686/xpi/zh-TW.xpi -> thunderbird-10.0-zh-TW.xpi ) ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0-real/source/thunderbird-10.0.source.tar.bz2 crypt? ( http://www.mozilla-enigmail.org/download/source/enigmail-1.3.5.tar.gz ) http://dev.gentoo.org/~anarchy/mozilla/patchsets/thunderbird-9.0-patches-0.1.tar.xz http://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-10.0-patches-0.4.tar.xz
diff --git a/metadata/cache/mail-client/thunderbird-10.0.1 b/metadata/cache/mail-client/thunderbird-10.0.1
index b39c3d5f08d2..55af87fda2ef 100644
--- a/metadata/cache/mail-client/thunderbird-10.0.1
+++ b/metadata/cache/mail-client/thunderbird-10.0.1
@@ -1,4 +1,4 @@
->=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.13.1 >=dev-libs/nspr-4.8.8 >=dev-libs/glib-2.26 crashreporter? ( net-misc/curl ) gconf? ( >=gnome-base/gconf-1.2.1:2 ) media-libs/libpng[apng] >=x11-libs/cairo-1.10 >=x11-libs/pango-1.14.0 >=x11-libs/gtk+-2.14 webm? ( >=media-libs/libvpx-0.9.7 media-libs/alsa-lib ) virtual/libffi !x11-plugins/enigmail system-sqlite? ( >=dev-db/sqlite-3.7.7.1[fts3,secure-delete,unlock-notify,debug=] ) crypt? ( || ( ( >=app-crypt/gnupg-2.0 || ( app-crypt/pinentry[gtk] app-crypt/pinentry[qt4] ) ) =app-crypt/gnupg-1.4* ) ) dev-util/pkgconfig webm? ( x86? ( >=dev-lang/yasm-1.1 ) amd64? ( >=dev-lang/yasm-1.1 ) ) x11-libs/libXrender x11-libs/libXt x11-libs/libXmu >=sys-libs/zlib-1.1.4 dev-util/pkgconfig =dev-lang/python-2*[threads] app-arch/zip app-arch/unzip >=app-text/hunspell-1.2 dev-libs/expat >=dev-libs/libIDL-0.8.0 >=dev-libs/libevent-1.4.7 >=x11-libs/cairo-1.8[X] >=x11-libs/gtk+-2.8.6:2 >=x11-libs/pango-1.10.1[X] virtual/jpeg virtual/freedesktop-icon-theme alsa? ( media-libs/alsa-lib ) dbus? ( >=dev-libs/dbus-glib-0.72 ) libnotify? ( >=x11-libs/libnotify-0.4 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) wifi? ( net-wireless/wireless-tools ) || ( >=sys-devel/automake-1.11.1 ) =sys-devel/autoconf-2.1* sys-devel/libtool app-arch/unzip
+>=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.13.1 >=dev-libs/nspr-4.8.8 >=dev-libs/glib-2.26 crashreporter? ( net-misc/curl ) gconf? ( >=gnome-base/gconf-1.2.1:2 ) media-libs/libpng[apng] >=x11-libs/cairo-1.10 >=x11-libs/pango-1.14.0 >=x11-libs/gtk+-2.14 webm? ( >=media-libs/libvpx-0.9.7 media-libs/alsa-lib ) virtual/libffi !x11-plugins/enigmail system-sqlite? ( >=dev-db/sqlite-3.7.7.1[fts3,secure-delete,unlock-notify,debug=] ) crypt? ( || ( ( >=app-crypt/gnupg-2.0 || ( app-crypt/pinentry[gtk] app-crypt/pinentry[qt4] ) ) =app-crypt/gnupg-1.4* ) ) dev-util/pkgconfig webm? ( x86? ( >=dev-lang/yasm-1.1 ) amd64? ( >=dev-lang/yasm-1.1 ) ) x11-libs/libXrender x11-libs/libXt x11-libs/libXmu >=sys-libs/zlib-1.1.4 dev-util/pkgconfig =dev-lang/python-2*[threads] app-arch/zip app-arch/unzip >=app-text/hunspell-1.2 dev-libs/expat >=dev-libs/libIDL-0.8.0 >=dev-libs/libevent-1.4.7 >=x11-libs/cairo-1.8[X] >=x11-libs/gtk+-2.8.6:2 >=x11-libs/pango-1.10.1[X] virtual/jpeg virtual/freedesktop-icon-theme alsa? ( media-libs/alsa-lib ) dbus? ( >=dev-libs/dbus-glib-0.72 ) libnotify? ( >=x11-libs/libnotify-0.4 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) wifi? ( net-wireless/wireless-tools ) || ( >=sys-devel/automake-1.11.1:1.11 ) =sys-devel/autoconf-2.1* sys-devel/libtool app-arch/unzip
 >=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.13.1 >=dev-libs/nspr-4.8.8 >=dev-libs/glib-2.26 crashreporter? ( net-misc/curl ) gconf? ( >=gnome-base/gconf-1.2.1:2 ) media-libs/libpng[apng] >=x11-libs/cairo-1.10 >=x11-libs/pango-1.14.0 >=x11-libs/gtk+-2.14 webm? ( >=media-libs/libvpx-0.9.7 media-libs/alsa-lib ) virtual/libffi !x11-plugins/enigmail system-sqlite? ( >=dev-db/sqlite-3.7.7.1[fts3,secure-delete,unlock-notify,debug=] ) crypt? ( || ( ( >=app-crypt/gnupg-2.0 || ( app-crypt/pinentry[gtk] app-crypt/pinentry[qt4] ) ) =app-crypt/gnupg-1.4* ) ) x11-libs/libXrender x11-libs/libXt x11-libs/libXmu >=sys-libs/zlib-1.1.4 app-arch/zip app-arch/unzip >=app-text/hunspell-1.2 dev-libs/expat >=dev-libs/libIDL-0.8.0 >=dev-libs/libevent-1.4.7 >=x11-libs/cairo-1.8[X] >=x11-libs/gtk+-2.8.6:2 >=x11-libs/pango-1.10.1[X] virtual/jpeg virtual/freedesktop-icon-theme alsa? ( media-libs/alsa-lib ) dbus? ( >=dev-libs/dbus-glib-0.72 ) libnotify? ( >=x11-libs/libnotify-0.4 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) wifi? ( net-wireless/wireless-tools )
 0
 linguas_ar? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/ar.xpi -> thunderbird-10.0.1-ar.xpi ) linguas_ast? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/ast.xpi -> thunderbird-10.0.1-ast.xpi ) linguas_be? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/be.xpi -> thunderbird-10.0.1-be.xpi ) linguas_bg? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/bg.xpi -> thunderbird-10.0.1-bg.xpi ) linguas_bn_BD? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/bn-BD.xpi -> thunderbird-10.0.1-bn-BD.xpi ) linguas_br? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/br.xpi -> thunderbird-10.0.1-br.xpi ) linguas_ca? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/ca.xpi -> thunderbird-10.0.1-ca.xpi ) linguas_cs? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/cs.xpi -> thunderbird-10.0.1-cs.xpi ) linguas_da? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/da.xpi -> thunderbird-10.0.1-da.xpi ) linguas_de? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/de.xpi -> thunderbird-10.0.1-de.xpi ) linguas_el? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/el.xpi -> thunderbird-10.0.1-el.xpi ) linguas_en_GB? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/en-GB.xpi -> thunderbird-10.0.1-en-GB.xpi ) linguas_es_AR? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/es-AR.xpi -> thunderbird-10.0.1-es-AR.xpi ) linguas_es_ES? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/es-ES.xpi -> thunderbird-10.0.1-es-ES.xpi ) linguas_et? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/et.xpi -> thunderbird-10.0.1-et.xpi ) linguas_eu? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/eu.xpi -> thunderbird-10.0.1-eu.xpi ) linguas_fi? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/fi.xpi -> thunderbird-10.0.1-fi.xpi ) linguas_fr? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/fr.xpi -> thunderbird-10.0.1-fr.xpi ) linguas_fy_NL? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/fy-NL.xpi -> thunderbird-10.0.1-fy-NL.xpi ) linguas_ga_IE? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/ga-IE.xpi -> thunderbird-10.0.1-ga-IE.xpi ) linguas_gd? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/gd.xpi -> thunderbird-10.0.1-gd.xpi ) linguas_gl? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/gl.xpi -> thunderbird-10.0.1-gl.xpi ) linguas_he? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/he.xpi -> thunderbird-10.0.1-he.xpi ) linguas_hu? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/hu.xpi -> thunderbird-10.0.1-hu.xpi ) linguas_id? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/id.xpi -> thunderbird-10.0.1-id.xpi ) linguas_is? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/is.xpi -> thunderbird-10.0.1-is.xpi ) linguas_it? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/it.xpi -> thunderbird-10.0.1-it.xpi ) linguas_ja? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/ja.xpi -> thunderbird-10.0.1-ja.xpi ) linguas_ko? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/ko.xpi -> thunderbird-10.0.1-ko.xpi ) linguas_lt? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/lt.xpi -> thunderbird-10.0.1-lt.xpi ) linguas_nb_NO? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/nb-NO.xpi -> thunderbird-10.0.1-nb-NO.xpi ) linguas_nl? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/nl.xpi -> thunderbird-10.0.1-nl.xpi ) linguas_nn_NO? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/nn-NO.xpi -> thunderbird-10.0.1-nn-NO.xpi ) linguas_pa_IN? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/pa-IN.xpi -> thunderbird-10.0.1-pa-IN.xpi ) linguas_pl? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/pl.xpi -> thunderbird-10.0.1-pl.xpi ) linguas_pt_BR? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/pt-BR.xpi -> thunderbird-10.0.1-pt-BR.xpi ) linguas_pt_PT? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/pt-PT.xpi -> thunderbird-10.0.1-pt-PT.xpi ) linguas_rm? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/rm.xpi -> thunderbird-10.0.1-rm.xpi ) linguas_ro? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/ro.xpi -> thunderbird-10.0.1-ro.xpi ) linguas_ru? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/ru.xpi -> thunderbird-10.0.1-ru.xpi ) linguas_si? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/si.xpi -> thunderbird-10.0.1-si.xpi ) linguas_sk? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/sk.xpi -> thunderbird-10.0.1-sk.xpi ) linguas_sl? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/sl.xpi -> thunderbird-10.0.1-sl.xpi ) linguas_sq? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/sq.xpi -> thunderbird-10.0.1-sq.xpi ) linguas_sr? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/sr.xpi -> thunderbird-10.0.1-sr.xpi ) linguas_sv_SE? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/sv-SE.xpi -> thunderbird-10.0.1-sv-SE.xpi ) linguas_ta_LK? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/ta-LK.xpi -> thunderbird-10.0.1-ta-LK.xpi ) linguas_tr? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/tr.xpi -> thunderbird-10.0.1-tr.xpi ) linguas_uk? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/uk.xpi -> thunderbird-10.0.1-uk.xpi ) linguas_vi? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/vi.xpi -> thunderbird-10.0.1-vi.xpi ) linguas_zh_CN? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/zh-CN.xpi -> thunderbird-10.0.1-zh-CN.xpi ) linguas_zh_TW? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/zh-TW.xpi -> thunderbird-10.0.1-zh-TW.xpi ) ftp://ftp.mozilla.org/pub/thunderbird/releases/10.0.1/source/thunderbird-10.0.1.source.tar.bz2 crypt? ( http://www.mozilla-enigmail.org/download/source/enigmail-1.3.5.tar.gz ) http://dev.gentoo.org/~anarchy/mozilla/patchsets/thunderbird-10.0-patches-0.1.tar.xz http://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-10.0-patches-0.5.tar.xz
diff --git a/metadata/cache/mail-client/thunderbird-10.0.1-r1 b/metadata/cache/mail-client/thunderbird-10.0.1-r1
index c5333c2d4eef..2cf80b0ec019 100644
--- a/metadata/cache/mail-client/thunderbird-10.0.1-r1
+++ b/metadata/cache/mail-client/thunderbird-10.0.1-r1
@@ -1,4 +1,4 @@
->=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.13.1 >=dev-libs/nspr-4.8.8 >=dev-libs/glib-2.26 crashreporter? ( net-misc/curl ) gconf? ( >=gnome-base/gconf-1.2.1:2 ) media-libs/libpng[apng] >=x11-libs/cairo-1.10 >=x11-libs/pango-1.14.0 >=x11-libs/gtk+-2.14 webm? ( >=media-libs/libvpx-1.0.0 media-libs/alsa-lib ) virtual/libffi !x11-plugins/enigmail system-sqlite? ( >=dev-db/sqlite-3.7.7.1[fts3,secure-delete,unlock-notify,debug=] ) crypt? ( || ( ( >=app-crypt/gnupg-2.0 || ( app-crypt/pinentry[gtk] app-crypt/pinentry[qt4] ) ) =app-crypt/gnupg-1.4* ) ) dev-util/pkgconfig webm? ( x86? ( >=dev-lang/yasm-1.1 ) amd64? ( >=dev-lang/yasm-1.1 ) ) x11-libs/libXrender x11-libs/libXt x11-libs/libXmu >=sys-libs/zlib-1.1.4 dev-util/pkgconfig =dev-lang/python-2*[threads] app-arch/zip app-arch/unzip >=app-text/hunspell-1.2 dev-libs/expat >=dev-libs/libIDL-0.8.0 >=dev-libs/libevent-1.4.7 >=x11-libs/cairo-1.8[X] >=x11-libs/gtk+-2.8.6:2 >=x11-libs/pango-1.10.1[X] virtual/jpeg virtual/freedesktop-icon-theme alsa? ( media-libs/alsa-lib ) dbus? ( >=dev-libs/dbus-glib-0.72 ) libnotify? ( >=x11-libs/libnotify-0.4 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) wifi? ( net-wireless/wireless-tools ) || ( >=sys-devel/automake-1.11.1 ) =sys-devel/autoconf-2.1* sys-devel/libtool app-arch/unzip
+>=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.13.1 >=dev-libs/nspr-4.8.8 >=dev-libs/glib-2.26 crashreporter? ( net-misc/curl ) gconf? ( >=gnome-base/gconf-1.2.1:2 ) media-libs/libpng[apng] >=x11-libs/cairo-1.10 >=x11-libs/pango-1.14.0 >=x11-libs/gtk+-2.14 webm? ( >=media-libs/libvpx-1.0.0 media-libs/alsa-lib ) virtual/libffi !x11-plugins/enigmail system-sqlite? ( >=dev-db/sqlite-3.7.7.1[fts3,secure-delete,unlock-notify,debug=] ) crypt? ( || ( ( >=app-crypt/gnupg-2.0 || ( app-crypt/pinentry[gtk] app-crypt/pinentry[qt4] ) ) =app-crypt/gnupg-1.4* ) ) dev-util/pkgconfig webm? ( x86? ( >=dev-lang/yasm-1.1 ) amd64? ( >=dev-lang/yasm-1.1 ) ) x11-libs/libXrender x11-libs/libXt x11-libs/libXmu >=sys-libs/zlib-1.1.4 dev-util/pkgconfig =dev-lang/python-2*[threads] app-arch/zip app-arch/unzip >=app-text/hunspell-1.2 dev-libs/expat >=dev-libs/libIDL-0.8.0 >=dev-libs/libevent-1.4.7 >=x11-libs/cairo-1.8[X] >=x11-libs/gtk+-2.8.6:2 >=x11-libs/pango-1.10.1[X] virtual/jpeg virtual/freedesktop-icon-theme alsa? ( media-libs/alsa-lib ) dbus? ( >=dev-libs/dbus-glib-0.72 ) libnotify? ( >=x11-libs/libnotify-0.4 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) wifi? ( net-wireless/wireless-tools ) || ( >=sys-devel/automake-1.11.1:1.11 ) =sys-devel/autoconf-2.1* sys-devel/libtool app-arch/unzip
 >=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.13.1 >=dev-libs/nspr-4.8.8 >=dev-libs/glib-2.26 crashreporter? ( net-misc/curl ) gconf? ( >=gnome-base/gconf-1.2.1:2 ) media-libs/libpng[apng] >=x11-libs/cairo-1.10 >=x11-libs/pango-1.14.0 >=x11-libs/gtk+-2.14 webm? ( >=media-libs/libvpx-1.0.0 media-libs/alsa-lib ) virtual/libffi !x11-plugins/enigmail system-sqlite? ( >=dev-db/sqlite-3.7.7.1[fts3,secure-delete,unlock-notify,debug=] ) crypt? ( || ( ( >=app-crypt/gnupg-2.0 || ( app-crypt/pinentry[gtk] app-crypt/pinentry[qt4] ) ) =app-crypt/gnupg-1.4* ) ) x11-libs/libXrender x11-libs/libXt x11-libs/libXmu >=sys-libs/zlib-1.1.4 app-arch/zip app-arch/unzip >=app-text/hunspell-1.2 dev-libs/expat >=dev-libs/libIDL-0.8.0 >=dev-libs/libevent-1.4.7 >=x11-libs/cairo-1.8[X] >=x11-libs/gtk+-2.8.6:2 >=x11-libs/pango-1.10.1[X] virtual/jpeg virtual/freedesktop-icon-theme alsa? ( media-libs/alsa-lib ) dbus? ( >=dev-libs/dbus-glib-0.72 ) libnotify? ( >=x11-libs/libnotify-0.4 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) wifi? ( net-wireless/wireless-tools )
 0
 linguas_ar? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/ar.xpi -> thunderbird-10.0.1-ar.xpi ) linguas_ast? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/ast.xpi -> thunderbird-10.0.1-ast.xpi ) linguas_be? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/be.xpi -> thunderbird-10.0.1-be.xpi ) linguas_bg? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/bg.xpi -> thunderbird-10.0.1-bg.xpi ) linguas_bn_BD? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/bn-BD.xpi -> thunderbird-10.0.1-bn-BD.xpi ) linguas_br? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/br.xpi -> thunderbird-10.0.1-br.xpi ) linguas_ca? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/ca.xpi -> thunderbird-10.0.1-ca.xpi ) linguas_cs? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/cs.xpi -> thunderbird-10.0.1-cs.xpi ) linguas_da? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/da.xpi -> thunderbird-10.0.1-da.xpi ) linguas_de? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/de.xpi -> thunderbird-10.0.1-de.xpi ) linguas_el? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/el.xpi -> thunderbird-10.0.1-el.xpi ) linguas_en_GB? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/en-GB.xpi -> thunderbird-10.0.1-en-GB.xpi ) linguas_es_AR? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/es-AR.xpi -> thunderbird-10.0.1-es-AR.xpi ) linguas_es_ES? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/es-ES.xpi -> thunderbird-10.0.1-es-ES.xpi ) linguas_et? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/et.xpi -> thunderbird-10.0.1-et.xpi ) linguas_eu? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/eu.xpi -> thunderbird-10.0.1-eu.xpi ) linguas_fi? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/fi.xpi -> thunderbird-10.0.1-fi.xpi ) linguas_fr? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/fr.xpi -> thunderbird-10.0.1-fr.xpi ) linguas_fy_NL? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/fy-NL.xpi -> thunderbird-10.0.1-fy-NL.xpi ) linguas_ga_IE? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/ga-IE.xpi -> thunderbird-10.0.1-ga-IE.xpi ) linguas_gd? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/gd.xpi -> thunderbird-10.0.1-gd.xpi ) linguas_gl? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/gl.xpi -> thunderbird-10.0.1-gl.xpi ) linguas_he? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/he.xpi -> thunderbird-10.0.1-he.xpi ) linguas_hu? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/hu.xpi -> thunderbird-10.0.1-hu.xpi ) linguas_id? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/id.xpi -> thunderbird-10.0.1-id.xpi ) linguas_is? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/is.xpi -> thunderbird-10.0.1-is.xpi ) linguas_it? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/it.xpi -> thunderbird-10.0.1-it.xpi ) linguas_ja? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/ja.xpi -> thunderbird-10.0.1-ja.xpi ) linguas_ko? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/ko.xpi -> thunderbird-10.0.1-ko.xpi ) linguas_lt? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/lt.xpi -> thunderbird-10.0.1-lt.xpi ) linguas_nb_NO? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/nb-NO.xpi -> thunderbird-10.0.1-nb-NO.xpi ) linguas_nl? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/nl.xpi -> thunderbird-10.0.1-nl.xpi ) linguas_nn_NO? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/nn-NO.xpi -> thunderbird-10.0.1-nn-NO.xpi ) linguas_pa_IN? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/pa-IN.xpi -> thunderbird-10.0.1-pa-IN.xpi ) linguas_pl? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/pl.xpi -> thunderbird-10.0.1-pl.xpi ) linguas_pt_BR? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/pt-BR.xpi -> thunderbird-10.0.1-pt-BR.xpi ) linguas_pt_PT? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/pt-PT.xpi -> thunderbird-10.0.1-pt-PT.xpi ) linguas_rm? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/rm.xpi -> thunderbird-10.0.1-rm.xpi ) linguas_ro? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/ro.xpi -> thunderbird-10.0.1-ro.xpi ) linguas_ru? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/ru.xpi -> thunderbird-10.0.1-ru.xpi ) linguas_si? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/si.xpi -> thunderbird-10.0.1-si.xpi ) linguas_sk? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/sk.xpi -> thunderbird-10.0.1-sk.xpi ) linguas_sl? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/sl.xpi -> thunderbird-10.0.1-sl.xpi ) linguas_sq? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/sq.xpi -> thunderbird-10.0.1-sq.xpi ) linguas_sr? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/sr.xpi -> thunderbird-10.0.1-sr.xpi ) linguas_sv_SE? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/sv-SE.xpi -> thunderbird-10.0.1-sv-SE.xpi ) linguas_ta_LK? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/ta-LK.xpi -> thunderbird-10.0.1-ta-LK.xpi ) linguas_tr? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/tr.xpi -> thunderbird-10.0.1-tr.xpi ) linguas_uk? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/uk.xpi -> thunderbird-10.0.1-uk.xpi ) linguas_vi? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/vi.xpi -> thunderbird-10.0.1-vi.xpi ) linguas_zh_CN? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/zh-CN.xpi -> thunderbird-10.0.1-zh-CN.xpi ) linguas_zh_TW? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.1/linux-i686/xpi/zh-TW.xpi -> thunderbird-10.0.1-zh-TW.xpi ) ftp://ftp.mozilla.org/pub/thunderbird/releases/10.0.1/source/thunderbird-10.0.1.source.tar.bz2 crypt? ( http://www.mozilla-enigmail.org/download/source/enigmail-1.3.5.tar.gz ) http://dev.gentoo.org/~anarchy/mozilla/patchsets/thunderbird-10.0-patches-0.1.tar.xz http://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-10.0-patches-0.6.tar.xz
diff --git a/metadata/cache/mail-client/thunderbird-10.0.3 b/metadata/cache/mail-client/thunderbird-10.0.3
index 1eb82b979354..8e4d045ccadd 100644
--- a/metadata/cache/mail-client/thunderbird-10.0.3
+++ b/metadata/cache/mail-client/thunderbird-10.0.3
@@ -1,4 +1,4 @@
->=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.13.1 >=dev-libs/nspr-4.8.8 >=dev-libs/glib-2.26 crashreporter? ( net-misc/curl ) gconf? ( >=gnome-base/gconf-1.2.1:2 ) media-libs/libpng[apng] >=x11-libs/cairo-1.10 >=x11-libs/pango-1.14.0 >=x11-libs/gtk+-2.14 webm? ( >=media-libs/libvpx-1.0.0 media-libs/alsa-lib ) virtual/libffi !x11-plugins/enigmail system-sqlite? ( >=dev-db/sqlite-3.7.7.1[fts3,secure-delete,unlock-notify,debug=] ) crypt? ( || ( ( >=app-crypt/gnupg-2.0 || ( app-crypt/pinentry[gtk] app-crypt/pinentry[qt4] ) ) =app-crypt/gnupg-1.4* ) ) dev-util/pkgconfig webm? ( x86? ( >=dev-lang/yasm-1.1 ) amd64? ( >=dev-lang/yasm-1.1 ) ) x11-libs/libXrender x11-libs/libXt x11-libs/libXmu >=sys-libs/zlib-1.1.4 dev-util/pkgconfig =dev-lang/python-2*[threads] app-arch/zip app-arch/unzip >=app-text/hunspell-1.2 dev-libs/expat >=dev-libs/libIDL-0.8.0 >=dev-libs/libevent-1.4.7 >=x11-libs/cairo-1.8[X] >=x11-libs/gtk+-2.8.6:2 >=x11-libs/pango-1.10.1[X] virtual/jpeg virtual/freedesktop-icon-theme alsa? ( media-libs/alsa-lib ) dbus? ( >=dev-libs/dbus-glib-0.72 ) libnotify? ( >=x11-libs/libnotify-0.4 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) wifi? ( net-wireless/wireless-tools ) || ( >=sys-devel/automake-1.11.1 ) =sys-devel/autoconf-2.1* sys-devel/libtool app-arch/unzip
+>=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.13.1 >=dev-libs/nspr-4.8.8 >=dev-libs/glib-2.26 crashreporter? ( net-misc/curl ) gconf? ( >=gnome-base/gconf-1.2.1:2 ) media-libs/libpng[apng] >=x11-libs/cairo-1.10 >=x11-libs/pango-1.14.0 >=x11-libs/gtk+-2.14 webm? ( >=media-libs/libvpx-1.0.0 media-libs/alsa-lib ) virtual/libffi !x11-plugins/enigmail system-sqlite? ( >=dev-db/sqlite-3.7.7.1[fts3,secure-delete,unlock-notify,debug=] ) crypt? ( || ( ( >=app-crypt/gnupg-2.0 || ( app-crypt/pinentry[gtk] app-crypt/pinentry[qt4] ) ) =app-crypt/gnupg-1.4* ) ) dev-util/pkgconfig webm? ( x86? ( >=dev-lang/yasm-1.1 ) amd64? ( >=dev-lang/yasm-1.1 ) ) x11-libs/libXrender x11-libs/libXt x11-libs/libXmu >=sys-libs/zlib-1.1.4 dev-util/pkgconfig =dev-lang/python-2*[threads] app-arch/zip app-arch/unzip >=app-text/hunspell-1.2 dev-libs/expat >=dev-libs/libIDL-0.8.0 >=dev-libs/libevent-1.4.7 >=x11-libs/cairo-1.8[X] >=x11-libs/gtk+-2.8.6:2 >=x11-libs/pango-1.10.1[X] virtual/jpeg virtual/freedesktop-icon-theme alsa? ( media-libs/alsa-lib ) dbus? ( >=dev-libs/dbus-glib-0.72 ) libnotify? ( >=x11-libs/libnotify-0.4 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) wifi? ( net-wireless/wireless-tools ) || ( >=sys-devel/automake-1.11.1:1.11 ) =sys-devel/autoconf-2.1* sys-devel/libtool app-arch/unzip
 >=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.13.1 >=dev-libs/nspr-4.8.8 >=dev-libs/glib-2.26 crashreporter? ( net-misc/curl ) gconf? ( >=gnome-base/gconf-1.2.1:2 ) media-libs/libpng[apng] >=x11-libs/cairo-1.10 >=x11-libs/pango-1.14.0 >=x11-libs/gtk+-2.14 webm? ( >=media-libs/libvpx-1.0.0 media-libs/alsa-lib ) virtual/libffi !x11-plugins/enigmail system-sqlite? ( >=dev-db/sqlite-3.7.7.1[fts3,secure-delete,unlock-notify,debug=] ) crypt? ( || ( ( >=app-crypt/gnupg-2.0 || ( app-crypt/pinentry[gtk] app-crypt/pinentry[qt4] ) ) =app-crypt/gnupg-1.4* ) ) x11-libs/libXrender x11-libs/libXt x11-libs/libXmu >=sys-libs/zlib-1.1.4 app-arch/zip app-arch/unzip >=app-text/hunspell-1.2 dev-libs/expat >=dev-libs/libIDL-0.8.0 >=dev-libs/libevent-1.4.7 >=x11-libs/cairo-1.8[X] >=x11-libs/gtk+-2.8.6:2 >=x11-libs/pango-1.10.1[X] virtual/jpeg virtual/freedesktop-icon-theme alsa? ( media-libs/alsa-lib ) dbus? ( >=dev-libs/dbus-glib-0.72 ) libnotify? ( >=x11-libs/libnotify-0.4 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) wifi? ( net-wireless/wireless-tools )
 0
 linguas_ar? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.3esr/linux-i686/xpi/ar.xpi -> thunderbird-10.0.3esr-ar.xpi ) linguas_ast? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.3esr/linux-i686/xpi/ast.xpi -> thunderbird-10.0.3esr-ast.xpi ) linguas_be? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.3esr/linux-i686/xpi/be.xpi -> thunderbird-10.0.3esr-be.xpi ) linguas_bg? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.3esr/linux-i686/xpi/bg.xpi -> thunderbird-10.0.3esr-bg.xpi ) linguas_bn_BD? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.3esr/linux-i686/xpi/bn-BD.xpi -> thunderbird-10.0.3esr-bn-BD.xpi ) linguas_br? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.3esr/linux-i686/xpi/br.xpi -> thunderbird-10.0.3esr-br.xpi ) linguas_ca? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.3esr/linux-i686/xpi/ca.xpi -> thunderbird-10.0.3esr-ca.xpi ) linguas_cs? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.3esr/linux-i686/xpi/cs.xpi -> thunderbird-10.0.3esr-cs.xpi ) linguas_da? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.3esr/linux-i686/xpi/da.xpi -> thunderbird-10.0.3esr-da.xpi ) linguas_de? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.3esr/linux-i686/xpi/de.xpi -> thunderbird-10.0.3esr-de.xpi ) linguas_el? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.3esr/linux-i686/xpi/el.xpi -> thunderbird-10.0.3esr-el.xpi ) linguas_en_GB? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.3esr/linux-i686/xpi/en-GB.xpi -> thunderbird-10.0.3esr-en-GB.xpi ) linguas_es_AR? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.3esr/linux-i686/xpi/es-AR.xpi -> thunderbird-10.0.3esr-es-AR.xpi ) linguas_es_ES? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.3esr/linux-i686/xpi/es-ES.xpi -> thunderbird-10.0.3esr-es-ES.xpi ) linguas_et? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.3esr/linux-i686/xpi/et.xpi -> thunderbird-10.0.3esr-et.xpi ) linguas_eu? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.3esr/linux-i686/xpi/eu.xpi -> thunderbird-10.0.3esr-eu.xpi ) linguas_fi? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.3esr/linux-i686/xpi/fi.xpi -> thunderbird-10.0.3esr-fi.xpi ) linguas_fr? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.3esr/linux-i686/xpi/fr.xpi -> thunderbird-10.0.3esr-fr.xpi ) linguas_fy_NL? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.3esr/linux-i686/xpi/fy-NL.xpi -> thunderbird-10.0.3esr-fy-NL.xpi ) linguas_ga_IE? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.3esr/linux-i686/xpi/ga-IE.xpi -> thunderbird-10.0.3esr-ga-IE.xpi ) linguas_gd? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.3esr/linux-i686/xpi/gd.xpi -> thunderbird-10.0.3esr-gd.xpi ) linguas_gl? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.3esr/linux-i686/xpi/gl.xpi -> thunderbird-10.0.3esr-gl.xpi ) linguas_he? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.3esr/linux-i686/xpi/he.xpi -> thunderbird-10.0.3esr-he.xpi ) linguas_hu? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.3esr/linux-i686/xpi/hu.xpi -> thunderbird-10.0.3esr-hu.xpi ) linguas_id? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.3esr/linux-i686/xpi/id.xpi -> thunderbird-10.0.3esr-id.xpi ) linguas_is? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.3esr/linux-i686/xpi/is.xpi -> thunderbird-10.0.3esr-is.xpi ) linguas_it? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.3esr/linux-i686/xpi/it.xpi -> thunderbird-10.0.3esr-it.xpi ) linguas_ja? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.3esr/linux-i686/xpi/ja.xpi -> thunderbird-10.0.3esr-ja.xpi ) linguas_ko? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.3esr/linux-i686/xpi/ko.xpi -> thunderbird-10.0.3esr-ko.xpi ) linguas_lt? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.3esr/linux-i686/xpi/lt.xpi -> thunderbird-10.0.3esr-lt.xpi ) linguas_nb_NO? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.3esr/linux-i686/xpi/nb-NO.xpi -> thunderbird-10.0.3esr-nb-NO.xpi ) linguas_nl? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.3esr/linux-i686/xpi/nl.xpi -> thunderbird-10.0.3esr-nl.xpi ) linguas_nn_NO? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.3esr/linux-i686/xpi/nn-NO.xpi -> thunderbird-10.0.3esr-nn-NO.xpi ) linguas_pa_IN? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.3esr/linux-i686/xpi/pa-IN.xpi -> thunderbird-10.0.3esr-pa-IN.xpi ) linguas_pl? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.3esr/linux-i686/xpi/pl.xpi -> thunderbird-10.0.3esr-pl.xpi ) linguas_pt_BR? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.3esr/linux-i686/xpi/pt-BR.xpi -> thunderbird-10.0.3esr-pt-BR.xpi ) linguas_pt_PT? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.3esr/linux-i686/xpi/pt-PT.xpi -> thunderbird-10.0.3esr-pt-PT.xpi ) linguas_rm? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.3esr/linux-i686/xpi/rm.xpi -> thunderbird-10.0.3esr-rm.xpi ) linguas_ro? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.3esr/linux-i686/xpi/ro.xpi -> thunderbird-10.0.3esr-ro.xpi ) linguas_ru? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.3esr/linux-i686/xpi/ru.xpi -> thunderbird-10.0.3esr-ru.xpi ) linguas_si? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.3esr/linux-i686/xpi/si.xpi -> thunderbird-10.0.3esr-si.xpi ) linguas_sk? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.3esr/linux-i686/xpi/sk.xpi -> thunderbird-10.0.3esr-sk.xpi ) linguas_sl? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.3esr/linux-i686/xpi/sl.xpi -> thunderbird-10.0.3esr-sl.xpi ) linguas_sq? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.3esr/linux-i686/xpi/sq.xpi -> thunderbird-10.0.3esr-sq.xpi ) linguas_sr? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.3esr/linux-i686/xpi/sr.xpi -> thunderbird-10.0.3esr-sr.xpi ) linguas_sv_SE? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.3esr/linux-i686/xpi/sv-SE.xpi -> thunderbird-10.0.3esr-sv-SE.xpi ) linguas_ta_LK? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.3esr/linux-i686/xpi/ta-LK.xpi -> thunderbird-10.0.3esr-ta-LK.xpi ) linguas_tr? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.3esr/linux-i686/xpi/tr.xpi -> thunderbird-10.0.3esr-tr.xpi ) linguas_uk? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.3esr/linux-i686/xpi/uk.xpi -> thunderbird-10.0.3esr-uk.xpi ) linguas_vi? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.3esr/linux-i686/xpi/vi.xpi -> thunderbird-10.0.3esr-vi.xpi ) linguas_zh_CN? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.3esr/linux-i686/xpi/zh-CN.xpi -> thunderbird-10.0.3esr-zh-CN.xpi ) linguas_zh_TW? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//10.0.3esr/linux-i686/xpi/zh-TW.xpi -> thunderbird-10.0.3esr-zh-TW.xpi ) ftp://ftp.mozilla.org/pub/thunderbird/releases/10.0.3esr/source/thunderbird-10.0.3esr.source.tar.bz2 crypt? ( http://www.mozilla-enigmail.org/download/source/enigmail-1.3.5.tar.gz ) http://dev.gentoo.org/~anarchy/mozilla/patchsets/thunderbird-10.0-patches-0.1.tar.xz http://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-10.0-patches-0.6.tar.xz
diff --git a/metadata/cache/mail-client/thunderbird-11.0 b/metadata/cache/mail-client/thunderbird-11.0
index 270e3e2ecba6..9e9af325741d 100644
--- a/metadata/cache/mail-client/thunderbird-11.0
+++ b/metadata/cache/mail-client/thunderbird-11.0
@@ -1,4 +1,4 @@
->=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.13.3 >=dev-libs/nspr-4.9 >=dev-libs/glib-2.26 crashreporter? ( net-misc/curl ) gconf? ( >=gnome-base/gconf-1.2.1:2 ) media-libs/libpng[apng] >=x11-libs/cairo-1.10 >=x11-libs/pango-1.14.0 >=x11-libs/gtk+-2.14 webm? ( >=media-libs/libvpx-1.0.0 media-libs/alsa-lib ) virtual/libffi !x11-plugins/enigmail system-sqlite? ( >=dev-db/sqlite-3.7.7.1[fts3,secure-delete,unlock-notify,debug=] ) crypt? ( || ( ( >=app-crypt/gnupg-2.0 || ( app-crypt/pinentry[gtk] app-crypt/pinentry[qt4] ) ) =app-crypt/gnupg-1.4* ) ) dev-util/pkgconfig webm? ( x86? ( >=dev-lang/yasm-1.1 ) amd64? ( >=dev-lang/yasm-1.1 ) virtual/opengl ) x11-libs/libXrender x11-libs/libXt x11-libs/libXmu >=sys-libs/zlib-1.1.4 dev-util/pkgconfig =dev-lang/python-2*[threads] app-arch/zip app-arch/unzip >=app-text/hunspell-1.2 dev-libs/expat >=dev-libs/libIDL-0.8.0 >=dev-libs/libevent-1.4.7 >=x11-libs/cairo-1.8[X] >=x11-libs/gtk+-2.8.6:2 >=x11-libs/pango-1.10.1[X] virtual/jpeg virtual/freedesktop-icon-theme alsa? ( media-libs/alsa-lib ) dbus? ( >=dev-libs/dbus-glib-0.72 ) libnotify? ( >=x11-libs/libnotify-0.4 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) wifi? ( net-wireless/wireless-tools ) || ( >=sys-devel/automake-1.11.1 ) =sys-devel/autoconf-2.1* sys-devel/libtool app-arch/unzip
+>=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.13.3 >=dev-libs/nspr-4.9 >=dev-libs/glib-2.26 crashreporter? ( net-misc/curl ) gconf? ( >=gnome-base/gconf-1.2.1:2 ) media-libs/libpng[apng] >=x11-libs/cairo-1.10 >=x11-libs/pango-1.14.0 >=x11-libs/gtk+-2.14 webm? ( >=media-libs/libvpx-1.0.0 media-libs/alsa-lib ) virtual/libffi !x11-plugins/enigmail system-sqlite? ( >=dev-db/sqlite-3.7.7.1[fts3,secure-delete,unlock-notify,debug=] ) crypt? ( || ( ( >=app-crypt/gnupg-2.0 || ( app-crypt/pinentry[gtk] app-crypt/pinentry[qt4] ) ) =app-crypt/gnupg-1.4* ) ) dev-util/pkgconfig webm? ( x86? ( >=dev-lang/yasm-1.1 ) amd64? ( >=dev-lang/yasm-1.1 ) virtual/opengl ) x11-libs/libXrender x11-libs/libXt x11-libs/libXmu >=sys-libs/zlib-1.1.4 dev-util/pkgconfig =dev-lang/python-2*[threads] app-arch/zip app-arch/unzip >=app-text/hunspell-1.2 dev-libs/expat >=dev-libs/libIDL-0.8.0 >=dev-libs/libevent-1.4.7 >=x11-libs/cairo-1.8[X] >=x11-libs/gtk+-2.8.6:2 >=x11-libs/pango-1.10.1[X] virtual/jpeg virtual/freedesktop-icon-theme alsa? ( media-libs/alsa-lib ) dbus? ( >=dev-libs/dbus-glib-0.72 ) libnotify? ( >=x11-libs/libnotify-0.4 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) wifi? ( net-wireless/wireless-tools ) || ( >=sys-devel/automake-1.11.1:1.11 ) =sys-devel/autoconf-2.1* sys-devel/libtool app-arch/unzip
 >=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.13.3 >=dev-libs/nspr-4.9 >=dev-libs/glib-2.26 crashreporter? ( net-misc/curl ) gconf? ( >=gnome-base/gconf-1.2.1:2 ) media-libs/libpng[apng] >=x11-libs/cairo-1.10 >=x11-libs/pango-1.14.0 >=x11-libs/gtk+-2.14 webm? ( >=media-libs/libvpx-1.0.0 media-libs/alsa-lib ) virtual/libffi !x11-plugins/enigmail system-sqlite? ( >=dev-db/sqlite-3.7.7.1[fts3,secure-delete,unlock-notify,debug=] ) crypt? ( || ( ( >=app-crypt/gnupg-2.0 || ( app-crypt/pinentry[gtk] app-crypt/pinentry[qt4] ) ) =app-crypt/gnupg-1.4* ) ) x11-libs/libXrender x11-libs/libXt x11-libs/libXmu >=sys-libs/zlib-1.1.4 app-arch/zip app-arch/unzip >=app-text/hunspell-1.2 dev-libs/expat >=dev-libs/libIDL-0.8.0 >=dev-libs/libevent-1.4.7 >=x11-libs/cairo-1.8[X] >=x11-libs/gtk+-2.8.6:2 >=x11-libs/pango-1.10.1[X] virtual/jpeg virtual/freedesktop-icon-theme alsa? ( media-libs/alsa-lib ) dbus? ( >=dev-libs/dbus-glib-0.72 ) libnotify? ( >=x11-libs/libnotify-0.4 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) wifi? ( net-wireless/wireless-tools )
 0
 linguas_ar? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//11.0/linux-i686/xpi/ar.xpi -> thunderbird-11.0-ar.xpi ) linguas_ast? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//11.0/linux-i686/xpi/ast.xpi -> thunderbird-11.0-ast.xpi ) linguas_be? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//11.0/linux-i686/xpi/be.xpi -> thunderbird-11.0-be.xpi ) linguas_bg? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//11.0/linux-i686/xpi/bg.xpi -> thunderbird-11.0-bg.xpi ) linguas_bn_BD? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//11.0/linux-i686/xpi/bn-BD.xpi -> thunderbird-11.0-bn-BD.xpi ) linguas_br? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//11.0/linux-i686/xpi/br.xpi -> thunderbird-11.0-br.xpi ) linguas_ca? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//11.0/linux-i686/xpi/ca.xpi -> thunderbird-11.0-ca.xpi ) linguas_cs? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//11.0/linux-i686/xpi/cs.xpi -> thunderbird-11.0-cs.xpi ) linguas_da? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//11.0/linux-i686/xpi/da.xpi -> thunderbird-11.0-da.xpi ) linguas_de? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//11.0/linux-i686/xpi/de.xpi -> thunderbird-11.0-de.xpi ) linguas_el? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//11.0/linux-i686/xpi/el.xpi -> thunderbird-11.0-el.xpi ) linguas_en_GB? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//11.0/linux-i686/xpi/en-GB.xpi -> thunderbird-11.0-en-GB.xpi ) linguas_es_AR? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//11.0/linux-i686/xpi/es-AR.xpi -> thunderbird-11.0-es-AR.xpi ) linguas_es_ES? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//11.0/linux-i686/xpi/es-ES.xpi -> thunderbird-11.0-es-ES.xpi ) linguas_et? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//11.0/linux-i686/xpi/et.xpi -> thunderbird-11.0-et.xpi ) linguas_eu? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//11.0/linux-i686/xpi/eu.xpi -> thunderbird-11.0-eu.xpi ) linguas_fi? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//11.0/linux-i686/xpi/fi.xpi -> thunderbird-11.0-fi.xpi ) linguas_fr? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//11.0/linux-i686/xpi/fr.xpi -> thunderbird-11.0-fr.xpi ) linguas_fy_NL? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//11.0/linux-i686/xpi/fy-NL.xpi -> thunderbird-11.0-fy-NL.xpi ) linguas_ga_IE? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//11.0/linux-i686/xpi/ga-IE.xpi -> thunderbird-11.0-ga-IE.xpi ) linguas_gd? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//11.0/linux-i686/xpi/gd.xpi -> thunderbird-11.0-gd.xpi ) linguas_gl? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//11.0/linux-i686/xpi/gl.xpi -> thunderbird-11.0-gl.xpi ) linguas_he? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//11.0/linux-i686/xpi/he.xpi -> thunderbird-11.0-he.xpi ) linguas_hu? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//11.0/linux-i686/xpi/hu.xpi -> thunderbird-11.0-hu.xpi ) linguas_id? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//11.0/linux-i686/xpi/id.xpi -> thunderbird-11.0-id.xpi ) linguas_is? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//11.0/linux-i686/xpi/is.xpi -> thunderbird-11.0-is.xpi ) linguas_it? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//11.0/linux-i686/xpi/it.xpi -> thunderbird-11.0-it.xpi ) linguas_ja? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//11.0/linux-i686/xpi/ja.xpi -> thunderbird-11.0-ja.xpi ) linguas_ko? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//11.0/linux-i686/xpi/ko.xpi -> thunderbird-11.0-ko.xpi ) linguas_lt? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//11.0/linux-i686/xpi/lt.xpi -> thunderbird-11.0-lt.xpi ) linguas_nb_NO? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//11.0/linux-i686/xpi/nb-NO.xpi -> thunderbird-11.0-nb-NO.xpi ) linguas_nl? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//11.0/linux-i686/xpi/nl.xpi -> thunderbird-11.0-nl.xpi ) linguas_nn_NO? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//11.0/linux-i686/xpi/nn-NO.xpi -> thunderbird-11.0-nn-NO.xpi ) linguas_pa_IN? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//11.0/linux-i686/xpi/pa-IN.xpi -> thunderbird-11.0-pa-IN.xpi ) linguas_pl? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//11.0/linux-i686/xpi/pl.xpi -> thunderbird-11.0-pl.xpi ) linguas_pt_BR? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//11.0/linux-i686/xpi/pt-BR.xpi -> thunderbird-11.0-pt-BR.xpi ) linguas_pt_PT? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//11.0/linux-i686/xpi/pt-PT.xpi -> thunderbird-11.0-pt-PT.xpi ) linguas_rm? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//11.0/linux-i686/xpi/rm.xpi -> thunderbird-11.0-rm.xpi ) linguas_ro? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//11.0/linux-i686/xpi/ro.xpi -> thunderbird-11.0-ro.xpi ) linguas_ru? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//11.0/linux-i686/xpi/ru.xpi -> thunderbird-11.0-ru.xpi ) linguas_si? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//11.0/linux-i686/xpi/si.xpi -> thunderbird-11.0-si.xpi ) linguas_sk? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//11.0/linux-i686/xpi/sk.xpi -> thunderbird-11.0-sk.xpi ) linguas_sl? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//11.0/linux-i686/xpi/sl.xpi -> thunderbird-11.0-sl.xpi ) linguas_sq? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//11.0/linux-i686/xpi/sq.xpi -> thunderbird-11.0-sq.xpi ) linguas_sr? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//11.0/linux-i686/xpi/sr.xpi -> thunderbird-11.0-sr.xpi ) linguas_sv_SE? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//11.0/linux-i686/xpi/sv-SE.xpi -> thunderbird-11.0-sv-SE.xpi ) linguas_ta_LK? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//11.0/linux-i686/xpi/ta-LK.xpi -> thunderbird-11.0-ta-LK.xpi ) linguas_tr? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//11.0/linux-i686/xpi/tr.xpi -> thunderbird-11.0-tr.xpi ) linguas_uk? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//11.0/linux-i686/xpi/uk.xpi -> thunderbird-11.0-uk.xpi ) linguas_vi? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//11.0/linux-i686/xpi/vi.xpi -> thunderbird-11.0-vi.xpi ) linguas_zh_CN? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//11.0/linux-i686/xpi/zh-CN.xpi -> thunderbird-11.0-zh-CN.xpi ) linguas_zh_TW? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//11.0/linux-i686/xpi/zh-TW.xpi -> thunderbird-11.0-zh-TW.xpi ) ftp://ftp.mozilla.org/pub/thunderbird/releases/11.0/source/thunderbird-11.0.source.tar.bz2 crypt? ( http://www.mozilla-enigmail.org/download/source/enigmail-1.4.tar.gz ) http://dev.gentoo.org/~anarchy/mozilla/patchsets/thunderbird-10.0-patches-0.1.tar.xz http://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-11.0-patches-0.1.tar.xz
diff --git a/metadata/cache/mail-client/thunderbird-3.1.12 b/metadata/cache/mail-client/thunderbird-3.1.12
index 6f5a9707cadc..e9ec4f7f28bb 100644
--- a/metadata/cache/mail-client/thunderbird-3.1.12
+++ b/metadata/cache/mail-client/thunderbird-3.1.12
@@ -1,4 +1,4 @@
->=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.12.8 >=dev-libs/nspr-4.8.6 >=app-text/hunspell-1.2 x11-libs/cairo[X] alsa? ( media-libs/alsa-lib ) gnome? ( >=gnome-base/gnome-vfs-2.16.3 >=gnome-base/libgnomeui-2.16.1 >=gnome-base/gconf-2.16.0 >=gnome-base/libgnome-2.16.0 ) libnotify? ( >=x11-libs/libnotify-0.4 ) system-sqlite? ( >=dev-db/sqlite-3.7.1[fts3,secure-delete,threadsafe] ) wifi? ( net-wireless/wireless-tools ) =dev-lang/python-2*[threads] x11-libs/libXrender x11-libs/libXt x11-libs/libXmu >=sys-libs/zlib-1.1.4 dev-util/pkgconfig =dev-lang/python-2*[threads] app-arch/zip app-arch/unzip >=app-text/hunspell-1.2 dev-libs/expat >=dev-libs/libIDL-0.8.0 >=dev-libs/libevent-1.4.7 >=x11-libs/cairo-1.8[X] >=x11-libs/gtk+-2.8.6:2 >=x11-libs/pango-1.10.1[X] virtual/jpeg virtual/freedesktop-icon-theme alsa? ( media-libs/alsa-lib ) dbus? ( >=dev-libs/dbus-glib-0.72 ) libnotify? ( >=x11-libs/libnotify-0.4 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) wifi? ( net-wireless/wireless-tools ) app-arch/unzip || ( >=sys-devel/automake-1.11.1 ) =sys-devel/autoconf-2.1* sys-devel/libtool
+>=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.12.8 >=dev-libs/nspr-4.8.6 >=app-text/hunspell-1.2 x11-libs/cairo[X] alsa? ( media-libs/alsa-lib ) gnome? ( >=gnome-base/gnome-vfs-2.16.3 >=gnome-base/libgnomeui-2.16.1 >=gnome-base/gconf-2.16.0 >=gnome-base/libgnome-2.16.0 ) libnotify? ( >=x11-libs/libnotify-0.4 ) system-sqlite? ( >=dev-db/sqlite-3.7.1[fts3,secure-delete,threadsafe] ) wifi? ( net-wireless/wireless-tools ) =dev-lang/python-2*[threads] x11-libs/libXrender x11-libs/libXt x11-libs/libXmu >=sys-libs/zlib-1.1.4 dev-util/pkgconfig =dev-lang/python-2*[threads] app-arch/zip app-arch/unzip >=app-text/hunspell-1.2 dev-libs/expat >=dev-libs/libIDL-0.8.0 >=dev-libs/libevent-1.4.7 >=x11-libs/cairo-1.8[X] >=x11-libs/gtk+-2.8.6:2 >=x11-libs/pango-1.10.1[X] virtual/jpeg virtual/freedesktop-icon-theme alsa? ( media-libs/alsa-lib ) dbus? ( >=dev-libs/dbus-glib-0.72 ) libnotify? ( >=x11-libs/libnotify-0.4 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) wifi? ( net-wireless/wireless-tools ) app-arch/unzip || ( >=sys-devel/automake-1.11.1:1.11 ) =sys-devel/autoconf-2.1* sys-devel/libtool
 >=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.12.8 >=dev-libs/nspr-4.8.6 >=app-text/hunspell-1.2 x11-libs/cairo[X] alsa? ( media-libs/alsa-lib ) gnome? ( >=gnome-base/gnome-vfs-2.16.3 >=gnome-base/libgnomeui-2.16.1 >=gnome-base/gconf-2.16.0 >=gnome-base/libgnome-2.16.0 ) libnotify? ( >=x11-libs/libnotify-0.4 ) system-sqlite? ( >=dev-db/sqlite-3.7.1[fts3,secure-delete,threadsafe] ) wifi? ( net-wireless/wireless-tools ) x11-libs/libXrender x11-libs/libXt x11-libs/libXmu >=sys-libs/zlib-1.1.4 app-arch/zip app-arch/unzip >=app-text/hunspell-1.2 dev-libs/expat >=dev-libs/libIDL-0.8.0 >=dev-libs/libevent-1.4.7 >=x11-libs/cairo-1.8[X] >=x11-libs/gtk+-2.8.6:2 >=x11-libs/pango-1.10.1[X] virtual/jpeg virtual/freedesktop-icon-theme alsa? ( media-libs/alsa-lib ) dbus? ( >=dev-libs/dbus-glib-0.72 ) libnotify? ( >=x11-libs/libnotify-0.4 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) wifi? ( net-wireless/wireless-tools )
 0
 http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.12/source/thunderbird-3.1.12.source.tar.bz2 http://dev.gentoo.org/~anarchy/mozilla/patchsets/thunderbird-3.1-patches-1.2.tar.bz2 linguas_af? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.12/linux-i686/xpi/af.xpi -> thunderbird-3.1.12-af.xpi ) linguas_ar? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.12/linux-i686/xpi/ar.xpi -> thunderbird-3.1.12-ar.xpi ) linguas_be? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.12/linux-i686/xpi/be.xpi -> thunderbird-3.1.12-be.xpi ) linguas_bg? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.12/linux-i686/xpi/bg.xpi -> thunderbird-3.1.12-bg.xpi ) linguas_bn_BD? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.12/linux-i686/xpi/bn-BD.xpi -> thunderbird-3.1.12-bn-BD.xpi ) linguas_bn? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.12/linux-i686/xpi/bn-BD.xpi -> thunderbird-3.1.12-bn-BD.xpi ) linguas_ca? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.12/linux-i686/xpi/ca.xpi -> thunderbird-3.1.12-ca.xpi ) linguas_cs? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.12/linux-i686/xpi/cs.xpi -> thunderbird-3.1.12-cs.xpi ) linguas_da? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.12/linux-i686/xpi/da.xpi -> thunderbird-3.1.12-da.xpi ) linguas_de? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.12/linux-i686/xpi/de.xpi -> thunderbird-3.1.12-de.xpi ) linguas_el? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.12/linux-i686/xpi/el.xpi -> thunderbird-3.1.12-el.xpi ) linguas_en_GB? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.12/linux-i686/xpi/en-GB.xpi -> thunderbird-3.1.12-en-GB.xpi ) linguas_es_AR? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.12/linux-i686/xpi/es-AR.xpi -> thunderbird-3.1.12-es-AR.xpi ) linguas_es_ES? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.12/linux-i686/xpi/es-ES.xpi -> thunderbird-3.1.12-es-ES.xpi ) linguas_es? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.12/linux-i686/xpi/es-ES.xpi -> thunderbird-3.1.12-es-ES.xpi ) linguas_et? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.12/linux-i686/xpi/et.xpi -> thunderbird-3.1.12-et.xpi ) linguas_eu? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.12/linux-i686/xpi/eu.xpi -> thunderbird-3.1.12-eu.xpi ) linguas_fi? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.12/linux-i686/xpi/fi.xpi -> thunderbird-3.1.12-fi.xpi ) linguas_fr? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.12/linux-i686/xpi/fr.xpi -> thunderbird-3.1.12-fr.xpi ) linguas_fy_NL? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.12/linux-i686/xpi/fy-NL.xpi -> thunderbird-3.1.12-fy-NL.xpi ) linguas_fy? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.12/linux-i686/xpi/fy-NL.xpi -> thunderbird-3.1.12-fy-NL.xpi ) linguas_ga_IE? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.12/linux-i686/xpi/ga-IE.xpi -> thunderbird-3.1.12-ga-IE.xpi ) linguas_ga? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.12/linux-i686/xpi/ga-IE.xpi -> thunderbird-3.1.12-ga-IE.xpi ) linguas_he? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.12/linux-i686/xpi/he.xpi -> thunderbird-3.1.12-he.xpi ) linguas_hu? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.12/linux-i686/xpi/hu.xpi -> thunderbird-3.1.12-hu.xpi ) linguas_id? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.12/linux-i686/xpi/id.xpi -> thunderbird-3.1.12-id.xpi ) linguas_is? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.12/linux-i686/xpi/is.xpi -> thunderbird-3.1.12-is.xpi ) linguas_it? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.12/linux-i686/xpi/it.xpi -> thunderbird-3.1.12-it.xpi ) linguas_ja? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.12/linux-i686/xpi/ja.xpi -> thunderbird-3.1.12-ja.xpi ) linguas_ko? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.12/linux-i686/xpi/ko.xpi -> thunderbird-3.1.12-ko.xpi ) linguas_lt? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.12/linux-i686/xpi/lt.xpi -> thunderbird-3.1.12-lt.xpi ) linguas_nb_NO? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.12/linux-i686/xpi/nb-NO.xpi -> thunderbird-3.1.12-nb-NO.xpi ) linguas_nb? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.12/linux-i686/xpi/nb-NO.xpi -> thunderbird-3.1.12-nb-NO.xpi ) linguas_nl? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.12/linux-i686/xpi/nl.xpi -> thunderbird-3.1.12-nl.xpi ) linguas_nn_NO? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.12/linux-i686/xpi/nn-NO.xpi -> thunderbird-3.1.12-nn-NO.xpi ) linguas_nn? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.12/linux-i686/xpi/nn-NO.xpi -> thunderbird-3.1.12-nn-NO.xpi ) linguas_pa_IN? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.12/linux-i686/xpi/pa-IN.xpi -> thunderbird-3.1.12-pa-IN.xpi ) linguas_pa? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.12/linux-i686/xpi/pa-IN.xpi -> thunderbird-3.1.12-pa-IN.xpi ) linguas_pl? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.12/linux-i686/xpi/pl.xpi -> thunderbird-3.1.12-pl.xpi ) linguas_pt_BR? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.12/linux-i686/xpi/pt-BR.xpi -> thunderbird-3.1.12-pt-BR.xpi ) linguas_pt_PT? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.12/linux-i686/xpi/pt-PT.xpi -> thunderbird-3.1.12-pt-PT.xpi ) linguas_pt? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.12/linux-i686/xpi/pt-PT.xpi -> thunderbird-3.1.12-pt-PT.xpi ) linguas_ro? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.12/linux-i686/xpi/ro.xpi -> thunderbird-3.1.12-ro.xpi ) linguas_ru? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.12/linux-i686/xpi/ru.xpi -> thunderbird-3.1.12-ru.xpi ) linguas_si? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.12/linux-i686/xpi/si.xpi -> thunderbird-3.1.12-si.xpi ) linguas_sk? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.12/linux-i686/xpi/sk.xpi -> thunderbird-3.1.12-sk.xpi ) linguas_sl? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.12/linux-i686/xpi/sl.xpi -> thunderbird-3.1.12-sl.xpi ) linguas_sq? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.12/linux-i686/xpi/sq.xpi -> thunderbird-3.1.12-sq.xpi ) linguas_sv_SE? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.12/linux-i686/xpi/sv-SE.xpi -> thunderbird-3.1.12-sv-SE.xpi ) linguas_sv? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.12/linux-i686/xpi/sv-SE.xpi -> thunderbird-3.1.12-sv-SE.xpi ) linguas_tr? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.12/linux-i686/xpi/tr.xpi -> thunderbird-3.1.12-tr.xpi ) linguas_uk? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.12/linux-i686/xpi/uk.xpi -> thunderbird-3.1.12-uk.xpi ) linguas_zh_CN? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.12/linux-i686/xpi/zh-CN.xpi -> thunderbird-3.1.12-zh-CN.xpi ) linguas_zh? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.12/linux-i686/xpi/zh-CN.xpi -> thunderbird-3.1.12-zh-CN.xpi ) linguas_zh_TW? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.12/linux-i686/xpi/zh-TW.xpi -> thunderbird-3.1.12-zh-TW.xpi )
diff --git a/metadata/cache/mail-client/thunderbird-3.1.13 b/metadata/cache/mail-client/thunderbird-3.1.13
index 96c6e8a67888..2bc84df79070 100644
--- a/metadata/cache/mail-client/thunderbird-3.1.13
+++ b/metadata/cache/mail-client/thunderbird-3.1.13
@@ -1,4 +1,4 @@
->=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.12.8 >=dev-libs/nspr-4.8.6 >=app-text/hunspell-1.2 x11-libs/cairo[X] alsa? ( media-libs/alsa-lib ) gnome? ( >=gnome-base/gnome-vfs-2.16.3 >=gnome-base/libgnomeui-2.16.1 >=gnome-base/gconf-2.16.0 >=gnome-base/libgnome-2.16.0 ) libnotify? ( >=x11-libs/libnotify-0.4 ) system-sqlite? ( >=dev-db/sqlite-3.7.1[fts3,secure-delete,threadsafe] ) wifi? ( net-wireless/wireless-tools ) =dev-lang/python-2*[threads] x11-libs/libXrender x11-libs/libXt x11-libs/libXmu >=sys-libs/zlib-1.1.4 dev-util/pkgconfig =dev-lang/python-2*[threads] app-arch/zip app-arch/unzip >=app-text/hunspell-1.2 dev-libs/expat >=dev-libs/libIDL-0.8.0 >=dev-libs/libevent-1.4.7 >=x11-libs/cairo-1.8[X] >=x11-libs/gtk+-2.8.6:2 >=x11-libs/pango-1.10.1[X] virtual/jpeg virtual/freedesktop-icon-theme alsa? ( media-libs/alsa-lib ) dbus? ( >=dev-libs/dbus-glib-0.72 ) libnotify? ( >=x11-libs/libnotify-0.4 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) wifi? ( net-wireless/wireless-tools ) app-arch/unzip || ( >=sys-devel/automake-1.11.1 ) =sys-devel/autoconf-2.1* sys-devel/libtool
+>=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.12.8 >=dev-libs/nspr-4.8.6 >=app-text/hunspell-1.2 x11-libs/cairo[X] alsa? ( media-libs/alsa-lib ) gnome? ( >=gnome-base/gnome-vfs-2.16.3 >=gnome-base/libgnomeui-2.16.1 >=gnome-base/gconf-2.16.0 >=gnome-base/libgnome-2.16.0 ) libnotify? ( >=x11-libs/libnotify-0.4 ) system-sqlite? ( >=dev-db/sqlite-3.7.1[fts3,secure-delete,threadsafe] ) wifi? ( net-wireless/wireless-tools ) =dev-lang/python-2*[threads] x11-libs/libXrender x11-libs/libXt x11-libs/libXmu >=sys-libs/zlib-1.1.4 dev-util/pkgconfig =dev-lang/python-2*[threads] app-arch/zip app-arch/unzip >=app-text/hunspell-1.2 dev-libs/expat >=dev-libs/libIDL-0.8.0 >=dev-libs/libevent-1.4.7 >=x11-libs/cairo-1.8[X] >=x11-libs/gtk+-2.8.6:2 >=x11-libs/pango-1.10.1[X] virtual/jpeg virtual/freedesktop-icon-theme alsa? ( media-libs/alsa-lib ) dbus? ( >=dev-libs/dbus-glib-0.72 ) libnotify? ( >=x11-libs/libnotify-0.4 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) wifi? ( net-wireless/wireless-tools ) app-arch/unzip || ( >=sys-devel/automake-1.11.1:1.11 ) =sys-devel/autoconf-2.1* sys-devel/libtool
 >=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.12.8 >=dev-libs/nspr-4.8.6 >=app-text/hunspell-1.2 x11-libs/cairo[X] alsa? ( media-libs/alsa-lib ) gnome? ( >=gnome-base/gnome-vfs-2.16.3 >=gnome-base/libgnomeui-2.16.1 >=gnome-base/gconf-2.16.0 >=gnome-base/libgnome-2.16.0 ) libnotify? ( >=x11-libs/libnotify-0.4 ) system-sqlite? ( >=dev-db/sqlite-3.7.1[fts3,secure-delete,threadsafe] ) wifi? ( net-wireless/wireless-tools ) x11-libs/libXrender x11-libs/libXt x11-libs/libXmu >=sys-libs/zlib-1.1.4 app-arch/zip app-arch/unzip >=app-text/hunspell-1.2 dev-libs/expat >=dev-libs/libIDL-0.8.0 >=dev-libs/libevent-1.4.7 >=x11-libs/cairo-1.8[X] >=x11-libs/gtk+-2.8.6:2 >=x11-libs/pango-1.10.1[X] virtual/jpeg virtual/freedesktop-icon-theme alsa? ( media-libs/alsa-lib ) dbus? ( >=dev-libs/dbus-glib-0.72 ) libnotify? ( >=x11-libs/libnotify-0.4 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) wifi? ( net-wireless/wireless-tools )
 0
 http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.13/source/thunderbird-3.1.13.source.tar.bz2 http://dev.gentoo.org/~anarchy/mozilla/patchsets/thunderbird-3.1-patches-1.2.tar.bz2 linguas_af? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.13/linux-i686/xpi/af.xpi -> thunderbird-3.1.13-af.xpi ) linguas_ar? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.13/linux-i686/xpi/ar.xpi -> thunderbird-3.1.13-ar.xpi ) linguas_be? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.13/linux-i686/xpi/be.xpi -> thunderbird-3.1.13-be.xpi ) linguas_bg? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.13/linux-i686/xpi/bg.xpi -> thunderbird-3.1.13-bg.xpi ) linguas_bn_BD? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.13/linux-i686/xpi/bn-BD.xpi -> thunderbird-3.1.13-bn-BD.xpi ) linguas_bn? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.13/linux-i686/xpi/bn-BD.xpi -> thunderbird-3.1.13-bn-BD.xpi ) linguas_ca? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.13/linux-i686/xpi/ca.xpi -> thunderbird-3.1.13-ca.xpi ) linguas_cs? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.13/linux-i686/xpi/cs.xpi -> thunderbird-3.1.13-cs.xpi ) linguas_da? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.13/linux-i686/xpi/da.xpi -> thunderbird-3.1.13-da.xpi ) linguas_de? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.13/linux-i686/xpi/de.xpi -> thunderbird-3.1.13-de.xpi ) linguas_el? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.13/linux-i686/xpi/el.xpi -> thunderbird-3.1.13-el.xpi ) linguas_en_GB? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.13/linux-i686/xpi/en-GB.xpi -> thunderbird-3.1.13-en-GB.xpi ) linguas_es_AR? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.13/linux-i686/xpi/es-AR.xpi -> thunderbird-3.1.13-es-AR.xpi ) linguas_es_ES? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.13/linux-i686/xpi/es-ES.xpi -> thunderbird-3.1.13-es-ES.xpi ) linguas_es? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.13/linux-i686/xpi/es-ES.xpi -> thunderbird-3.1.13-es-ES.xpi ) linguas_et? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.13/linux-i686/xpi/et.xpi -> thunderbird-3.1.13-et.xpi ) linguas_eu? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.13/linux-i686/xpi/eu.xpi -> thunderbird-3.1.13-eu.xpi ) linguas_fi? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.13/linux-i686/xpi/fi.xpi -> thunderbird-3.1.13-fi.xpi ) linguas_fr? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.13/linux-i686/xpi/fr.xpi -> thunderbird-3.1.13-fr.xpi ) linguas_fy_NL? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.13/linux-i686/xpi/fy-NL.xpi -> thunderbird-3.1.13-fy-NL.xpi ) linguas_fy? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.13/linux-i686/xpi/fy-NL.xpi -> thunderbird-3.1.13-fy-NL.xpi ) linguas_ga_IE? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.13/linux-i686/xpi/ga-IE.xpi -> thunderbird-3.1.13-ga-IE.xpi ) linguas_ga? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.13/linux-i686/xpi/ga-IE.xpi -> thunderbird-3.1.13-ga-IE.xpi ) linguas_he? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.13/linux-i686/xpi/he.xpi -> thunderbird-3.1.13-he.xpi ) linguas_hu? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.13/linux-i686/xpi/hu.xpi -> thunderbird-3.1.13-hu.xpi ) linguas_id? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.13/linux-i686/xpi/id.xpi -> thunderbird-3.1.13-id.xpi ) linguas_is? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.13/linux-i686/xpi/is.xpi -> thunderbird-3.1.13-is.xpi ) linguas_it? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.13/linux-i686/xpi/it.xpi -> thunderbird-3.1.13-it.xpi ) linguas_ja? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.13/linux-i686/xpi/ja.xpi -> thunderbird-3.1.13-ja.xpi ) linguas_ko? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.13/linux-i686/xpi/ko.xpi -> thunderbird-3.1.13-ko.xpi ) linguas_lt? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.13/linux-i686/xpi/lt.xpi -> thunderbird-3.1.13-lt.xpi ) linguas_nb_NO? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.13/linux-i686/xpi/nb-NO.xpi -> thunderbird-3.1.13-nb-NO.xpi ) linguas_nb? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.13/linux-i686/xpi/nb-NO.xpi -> thunderbird-3.1.13-nb-NO.xpi ) linguas_nl? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.13/linux-i686/xpi/nl.xpi -> thunderbird-3.1.13-nl.xpi ) linguas_nn_NO? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.13/linux-i686/xpi/nn-NO.xpi -> thunderbird-3.1.13-nn-NO.xpi ) linguas_nn? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.13/linux-i686/xpi/nn-NO.xpi -> thunderbird-3.1.13-nn-NO.xpi ) linguas_pa_IN? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.13/linux-i686/xpi/pa-IN.xpi -> thunderbird-3.1.13-pa-IN.xpi ) linguas_pa? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.13/linux-i686/xpi/pa-IN.xpi -> thunderbird-3.1.13-pa-IN.xpi ) linguas_pl? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.13/linux-i686/xpi/pl.xpi -> thunderbird-3.1.13-pl.xpi ) linguas_pt_BR? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.13/linux-i686/xpi/pt-BR.xpi -> thunderbird-3.1.13-pt-BR.xpi ) linguas_pt_PT? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.13/linux-i686/xpi/pt-PT.xpi -> thunderbird-3.1.13-pt-PT.xpi ) linguas_pt? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.13/linux-i686/xpi/pt-PT.xpi -> thunderbird-3.1.13-pt-PT.xpi ) linguas_ro? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.13/linux-i686/xpi/ro.xpi -> thunderbird-3.1.13-ro.xpi ) linguas_ru? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.13/linux-i686/xpi/ru.xpi -> thunderbird-3.1.13-ru.xpi ) linguas_si? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.13/linux-i686/xpi/si.xpi -> thunderbird-3.1.13-si.xpi ) linguas_sk? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.13/linux-i686/xpi/sk.xpi -> thunderbird-3.1.13-sk.xpi ) linguas_sl? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.13/linux-i686/xpi/sl.xpi -> thunderbird-3.1.13-sl.xpi ) linguas_sq? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.13/linux-i686/xpi/sq.xpi -> thunderbird-3.1.13-sq.xpi ) linguas_sv_SE? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.13/linux-i686/xpi/sv-SE.xpi -> thunderbird-3.1.13-sv-SE.xpi ) linguas_sv? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.13/linux-i686/xpi/sv-SE.xpi -> thunderbird-3.1.13-sv-SE.xpi ) linguas_tr? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.13/linux-i686/xpi/tr.xpi -> thunderbird-3.1.13-tr.xpi ) linguas_uk? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.13/linux-i686/xpi/uk.xpi -> thunderbird-3.1.13-uk.xpi ) linguas_zh_CN? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.13/linux-i686/xpi/zh-CN.xpi -> thunderbird-3.1.13-zh-CN.xpi ) linguas_zh? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.13/linux-i686/xpi/zh-CN.xpi -> thunderbird-3.1.13-zh-CN.xpi ) linguas_zh_TW? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.13/linux-i686/xpi/zh-TW.xpi -> thunderbird-3.1.13-zh-TW.xpi )
diff --git a/metadata/cache/mail-client/thunderbird-3.1.14 b/metadata/cache/mail-client/thunderbird-3.1.14
index 9ca958b2c6c4..7ae86b70657b 100644
--- a/metadata/cache/mail-client/thunderbird-3.1.14
+++ b/metadata/cache/mail-client/thunderbird-3.1.14
@@ -1,4 +1,4 @@
->=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.12.8 >=dev-libs/nspr-4.8.6 >=app-text/hunspell-1.2 x11-libs/cairo[X] alsa? ( media-libs/alsa-lib ) gnome? ( >=gnome-base/gnome-vfs-2.16.3 >=gnome-base/libgnomeui-2.16.1 >=gnome-base/gconf-2.16.0 >=gnome-base/libgnome-2.16.0 ) libnotify? ( >=x11-libs/libnotify-0.4 ) system-sqlite? ( >=dev-db/sqlite-3.7.1[fts3,secure-delete,threadsafe] ) wifi? ( net-wireless/wireless-tools ) =dev-lang/python-2*[threads] x11-libs/libXrender x11-libs/libXt x11-libs/libXmu >=sys-libs/zlib-1.1.4 dev-util/pkgconfig =dev-lang/python-2*[threads] app-arch/zip app-arch/unzip >=app-text/hunspell-1.2 dev-libs/expat >=dev-libs/libIDL-0.8.0 >=dev-libs/libevent-1.4.7 >=x11-libs/cairo-1.8[X] >=x11-libs/gtk+-2.8.6:2 >=x11-libs/pango-1.10.1[X] virtual/jpeg virtual/freedesktop-icon-theme alsa? ( media-libs/alsa-lib ) dbus? ( >=dev-libs/dbus-glib-0.72 ) libnotify? ( >=x11-libs/libnotify-0.4 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) wifi? ( net-wireless/wireless-tools ) app-arch/unzip || ( >=sys-devel/automake-1.11.1 ) =sys-devel/autoconf-2.1* sys-devel/libtool
+>=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.12.8 >=dev-libs/nspr-4.8.6 >=app-text/hunspell-1.2 x11-libs/cairo[X] alsa? ( media-libs/alsa-lib ) gnome? ( >=gnome-base/gnome-vfs-2.16.3 >=gnome-base/libgnomeui-2.16.1 >=gnome-base/gconf-2.16.0 >=gnome-base/libgnome-2.16.0 ) libnotify? ( >=x11-libs/libnotify-0.4 ) system-sqlite? ( >=dev-db/sqlite-3.7.1[fts3,secure-delete,threadsafe] ) wifi? ( net-wireless/wireless-tools ) =dev-lang/python-2*[threads] x11-libs/libXrender x11-libs/libXt x11-libs/libXmu >=sys-libs/zlib-1.1.4 dev-util/pkgconfig =dev-lang/python-2*[threads] app-arch/zip app-arch/unzip >=app-text/hunspell-1.2 dev-libs/expat >=dev-libs/libIDL-0.8.0 >=dev-libs/libevent-1.4.7 >=x11-libs/cairo-1.8[X] >=x11-libs/gtk+-2.8.6:2 >=x11-libs/pango-1.10.1[X] virtual/jpeg virtual/freedesktop-icon-theme alsa? ( media-libs/alsa-lib ) dbus? ( >=dev-libs/dbus-glib-0.72 ) libnotify? ( >=x11-libs/libnotify-0.4 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) wifi? ( net-wireless/wireless-tools ) app-arch/unzip || ( >=sys-devel/automake-1.11.1:1.11 ) =sys-devel/autoconf-2.1* sys-devel/libtool
 >=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.12.8 >=dev-libs/nspr-4.8.6 >=app-text/hunspell-1.2 x11-libs/cairo[X] alsa? ( media-libs/alsa-lib ) gnome? ( >=gnome-base/gnome-vfs-2.16.3 >=gnome-base/libgnomeui-2.16.1 >=gnome-base/gconf-2.16.0 >=gnome-base/libgnome-2.16.0 ) libnotify? ( >=x11-libs/libnotify-0.4 ) system-sqlite? ( >=dev-db/sqlite-3.7.1[fts3,secure-delete,threadsafe] ) wifi? ( net-wireless/wireless-tools ) x11-libs/libXrender x11-libs/libXt x11-libs/libXmu >=sys-libs/zlib-1.1.4 app-arch/zip app-arch/unzip >=app-text/hunspell-1.2 dev-libs/expat >=dev-libs/libIDL-0.8.0 >=dev-libs/libevent-1.4.7 >=x11-libs/cairo-1.8[X] >=x11-libs/gtk+-2.8.6:2 >=x11-libs/pango-1.10.1[X] virtual/jpeg virtual/freedesktop-icon-theme alsa? ( media-libs/alsa-lib ) dbus? ( >=dev-libs/dbus-glib-0.72 ) libnotify? ( >=x11-libs/libnotify-0.4 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) wifi? ( net-wireless/wireless-tools )
 0
 http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.14/source/thunderbird-3.1.14.source.tar.bz2 http://dev.gentoo.org/~anarchy/mozilla/patchsets/thunderbird-3.1-patches-1.2.tar.bz2 linguas_af? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.14/linux-i686/xpi/af.xpi -> thunderbird-3.1.14-af.xpi ) linguas_ar? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.14/linux-i686/xpi/ar.xpi -> thunderbird-3.1.14-ar.xpi ) linguas_be? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.14/linux-i686/xpi/be.xpi -> thunderbird-3.1.14-be.xpi ) linguas_bg? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.14/linux-i686/xpi/bg.xpi -> thunderbird-3.1.14-bg.xpi ) linguas_bn_BD? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.14/linux-i686/xpi/bn-BD.xpi -> thunderbird-3.1.14-bn-BD.xpi ) linguas_bn? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.14/linux-i686/xpi/bn-BD.xpi -> thunderbird-3.1.14-bn-BD.xpi ) linguas_ca? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.14/linux-i686/xpi/ca.xpi -> thunderbird-3.1.14-ca.xpi ) linguas_cs? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.14/linux-i686/xpi/cs.xpi -> thunderbird-3.1.14-cs.xpi ) linguas_da? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.14/linux-i686/xpi/da.xpi -> thunderbird-3.1.14-da.xpi ) linguas_de? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.14/linux-i686/xpi/de.xpi -> thunderbird-3.1.14-de.xpi ) linguas_el? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.14/linux-i686/xpi/el.xpi -> thunderbird-3.1.14-el.xpi ) linguas_en_GB? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.14/linux-i686/xpi/en-GB.xpi -> thunderbird-3.1.14-en-GB.xpi ) linguas_es_AR? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.14/linux-i686/xpi/es-AR.xpi -> thunderbird-3.1.14-es-AR.xpi ) linguas_es_ES? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.14/linux-i686/xpi/es-ES.xpi -> thunderbird-3.1.14-es-ES.xpi ) linguas_es? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.14/linux-i686/xpi/es-ES.xpi -> thunderbird-3.1.14-es-ES.xpi ) linguas_et? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.14/linux-i686/xpi/et.xpi -> thunderbird-3.1.14-et.xpi ) linguas_eu? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.14/linux-i686/xpi/eu.xpi -> thunderbird-3.1.14-eu.xpi ) linguas_fi? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.14/linux-i686/xpi/fi.xpi -> thunderbird-3.1.14-fi.xpi ) linguas_fr? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.14/linux-i686/xpi/fr.xpi -> thunderbird-3.1.14-fr.xpi ) linguas_fy_NL? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.14/linux-i686/xpi/fy-NL.xpi -> thunderbird-3.1.14-fy-NL.xpi ) linguas_fy? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.14/linux-i686/xpi/fy-NL.xpi -> thunderbird-3.1.14-fy-NL.xpi ) linguas_ga_IE? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.14/linux-i686/xpi/ga-IE.xpi -> thunderbird-3.1.14-ga-IE.xpi ) linguas_ga? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.14/linux-i686/xpi/ga-IE.xpi -> thunderbird-3.1.14-ga-IE.xpi ) linguas_he? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.14/linux-i686/xpi/he.xpi -> thunderbird-3.1.14-he.xpi ) linguas_hu? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.14/linux-i686/xpi/hu.xpi -> thunderbird-3.1.14-hu.xpi ) linguas_id? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.14/linux-i686/xpi/id.xpi -> thunderbird-3.1.14-id.xpi ) linguas_is? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.14/linux-i686/xpi/is.xpi -> thunderbird-3.1.14-is.xpi ) linguas_it? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.14/linux-i686/xpi/it.xpi -> thunderbird-3.1.14-it.xpi ) linguas_ja? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.14/linux-i686/xpi/ja.xpi -> thunderbird-3.1.14-ja.xpi ) linguas_ko? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.14/linux-i686/xpi/ko.xpi -> thunderbird-3.1.14-ko.xpi ) linguas_lt? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.14/linux-i686/xpi/lt.xpi -> thunderbird-3.1.14-lt.xpi ) linguas_nb_NO? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.14/linux-i686/xpi/nb-NO.xpi -> thunderbird-3.1.14-nb-NO.xpi ) linguas_nb? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.14/linux-i686/xpi/nb-NO.xpi -> thunderbird-3.1.14-nb-NO.xpi ) linguas_nl? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.14/linux-i686/xpi/nl.xpi -> thunderbird-3.1.14-nl.xpi ) linguas_nn_NO? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.14/linux-i686/xpi/nn-NO.xpi -> thunderbird-3.1.14-nn-NO.xpi ) linguas_nn? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.14/linux-i686/xpi/nn-NO.xpi -> thunderbird-3.1.14-nn-NO.xpi ) linguas_pa_IN? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.14/linux-i686/xpi/pa-IN.xpi -> thunderbird-3.1.14-pa-IN.xpi ) linguas_pa? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.14/linux-i686/xpi/pa-IN.xpi -> thunderbird-3.1.14-pa-IN.xpi ) linguas_pl? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.14/linux-i686/xpi/pl.xpi -> thunderbird-3.1.14-pl.xpi ) linguas_pt_BR? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.14/linux-i686/xpi/pt-BR.xpi -> thunderbird-3.1.14-pt-BR.xpi ) linguas_pt_PT? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.14/linux-i686/xpi/pt-PT.xpi -> thunderbird-3.1.14-pt-PT.xpi ) linguas_pt? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.14/linux-i686/xpi/pt-PT.xpi -> thunderbird-3.1.14-pt-PT.xpi ) linguas_ro? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.14/linux-i686/xpi/ro.xpi -> thunderbird-3.1.14-ro.xpi ) linguas_ru? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.14/linux-i686/xpi/ru.xpi -> thunderbird-3.1.14-ru.xpi ) linguas_si? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.14/linux-i686/xpi/si.xpi -> thunderbird-3.1.14-si.xpi ) linguas_sk? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.14/linux-i686/xpi/sk.xpi -> thunderbird-3.1.14-sk.xpi ) linguas_sl? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.14/linux-i686/xpi/sl.xpi -> thunderbird-3.1.14-sl.xpi ) linguas_sq? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.14/linux-i686/xpi/sq.xpi -> thunderbird-3.1.14-sq.xpi ) linguas_sv_SE? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.14/linux-i686/xpi/sv-SE.xpi -> thunderbird-3.1.14-sv-SE.xpi ) linguas_sv? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.14/linux-i686/xpi/sv-SE.xpi -> thunderbird-3.1.14-sv-SE.xpi ) linguas_tr? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.14/linux-i686/xpi/tr.xpi -> thunderbird-3.1.14-tr.xpi ) linguas_uk? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.14/linux-i686/xpi/uk.xpi -> thunderbird-3.1.14-uk.xpi ) linguas_zh_CN? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.14/linux-i686/xpi/zh-CN.xpi -> thunderbird-3.1.14-zh-CN.xpi ) linguas_zh? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.14/linux-i686/xpi/zh-CN.xpi -> thunderbird-3.1.14-zh-CN.xpi ) linguas_zh_TW? ( http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.14/linux-i686/xpi/zh-TW.xpi -> thunderbird-3.1.14-zh-TW.xpi )
diff --git a/metadata/cache/mail-client/thunderbird-7.0.1-r1 b/metadata/cache/mail-client/thunderbird-7.0.1-r1
index 130fdf39a2bb..40116cce62ed 100644
--- a/metadata/cache/mail-client/thunderbird-7.0.1-r1
+++ b/metadata/cache/mail-client/thunderbird-7.0.1-r1
@@ -1,4 +1,4 @@
->=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.12.10 >=dev-libs/nspr-4.8.8 gconf? ( >=gnome-base/gconf-1.2.1:2 ) media-libs/libpng[apng] virtual/libffi !x11-plugins/enigmail system-sqlite? ( >=dev-db/sqlite-3.7.5[fts3,secure-delete,unlock-notify,debug=] ) crypt? ( || ( ( >=app-crypt/gnupg-2.0 || ( app-crypt/pinentry[gtk] app-crypt/pinentry[qt4] ) ) =app-crypt/gnupg-1.4* ) ) x11-libs/libXrender x11-libs/libXt x11-libs/libXmu >=sys-libs/zlib-1.1.4 dev-util/pkgconfig =dev-lang/python-2*[threads] app-arch/zip app-arch/unzip >=app-text/hunspell-1.2 dev-libs/expat >=dev-libs/libIDL-0.8.0 >=dev-libs/libevent-1.4.7 >=x11-libs/cairo-1.8[X] >=x11-libs/gtk+-2.8.6:2 >=x11-libs/pango-1.10.1[X] virtual/jpeg virtual/freedesktop-icon-theme alsa? ( media-libs/alsa-lib ) dbus? ( >=dev-libs/dbus-glib-0.72 ) libnotify? ( >=x11-libs/libnotify-0.4 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) wifi? ( net-wireless/wireless-tools ) app-arch/unzip || ( >=sys-devel/automake-1.11.1 ) =sys-devel/autoconf-2.1* sys-devel/libtool
+>=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.12.10 >=dev-libs/nspr-4.8.8 gconf? ( >=gnome-base/gconf-1.2.1:2 ) media-libs/libpng[apng] virtual/libffi !x11-plugins/enigmail system-sqlite? ( >=dev-db/sqlite-3.7.5[fts3,secure-delete,unlock-notify,debug=] ) crypt? ( || ( ( >=app-crypt/gnupg-2.0 || ( app-crypt/pinentry[gtk] app-crypt/pinentry[qt4] ) ) =app-crypt/gnupg-1.4* ) ) x11-libs/libXrender x11-libs/libXt x11-libs/libXmu >=sys-libs/zlib-1.1.4 dev-util/pkgconfig =dev-lang/python-2*[threads] app-arch/zip app-arch/unzip >=app-text/hunspell-1.2 dev-libs/expat >=dev-libs/libIDL-0.8.0 >=dev-libs/libevent-1.4.7 >=x11-libs/cairo-1.8[X] >=x11-libs/gtk+-2.8.6:2 >=x11-libs/pango-1.10.1[X] virtual/jpeg virtual/freedesktop-icon-theme alsa? ( media-libs/alsa-lib ) dbus? ( >=dev-libs/dbus-glib-0.72 ) libnotify? ( >=x11-libs/libnotify-0.4 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) wifi? ( net-wireless/wireless-tools ) app-arch/unzip || ( >=sys-devel/automake-1.11.1:1.11 ) =sys-devel/autoconf-2.1* sys-devel/libtool
 >=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.12.10 >=dev-libs/nspr-4.8.8 gconf? ( >=gnome-base/gconf-1.2.1:2 ) media-libs/libpng[apng] virtual/libffi !x11-plugins/enigmail system-sqlite? ( >=dev-db/sqlite-3.7.5[fts3,secure-delete,unlock-notify,debug=] ) crypt? ( || ( ( >=app-crypt/gnupg-2.0 || ( app-crypt/pinentry[gtk] app-crypt/pinentry[qt4] ) ) =app-crypt/gnupg-1.4* ) ) x11-libs/libXrender x11-libs/libXt x11-libs/libXmu >=sys-libs/zlib-1.1.4 app-arch/zip app-arch/unzip >=app-text/hunspell-1.2 dev-libs/expat >=dev-libs/libIDL-0.8.0 >=dev-libs/libevent-1.4.7 >=x11-libs/cairo-1.8[X] >=x11-libs/gtk+-2.8.6:2 >=x11-libs/pango-1.10.1[X] virtual/jpeg virtual/freedesktop-icon-theme alsa? ( media-libs/alsa-lib ) dbus? ( >=dev-libs/dbus-glib-0.72 ) libnotify? ( >=x11-libs/libnotify-0.4 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) wifi? ( net-wireless/wireless-tools )
 0
 ftp://ftp.mozilla.org/pub/thunderbird/releases//7.0.1/source/thunderbird-7.0.1.source.tar.bz2 crypt? ( http://www.mozilla-enigmail.org/download/source/enigmail-1.3.2.tar.gz ) http://dev.gentoo.org/~anarchy/mozilla/patchsets/thunderbird-7.0-patches-0.4.tar.xz http://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-7.0-patches-0.5.tar.xz linguas_ar? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//7.0.1/linux-i686/xpi/ar.xpi -> thunderbird-7.0.1-ar.xpi ) linguas_ca? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//7.0.1/linux-i686/xpi/ca.xpi -> thunderbird-7.0.1-ca.xpi ) linguas_cs? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//7.0.1/linux-i686/xpi/cs.xpi -> thunderbird-7.0.1-cs.xpi ) linguas_da? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//7.0.1/linux-i686/xpi/da.xpi -> thunderbird-7.0.1-da.xpi ) linguas_de? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//7.0.1/linux-i686/xpi/de.xpi -> thunderbird-7.0.1-de.xpi ) linguas_en_GB? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//7.0.1/linux-i686/xpi/en-GB.xpi -> thunderbird-7.0.1-en-GB.xpi ) linguas_es_AR? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//7.0.1/linux-i686/xpi/es-AR.xpi -> thunderbird-7.0.1-es-AR.xpi ) linguas_es_ES? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//7.0.1/linux-i686/xpi/es-ES.xpi -> thunderbird-7.0.1-es-ES.xpi ) linguas_es? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//7.0.1/linux-i686/xpi/es-ES.xpi -> thunderbird-7.0.1-es-ES.xpi ) linguas_et? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//7.0.1/linux-i686/xpi/et.xpi -> thunderbird-7.0.1-et.xpi ) linguas_eu? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//7.0.1/linux-i686/xpi/eu.xpi -> thunderbird-7.0.1-eu.xpi ) linguas_fi? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//7.0.1/linux-i686/xpi/fi.xpi -> thunderbird-7.0.1-fi.xpi ) linguas_fr? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//7.0.1/linux-i686/xpi/fr.xpi -> thunderbird-7.0.1-fr.xpi ) linguas_fy_NL? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//7.0.1/linux-i686/xpi/fy-NL.xpi -> thunderbird-7.0.1-fy-NL.xpi ) linguas_fy? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//7.0.1/linux-i686/xpi/fy-NL.xpi -> thunderbird-7.0.1-fy-NL.xpi ) linguas_ga_IE? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//7.0.1/linux-i686/xpi/ga-IE.xpi -> thunderbird-7.0.1-ga-IE.xpi ) linguas_ga? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//7.0.1/linux-i686/xpi/ga-IE.xpi -> thunderbird-7.0.1-ga-IE.xpi ) linguas_he? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//7.0.1/linux-i686/xpi/he.xpi -> thunderbird-7.0.1-he.xpi ) linguas_hu? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//7.0.1/linux-i686/xpi/hu.xpi -> thunderbird-7.0.1-hu.xpi ) linguas_is? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//7.0.1/linux-i686/xpi/is.xpi -> thunderbird-7.0.1-is.xpi ) linguas_it? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//7.0.1/linux-i686/xpi/it.xpi -> thunderbird-7.0.1-it.xpi ) linguas_ja? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//7.0.1/linux-i686/xpi/ja.xpi -> thunderbird-7.0.1-ja.xpi ) linguas_ko? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//7.0.1/linux-i686/xpi/ko.xpi -> thunderbird-7.0.1-ko.xpi ) linguas_lt? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//7.0.1/linux-i686/xpi/lt.xpi -> thunderbird-7.0.1-lt.xpi ) linguas_nb_NO? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//7.0.1/linux-i686/xpi/nb-NO.xpi -> thunderbird-7.0.1-nb-NO.xpi ) linguas_nb? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//7.0.1/linux-i686/xpi/nb-NO.xpi -> thunderbird-7.0.1-nb-NO.xpi ) linguas_nl? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//7.0.1/linux-i686/xpi/nl.xpi -> thunderbird-7.0.1-nl.xpi ) linguas_nn_NO? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//7.0.1/linux-i686/xpi/nn-NO.xpi -> thunderbird-7.0.1-nn-NO.xpi ) linguas_nn? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//7.0.1/linux-i686/xpi/nn-NO.xpi -> thunderbird-7.0.1-nn-NO.xpi ) linguas_pl? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//7.0.1/linux-i686/xpi/pl.xpi -> thunderbird-7.0.1-pl.xpi ) linguas_pt_BR? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//7.0.1/linux-i686/xpi/pt-BR.xpi -> thunderbird-7.0.1-pt-BR.xpi ) linguas_pt_PT? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//7.0.1/linux-i686/xpi/pt-PT.xpi -> thunderbird-7.0.1-pt-PT.xpi ) linguas_pt? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//7.0.1/linux-i686/xpi/pt-PT.xpi -> thunderbird-7.0.1-pt-PT.xpi ) linguas_ru? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//7.0.1/linux-i686/xpi/ru.xpi -> thunderbird-7.0.1-ru.xpi ) linguas_si? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//7.0.1/linux-i686/xpi/si.xpi -> thunderbird-7.0.1-si.xpi ) linguas_sk? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//7.0.1/linux-i686/xpi/sk.xpi -> thunderbird-7.0.1-sk.xpi ) linguas_sl? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//7.0.1/linux-i686/xpi/sl.xpi -> thunderbird-7.0.1-sl.xpi ) linguas_sq? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//7.0.1/linux-i686/xpi/sq.xpi -> thunderbird-7.0.1-sq.xpi ) linguas_sv_SE? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//7.0.1/linux-i686/xpi/sv-SE.xpi -> thunderbird-7.0.1-sv-SE.xpi ) linguas_sv? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//7.0.1/linux-i686/xpi/sv-SE.xpi -> thunderbird-7.0.1-sv-SE.xpi ) linguas_tr? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//7.0.1/linux-i686/xpi/tr.xpi -> thunderbird-7.0.1-tr.xpi ) linguas_uk? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//7.0.1/linux-i686/xpi/uk.xpi -> thunderbird-7.0.1-uk.xpi ) linguas_zh_TW? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//7.0.1/linux-i686/xpi/zh-TW.xpi -> thunderbird-7.0.1-zh-TW.xpi )
diff --git a/metadata/cache/mail-client/thunderbird-8.0-r1 b/metadata/cache/mail-client/thunderbird-8.0-r1
index 5c9b58fd35f0..8015411710b1 100644
--- a/metadata/cache/mail-client/thunderbird-8.0-r1
+++ b/metadata/cache/mail-client/thunderbird-8.0-r1
@@ -1,4 +1,4 @@
->=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.12.10 >=dev-libs/nspr-4.8.8 crashreporter? ( net-misc/curl ) gconf? ( >=gnome-base/gconf-1.2.1:2 ) media-libs/libpng[apng] webm? ( media-libs/libvpx media-libs/alsa-lib ) virtual/libffi !x11-plugins/enigmail system-sqlite? ( >=dev-db/sqlite-3.7.5[fts3,secure-delete,unlock-notify,debug=] ) crypt? ( || ( ( >=app-crypt/gnupg-2.0 || ( app-crypt/pinentry[gtk] app-crypt/pinentry[qt4] ) ) =app-crypt/gnupg-1.4* ) ) dev-util/pkgconfig webm? ( x86? ( >=dev-lang/yasm-1.1 ) amd64? ( >=dev-lang/yasm-1.1 ) ) x11-libs/libXrender x11-libs/libXt x11-libs/libXmu >=sys-libs/zlib-1.1.4 dev-util/pkgconfig =dev-lang/python-2*[threads] app-arch/zip app-arch/unzip >=app-text/hunspell-1.2 dev-libs/expat >=dev-libs/libIDL-0.8.0 >=dev-libs/libevent-1.4.7 >=x11-libs/cairo-1.8[X] >=x11-libs/gtk+-2.8.6:2 >=x11-libs/pango-1.10.1[X] virtual/jpeg virtual/freedesktop-icon-theme alsa? ( media-libs/alsa-lib ) dbus? ( >=dev-libs/dbus-glib-0.72 ) libnotify? ( >=x11-libs/libnotify-0.4 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) wifi? ( net-wireless/wireless-tools ) app-arch/unzip || ( >=sys-devel/automake-1.11.1 ) =sys-devel/autoconf-2.1* sys-devel/libtool
+>=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.12.10 >=dev-libs/nspr-4.8.8 crashreporter? ( net-misc/curl ) gconf? ( >=gnome-base/gconf-1.2.1:2 ) media-libs/libpng[apng] webm? ( media-libs/libvpx media-libs/alsa-lib ) virtual/libffi !x11-plugins/enigmail system-sqlite? ( >=dev-db/sqlite-3.7.5[fts3,secure-delete,unlock-notify,debug=] ) crypt? ( || ( ( >=app-crypt/gnupg-2.0 || ( app-crypt/pinentry[gtk] app-crypt/pinentry[qt4] ) ) =app-crypt/gnupg-1.4* ) ) dev-util/pkgconfig webm? ( x86? ( >=dev-lang/yasm-1.1 ) amd64? ( >=dev-lang/yasm-1.1 ) ) x11-libs/libXrender x11-libs/libXt x11-libs/libXmu >=sys-libs/zlib-1.1.4 dev-util/pkgconfig =dev-lang/python-2*[threads] app-arch/zip app-arch/unzip >=app-text/hunspell-1.2 dev-libs/expat >=dev-libs/libIDL-0.8.0 >=dev-libs/libevent-1.4.7 >=x11-libs/cairo-1.8[X] >=x11-libs/gtk+-2.8.6:2 >=x11-libs/pango-1.10.1[X] virtual/jpeg virtual/freedesktop-icon-theme alsa? ( media-libs/alsa-lib ) dbus? ( >=dev-libs/dbus-glib-0.72 ) libnotify? ( >=x11-libs/libnotify-0.4 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) wifi? ( net-wireless/wireless-tools ) app-arch/unzip || ( >=sys-devel/automake-1.11.1:1.11 ) =sys-devel/autoconf-2.1* sys-devel/libtool
 >=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.12.10 >=dev-libs/nspr-4.8.8 crashreporter? ( net-misc/curl ) gconf? ( >=gnome-base/gconf-1.2.1:2 ) media-libs/libpng[apng] webm? ( media-libs/libvpx media-libs/alsa-lib ) virtual/libffi !x11-plugins/enigmail system-sqlite? ( >=dev-db/sqlite-3.7.5[fts3,secure-delete,unlock-notify,debug=] ) crypt? ( || ( ( >=app-crypt/gnupg-2.0 || ( app-crypt/pinentry[gtk] app-crypt/pinentry[qt4] ) ) =app-crypt/gnupg-1.4* ) ) x11-libs/libXrender x11-libs/libXt x11-libs/libXmu >=sys-libs/zlib-1.1.4 app-arch/zip app-arch/unzip >=app-text/hunspell-1.2 dev-libs/expat >=dev-libs/libIDL-0.8.0 >=dev-libs/libevent-1.4.7 >=x11-libs/cairo-1.8[X] >=x11-libs/gtk+-2.8.6:2 >=x11-libs/pango-1.10.1[X] virtual/jpeg virtual/freedesktop-icon-theme alsa? ( media-libs/alsa-lib ) dbus? ( >=dev-libs/dbus-glib-0.72 ) libnotify? ( >=x11-libs/libnotify-0.4 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) wifi? ( net-wireless/wireless-tools )
 0
 ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/source/thunderbird-8.0.source.tar.bz2 crypt? ( http://www.mozilla-enigmail.org/download/source/enigmail-1.3.3.tar.gz ) http://dev.gentoo.org/~anarchy/mozilla/patchsets/thunderbird-8.0-patches-0.1.tar.xz http://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-8.0-patches-0.2.tar.xz linguas_ar? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/ar.xpi -> thunderbird-8.0-ar.xpi ) linguas_be? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/be.xpi -> thunderbird-8.0-be.xpi ) linguas_bg? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/bg.xpi -> thunderbird-8.0-bg.xpi ) linguas_bn_BD? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/bn-BD.xpi -> thunderbird-8.0-bn-BD.xpi ) linguas_bn? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/bn-BD.xpi -> thunderbird-8.0-bn-BD.xpi ) linguas_br? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/br.xpi -> thunderbird-8.0-br.xpi ) linguas_ca? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/ca.xpi -> thunderbird-8.0-ca.xpi ) linguas_cs? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/cs.xpi -> thunderbird-8.0-cs.xpi ) linguas_da? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/da.xpi -> thunderbird-8.0-da.xpi ) linguas_de? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/de.xpi -> thunderbird-8.0-de.xpi ) linguas_el? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/el.xpi -> thunderbird-8.0-el.xpi ) linguas_en_GB? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/en-GB.xpi -> thunderbird-8.0-en-GB.xpi ) linguas_es_AR? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/es-AR.xpi -> thunderbird-8.0-es-AR.xpi ) linguas_es? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/es-AR.xpi -> thunderbird-8.0-es-AR.xpi ) linguas_es_ES? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/es-ES.xpi -> thunderbird-8.0-es-ES.xpi ) linguas_es? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/es-ES.xpi -> thunderbird-8.0-es-ES.xpi ) linguas_et? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/et.xpi -> thunderbird-8.0-et.xpi ) linguas_eu? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/eu.xpi -> thunderbird-8.0-eu.xpi ) linguas_fi? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/fi.xpi -> thunderbird-8.0-fi.xpi ) linguas_fr? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/fr.xpi -> thunderbird-8.0-fr.xpi ) linguas_fy_NL? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/fy-NL.xpi -> thunderbird-8.0-fy-NL.xpi ) linguas_fy? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/fy-NL.xpi -> thunderbird-8.0-fy-NL.xpi ) linguas_ga_IE? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/ga-IE.xpi -> thunderbird-8.0-ga-IE.xpi ) linguas_ga? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/ga-IE.xpi -> thunderbird-8.0-ga-IE.xpi ) linguas_gd? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/gd.xpi -> thunderbird-8.0-gd.xpi ) linguas_gl? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/gl.xpi -> thunderbird-8.0-gl.xpi ) linguas_he? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/he.xpi -> thunderbird-8.0-he.xpi ) linguas_hu? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/hu.xpi -> thunderbird-8.0-hu.xpi ) linguas_id? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/id.xpi -> thunderbird-8.0-id.xpi ) linguas_is? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/is.xpi -> thunderbird-8.0-is.xpi ) linguas_it? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/it.xpi -> thunderbird-8.0-it.xpi ) linguas_ja? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/ja.xpi -> thunderbird-8.0-ja.xpi ) linguas_ko? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/ko.xpi -> thunderbird-8.0-ko.xpi ) linguas_lt? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/lt.xpi -> thunderbird-8.0-lt.xpi ) linguas_nb_NO? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/nb-NO.xpi -> thunderbird-8.0-nb-NO.xpi ) linguas_nb? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/nb-NO.xpi -> thunderbird-8.0-nb-NO.xpi ) linguas_nl? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/nl.xpi -> thunderbird-8.0-nl.xpi ) linguas_nn_NO? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/nn-NO.xpi -> thunderbird-8.0-nn-NO.xpi ) linguas_nn? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/nn-NO.xpi -> thunderbird-8.0-nn-NO.xpi ) linguas_pa_IN? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/pa-IN.xpi -> thunderbird-8.0-pa-IN.xpi ) linguas_pa? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/pa-IN.xpi -> thunderbird-8.0-pa-IN.xpi ) linguas_pl? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/pl.xpi -> thunderbird-8.0-pl.xpi ) linguas_pt_BR? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/pt-BR.xpi -> thunderbird-8.0-pt-BR.xpi ) linguas_pt? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/pt-BR.xpi -> thunderbird-8.0-pt-BR.xpi ) linguas_pt_PT? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/pt-PT.xpi -> thunderbird-8.0-pt-PT.xpi ) linguas_pt? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/pt-PT.xpi -> thunderbird-8.0-pt-PT.xpi ) linguas_rm? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/rm.xpi -> thunderbird-8.0-rm.xpi ) linguas_ro? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/ro.xpi -> thunderbird-8.0-ro.xpi ) linguas_ru? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/ru.xpi -> thunderbird-8.0-ru.xpi ) linguas_si? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/si.xpi -> thunderbird-8.0-si.xpi ) linguas_sk? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/sk.xpi -> thunderbird-8.0-sk.xpi ) linguas_sl? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/sl.xpi -> thunderbird-8.0-sl.xpi ) linguas_sq? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/sq.xpi -> thunderbird-8.0-sq.xpi ) linguas_sv_SE? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/sv-SE.xpi -> thunderbird-8.0-sv-SE.xpi ) linguas_sv? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/sv-SE.xpi -> thunderbird-8.0-sv-SE.xpi ) linguas_ta_LK? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/ta-LK.xpi -> thunderbird-8.0-ta-LK.xpi ) linguas_ta? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/ta-LK.xpi -> thunderbird-8.0-ta-LK.xpi ) linguas_tr? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/tr.xpi -> thunderbird-8.0-tr.xpi ) linguas_uk? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/uk.xpi -> thunderbird-8.0-uk.xpi ) linguas_vi? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/vi.xpi -> thunderbird-8.0-vi.xpi ) linguas_zh_CN? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/zh-CN.xpi -> thunderbird-8.0-zh-CN.xpi ) linguas_zh? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/zh-CN.xpi -> thunderbird-8.0-zh-CN.xpi ) linguas_zh_TW? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/zh-TW.xpi -> thunderbird-8.0-zh-TW.xpi ) linguas_zh? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//8.0/linux-i686/xpi/zh-TW.xpi -> thunderbird-8.0-zh-TW.xpi )
diff --git a/metadata/cache/mail-client/thunderbird-9.0 b/metadata/cache/mail-client/thunderbird-9.0
index 724e2b56dcb6..12b1d1d3f73e 100644
--- a/metadata/cache/mail-client/thunderbird-9.0
+++ b/metadata/cache/mail-client/thunderbird-9.0
@@ -1,4 +1,4 @@
->=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.13.1 >=dev-libs/nspr-4.8.8 >=dev-libs/glib-2.26 crashreporter? ( net-misc/curl ) gconf? ( >=gnome-base/gconf-1.2.1:2 ) media-libs/libpng[apng] >=x11-libs/cairo-1.10 >=x11-libs/pango-1.14.0 >=x11-libs/gtk+-2.14 webm? ( media-libs/libvpx media-libs/alsa-lib ) virtual/libffi !x11-plugins/enigmail system-sqlite? ( >=dev-db/sqlite-3.7.7.1[fts3,secure-delete,unlock-notify,debug=] ) crypt? ( || ( ( >=app-crypt/gnupg-2.0 || ( app-crypt/pinentry[gtk] app-crypt/pinentry[qt4] ) ) =app-crypt/gnupg-1.4* ) ) dev-util/pkgconfig webm? ( x86? ( >=dev-lang/yasm-1.1 ) amd64? ( >=dev-lang/yasm-1.1 ) ) x11-libs/libXrender x11-libs/libXt x11-libs/libXmu >=sys-libs/zlib-1.1.4 dev-util/pkgconfig =dev-lang/python-2*[threads] app-arch/zip app-arch/unzip >=app-text/hunspell-1.2 dev-libs/expat >=dev-libs/libIDL-0.8.0 >=dev-libs/libevent-1.4.7 >=x11-libs/cairo-1.8[X] >=x11-libs/gtk+-2.8.6:2 >=x11-libs/pango-1.10.1[X] virtual/jpeg virtual/freedesktop-icon-theme alsa? ( media-libs/alsa-lib ) dbus? ( >=dev-libs/dbus-glib-0.72 ) libnotify? ( >=x11-libs/libnotify-0.4 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) wifi? ( net-wireless/wireless-tools ) app-arch/unzip || ( >=sys-devel/automake-1.11.1 ) =sys-devel/autoconf-2.1* sys-devel/libtool
+>=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.13.1 >=dev-libs/nspr-4.8.8 >=dev-libs/glib-2.26 crashreporter? ( net-misc/curl ) gconf? ( >=gnome-base/gconf-1.2.1:2 ) media-libs/libpng[apng] >=x11-libs/cairo-1.10 >=x11-libs/pango-1.14.0 >=x11-libs/gtk+-2.14 webm? ( media-libs/libvpx media-libs/alsa-lib ) virtual/libffi !x11-plugins/enigmail system-sqlite? ( >=dev-db/sqlite-3.7.7.1[fts3,secure-delete,unlock-notify,debug=] ) crypt? ( || ( ( >=app-crypt/gnupg-2.0 || ( app-crypt/pinentry[gtk] app-crypt/pinentry[qt4] ) ) =app-crypt/gnupg-1.4* ) ) dev-util/pkgconfig webm? ( x86? ( >=dev-lang/yasm-1.1 ) amd64? ( >=dev-lang/yasm-1.1 ) ) x11-libs/libXrender x11-libs/libXt x11-libs/libXmu >=sys-libs/zlib-1.1.4 dev-util/pkgconfig =dev-lang/python-2*[threads] app-arch/zip app-arch/unzip >=app-text/hunspell-1.2 dev-libs/expat >=dev-libs/libIDL-0.8.0 >=dev-libs/libevent-1.4.7 >=x11-libs/cairo-1.8[X] >=x11-libs/gtk+-2.8.6:2 >=x11-libs/pango-1.10.1[X] virtual/jpeg virtual/freedesktop-icon-theme alsa? ( media-libs/alsa-lib ) dbus? ( >=dev-libs/dbus-glib-0.72 ) libnotify? ( >=x11-libs/libnotify-0.4 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) wifi? ( net-wireless/wireless-tools ) app-arch/unzip || ( >=sys-devel/automake-1.11.1:1.11 ) =sys-devel/autoconf-2.1* sys-devel/libtool
 >=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.13.1 >=dev-libs/nspr-4.8.8 >=dev-libs/glib-2.26 crashreporter? ( net-misc/curl ) gconf? ( >=gnome-base/gconf-1.2.1:2 ) media-libs/libpng[apng] >=x11-libs/cairo-1.10 >=x11-libs/pango-1.14.0 >=x11-libs/gtk+-2.14 webm? ( media-libs/libvpx media-libs/alsa-lib ) virtual/libffi !x11-plugins/enigmail system-sqlite? ( >=dev-db/sqlite-3.7.7.1[fts3,secure-delete,unlock-notify,debug=] ) crypt? ( || ( ( >=app-crypt/gnupg-2.0 || ( app-crypt/pinentry[gtk] app-crypt/pinentry[qt4] ) ) =app-crypt/gnupg-1.4* ) ) x11-libs/libXrender x11-libs/libXt x11-libs/libXmu >=sys-libs/zlib-1.1.4 app-arch/zip app-arch/unzip >=app-text/hunspell-1.2 dev-libs/expat >=dev-libs/libIDL-0.8.0 >=dev-libs/libevent-1.4.7 >=x11-libs/cairo-1.8[X] >=x11-libs/gtk+-2.8.6:2 >=x11-libs/pango-1.10.1[X] virtual/jpeg virtual/freedesktop-icon-theme alsa? ( media-libs/alsa-lib ) dbus? ( >=dev-libs/dbus-glib-0.72 ) libnotify? ( >=x11-libs/libnotify-0.4 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) wifi? ( net-wireless/wireless-tools )
 0
 ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/source/thunderbird-9.0.source.tar.bz2 crypt? ( http://www.mozilla-enigmail.org/download/source/enigmail-1.3.4.tar.gz ) http://dev.gentoo.org/~anarchy/mozilla/patchsets/thunderbird-9.0-patches-0.1.tar.xz http://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-9.0-patches-0.5.tar.xz linguas_ar? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/ar.xpi -> thunderbird-9.0-ar.xpi ) linguas_be? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/be.xpi -> thunderbird-9.0-be.xpi ) linguas_bg? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/bg.xpi -> thunderbird-9.0-bg.xpi ) linguas_bn_BD? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/bn-BD.xpi -> thunderbird-9.0-bn-BD.xpi ) linguas_bn? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/bn-BD.xpi -> thunderbird-9.0-bn-BD.xpi ) linguas_br? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/br.xpi -> thunderbird-9.0-br.xpi ) linguas_ca? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/ca.xpi -> thunderbird-9.0-ca.xpi ) linguas_cs? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/cs.xpi -> thunderbird-9.0-cs.xpi ) linguas_da? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/da.xpi -> thunderbird-9.0-da.xpi ) linguas_de? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/de.xpi -> thunderbird-9.0-de.xpi ) linguas_el? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/el.xpi -> thunderbird-9.0-el.xpi ) linguas_en_GB? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/en-GB.xpi -> thunderbird-9.0-en-GB.xpi ) linguas_es_AR? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/es-AR.xpi -> thunderbird-9.0-es-AR.xpi ) linguas_es? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/es-AR.xpi -> thunderbird-9.0-es-AR.xpi ) linguas_es_ES? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/es-ES.xpi -> thunderbird-9.0-es-ES.xpi ) linguas_es? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/es-ES.xpi -> thunderbird-9.0-es-ES.xpi ) linguas_et? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/et.xpi -> thunderbird-9.0-et.xpi ) linguas_eu? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/eu.xpi -> thunderbird-9.0-eu.xpi ) linguas_fi? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/fi.xpi -> thunderbird-9.0-fi.xpi ) linguas_fr? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/fr.xpi -> thunderbird-9.0-fr.xpi ) linguas_fy_NL? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/fy-NL.xpi -> thunderbird-9.0-fy-NL.xpi ) linguas_fy? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/fy-NL.xpi -> thunderbird-9.0-fy-NL.xpi ) linguas_ga_IE? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/ga-IE.xpi -> thunderbird-9.0-ga-IE.xpi ) linguas_ga? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/ga-IE.xpi -> thunderbird-9.0-ga-IE.xpi ) linguas_gd? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/gd.xpi -> thunderbird-9.0-gd.xpi ) linguas_gl? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/gl.xpi -> thunderbird-9.0-gl.xpi ) linguas_he? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/he.xpi -> thunderbird-9.0-he.xpi ) linguas_hu? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/hu.xpi -> thunderbird-9.0-hu.xpi ) linguas_id? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/id.xpi -> thunderbird-9.0-id.xpi ) linguas_is? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/is.xpi -> thunderbird-9.0-is.xpi ) linguas_it? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/it.xpi -> thunderbird-9.0-it.xpi ) linguas_ja? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/ja.xpi -> thunderbird-9.0-ja.xpi ) linguas_ko? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/ko.xpi -> thunderbird-9.0-ko.xpi ) linguas_lt? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/lt.xpi -> thunderbird-9.0-lt.xpi ) linguas_nb_NO? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/nb-NO.xpi -> thunderbird-9.0-nb-NO.xpi ) linguas_nb? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/nb-NO.xpi -> thunderbird-9.0-nb-NO.xpi ) linguas_nl? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/nl.xpi -> thunderbird-9.0-nl.xpi ) linguas_nn_NO? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/nn-NO.xpi -> thunderbird-9.0-nn-NO.xpi ) linguas_nn? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/nn-NO.xpi -> thunderbird-9.0-nn-NO.xpi ) linguas_pa_IN? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/pa-IN.xpi -> thunderbird-9.0-pa-IN.xpi ) linguas_pa? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/pa-IN.xpi -> thunderbird-9.0-pa-IN.xpi ) linguas_pl? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/pl.xpi -> thunderbird-9.0-pl.xpi ) linguas_pt_BR? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/pt-BR.xpi -> thunderbird-9.0-pt-BR.xpi ) linguas_pt? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/pt-BR.xpi -> thunderbird-9.0-pt-BR.xpi ) linguas_pt_PT? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/pt-PT.xpi -> thunderbird-9.0-pt-PT.xpi ) linguas_pt? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/pt-PT.xpi -> thunderbird-9.0-pt-PT.xpi ) linguas_rm? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/rm.xpi -> thunderbird-9.0-rm.xpi ) linguas_ro? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/ro.xpi -> thunderbird-9.0-ro.xpi ) linguas_ru? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/ru.xpi -> thunderbird-9.0-ru.xpi ) linguas_si? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/si.xpi -> thunderbird-9.0-si.xpi ) linguas_sk? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/sk.xpi -> thunderbird-9.0-sk.xpi ) linguas_sl? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/sl.xpi -> thunderbird-9.0-sl.xpi ) linguas_sq? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/sq.xpi -> thunderbird-9.0-sq.xpi ) linguas_sv_SE? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/sv-SE.xpi -> thunderbird-9.0-sv-SE.xpi ) linguas_sv? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/sv-SE.xpi -> thunderbird-9.0-sv-SE.xpi ) linguas_ta_LK? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/ta-LK.xpi -> thunderbird-9.0-ta-LK.xpi ) linguas_ta? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/ta-LK.xpi -> thunderbird-9.0-ta-LK.xpi ) linguas_tr? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/tr.xpi -> thunderbird-9.0-tr.xpi ) linguas_uk? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/uk.xpi -> thunderbird-9.0-uk.xpi ) linguas_vi? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/vi.xpi -> thunderbird-9.0-vi.xpi ) linguas_zh_CN? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/zh-CN.xpi -> thunderbird-9.0-zh-CN.xpi ) linguas_zh? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/zh-CN.xpi -> thunderbird-9.0-zh-CN.xpi ) linguas_zh_TW? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/zh-TW.xpi -> thunderbird-9.0-zh-TW.xpi ) linguas_zh? ( ftp://ftp.mozilla.org/pub/thunderbird/releases//9.0/linux-i686/xpi/zh-TW.xpi -> thunderbird-9.0-zh-TW.xpi )
diff --git a/metadata/cache/mail-client/thunderbird-bin-10.0.3 b/metadata/cache/mail-client/thunderbird-bin-10.0.3
new file mode 100644
index 000000000000..b78d8e29d2c1
--- /dev/null
+++ b/metadata/cache/mail-client/thunderbird-bin-10.0.3
@@ -0,0 +1,22 @@
+app-arch/unzip >=sys-apps/sed-4 app-arch/unzip
+virtual/freedesktop-icon-theme x11-libs/libXrender x11-libs/libXt x11-libs/libXmu >=x11-libs/gtk+-2.2:2 >=media-libs/alsa-lib-1.0.16 crashreporter? ( net-misc/curl )
+0
+linguas_ar? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//10.0.3esr/linux-i686/xpi/ar.xpi -> thunderbird-10.0.3esr-ar.xpi ) linguas_ast? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//10.0.3esr/linux-i686/xpi/ast.xpi -> thunderbird-10.0.3esr-ast.xpi ) linguas_be? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//10.0.3esr/linux-i686/xpi/be.xpi -> thunderbird-10.0.3esr-be.xpi ) linguas_bg? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//10.0.3esr/linux-i686/xpi/bg.xpi -> thunderbird-10.0.3esr-bg.xpi ) linguas_bn_BD? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//10.0.3esr/linux-i686/xpi/bn-BD.xpi -> thunderbird-10.0.3esr-bn-BD.xpi ) linguas_br? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//10.0.3esr/linux-i686/xpi/br.xpi -> thunderbird-10.0.3esr-br.xpi ) linguas_ca? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//10.0.3esr/linux-i686/xpi/ca.xpi -> thunderbird-10.0.3esr-ca.xpi ) linguas_cs? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//10.0.3esr/linux-i686/xpi/cs.xpi -> thunderbird-10.0.3esr-cs.xpi ) linguas_da? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//10.0.3esr/linux-i686/xpi/da.xpi -> thunderbird-10.0.3esr-da.xpi ) linguas_de? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//10.0.3esr/linux-i686/xpi/de.xpi -> thunderbird-10.0.3esr-de.xpi ) linguas_el? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//10.0.3esr/linux-i686/xpi/el.xpi -> thunderbird-10.0.3esr-el.xpi ) linguas_en_GB? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//10.0.3esr/linux-i686/xpi/en-GB.xpi -> thunderbird-10.0.3esr-en-GB.xpi ) linguas_es_AR? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//10.0.3esr/linux-i686/xpi/es-AR.xpi -> thunderbird-10.0.3esr-es-AR.xpi ) linguas_es_ES? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//10.0.3esr/linux-i686/xpi/es-ES.xpi -> thunderbird-10.0.3esr-es-ES.xpi ) linguas_et? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//10.0.3esr/linux-i686/xpi/et.xpi -> thunderbird-10.0.3esr-et.xpi ) linguas_eu? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//10.0.3esr/linux-i686/xpi/eu.xpi -> thunderbird-10.0.3esr-eu.xpi ) linguas_fi? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//10.0.3esr/linux-i686/xpi/fi.xpi -> thunderbird-10.0.3esr-fi.xpi ) linguas_fr? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//10.0.3esr/linux-i686/xpi/fr.xpi -> thunderbird-10.0.3esr-fr.xpi ) linguas_fy_NL? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//10.0.3esr/linux-i686/xpi/fy-NL.xpi -> thunderbird-10.0.3esr-fy-NL.xpi ) linguas_ga_IE? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//10.0.3esr/linux-i686/xpi/ga-IE.xpi -> thunderbird-10.0.3esr-ga-IE.xpi ) linguas_gd? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//10.0.3esr/linux-i686/xpi/gd.xpi -> thunderbird-10.0.3esr-gd.xpi ) linguas_gl? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//10.0.3esr/linux-i686/xpi/gl.xpi -> thunderbird-10.0.3esr-gl.xpi ) linguas_he? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//10.0.3esr/linux-i686/xpi/he.xpi -> thunderbird-10.0.3esr-he.xpi ) linguas_hu? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//10.0.3esr/linux-i686/xpi/hu.xpi -> thunderbird-10.0.3esr-hu.xpi ) linguas_id? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//10.0.3esr/linux-i686/xpi/id.xpi -> thunderbird-10.0.3esr-id.xpi ) linguas_is? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//10.0.3esr/linux-i686/xpi/is.xpi -> thunderbird-10.0.3esr-is.xpi ) linguas_it? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//10.0.3esr/linux-i686/xpi/it.xpi -> thunderbird-10.0.3esr-it.xpi ) linguas_ja? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//10.0.3esr/linux-i686/xpi/ja.xpi -> thunderbird-10.0.3esr-ja.xpi ) linguas_ko? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//10.0.3esr/linux-i686/xpi/ko.xpi -> thunderbird-10.0.3esr-ko.xpi ) linguas_lt? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//10.0.3esr/linux-i686/xpi/lt.xpi -> thunderbird-10.0.3esr-lt.xpi ) linguas_nb_NO? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//10.0.3esr/linux-i686/xpi/nb-NO.xpi -> thunderbird-10.0.3esr-nb-NO.xpi ) linguas_nl? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//10.0.3esr/linux-i686/xpi/nl.xpi -> thunderbird-10.0.3esr-nl.xpi ) linguas_nn_NO? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//10.0.3esr/linux-i686/xpi/nn-NO.xpi -> thunderbird-10.0.3esr-nn-NO.xpi ) linguas_pa_IN? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//10.0.3esr/linux-i686/xpi/pa-IN.xpi -> thunderbird-10.0.3esr-pa-IN.xpi ) linguas_pl? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//10.0.3esr/linux-i686/xpi/pl.xpi -> thunderbird-10.0.3esr-pl.xpi ) linguas_pt_BR? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//10.0.3esr/linux-i686/xpi/pt-BR.xpi -> thunderbird-10.0.3esr-pt-BR.xpi ) linguas_pt_PT? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//10.0.3esr/linux-i686/xpi/pt-PT.xpi -> thunderbird-10.0.3esr-pt-PT.xpi ) linguas_rm? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//10.0.3esr/linux-i686/xpi/rm.xpi -> thunderbird-10.0.3esr-rm.xpi ) linguas_ro? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//10.0.3esr/linux-i686/xpi/ro.xpi -> thunderbird-10.0.3esr-ro.xpi ) linguas_ru? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//10.0.3esr/linux-i686/xpi/ru.xpi -> thunderbird-10.0.3esr-ru.xpi ) linguas_si? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//10.0.3esr/linux-i686/xpi/si.xpi -> thunderbird-10.0.3esr-si.xpi ) linguas_sk? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//10.0.3esr/linux-i686/xpi/sk.xpi -> thunderbird-10.0.3esr-sk.xpi ) linguas_sl? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//10.0.3esr/linux-i686/xpi/sl.xpi -> thunderbird-10.0.3esr-sl.xpi ) linguas_sq? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//10.0.3esr/linux-i686/xpi/sq.xpi -> thunderbird-10.0.3esr-sq.xpi ) linguas_sr? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//10.0.3esr/linux-i686/xpi/sr.xpi -> thunderbird-10.0.3esr-sr.xpi ) linguas_sv_SE? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//10.0.3esr/linux-i686/xpi/sv-SE.xpi -> thunderbird-10.0.3esr-sv-SE.xpi ) linguas_ta_LK? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//10.0.3esr/linux-i686/xpi/ta-LK.xpi -> thunderbird-10.0.3esr-ta-LK.xpi ) linguas_tr? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//10.0.3esr/linux-i686/xpi/tr.xpi -> thunderbird-10.0.3esr-tr.xpi ) linguas_uk? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//10.0.3esr/linux-i686/xpi/uk.xpi -> thunderbird-10.0.3esr-uk.xpi ) linguas_vi? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//10.0.3esr/linux-i686/xpi/vi.xpi -> thunderbird-10.0.3esr-vi.xpi ) linguas_zh_CN? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//10.0.3esr/linux-i686/xpi/zh-CN.xpi -> thunderbird-10.0.3esr-zh-CN.xpi ) linguas_zh_TW? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//10.0.3esr/linux-i686/xpi/zh-TW.xpi -> thunderbird-10.0.3esr-zh-TW.xpi ) amd64? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//10.0.3esr/linux-x86_64/en-US/thunderbird-10.0.3esr.tar.bz2 -> thunderbird-bin_x86_64-10.0.3.tar.bz2 ) x86? ( ftp://ftp.mozilla.org/pub/mozilla.org/thunderbird/releases//10.0.3esr/linux-i686/en-US/thunderbird-10.0.3esr.tar.bz2 -> thunderbird-bin_i686-10.0.3.tar.bz2 )
+strip mirror binchecks
+http://www.mozilla.com/thunderbird
+|| ( MPL-1.1 GPL-2 LGPL-2.1 )
+Thunderbird Mail Client
+-* ~amd64 ~x86
+eutils fdo-mime gnome2-utils mozextension mozlinguas multilib nsplugins pax-utils toolchain-funcs user
++crashreporter linguas_ar linguas_ast linguas_be linguas_bg linguas_bn_BD linguas_br linguas_ca linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_es_AR linguas_es_ES linguas_et linguas_eu linguas_fi linguas_fr linguas_fy_NL linguas_ga_IE linguas_gd linguas_gl linguas_he linguas_hu linguas_id linguas_is linguas_it linguas_ja linguas_ko linguas_lt linguas_nb_NO linguas_nl linguas_nn_NO linguas_pa_IN linguas_pl linguas_pt_BR linguas_pt_PT linguas_rm linguas_ro linguas_ru linguas_si linguas_sk linguas_sl linguas_sq linguas_sr linguas_sv_SE linguas_ta_LK linguas_tr linguas_uk linguas_vi linguas_zh_CN linguas_zh_TW
+
+
+
+4
+
+install postinst postrm preinst unpack
+
+
+
+
+
diff --git a/metadata/cache/mail-filter/anubis-4.1.1 b/metadata/cache/mail-filter/anubis-4.1.1
index 972c7c9335ea..2d84db13eb30 100644
--- a/metadata/cache/mail-filter/anubis-4.1.1
+++ b/metadata/cache/mail-filter/anubis-4.1.1
@@ -1,4 +1,4 @@
-sys-libs/gdbm crypt? ( >=app-crypt/gpgme-0.9.0 ) guile? ( >=dev-scheme/guile-1.8 ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql-server ) nls? ( sys-devel/gettext ) pcre? ( >=dev-libs/libpcre-3.9 ) sasl? ( virtual/gsasl ) gnutls? ( net-libs/gnutls ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) test? ( dev-util/dejagnu ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+sys-libs/gdbm crypt? ( >=app-crypt/gpgme-0.9.0 ) guile? ( >=dev-scheme/guile-1.8 ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql-server ) nls? ( sys-devel/gettext ) pcre? ( >=dev-libs/libpcre-3.9 ) sasl? ( virtual/gsasl ) gnutls? ( net-libs/gnutls ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) test? ( dev-util/dejagnu ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 sys-libs/gdbm crypt? ( >=app-crypt/gpgme-0.9.0 ) guile? ( >=dev-scheme/guile-1.8 ) mysql? ( virtual/mysql ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql-server ) nls? ( sys-devel/gettext ) pcre? ( >=dev-libs/libpcre-3.9 ) sasl? ( virtual/gsasl ) gnutls? ( net-libs/gnutls ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
 0
 mirror://gnu/anubis/anubis-4.1.1.tar.gz
diff --git a/metadata/cache/mail-filter/couriersrs-0.1.2 b/metadata/cache/mail-filter/couriersrs-0.1.2
index a41611312acb..6d672f56b7b0 100644
--- a/metadata/cache/mail-filter/couriersrs-0.1.2
+++ b/metadata/cache/mail-filter/couriersrs-0.1.2
@@ -1,4 +1,4 @@
-dev-libs/popt mail-filter/libsrs2 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-libs/popt mail-filter/libsrs2 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-libs/popt mail-filter/libsrs2
 0
 http://couriersrs.com/download/couriersrs-0.1.2.tar.gz
diff --git a/metadata/cache/mail-filter/dovecot-antispam-2.0_pre20101222 b/metadata/cache/mail-filter/dovecot-antispam-2.0_pre20101222
index 60986bcc9e24..184582e78832 100644
--- a/metadata/cache/mail-filter/dovecot-antispam-2.0_pre20101222
+++ b/metadata/cache/mail-filter/dovecot-antispam-2.0_pre20101222
@@ -1,4 +1,4 @@
-=net-mail/dovecot-2.0* || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+=net-mail/dovecot-2.0* || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 =net-mail/dovecot-2.0*
 0
 http://dev.gentoo.org/~radhermit/distfiles/dovecot-antispam-2.0_pre20101222.tar.bz2
diff --git a/metadata/cache/mail-filter/dovecot-antispam-2.0_pre20120226 b/metadata/cache/mail-filter/dovecot-antispam-2.0_pre20120226
index 9f3888fb05c4..27f47b6615a3 100644
--- a/metadata/cache/mail-filter/dovecot-antispam-2.0_pre20120226
+++ b/metadata/cache/mail-filter/dovecot-antispam-2.0_pre20120226
@@ -1,4 +1,4 @@
->=net-mail/dovecot-2.1.0 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=net-mail/dovecot-2.1.0 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=net-mail/dovecot-2.1.0
 0
 http://dev.gentoo.org/~radhermit/distfiles/dovecot-antispam-2.0_pre20120226.tar.bz2
diff --git a/metadata/cache/mail-filter/libsrs2-1.0.18 b/metadata/cache/mail-filter/libsrs2-1.0.18
index bc97331c2f18..a976f4501075 100644
--- a/metadata/cache/mail-filter/libsrs2-1.0.18
+++ b/metadata/cache/mail-filter/libsrs2-1.0.18
@@ -1,4 +1,4 @@
-!dev-perl/Mail-SRS || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+!dev-perl/Mail-SRS || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 !dev-perl/Mail-SRS
 0
 http://www.libsrs2.org/srs/libsrs2-1.0.18.tar.gz
diff --git a/metadata/cache/mail-filter/maildrop-2.5.4 b/metadata/cache/mail-filter/maildrop-2.5.4
index 9c12dca6d762..10fba1355514 100644
--- a/metadata/cache/mail-filter/maildrop-2.5.4
+++ b/metadata/cache/mail-filter/maildrop-2.5.4
@@ -1,4 +1,4 @@
-!mail-mta/courier net-mail/mailbase dev-libs/libpcre net-dns/libidn gdbm? ( >=sys-libs/gdbm-1.8.0 ) mysql? ( net-libs/courier-authlib ) postgres? ( net-libs/courier-authlib ) ldap? ( net-libs/courier-authlib ) authlib? ( net-libs/courier-authlib ) fam? ( virtual/fam ) !gdbm? ( berkdb? ( >=sys-libs/db-3 ) ) tools? ( !mail-mta/netqmail !net-mail/courier-imap !mail-mta/mini-qmail ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+!mail-mta/courier net-mail/mailbase dev-libs/libpcre net-dns/libidn gdbm? ( >=sys-libs/gdbm-1.8.0 ) mysql? ( net-libs/courier-authlib ) postgres? ( net-libs/courier-authlib ) ldap? ( net-libs/courier-authlib ) authlib? ( net-libs/courier-authlib ) fam? ( virtual/fam ) !gdbm? ( berkdb? ( >=sys-libs/db-3 ) ) tools? ( !mail-mta/netqmail !net-mail/courier-imap !mail-mta/mini-qmail ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 !mail-mta/courier net-mail/mailbase dev-libs/libpcre net-dns/libidn gdbm? ( >=sys-libs/gdbm-1.8.0 ) mysql? ( net-libs/courier-authlib ) postgres? ( net-libs/courier-authlib ) ldap? ( net-libs/courier-authlib ) authlib? ( net-libs/courier-authlib ) fam? ( virtual/fam ) !gdbm? ( berkdb? ( >=sys-libs/db-3 ) ) tools? ( !mail-mta/netqmail !net-mail/courier-imap !mail-mta/mini-qmail ) dev-lang/perl
 0
 mirror://sourceforge/courier/maildrop-2.5.4.tar.bz2
diff --git a/metadata/cache/mail-filter/maildrop-2.5.5 b/metadata/cache/mail-filter/maildrop-2.5.5
index 5b54e96f9ac8..55b68980879e 100644
--- a/metadata/cache/mail-filter/maildrop-2.5.5
+++ b/metadata/cache/mail-filter/maildrop-2.5.5
@@ -1,4 +1,4 @@
-!mail-mta/courier net-mail/mailbase dev-libs/libpcre net-dns/libidn gdbm? ( >=sys-libs/gdbm-1.8.0 ) mysql? ( net-libs/courier-authlib ) postgres? ( net-libs/courier-authlib ) ldap? ( net-libs/courier-authlib ) authlib? ( net-libs/courier-authlib ) fam? ( virtual/fam ) !gdbm? ( berkdb? ( >=sys-libs/db-3 ) ) tools? ( !mail-mta/netqmail !net-mail/courier-imap !mail-mta/mini-qmail ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+!mail-mta/courier net-mail/mailbase dev-libs/libpcre net-dns/libidn gdbm? ( >=sys-libs/gdbm-1.8.0 ) mysql? ( net-libs/courier-authlib ) postgres? ( net-libs/courier-authlib ) ldap? ( net-libs/courier-authlib ) authlib? ( net-libs/courier-authlib ) fam? ( virtual/fam ) !gdbm? ( berkdb? ( >=sys-libs/db-3 ) ) tools? ( !mail-mta/netqmail !net-mail/courier-imap !mail-mta/mini-qmail ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 !mail-mta/courier net-mail/mailbase dev-libs/libpcre net-dns/libidn gdbm? ( >=sys-libs/gdbm-1.8.0 ) mysql? ( net-libs/courier-authlib ) postgres? ( net-libs/courier-authlib ) ldap? ( net-libs/courier-authlib ) authlib? ( net-libs/courier-authlib ) fam? ( virtual/fam ) !gdbm? ( berkdb? ( >=sys-libs/db-3 ) ) tools? ( !mail-mta/netqmail !net-mail/courier-imap !mail-mta/mini-qmail ) dev-lang/perl
 0
 mirror://sourceforge/courier/maildrop-2.5.5.tar.bz2
diff --git a/metadata/cache/mail-filter/opendkim-2.4.3 b/metadata/cache/mail-filter/opendkim-2.4.3
index 450776682c2d..0902d5cecb6e 100644
--- a/metadata/cache/mail-filter/opendkim-2.4.3
+++ b/metadata/cache/mail-filter/opendkim-2.4.3
@@ -6,7 +6,7 @@ mirror://sourceforge/opendkim/opendkim-2.4.3.tar.gz
 http://opendkim.org
 Sendmail-Open-Source BSD
 A milter-based application to provide DKIM signing and verification
-~amd64 ~x86
+amd64 ~x86
 db-use eutils multilib toolchain-funcs user versionator
 asyncdns +berkdb ldap lua opendbx poll sasl +ssl static-libs unbound
 sasl? ( ldap ) lua? ( berkdb )
diff --git a/metadata/cache/mail-filter/opendkim-2.5.1 b/metadata/cache/mail-filter/opendkim-2.5.1
index 27f066880a95..76b969bd8b40 100644
--- a/metadata/cache/mail-filter/opendkim-2.5.1
+++ b/metadata/cache/mail-filter/opendkim-2.5.1
@@ -1,4 +1,4 @@
-|| ( mail-filter/libmilter mail-mta/sendmail ) ssl? ( >=dev-libs/openssl-0.9.8 ) berkdb? ( >=sys-libs/db-3.2 ) opendbx? ( >=dev-db/opendbx-1.4.0 ) lua? ( dev-lang/lua ) ldap? ( net-nds/openldap ) sasl? ( dev-libs/cyrus-sasl ) unbound? ( >=net-dns/unbound-1.4.1 net-dns/dnssec-root ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+|| ( mail-filter/libmilter mail-mta/sendmail ) ssl? ( >=dev-libs/openssl-0.9.8 ) berkdb? ( >=sys-libs/db-3.2 ) opendbx? ( >=dev-db/opendbx-1.4.0 ) lua? ( dev-lang/lua ) ldap? ( net-nds/openldap ) sasl? ( dev-libs/cyrus-sasl ) unbound? ( >=net-dns/unbound-1.4.1 net-dns/dnssec-root ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 || ( mail-filter/libmilter mail-mta/sendmail ) ssl? ( >=dev-libs/openssl-0.9.8 ) berkdb? ( >=sys-libs/db-3.2 ) opendbx? ( >=dev-db/opendbx-1.4.0 ) lua? ( dev-lang/lua ) ldap? ( net-nds/openldap ) sasl? ( dev-libs/cyrus-sasl ) unbound? ( >=net-dns/unbound-1.4.1 net-dns/dnssec-root )
 0
 mirror://sourceforge/opendkim/opendkim-2.5.1.tar.gz
diff --git a/metadata/cache/mail-filter/spamdyke-4.3.0 b/metadata/cache/mail-filter/spamdyke-4.3.0
index 198c2323da9e..6bfb23c2b4be 100644
--- a/metadata/cache/mail-filter/spamdyke-4.3.0
+++ b/metadata/cache/mail-filter/spamdyke-4.3.0
@@ -1,4 +1,4 @@
-tls? ( dev-libs/openssl ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+tls? ( dev-libs/openssl ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 tls? ( dev-libs/openssl ) virtual/qmail
 0
 http://www.spamdyke.org/releases/spamdyke-4.3.0.tgz
diff --git a/metadata/cache/mail-mta/ssmtp-2.62-r8 b/metadata/cache/mail-mta/ssmtp-2.62-r8
index 6681f8e35913..d685b7b3032d 100644
--- a/metadata/cache/mail-mta/ssmtp-2.62-r8
+++ b/metadata/cache/mail-mta/ssmtp-2.62-r8
@@ -1,4 +1,4 @@
-ssl? ( dev-libs/openssl ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+ssl? ( dev-libs/openssl ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 ssl? ( dev-libs/openssl ) net-mail/mailbase !net-mail/mailwrapper !mail-mta/courier !mail-mta/esmtp !mail-mta/exim !mail-mta/mini-qmail !mail-mta/msmtp !mail-mta/nbsmtp !mail-mta/netqmail !mail-mta/nullmailer !mail-mta/postfix !mail-mta/qmail-ldap !mail-mta/sendmail
 0
 mirror://debian/pool/main/s/ssmtp/ssmtp_2.62.orig.tar.gz
diff --git a/metadata/cache/media-gfx/asymptote-2.13 b/metadata/cache/media-gfx/asymptote-2.13
index 9b89fedcd699..9f6f58cf180b 100644
--- a/metadata/cache/media-gfx/asymptote-2.13
+++ b/metadata/cache/media-gfx/asymptote-2.13
@@ -1,4 +1,4 @@
->=sys-libs/readline-4.3-r5 >=sys-libs/ncurses-5.4-r5 imagemagick? ( media-gfx/imagemagick[png] ) sigsegv? ( dev-libs/libsigsegv ) boehm-gc? ( >=dev-libs/boehm-gc-7.0[cxx,threads] ) fftw? ( >=sci-libs/fftw-3.0.1 ) gsl? ( sci-libs/gsl ) X? ( x11-misc/xdg-utils dev-lang/python dev-python/imaging[tk] ) latex? ( virtual/latex-base dev-texlive/texlive-latexextra ) emacs? ( virtual/emacs ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) doc? ( dev-lang/perl virtual/texi2dvi virtual/latex-base media-gfx/imagemagick[png] ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/latex-base >=sys-apps/texinfo-4.2-r5 python? ( =dev-lang/python-2* )
+>=sys-libs/readline-4.3-r5 >=sys-libs/ncurses-5.4-r5 imagemagick? ( media-gfx/imagemagick[png] ) sigsegv? ( dev-libs/libsigsegv ) boehm-gc? ( >=dev-libs/boehm-gc-7.0[cxx,threads] ) fftw? ( >=sci-libs/fftw-3.0.1 ) gsl? ( sci-libs/gsl ) X? ( x11-misc/xdg-utils dev-lang/python dev-python/imaging[tk] ) latex? ( virtual/latex-base dev-texlive/texlive-latexextra ) emacs? ( virtual/emacs ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) doc? ( dev-lang/perl virtual/texi2dvi virtual/latex-base media-gfx/imagemagick[png] ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/latex-base >=sys-apps/texinfo-4.2-r5 python? ( =dev-lang/python-2* )
 >=sys-libs/readline-4.3-r5 >=sys-libs/ncurses-5.4-r5 imagemagick? ( media-gfx/imagemagick[png] ) sigsegv? ( dev-libs/libsigsegv ) boehm-gc? ( >=dev-libs/boehm-gc-7.0[cxx,threads] ) fftw? ( >=sci-libs/fftw-3.0.1 ) gsl? ( sci-libs/gsl ) X? ( x11-misc/xdg-utils dev-lang/python dev-python/imaging[tk] ) latex? ( virtual/latex-base dev-texlive/texlive-latexextra ) emacs? ( virtual/emacs ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) virtual/latex-base python? ( =dev-lang/python-2* )
 0
 mirror://sourceforge/asymptote/asymptote-2.13.src.tgz
diff --git a/metadata/cache/media-gfx/asymptote-2.14 b/metadata/cache/media-gfx/asymptote-2.14
index 072d158874dd..77a172718f74 100644
--- a/metadata/cache/media-gfx/asymptote-2.14
+++ b/metadata/cache/media-gfx/asymptote-2.14
@@ -1,4 +1,4 @@
->=sys-libs/readline-4.3-r5 >=sys-libs/ncurses-5.4-r5 imagemagick? ( media-gfx/imagemagick[png] ) sigsegv? ( dev-libs/libsigsegv ) boehm-gc? ( >=dev-libs/boehm-gc-7.0[cxx,threads] ) fftw? ( >=sci-libs/fftw-3.0.1 ) gsl? ( sci-libs/gsl ) X? ( x11-misc/xdg-utils dev-lang/python dev-python/imaging[tk] ) latex? ( virtual/latex-base dev-texlive/texlive-latexextra ) emacs? ( virtual/emacs ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) doc? ( dev-lang/perl virtual/texi2dvi virtual/latex-base media-gfx/imagemagick[png] ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/latex-base >=sys-apps/texinfo-4.2-r5 python? ( =dev-lang/python-2* )
+>=sys-libs/readline-4.3-r5 >=sys-libs/ncurses-5.4-r5 imagemagick? ( media-gfx/imagemagick[png] ) sigsegv? ( dev-libs/libsigsegv ) boehm-gc? ( >=dev-libs/boehm-gc-7.0[cxx,threads] ) fftw? ( >=sci-libs/fftw-3.0.1 ) gsl? ( sci-libs/gsl ) X? ( x11-misc/xdg-utils dev-lang/python dev-python/imaging[tk] ) latex? ( virtual/latex-base dev-texlive/texlive-latexextra ) emacs? ( virtual/emacs ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) doc? ( dev-lang/perl virtual/texi2dvi virtual/latex-base media-gfx/imagemagick[png] ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/latex-base >=sys-apps/texinfo-4.2-r5 python? ( =dev-lang/python-2* )
 >=sys-libs/readline-4.3-r5 >=sys-libs/ncurses-5.4-r5 imagemagick? ( media-gfx/imagemagick[png] ) sigsegv? ( dev-libs/libsigsegv ) boehm-gc? ( >=dev-libs/boehm-gc-7.0[cxx,threads] ) fftw? ( >=sci-libs/fftw-3.0.1 ) gsl? ( sci-libs/gsl ) X? ( x11-misc/xdg-utils dev-lang/python dev-python/imaging[tk] ) latex? ( virtual/latex-base dev-texlive/texlive-latexextra ) emacs? ( virtual/emacs ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) virtual/latex-base python? ( =dev-lang/python-2* )
 0
 mirror://sourceforge/asymptote/asymptote-2.14.src.tgz
diff --git a/metadata/cache/media-gfx/asymptote-2.15 b/metadata/cache/media-gfx/asymptote-2.15
index 8925f7e1189c..6a3659d9cfbc 100644
--- a/metadata/cache/media-gfx/asymptote-2.15
+++ b/metadata/cache/media-gfx/asymptote-2.15
@@ -1,4 +1,4 @@
->=sys-libs/readline-4.3-r5 >=sys-libs/ncurses-5.4-r5 imagemagick? ( media-gfx/imagemagick[png] ) sigsegv? ( dev-libs/libsigsegv ) boehm-gc? ( >=dev-libs/boehm-gc-7.0[cxx,threads] ) fftw? ( >=sci-libs/fftw-3.0.1 ) gsl? ( sci-libs/gsl ) X? ( x11-misc/xdg-utils dev-lang/python dev-python/imaging[tk] ) latex? ( virtual/latex-base dev-texlive/texlive-latexextra ) emacs? ( virtual/emacs ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) doc? ( dev-lang/perl virtual/texi2dvi virtual/latex-base media-gfx/imagemagick[png] ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/latex-base >=sys-apps/texinfo-4.2-r5 python? ( =dev-lang/python-2* )
+>=sys-libs/readline-4.3-r5 >=sys-libs/ncurses-5.4-r5 imagemagick? ( media-gfx/imagemagick[png] ) sigsegv? ( dev-libs/libsigsegv ) boehm-gc? ( >=dev-libs/boehm-gc-7.0[cxx,threads] ) fftw? ( >=sci-libs/fftw-3.0.1 ) gsl? ( sci-libs/gsl ) X? ( x11-misc/xdg-utils dev-lang/python dev-python/imaging[tk] ) latex? ( virtual/latex-base dev-texlive/texlive-latexextra ) emacs? ( virtual/emacs ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) doc? ( dev-lang/perl virtual/texi2dvi virtual/latex-base media-gfx/imagemagick[png] ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/latex-base >=sys-apps/texinfo-4.2-r5 python? ( =dev-lang/python-2* )
 >=sys-libs/readline-4.3-r5 >=sys-libs/ncurses-5.4-r5 imagemagick? ( media-gfx/imagemagick[png] ) sigsegv? ( dev-libs/libsigsegv ) boehm-gc? ( >=dev-libs/boehm-gc-7.0[cxx,threads] ) fftw? ( >=sci-libs/fftw-3.0.1 ) gsl? ( sci-libs/gsl ) X? ( x11-misc/xdg-utils dev-lang/python dev-python/imaging[tk] ) latex? ( virtual/latex-base dev-texlive/texlive-latexextra ) emacs? ( virtual/emacs ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) virtual/latex-base python? ( =dev-lang/python-2* )
 0
 mirror://sourceforge/asymptote/asymptote-2.15.src.tgz
diff --git a/metadata/cache/media-gfx/autotrace-0.31.1-r6 b/metadata/cache/media-gfx/autotrace-0.31.1-r6
index 27df2752645e..5475b0f2f38b 100644
--- a/metadata/cache/media-gfx/autotrace-0.31.1-r6
+++ b/metadata/cache/media-gfx/autotrace-0.31.1-r6
@@ -1,4 +1,4 @@
-media-libs/libexif >=media-libs/libpng-1.4.3 >=media-libs/ming-0.4.2 >=media-gfx/pstoedit-3.50 imagemagick? ( >=media-gfx/imagemagick-6.6.2.5 ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+media-libs/libexif >=media-libs/libpng-1.4.3 >=media-libs/ming-0.4.2 >=media-gfx/pstoedit-3.50 imagemagick? ( >=media-gfx/imagemagick-6.6.2.5 ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 media-libs/libexif >=media-libs/libpng-1.4.3 >=media-libs/ming-0.4.2 >=media-gfx/pstoedit-3.50 imagemagick? ( >=media-gfx/imagemagick-6.6.2.5 )
 0
 mirror://debian/pool/main/a/autotrace/autotrace_0.31.1.orig.tar.gz mirror://debian/pool/main/a/autotrace/autotrace_0.31.1-15.diff.gz
diff --git a/metadata/cache/media-gfx/cfe-0.12 b/metadata/cache/media-gfx/cfe-0.12
index 14e4bfa0eebb..778cbdcb918e 100644
--- a/metadata/cache/media-gfx/cfe-0.12
+++ b/metadata/cache/media-gfx/cfe-0.12
@@ -1,4 +1,4 @@
-sys-libs/ncurses || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+sys-libs/ncurses || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 sys-libs/ncurses
 0
 http://download.uhulinux.hu/pub/pub/mirror/http:/lrn.ru/~osgene/files/cfe-0.12.tar.gz
diff --git a/metadata/cache/media-gfx/colorhug-client-0.1.7-r1 b/metadata/cache/media-gfx/colorhug-client-0.1.7-r1
new file mode 100644
index 000000000000..dc4588f939fe
--- /dev/null
+++ b/metadata/cache/media-gfx/colorhug-client-0.1.7-r1
@@ -0,0 +1,22 @@
+dev-db/sqlite:3 >=dev-libs/glib-2.28.0 dev-libs/libgusb media-libs/lcms:2 net-libs/libsoup:2.4 x11-libs/gtk+:3 >=x11-misc/colord-0.1.15 >=sys-apps/sed-4
+dev-db/sqlite:3 >=dev-libs/glib-2.28.0 dev-libs/libgusb media-libs/lcms:2 net-libs/libsoup:2.4 x11-libs/gtk+:3 >=x11-misc/colord-0.1.15
+0
+http://people.freedesktop.org/~hughsient/releases/colorhug-client-0.1.7.tar.xz
+
+http://www.hughsie.com/
+GPL-2
+Client tools for the ColorHug display colorimeter
+~amd64 ~x86
+gnome2-utils
+
+
+
+
+4
+
+postinst postrm
+
+
+
+
+
diff --git a/metadata/cache/media-gfx/f-spot-0.8.2 b/metadata/cache/media-gfx/f-spot-0.8.2
index 50f1acbbb667..48e0bc5aaa40 100644
--- a/metadata/cache/media-gfx/f-spot-0.8.2
+++ b/metadata/cache/media-gfx/f-spot-0.8.2
@@ -1,4 +1,4 @@
->=dev-lang/mono-2.2 >=gnome-base/libgnome-2.2 >=gnome-base/libgnomeui-2.2 dev-dotnet/gnome-keyring-sharp >=dev-dotnet/gtk-sharp-2.12.2:2 >=dev-dotnet/glib-sharp-2.12.2:2 >=x11-libs/gtk+-2.16:2 >=dev-libs/glib-2.22:2 >=dev-libs/libunique-1.0:1 >=dev-dotnet/gnome-sharp-2.8:2 >=dev-dotnet/glib-sharp-2.12:2 >=dev-dotnet/gconf-sharp-2.20.2:2 >=dev-dotnet/mono-addins-0.3[gtk] >=dev-libs/dbus-glib-0.71 >=dev-dotnet/ndesk-dbus-0.4.2 >=dev-dotnet/ndesk-dbus-glib-0.3.0 >=media-libs/lcms-1.12:0 >=x11-libs/cairo-1.4 doc? ( virtual/monodoc >=app-text/gnome-doc-utils-0.17.3 ) flickr? ( >=dev-dotnet/flickrnet-bin-2.2-r1 ) raw? ( media-gfx/dcraw ) >=dev-dotnet/gtk-sharp-gapi-2.12.2 >=app-text/gnome-doc-utils-0.17.3 dev-util/pkgconfig >=dev-util/intltool-0.35 >=sys-apps/sed-4 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-lang/mono-2.2 >=gnome-base/libgnome-2.2 >=gnome-base/libgnomeui-2.2 dev-dotnet/gnome-keyring-sharp >=dev-dotnet/gtk-sharp-2.12.2:2 >=dev-dotnet/glib-sharp-2.12.2:2 >=x11-libs/gtk+-2.16:2 >=dev-libs/glib-2.22:2 >=dev-libs/libunique-1.0:1 >=dev-dotnet/gnome-sharp-2.8:2 >=dev-dotnet/glib-sharp-2.12:2 >=dev-dotnet/gconf-sharp-2.20.2:2 >=dev-dotnet/mono-addins-0.3[gtk] >=dev-libs/dbus-glib-0.71 >=dev-dotnet/ndesk-dbus-0.4.2 >=dev-dotnet/ndesk-dbus-glib-0.3.0 >=media-libs/lcms-1.12:0 >=x11-libs/cairo-1.4 doc? ( virtual/monodoc >=app-text/gnome-doc-utils-0.17.3 ) flickr? ( >=dev-dotnet/flickrnet-bin-2.2-r1 ) raw? ( media-gfx/dcraw ) >=dev-dotnet/gtk-sharp-gapi-2.12.2 >=app-text/gnome-doc-utils-0.17.3 dev-util/pkgconfig >=dev-util/intltool-0.35 >=sys-apps/sed-4 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=dev-lang/mono-2.2 >=gnome-base/libgnome-2.2 >=gnome-base/libgnomeui-2.2 dev-dotnet/gnome-keyring-sharp >=dev-dotnet/gtk-sharp-2.12.2:2 >=dev-dotnet/glib-sharp-2.12.2:2 >=x11-libs/gtk+-2.16:2 >=dev-libs/glib-2.22:2 >=dev-libs/libunique-1.0:1 >=dev-dotnet/gnome-sharp-2.8:2 >=dev-dotnet/glib-sharp-2.12:2 >=dev-dotnet/gconf-sharp-2.20.2:2 >=dev-dotnet/mono-addins-0.3[gtk] >=dev-libs/dbus-glib-0.71 >=dev-dotnet/ndesk-dbus-0.4.2 >=dev-dotnet/ndesk-dbus-glib-0.3.0 >=media-libs/lcms-1.12:0 >=x11-libs/cairo-1.4 doc? ( virtual/monodoc >=app-text/gnome-doc-utils-0.17.3 ) flickr? ( >=dev-dotnet/flickrnet-bin-2.2-r1 ) raw? ( media-gfx/dcraw )
 0
 mirror://gnome/sources/f-spot/0.8/f-spot-0.8.2.tar.bz2
diff --git a/metadata/cache/media-gfx/flam3-3.0.1 b/metadata/cache/media-gfx/flam3-3.0.1
index ba4a2f5330df..7532dfa40a43 100644
--- a/metadata/cache/media-gfx/flam3-3.0.1
+++ b/metadata/cache/media-gfx/flam3-3.0.1
@@ -1,4 +1,4 @@
-dev-libs/libxml2 media-libs/libpng virtual/jpeg !<=x11-misc/electricsheep-2.6.8-r2 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-libs/libxml2 media-libs/libpng virtual/jpeg !<=x11-misc/electricsheep-2.6.8-r2 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-libs/libxml2 media-libs/libpng virtual/jpeg !<=x11-misc/electricsheep-2.6.8-r2
 0
 http://flam3.googlecode.com/files/flam3-3.0.1.tar.gz
diff --git a/metadata/cache/media-gfx/flam3-9999 b/metadata/cache/media-gfx/flam3-9999
index 8ee9bb51eac3..ef78d206743b 100644
--- a/metadata/cache/media-gfx/flam3-9999
+++ b/metadata/cache/media-gfx/flam3-9999
@@ -1,4 +1,4 @@
-dev-libs/libxml2 virtual/jpeg media-libs/libpng !<=x11-misc/electricsheep-2.6.8-r2 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/subversion net-misc/rsync
+dev-libs/libxml2 virtual/jpeg media-libs/libpng !<=x11-misc/electricsheep-2.6.8-r2 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/subversion net-misc/rsync
 dev-libs/libxml2 virtual/jpeg media-libs/libpng !<=x11-misc/electricsheep-2.6.8-r2
 0
 
diff --git a/metadata/cache/media-gfx/flphoto-1.3.1-r2 b/metadata/cache/media-gfx/flphoto-1.3.1-r2
index 55a71067cd97..fdfb7b0af37f 100644
--- a/metadata/cache/media-gfx/flphoto-1.3.1-r2
+++ b/metadata/cache/media-gfx/flphoto-1.3.1-r2
@@ -1,4 +1,4 @@
-dev-libs/openssl:0 virtual/jpeg >=media-libs/libpng-1.2:0 sys-libs/zlib >=x11-libs/fltk-1.1:1 x11-libs/libX11 x11-misc/shared-mime-info cups? ( net-print/cups ) gphoto2? ( media-gfx/gphoto2 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-libs/openssl:0 virtual/jpeg >=media-libs/libpng-1.2:0 sys-libs/zlib >=x11-libs/fltk-1.1:1 x11-libs/libX11 x11-misc/shared-mime-info cups? ( net-print/cups ) gphoto2? ( media-gfx/gphoto2 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-libs/openssl:0 virtual/jpeg >=media-libs/libpng-1.2:0 sys-libs/zlib >=x11-libs/fltk-1.1:1 x11-libs/libX11 x11-misc/shared-mime-info cups? ( net-print/cups ) gphoto2? ( media-gfx/gphoto2 )
 0
 mirror://sourceforge/fltk/flphoto-1.3.1-source.tar.gz
diff --git a/metadata/cache/media-gfx/fontforge-20110222 b/metadata/cache/media-gfx/fontforge-20110222
index 3783d524338e..d69bf7993b75 100644
--- a/metadata/cache/media-gfx/fontforge-20110222
+++ b/metadata/cache/media-gfx/fontforge-20110222
@@ -1,4 +1,4 @@
-gif? ( >=media-libs/giflib-4.1.0-r1 ) jpeg? ( virtual/jpeg ) png? ( >=media-libs/libpng-1.2.4 ) tiff? ( >=media-libs/tiff-3.5.7-r1 ) truetype? ( >=media-libs/freetype-2.1.4 ) truetype-debugger? ( >=media-libs/freetype-2.3.8[fontforge,-bindist] ) svg? ( >=dev-libs/libxml2-2.6.7 ) unicode? ( >=media-libs/libuninameslist-030713 ) cairo? ( >=x11-libs/cairo-1.6.4[X] ) pango? ( >=x11-libs/pango-1.20.3 ) x11-libs/libXi x11-proto/inputproto !media-gfx/pfaedit nls? ( sys-devel/gettext ) python? ( =dev-lang/python-2* ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+gif? ( >=media-libs/giflib-4.1.0-r1 ) jpeg? ( virtual/jpeg ) png? ( >=media-libs/libpng-1.2.4 ) tiff? ( >=media-libs/tiff-3.5.7-r1 ) truetype? ( >=media-libs/freetype-2.1.4 ) truetype-debugger? ( >=media-libs/freetype-2.3.8[fontforge,-bindist] ) svg? ( >=dev-libs/libxml2-2.6.7 ) unicode? ( >=media-libs/libuninameslist-030713 ) cairo? ( >=x11-libs/cairo-1.6.4[X] ) pango? ( >=x11-libs/pango-1.20.3 ) x11-libs/libXi x11-proto/inputproto !media-gfx/pfaedit nls? ( sys-devel/gettext ) python? ( =dev-lang/python-2* ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 gif? ( >=media-libs/giflib-4.1.0-r1 ) jpeg? ( virtual/jpeg ) png? ( >=media-libs/libpng-1.2.4 ) tiff? ( >=media-libs/tiff-3.5.7-r1 ) truetype? ( >=media-libs/freetype-2.1.4 ) truetype-debugger? ( >=media-libs/freetype-2.3.8[fontforge,-bindist] ) svg? ( >=dev-libs/libxml2-2.6.7 ) unicode? ( >=media-libs/libuninameslist-030713 ) cairo? ( >=x11-libs/cairo-1.6.4[X] ) pango? ( >=x11-libs/pango-1.20.3 ) x11-libs/libXi x11-proto/inputproto !media-gfx/pfaedit python? ( =dev-lang/python-2* )
 0
 mirror://sourceforge/fontforge/fontforge_full-20110222.tar.bz2 doc? ( mirror://sourceforge/fontforge/fontforge_htdocs-20110221.tar.bz2 ) cjk? ( mirror://gentoo/cidmaps-20090121.tgz )
diff --git a/metadata/cache/media-gfx/fontforge-20110222-r1 b/metadata/cache/media-gfx/fontforge-20110222-r1
index 7efb8a839e07..0043abfe1348 100644
--- a/metadata/cache/media-gfx/fontforge-20110222-r1
+++ b/metadata/cache/media-gfx/fontforge-20110222-r1
@@ -1,4 +1,4 @@
-gif? ( >=media-libs/giflib-4.1.0-r1 ) jpeg? ( virtual/jpeg ) png? ( >=media-libs/libpng-1.2.4 ) tiff? ( >=media-libs/tiff-3.5.7-r1 ) truetype? ( >=media-libs/freetype-2.1.4 ) truetype-debugger? ( >=media-libs/freetype-2.3.8[fontforge,-bindist] ) svg? ( >=dev-libs/libxml2-2.6.7 ) unicode? ( >=media-libs/libuninameslist-030713 ) cairo? ( >=x11-libs/cairo-1.6.4[X] ) pango? ( >=x11-libs/pango-1.20.3 ) x11-libs/libXi x11-proto/inputproto !media-gfx/pfaedit nls? ( sys-devel/gettext ) python? ( =dev-lang/python-2* ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+gif? ( >=media-libs/giflib-4.1.0-r1 ) jpeg? ( virtual/jpeg ) png? ( >=media-libs/libpng-1.2.4 ) tiff? ( >=media-libs/tiff-3.5.7-r1 ) truetype? ( >=media-libs/freetype-2.1.4 ) truetype-debugger? ( >=media-libs/freetype-2.3.8[fontforge,-bindist] ) svg? ( >=dev-libs/libxml2-2.6.7 ) unicode? ( >=media-libs/libuninameslist-030713 ) cairo? ( >=x11-libs/cairo-1.6.4[X] ) pango? ( >=x11-libs/pango-1.20.3 ) x11-libs/libXi x11-proto/inputproto !media-gfx/pfaedit nls? ( sys-devel/gettext ) python? ( =dev-lang/python-2* ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 gif? ( >=media-libs/giflib-4.1.0-r1 ) jpeg? ( virtual/jpeg ) png? ( >=media-libs/libpng-1.2.4 ) tiff? ( >=media-libs/tiff-3.5.7-r1 ) truetype? ( >=media-libs/freetype-2.1.4 ) truetype-debugger? ( >=media-libs/freetype-2.3.8[fontforge,-bindist] ) svg? ( >=dev-libs/libxml2-2.6.7 ) unicode? ( >=media-libs/libuninameslist-030713 ) cairo? ( >=x11-libs/cairo-1.6.4[X] ) pango? ( >=x11-libs/pango-1.20.3 ) x11-libs/libXi x11-proto/inputproto !media-gfx/pfaedit python? ( =dev-lang/python-2* )
 0
 mirror://sourceforge/fontforge/fontforge_full-20110222.tar.bz2 doc? ( mirror://sourceforge/fontforge/fontforge_htdocs-20110221.tar.bz2 ) cjk? ( mirror://gentoo/cidmaps-20090121.tgz )
diff --git a/metadata/cache/media-gfx/geeqie-1.0-r2 b/metadata/cache/media-gfx/geeqie-1.0-r2
index 5e8afcd1aefd..ae42446a7eae 100644
--- a/metadata/cache/media-gfx/geeqie-1.0-r2
+++ b/metadata/cache/media-gfx/geeqie-1.0-r2
@@ -1,4 +1,4 @@
-x11-libs/gtk+:2 virtual/libintl doc? ( app-text/gnome-doc-utils ) lcms? ( =media-libs/lcms-1* ) lirc? ( app-misc/lirc ) xmp? ( >=media-gfx/exiv2-0.17[xmp] ) !xmp? ( exif? ( >=media-gfx/exiv2-0.17 ) ) dev-util/pkgconfig dev-util/intltool sys-devel/gettext || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+x11-libs/gtk+:2 virtual/libintl doc? ( app-text/gnome-doc-utils ) lcms? ( =media-libs/lcms-1* ) lirc? ( app-misc/lirc ) xmp? ( >=media-gfx/exiv2-0.17[xmp] ) !xmp? ( exif? ( >=media-gfx/exiv2-0.17 ) ) dev-util/pkgconfig dev-util/intltool sys-devel/gettext || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 x11-libs/gtk+:2 virtual/libintl doc? ( app-text/gnome-doc-utils ) lcms? ( =media-libs/lcms-1* ) lirc? ( app-misc/lirc ) xmp? ( >=media-gfx/exiv2-0.17[xmp] ) !xmp? ( exif? ( >=media-gfx/exiv2-0.17 ) )
 0
 mirror://sourceforge/geeqie/geeqie-1.0.tar.gz
diff --git a/metadata/cache/media-gfx/gimmage-0.2.3 b/metadata/cache/media-gfx/gimmage-0.2.3
index 586425dabda8..acac671c8914 100644
--- a/metadata/cache/media-gfx/gimmage-0.2.3
+++ b/metadata/cache/media-gfx/gimmage-0.2.3
@@ -1,4 +1,4 @@
-dev-cpp/cairomm >=dev-cpp/gtkmm-2.6.2:2.4 net-misc/curl sys-apps/file sys-devel/gettext dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-cpp/cairomm >=dev-cpp/gtkmm-2.6.2:2.4 net-misc/curl sys-apps/file sys-devel/gettext dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-cpp/cairomm >=dev-cpp/gtkmm-2.6.2:2.4 net-misc/curl sys-apps/file
 0
 mirror://berlios/gimmage/gimmage-0.2.3.tar.gz
diff --git a/metadata/cache/media-gfx/gimp-2.7.3 b/metadata/cache/media-gfx/gimp-2.7.3
index 674cef554367..e8986ae9d676 100644
--- a/metadata/cache/media-gfx/gimp-2.7.3
+++ b/metadata/cache/media-gfx/gimp-2.7.3
@@ -1,4 +1,4 @@
->=dev-libs/glib-2.28.1:2 >=x11-libs/gtk+-2.24.3:2 >=x11-libs/gdk-pixbuf-2.22.1:2 >=x11-libs/cairo-1.10.2 >=x11-libs/pango-1.22.0 xpm? ( x11-libs/libXpm ) >=media-libs/freetype-2.1.7 >=media-libs/fontconfig-2.2.0 sys-libs/zlib dev-libs/libxml2 dev-libs/libxslt x11-misc/xdg-utils x11-themes/hicolor-icon-theme >=media-libs/babl-0.1.4 >=media-libs/gegl-0.1.6 aalib? ( media-libs/aalib ) alsa? ( media-libs/alsa-lib ) curl? ( net-misc/curl ) dbus? ( dev-libs/dbus-glib ) gnome? ( gnome-base/gvfs ) webkit? ( net-libs/webkit-gtk:2 ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/jasper ) exif? ( >=media-libs/libexif-0.6.15 ) lcms? ( >=media-libs/lcms-1.16:0 ) mng? ( media-libs/libmng ) pdf? ( >=app-text/poppler-0.12.4[cairo] ) png? ( >=media-libs/libpng-1.2.37:0 ) python? ( >=dev-python/pygtk-2.10.4:2 ) tiff? ( >=media-libs/tiff-3.5.7:0 ) svg? ( >=gnome-base/librsvg-2.14.0:2 ) wmf? ( >=media-libs/libwmf-0.2.8 ) x11-libs/libXcursor udev? ( sys-fs/udev[gudev] ) >=dev-util/pkgconfig-0.22 >=dev-util/intltool-0.40.1 >=sys-devel/gettext-0.17 doc? ( >=dev-util/gtk-doc-1 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) )
+>=dev-libs/glib-2.28.1:2 >=x11-libs/gtk+-2.24.3:2 >=x11-libs/gdk-pixbuf-2.22.1:2 >=x11-libs/cairo-1.10.2 >=x11-libs/pango-1.22.0 xpm? ( x11-libs/libXpm ) >=media-libs/freetype-2.1.7 >=media-libs/fontconfig-2.2.0 sys-libs/zlib dev-libs/libxml2 dev-libs/libxslt x11-misc/xdg-utils x11-themes/hicolor-icon-theme >=media-libs/babl-0.1.4 >=media-libs/gegl-0.1.6 aalib? ( media-libs/aalib ) alsa? ( media-libs/alsa-lib ) curl? ( net-misc/curl ) dbus? ( dev-libs/dbus-glib ) gnome? ( gnome-base/gvfs ) webkit? ( net-libs/webkit-gtk:2 ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/jasper ) exif? ( >=media-libs/libexif-0.6.15 ) lcms? ( >=media-libs/lcms-1.16:0 ) mng? ( media-libs/libmng ) pdf? ( >=app-text/poppler-0.12.4[cairo] ) png? ( >=media-libs/libpng-1.2.37:0 ) python? ( >=dev-python/pygtk-2.10.4:2 ) tiff? ( >=media-libs/tiff-3.5.7:0 ) svg? ( >=gnome-base/librsvg-2.14.0:2 ) wmf? ( >=media-libs/libwmf-0.2.8 ) x11-libs/libXcursor udev? ( sys-fs/udev[gudev] ) >=dev-util/pkgconfig-0.22 >=dev-util/intltool-0.40.1 >=sys-devel/gettext-0.17 doc? ( >=dev-util/gtk-doc-1 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) )
 >=dev-libs/glib-2.28.1:2 >=x11-libs/gtk+-2.24.3:2 >=x11-libs/gdk-pixbuf-2.22.1:2 >=x11-libs/cairo-1.10.2 >=x11-libs/pango-1.22.0 xpm? ( x11-libs/libXpm ) >=media-libs/freetype-2.1.7 >=media-libs/fontconfig-2.2.0 sys-libs/zlib dev-libs/libxml2 dev-libs/libxslt x11-misc/xdg-utils x11-themes/hicolor-icon-theme >=media-libs/babl-0.1.4 >=media-libs/gegl-0.1.6 aalib? ( media-libs/aalib ) alsa? ( media-libs/alsa-lib ) curl? ( net-misc/curl ) dbus? ( dev-libs/dbus-glib ) gnome? ( gnome-base/gvfs ) webkit? ( net-libs/webkit-gtk:2 ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/jasper ) exif? ( >=media-libs/libexif-0.6.15 ) lcms? ( >=media-libs/lcms-1.16:0 ) mng? ( media-libs/libmng ) pdf? ( >=app-text/poppler-0.12.4[cairo] ) png? ( >=media-libs/libpng-1.2.37:0 ) python? ( >=dev-python/pygtk-2.10.4:2 ) tiff? ( >=media-libs/tiff-3.5.7:0 ) svg? ( >=gnome-base/librsvg-2.14.0:2 ) wmf? ( >=media-libs/libwmf-0.2.8 ) x11-libs/libXcursor udev? ( sys-fs/udev[gudev] ) python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) )
 2
 mirror://gimp/v2.7/gimp-2.7.3.tar.bz2
diff --git a/metadata/cache/media-gfx/gimp-2.7.3-r1 b/metadata/cache/media-gfx/gimp-2.7.3-r1
index a5aeb98d0f81..2a4f6faade47 100644
--- a/metadata/cache/media-gfx/gimp-2.7.3-r1
+++ b/metadata/cache/media-gfx/gimp-2.7.3-r1
@@ -1,4 +1,4 @@
->=dev-libs/glib-2.28.1:2 >=x11-libs/gtk+-2.24.3:2 >=x11-libs/gdk-pixbuf-2.22.1:2 >=x11-libs/cairo-1.10.2 >=x11-libs/pango-1.22.0 xpm? ( x11-libs/libXpm ) >=media-libs/freetype-2.1.7 >=media-libs/fontconfig-2.2.0 sys-libs/zlib dev-libs/libxml2 dev-libs/libxslt x11-misc/xdg-utils x11-themes/hicolor-icon-theme >=media-libs/babl-0.1.4 >=media-libs/gegl-0.1.6 aalib? ( media-libs/aalib ) alsa? ( media-libs/alsa-lib ) curl? ( net-misc/curl ) dbus? ( dev-libs/dbus-glib ) gnome? ( gnome-base/gvfs ) webkit? ( net-libs/webkit-gtk:2 ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/jasper ) exif? ( >=media-libs/libexif-0.6.15 ) lcms? ( >=media-libs/lcms-1.16:0 ) mng? ( media-libs/libmng ) pdf? ( >=app-text/poppler-0.12.4[cairo] ) png? ( >=media-libs/libpng-1.2.37:0 ) python? ( >=dev-python/pygtk-2.10.4:2 ) tiff? ( >=media-libs/tiff-3.5.7:0 ) svg? ( >=gnome-base/librsvg-2.14.0:2 ) wmf? ( >=media-libs/libwmf-0.2.8 ) x11-libs/libXcursor udev? ( sys-fs/udev[gudev] ) >=dev-util/pkgconfig-0.22 >=dev-util/intltool-0.40.1 >=sys-devel/gettext-0.17 doc? ( >=dev-util/gtk-doc-1 ) >=sys-devel/automake-1.11 dev-util/gtk-doc-am || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) )
+>=dev-libs/glib-2.28.1:2 >=x11-libs/gtk+-2.24.3:2 >=x11-libs/gdk-pixbuf-2.22.1:2 >=x11-libs/cairo-1.10.2 >=x11-libs/pango-1.22.0 xpm? ( x11-libs/libXpm ) >=media-libs/freetype-2.1.7 >=media-libs/fontconfig-2.2.0 sys-libs/zlib dev-libs/libxml2 dev-libs/libxslt x11-misc/xdg-utils x11-themes/hicolor-icon-theme >=media-libs/babl-0.1.4 >=media-libs/gegl-0.1.6 aalib? ( media-libs/aalib ) alsa? ( media-libs/alsa-lib ) curl? ( net-misc/curl ) dbus? ( dev-libs/dbus-glib ) gnome? ( gnome-base/gvfs ) webkit? ( net-libs/webkit-gtk:2 ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/jasper ) exif? ( >=media-libs/libexif-0.6.15 ) lcms? ( >=media-libs/lcms-1.16:0 ) mng? ( media-libs/libmng ) pdf? ( >=app-text/poppler-0.12.4[cairo] ) png? ( >=media-libs/libpng-1.2.37:0 ) python? ( >=dev-python/pygtk-2.10.4:2 ) tiff? ( >=media-libs/tiff-3.5.7:0 ) svg? ( >=gnome-base/librsvg-2.14.0:2 ) wmf? ( >=media-libs/libwmf-0.2.8 ) x11-libs/libXcursor udev? ( sys-fs/udev[gudev] ) >=dev-util/pkgconfig-0.22 >=dev-util/intltool-0.40.1 >=sys-devel/gettext-0.17 doc? ( >=dev-util/gtk-doc-1 ) >=sys-devel/automake-1.11 dev-util/gtk-doc-am || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) )
 >=dev-libs/glib-2.28.1:2 >=x11-libs/gtk+-2.24.3:2 >=x11-libs/gdk-pixbuf-2.22.1:2 >=x11-libs/cairo-1.10.2 >=x11-libs/pango-1.22.0 xpm? ( x11-libs/libXpm ) >=media-libs/freetype-2.1.7 >=media-libs/fontconfig-2.2.0 sys-libs/zlib dev-libs/libxml2 dev-libs/libxslt x11-misc/xdg-utils x11-themes/hicolor-icon-theme >=media-libs/babl-0.1.4 >=media-libs/gegl-0.1.6 aalib? ( media-libs/aalib ) alsa? ( media-libs/alsa-lib ) curl? ( net-misc/curl ) dbus? ( dev-libs/dbus-glib ) gnome? ( gnome-base/gvfs ) webkit? ( net-libs/webkit-gtk:2 ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/jasper ) exif? ( >=media-libs/libexif-0.6.15 ) lcms? ( >=media-libs/lcms-1.16:0 ) mng? ( media-libs/libmng ) pdf? ( >=app-text/poppler-0.12.4[cairo] ) png? ( >=media-libs/libpng-1.2.37:0 ) python? ( >=dev-python/pygtk-2.10.4:2 ) tiff? ( >=media-libs/tiff-3.5.7:0 ) svg? ( >=gnome-base/librsvg-2.14.0:2 ) wmf? ( >=media-libs/libwmf-0.2.8 ) x11-libs/libXcursor udev? ( sys-fs/udev[gudev] ) python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) )
 2
 mirror://gimp/v2.7/gimp-2.7.3.tar.bz2
diff --git a/metadata/cache/media-gfx/gimp-2.7.4 b/metadata/cache/media-gfx/gimp-2.7.4
index 1ece4867359d..7b1d44e077e9 100644
--- a/metadata/cache/media-gfx/gimp-2.7.4
+++ b/metadata/cache/media-gfx/gimp-2.7.4
@@ -1,4 +1,4 @@
->=dev-libs/glib-2.30.2:2 >=x11-libs/gtk+-2.24.7:2 >=x11-libs/gdk-pixbuf-2.24:2 >=x11-libs/cairo-1.10.2 >=x11-libs/pango-1.29.4 xpm? ( x11-libs/libXpm ) >=media-libs/freetype-2.1.7 >=media-libs/fontconfig-2.2.0 sys-libs/zlib dev-libs/libxml2 dev-libs/libxslt x11-misc/xdg-utils x11-themes/hicolor-icon-theme >=media-libs/babl-0.1.6 >=media-libs/gegl-0.1.8 aalib? ( media-libs/aalib ) alsa? ( media-libs/alsa-lib ) curl? ( net-misc/curl ) dbus? ( dev-libs/dbus-glib ) gnome? ( gnome-base/gvfs ) webkit? ( >=net-libs/webkit-gtk-1.6.1:2 ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/jasper ) exif? ( >=media-libs/libexif-0.6.15 ) lcms? ( >=media-libs/lcms-1.16:0 ) mng? ( media-libs/libmng ) pdf? ( >=app-text/poppler-0.12.4[cairo] ) png? ( >=media-libs/libpng-1.2.37:0 ) python? ( >=dev-python/pygtk-2.10.4:2 ) tiff? ( >=media-libs/tiff-3.5.7:0 ) svg? ( >=gnome-base/librsvg-2.34.2:2 ) wmf? ( >=media-libs/libwmf-0.2.8 ) x11-libs/libXcursor udev? ( sys-fs/udev[gudev] ) >=dev-util/pkgconfig-0.22 >=dev-util/intltool-0.40.1 >=sys-devel/gettext-0.17 doc? ( >=dev-util/gtk-doc-1 ) >=sys-devel/libtool-2.2 >=sys-devel/automake-1.11 dev-util/gtk-doc-am || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) )
+>=dev-libs/glib-2.30.2:2 >=x11-libs/gtk+-2.24.7:2 >=x11-libs/gdk-pixbuf-2.24:2 >=x11-libs/cairo-1.10.2 >=x11-libs/pango-1.29.4 xpm? ( x11-libs/libXpm ) >=media-libs/freetype-2.1.7 >=media-libs/fontconfig-2.2.0 sys-libs/zlib dev-libs/libxml2 dev-libs/libxslt x11-misc/xdg-utils x11-themes/hicolor-icon-theme >=media-libs/babl-0.1.6 >=media-libs/gegl-0.1.8 aalib? ( media-libs/aalib ) alsa? ( media-libs/alsa-lib ) curl? ( net-misc/curl ) dbus? ( dev-libs/dbus-glib ) gnome? ( gnome-base/gvfs ) webkit? ( >=net-libs/webkit-gtk-1.6.1:2 ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/jasper ) exif? ( >=media-libs/libexif-0.6.15 ) lcms? ( >=media-libs/lcms-1.16:0 ) mng? ( media-libs/libmng ) pdf? ( >=app-text/poppler-0.12.4[cairo] ) png? ( >=media-libs/libpng-1.2.37:0 ) python? ( >=dev-python/pygtk-2.10.4:2 ) tiff? ( >=media-libs/tiff-3.5.7:0 ) svg? ( >=gnome-base/librsvg-2.34.2:2 ) wmf? ( >=media-libs/libwmf-0.2.8 ) x11-libs/libXcursor udev? ( sys-fs/udev[gudev] ) >=dev-util/pkgconfig-0.22 >=dev-util/intltool-0.40.1 >=sys-devel/gettext-0.17 doc? ( >=dev-util/gtk-doc-1 ) >=sys-devel/libtool-2.2 >=sys-devel/automake-1.11 dev-util/gtk-doc-am || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) )
 >=dev-libs/glib-2.30.2:2 >=x11-libs/gtk+-2.24.7:2 >=x11-libs/gdk-pixbuf-2.24:2 >=x11-libs/cairo-1.10.2 >=x11-libs/pango-1.29.4 xpm? ( x11-libs/libXpm ) >=media-libs/freetype-2.1.7 >=media-libs/fontconfig-2.2.0 sys-libs/zlib dev-libs/libxml2 dev-libs/libxslt x11-misc/xdg-utils x11-themes/hicolor-icon-theme >=media-libs/babl-0.1.6 >=media-libs/gegl-0.1.8 aalib? ( media-libs/aalib ) alsa? ( media-libs/alsa-lib ) curl? ( net-misc/curl ) dbus? ( dev-libs/dbus-glib ) gnome? ( gnome-base/gvfs ) webkit? ( >=net-libs/webkit-gtk-1.6.1:2 ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/jasper ) exif? ( >=media-libs/libexif-0.6.15 ) lcms? ( >=media-libs/lcms-1.16:0 ) mng? ( media-libs/libmng ) pdf? ( >=app-text/poppler-0.12.4[cairo] ) png? ( >=media-libs/libpng-1.2.37:0 ) python? ( >=dev-python/pygtk-2.10.4:2 ) tiff? ( >=media-libs/tiff-3.5.7:0 ) svg? ( >=gnome-base/librsvg-2.34.2:2 ) wmf? ( >=media-libs/libwmf-0.2.8 ) x11-libs/libXcursor udev? ( sys-fs/udev[gudev] ) python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) )
 2
 mirror://gimp/v2.7/gimp-2.7.4.tar.bz2
diff --git a/metadata/cache/media-gfx/gimp-2.7.5 b/metadata/cache/media-gfx/gimp-2.7.5
index 06705942c6e6..d3db705ab89d 100644
--- a/metadata/cache/media-gfx/gimp-2.7.5
+++ b/metadata/cache/media-gfx/gimp-2.7.5
@@ -1,4 +1,4 @@
->=dev-libs/glib-2.30.2:2 >=dev-libs/atk-2.0.1 >=x11-libs/gtk+-2.24.7:2 >=x11-libs/gdk-pixbuf-2.24:2 >=x11-libs/cairo-1.10.2 >=x11-libs/pango-1.29.4 xpm? ( x11-libs/libXpm ) >=media-libs/freetype-2.1.7 >=media-libs/fontconfig-2.2.0 sys-libs/zlib dev-libs/libxml2 dev-libs/libxslt x11-misc/xdg-utils x11-themes/hicolor-icon-theme >=media-libs/babl-0.1.6 >=media-libs/gegl-0.1.8 aalib? ( media-libs/aalib ) alsa? ( media-libs/alsa-lib ) curl? ( net-misc/curl ) dbus? ( dev-libs/dbus-glib ) gnome? ( gnome-base/gvfs ) webkit? ( >=net-libs/webkit-gtk-1.6.1:2 ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/jasper ) exif? ( >=media-libs/libexif-0.6.15 ) lcms? ( >=media-libs/lcms-1.16:0 ) mng? ( media-libs/libmng ) pdf? ( >=app-text/poppler-0.12.4[cairo] ) png? ( >=media-libs/libpng-1.2.37:0 ) python? ( >=dev-python/pygtk-2.10.4:2 ) tiff? ( >=media-libs/tiff-3.5.7:0 ) svg? ( >=gnome-base/librsvg-2.34.2:2 ) wmf? ( >=media-libs/libwmf-0.2.8 ) x11-libs/libXcursor sys-libs/zlib bzip2? ( app-arch/bzip2 ) gs? ( app-text/ghostscript-gpl ) udev? ( sys-fs/udev[gudev] ) >=dev-util/pkgconfig-0.22 >=dev-util/intltool-0.40.1 >=sys-devel/gettext-0.17 doc? ( >=dev-util/gtk-doc-1 ) >=sys-devel/libtool-2.2 >=sys-devel/automake-1.11 dev-util/gtk-doc-am || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) )
+>=dev-libs/glib-2.30.2:2 >=dev-libs/atk-2.0.1 >=x11-libs/gtk+-2.24.7:2 >=x11-libs/gdk-pixbuf-2.24:2 >=x11-libs/cairo-1.10.2 >=x11-libs/pango-1.29.4 xpm? ( x11-libs/libXpm ) >=media-libs/freetype-2.1.7 >=media-libs/fontconfig-2.2.0 sys-libs/zlib dev-libs/libxml2 dev-libs/libxslt x11-misc/xdg-utils x11-themes/hicolor-icon-theme >=media-libs/babl-0.1.6 >=media-libs/gegl-0.1.8 aalib? ( media-libs/aalib ) alsa? ( media-libs/alsa-lib ) curl? ( net-misc/curl ) dbus? ( dev-libs/dbus-glib ) gnome? ( gnome-base/gvfs ) webkit? ( >=net-libs/webkit-gtk-1.6.1:2 ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/jasper ) exif? ( >=media-libs/libexif-0.6.15 ) lcms? ( >=media-libs/lcms-1.16:0 ) mng? ( media-libs/libmng ) pdf? ( >=app-text/poppler-0.12.4[cairo] ) png? ( >=media-libs/libpng-1.2.37:0 ) python? ( >=dev-python/pygtk-2.10.4:2 ) tiff? ( >=media-libs/tiff-3.5.7:0 ) svg? ( >=gnome-base/librsvg-2.34.2:2 ) wmf? ( >=media-libs/libwmf-0.2.8 ) x11-libs/libXcursor sys-libs/zlib bzip2? ( app-arch/bzip2 ) gs? ( app-text/ghostscript-gpl ) udev? ( sys-fs/udev[gudev] ) >=dev-util/pkgconfig-0.22 >=dev-util/intltool-0.40.1 >=sys-devel/gettext-0.17 doc? ( >=dev-util/gtk-doc-1 ) >=sys-devel/libtool-2.2 >=sys-devel/automake-1.11 dev-util/gtk-doc-am || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) )
 >=dev-libs/glib-2.30.2:2 >=dev-libs/atk-2.0.1 >=x11-libs/gtk+-2.24.7:2 >=x11-libs/gdk-pixbuf-2.24:2 >=x11-libs/cairo-1.10.2 >=x11-libs/pango-1.29.4 xpm? ( x11-libs/libXpm ) >=media-libs/freetype-2.1.7 >=media-libs/fontconfig-2.2.0 sys-libs/zlib dev-libs/libxml2 dev-libs/libxslt x11-misc/xdg-utils x11-themes/hicolor-icon-theme >=media-libs/babl-0.1.6 >=media-libs/gegl-0.1.8 aalib? ( media-libs/aalib ) alsa? ( media-libs/alsa-lib ) curl? ( net-misc/curl ) dbus? ( dev-libs/dbus-glib ) gnome? ( gnome-base/gvfs ) webkit? ( >=net-libs/webkit-gtk-1.6.1:2 ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/jasper ) exif? ( >=media-libs/libexif-0.6.15 ) lcms? ( >=media-libs/lcms-1.16:0 ) mng? ( media-libs/libmng ) pdf? ( >=app-text/poppler-0.12.4[cairo] ) png? ( >=media-libs/libpng-1.2.37:0 ) python? ( >=dev-python/pygtk-2.10.4:2 ) tiff? ( >=media-libs/tiff-3.5.7:0 ) svg? ( >=gnome-base/librsvg-2.34.2:2 ) wmf? ( >=media-libs/libwmf-0.2.8 ) x11-libs/libXcursor sys-libs/zlib bzip2? ( app-arch/bzip2 ) gs? ( app-text/ghostscript-gpl ) udev? ( sys-fs/udev[gudev] ) python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) )
 2
 mirror://gimp/v2.7/gimp-2.7.5.tar.bz2
diff --git a/metadata/cache/media-gfx/gliv-1.9.6 b/metadata/cache/media-gfx/gliv-1.9.6
index d15e51e974b7..248358d3e2b9 100644
--- a/metadata/cache/media-gfx/gliv-1.9.6
+++ b/metadata/cache/media-gfx/gliv-1.9.6
@@ -1,4 +1,4 @@
->=x11-libs/gtk+-2.6:2 virtual/opengl >x11-libs/gtkglext-1.0.6 nls? ( sys-devel/gettext ) dev-util/pkgconfig >=sys-devel/bison-1.875 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=x11-libs/gtk+-2.6:2 virtual/opengl >x11-libs/gtkglext-1.0.6 nls? ( sys-devel/gettext ) dev-util/pkgconfig >=sys-devel/bison-1.875 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=x11-libs/gtk+-2.6:2 virtual/opengl >x11-libs/gtkglext-1.0.6 nls? ( sys-devel/gettext )
 0
 http://guichaz.free.fr/gliv/files/gliv-1.9.6.tar.bz2
diff --git a/metadata/cache/media-gfx/gliv-1.9.7 b/metadata/cache/media-gfx/gliv-1.9.7
index 5ca9d20e963d..a539311af10e 100644
--- a/metadata/cache/media-gfx/gliv-1.9.7
+++ b/metadata/cache/media-gfx/gliv-1.9.7
@@ -1,4 +1,4 @@
->=x11-libs/gtk+-2.6:2 virtual/opengl >x11-libs/gtkglext-1.0.6 dev-util/pkgconfig >=sys-devel/bison-1.875 nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=x11-libs/gtk+-2.6:2 virtual/opengl >x11-libs/gtkglext-1.0.6 dev-util/pkgconfig >=sys-devel/bison-1.875 nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=x11-libs/gtk+-2.6:2 virtual/opengl >x11-libs/gtkglext-1.0.6
 0
 http://guichaz.free.fr/gliv/files/gliv-1.9.7.tar.bz2
diff --git a/metadata/cache/media-gfx/gnome-raw-thumbnailer-0.99.1 b/metadata/cache/media-gfx/gnome-raw-thumbnailer-0.99.1
index 14c249cf7c5f..82fd392de0e9 100644
--- a/metadata/cache/media-gfx/gnome-raw-thumbnailer-0.99.1
+++ b/metadata/cache/media-gfx/gnome-raw-thumbnailer-0.99.1
@@ -1,4 +1,4 @@
-media-libs/libopenraw[gtk] >=x11-libs/gtk+-2:2 gnome-base/gnome-vfs:2 dev-util/intltool dev-util/pkgconfig sys-devel/gettext !media-gfx/raw-thumbnailer || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+media-libs/libopenraw[gtk] >=x11-libs/gtk+-2:2 gnome-base/gnome-vfs:2 dev-util/intltool dev-util/pkgconfig sys-devel/gettext !media-gfx/raw-thumbnailer || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 media-libs/libopenraw[gtk] >=x11-libs/gtk+-2:2 gnome-base/gnome-vfs:2
 0
 http://libopenraw.freedesktop.org/download/raw-thumbnailer-0.99.1.tar.gz
diff --git a/metadata/cache/media-gfx/gnome-raw-thumbnailer-3.0.0 b/metadata/cache/media-gfx/gnome-raw-thumbnailer-3.0.0
index 3d9f0001d93d..5e435b2c0df8 100644
--- a/metadata/cache/media-gfx/gnome-raw-thumbnailer-3.0.0
+++ b/metadata/cache/media-gfx/gnome-raw-thumbnailer-3.0.0
@@ -1,4 +1,4 @@
->=media-libs/libopenraw-0.0.9[gtk] x11-libs/gdk-pixbuf:2 >=dev-libs/glib-2.26:2 >=dev-util/intltool-0.21 dev-util/pkgconfig sys-devel/gettext !media-gfx/raw-thumbnailer || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
+>=media-libs/libopenraw-0.0.9[gtk] x11-libs/gdk-pixbuf:2 >=dev-libs/glib-2.26:2 >=dev-util/intltool-0.21 dev-util/pkgconfig sys-devel/gettext !media-gfx/raw-thumbnailer || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
 >=media-libs/libopenraw-0.0.9[gtk] x11-libs/gdk-pixbuf:2 >=dev-libs/glib-2.26:2
 0
 http://libopenraw.freedesktop.org/download/raw-thumbnailer-3.0.0.tar.bz2
diff --git a/metadata/cache/media-gfx/gnome-scan-0.7.2 b/metadata/cache/media-gfx/gnome-scan-0.7.2
index 3c7f7362b029..f4e82f0d84a7 100644
--- a/metadata/cache/media-gfx/gnome-scan-0.7.2
+++ b/metadata/cache/media-gfx/gnome-scan-0.7.2
@@ -1,4 +1,4 @@
->=x11-libs/gtk+-2.12:2 media-gfx/sane-backends >=media-libs/gegl-0.1.0 >=media-libs/babl-0.1.0 >=media-gfx/gimp-2.3 gnome-base/gconf:2 gnome-base/gnome-common sys-devel/gettext >=dev-util/intltool-0.35 dev-util/pkgconfig doc? ( >=dev-util/gtk-doc-1.7 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+>=x11-libs/gtk+-2.12:2 media-gfx/sane-backends >=media-libs/gegl-0.1.0 >=media-libs/babl-0.1.0 >=media-gfx/gimp-2.3 gnome-base/gconf:2 gnome-base/gnome-common sys-devel/gettext >=dev-util/intltool-0.35 dev-util/pkgconfig doc? ( >=dev-util/gtk-doc-1.7 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 >=x11-libs/gtk+-2.12:2 media-gfx/sane-backends >=media-libs/gegl-0.1.0 >=media-libs/babl-0.1.0 >=media-gfx/gimp-2.3 gnome-base/gconf:2
 0
 mirror://gnome/sources/gnome-scan/0.7/gnome-scan-0.7.2.tar.bz2
diff --git a/metadata/cache/media-gfx/gozer-0.7-r2 b/metadata/cache/media-gfx/gozer-0.7-r2
index 0f5bd3563dae..ff9c86e63f12 100644
--- a/metadata/cache/media-gfx/gozer-0.7-r2
+++ b/metadata/cache/media-gfx/gozer-0.7-r2
@@ -1,4 +1,4 @@
-x11-libs/libXext >=media-libs/giblib-1.2.1 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+x11-libs/libXext >=media-libs/giblib-1.2.1 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=media-libs/giblib-1.2.1 media-libs/imlib2
 0
 http://www.linuxbrit.co.uk/downloads/gozer-0.7.tar.gz
diff --git a/metadata/cache/media-gfx/gphoto2-2.4.11 b/metadata/cache/media-gfx/gphoto2-2.4.11
index eb94bfd32548..5f89825f218c 100644
--- a/metadata/cache/media-gfx/gphoto2-2.4.11
+++ b/metadata/cache/media-gfx/gphoto2-2.4.11
@@ -1,4 +1,4 @@
-virtual/libusb:0 dev-libs/popt >=media-libs/libgphoto2-2.4.11[exif?] ncurses? ( dev-libs/cdk ) aalib? ( media-libs/aalib virtual/jpeg:0 ) exif? ( media-libs/libexif ) readline? ( sys-libs/readline ) dev-util/pkgconfig nls? ( >=sys-devel/gettext-0.14 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+virtual/libusb:0 dev-libs/popt >=media-libs/libgphoto2-2.4.11[exif?] ncurses? ( dev-libs/cdk ) aalib? ( media-libs/aalib virtual/jpeg:0 ) exif? ( media-libs/libexif ) readline? ( sys-libs/readline ) dev-util/pkgconfig nls? ( >=sys-devel/gettext-0.14 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 virtual/libusb:0 dev-libs/popt >=media-libs/libgphoto2-2.4.11[exif?] ncurses? ( dev-libs/cdk ) aalib? ( media-libs/aalib virtual/jpeg:0 ) exif? ( media-libs/libexif ) readline? ( sys-libs/readline )
 0
 mirror://sourceforge/gphoto/gphoto2-2.4.11.tar.bz2
diff --git a/metadata/cache/media-gfx/graphviz-2.26.3-r2 b/metadata/cache/media-gfx/graphviz-2.26.3-r2
index 4188ef82a8a4..43aa376c9ee5 100644
--- a/metadata/cache/media-gfx/graphviz-2.26.3-r2
+++ b/metadata/cache/media-gfx/graphviz-2.26.3-r2
@@ -1,4 +1,4 @@
->=dev-libs/expat-2.0.0 >=dev-libs/glib-2.11.1 >=media-libs/fontconfig-2.3.95 >=media-libs/freetype-2.1.10 >=media-libs/gd-2.0.28[fontconfig,jpeg,png,truetype] >=media-libs/libpng-1.2.10 virtual/jpeg virtual/libiconv cairo? ( x11-libs/libXaw >=x11-libs/pango-1.12 >=x11-libs/cairo-1.1.10[svg] ) gtk? ( x11-libs/gtk+:2 x11-libs/libXaw >=x11-libs/pango-1.12 >=x11-libs/cairo-1.1.10 ) lasi? ( media-libs/lasi ) ruby? ( dev-lang/ruby ) tcl? ( >=dev-lang/tcl-8.3 ) dev-util/pkgconfig sys-devel/flex java? ( dev-lang/swig ) nls? ( >=sys-devel/gettext-0.14.5 ) perl? ( dev-lang/swig ) python? ( dev-lang/swig ) ruby? ( dev-lang/swig ) tcl? ( dev-lang/swig ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( =dev-lang/python-2* )
+>=dev-libs/expat-2.0.0 >=dev-libs/glib-2.11.1 >=media-libs/fontconfig-2.3.95 >=media-libs/freetype-2.1.10 >=media-libs/gd-2.0.28[fontconfig,jpeg,png,truetype] >=media-libs/libpng-1.2.10 virtual/jpeg virtual/libiconv cairo? ( x11-libs/libXaw >=x11-libs/pango-1.12 >=x11-libs/cairo-1.1.10[svg] ) gtk? ( x11-libs/gtk+:2 x11-libs/libXaw >=x11-libs/pango-1.12 >=x11-libs/cairo-1.1.10 ) lasi? ( media-libs/lasi ) ruby? ( dev-lang/ruby ) tcl? ( >=dev-lang/tcl-8.3 ) dev-util/pkgconfig sys-devel/flex java? ( dev-lang/swig ) nls? ( >=sys-devel/gettext-0.14.5 ) perl? ( dev-lang/swig ) python? ( dev-lang/swig ) ruby? ( dev-lang/swig ) tcl? ( dev-lang/swig ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( =dev-lang/python-2* )
 >=dev-libs/expat-2.0.0 >=dev-libs/glib-2.11.1 >=media-libs/fontconfig-2.3.95 >=media-libs/freetype-2.1.10 >=media-libs/gd-2.0.28[fontconfig,jpeg,png,truetype] >=media-libs/libpng-1.2.10 virtual/jpeg virtual/libiconv cairo? ( x11-libs/libXaw >=x11-libs/pango-1.12 >=x11-libs/cairo-1.1.10[svg] ) gtk? ( x11-libs/gtk+:2 x11-libs/libXaw >=x11-libs/pango-1.12 >=x11-libs/cairo-1.1.10 ) lasi? ( media-libs/lasi ) ruby? ( dev-lang/ruby ) tcl? ( >=dev-lang/tcl-8.3 ) python? ( =dev-lang/python-2* )
 0
 http://www.graphviz.org/pub/graphviz/ARCHIVE/graphviz-2.26.3.tar.gz
diff --git a/metadata/cache/media-gfx/graphviz-2.26.3-r3 b/metadata/cache/media-gfx/graphviz-2.26.3-r3
index 20e8cce410e9..b521c009d054 100644
--- a/metadata/cache/media-gfx/graphviz-2.26.3-r3
+++ b/metadata/cache/media-gfx/graphviz-2.26.3-r3
@@ -1,4 +1,4 @@
->=dev-libs/expat-2.0.0 >=dev-libs/glib-2.11.1 >=media-libs/fontconfig-2.3.95 >=media-libs/freetype-2.1.10 >=media-libs/gd-2.0.28[fontconfig,jpeg,png,truetype] >=media-libs/libpng-1.4 virtual/jpeg virtual/libiconv cairo? ( x11-libs/libXaw >=x11-libs/pango-1.12 >=x11-libs/cairo-1.1.10[svg] ) gtk? ( x11-libs/gtk+:2 x11-libs/libXaw >=x11-libs/pango-1.12 >=x11-libs/cairo-1.1.10 ) lasi? ( media-libs/lasi ) ruby? ( dev-lang/ruby ) tcl? ( >=dev-lang/tcl-8.3 ) dev-util/pkgconfig sys-devel/flex java? ( dev-lang/swig ) nls? ( >=sys-devel/gettext-0.14.5 ) perl? ( dev-lang/swig ) python? ( dev-lang/swig ) ruby? ( dev-lang/swig ) tcl? ( dev-lang/swig ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( =dev-lang/python-2* )
+>=dev-libs/expat-2.0.0 >=dev-libs/glib-2.11.1 >=media-libs/fontconfig-2.3.95 >=media-libs/freetype-2.1.10 >=media-libs/gd-2.0.28[fontconfig,jpeg,png,truetype] >=media-libs/libpng-1.4 virtual/jpeg virtual/libiconv cairo? ( x11-libs/libXaw >=x11-libs/pango-1.12 >=x11-libs/cairo-1.1.10[svg] ) gtk? ( x11-libs/gtk+:2 x11-libs/libXaw >=x11-libs/pango-1.12 >=x11-libs/cairo-1.1.10 ) lasi? ( media-libs/lasi ) ruby? ( dev-lang/ruby ) tcl? ( >=dev-lang/tcl-8.3 ) dev-util/pkgconfig sys-devel/flex java? ( dev-lang/swig ) nls? ( >=sys-devel/gettext-0.14.5 ) perl? ( dev-lang/swig ) python? ( dev-lang/swig ) ruby? ( dev-lang/swig ) tcl? ( dev-lang/swig ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( =dev-lang/python-2* )
 >=dev-libs/expat-2.0.0 >=dev-libs/glib-2.11.1 >=media-libs/fontconfig-2.3.95 >=media-libs/freetype-2.1.10 >=media-libs/gd-2.0.28[fontconfig,jpeg,png,truetype] >=media-libs/libpng-1.4 virtual/jpeg virtual/libiconv cairo? ( x11-libs/libXaw >=x11-libs/pango-1.12 >=x11-libs/cairo-1.1.10[svg] ) gtk? ( x11-libs/gtk+:2 x11-libs/libXaw >=x11-libs/pango-1.12 >=x11-libs/cairo-1.1.10 ) lasi? ( media-libs/lasi ) ruby? ( dev-lang/ruby ) tcl? ( >=dev-lang/tcl-8.3 ) python? ( =dev-lang/python-2* )
 0
 http://www.graphviz.org/pub/graphviz/ARCHIVE/graphviz-2.26.3.tar.gz
diff --git a/metadata/cache/media-gfx/graphviz-2.26.3-r4 b/metadata/cache/media-gfx/graphviz-2.26.3-r4
index 6d5391b25380..164b09a7fa40 100644
--- a/metadata/cache/media-gfx/graphviz-2.26.3-r4
+++ b/metadata/cache/media-gfx/graphviz-2.26.3-r4
@@ -1,4 +1,4 @@
->=dev-libs/expat-2.0.0 >=dev-libs/glib-2.11.1 >=media-libs/fontconfig-2.3.95 >=media-libs/freetype-2.1.10 >=media-libs/gd-2.0.28[fontconfig,jpeg,png,truetype] >=media-libs/libpng-1.4 virtual/jpeg virtual/libiconv cairo? ( x11-libs/libXaw >=x11-libs/pango-1.12 >=x11-libs/cairo-1.1.10[svg] ) gtk? ( x11-libs/gtk+:2 x11-libs/libXaw >=x11-libs/pango-1.12 >=x11-libs/cairo-1.1.10 ) lasi? ( media-libs/lasi ) ruby? ( dev-lang/ruby ) tcl? ( >=dev-lang/tcl-8.3 ) dev-util/pkgconfig sys-devel/flex java? ( dev-lang/swig ) nls? ( >=sys-devel/gettext-0.14.5 ) perl? ( dev-lang/swig ) python? ( dev-lang/swig ) ruby? ( dev-lang/swig ) tcl? ( dev-lang/swig ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( =dev-lang/python-2* )
+>=dev-libs/expat-2.0.0 >=dev-libs/glib-2.11.1 >=media-libs/fontconfig-2.3.95 >=media-libs/freetype-2.1.10 >=media-libs/gd-2.0.28[fontconfig,jpeg,png,truetype] >=media-libs/libpng-1.4 virtual/jpeg virtual/libiconv cairo? ( x11-libs/libXaw >=x11-libs/pango-1.12 >=x11-libs/cairo-1.1.10[svg] ) gtk? ( x11-libs/gtk+:2 x11-libs/libXaw >=x11-libs/pango-1.12 >=x11-libs/cairo-1.1.10 ) lasi? ( media-libs/lasi ) ruby? ( dev-lang/ruby ) tcl? ( >=dev-lang/tcl-8.3 ) dev-util/pkgconfig sys-devel/flex java? ( dev-lang/swig ) nls? ( >=sys-devel/gettext-0.14.5 ) perl? ( dev-lang/swig ) python? ( dev-lang/swig ) ruby? ( dev-lang/swig ) tcl? ( dev-lang/swig ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( =dev-lang/python-2* )
 >=dev-libs/expat-2.0.0 >=dev-libs/glib-2.11.1 >=media-libs/fontconfig-2.3.95 >=media-libs/freetype-2.1.10 >=media-libs/gd-2.0.28[fontconfig,jpeg,png,truetype] >=media-libs/libpng-1.4 virtual/jpeg virtual/libiconv cairo? ( x11-libs/libXaw >=x11-libs/pango-1.12 >=x11-libs/cairo-1.1.10[svg] ) gtk? ( x11-libs/gtk+:2 x11-libs/libXaw >=x11-libs/pango-1.12 >=x11-libs/cairo-1.1.10 ) lasi? ( media-libs/lasi ) ruby? ( dev-lang/ruby ) tcl? ( >=dev-lang/tcl-8.3 ) python? ( =dev-lang/python-2* )
 0
 http://www.graphviz.org/pub/graphviz/ARCHIVE/graphviz-2.26.3.tar.gz
diff --git a/metadata/cache/media-gfx/gtkam-0.1.17 b/metadata/cache/media-gfx/gtkam-0.1.17
index a7adba11812d..27378a2e0fa4 100644
--- a/metadata/cache/media-gfx/gtkam-0.1.17
+++ b/metadata/cache/media-gfx/gtkam-0.1.17
@@ -1,4 +1,4 @@
-x11-libs/gtk+:2 >media-libs/libgphoto2-2.4 >=media-libs/libexif-0.3.2 media-libs/libexif-gtk gimp? ( >=media-gfx/gimp-2 ) gnome? ( >=gnome-base/libbonobo-2 >=gnome-base/libgnomeui-2 ) >=dev-util/intltool-0.40 dev-util/pkgconfig app-text/scrollkeeper nls? ( >=sys-devel/gettext-0.14.1 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
+x11-libs/gtk+:2 >media-libs/libgphoto2-2.4 >=media-libs/libexif-0.3.2 media-libs/libexif-gtk gimp? ( >=media-gfx/gimp-2 ) gnome? ( >=gnome-base/libbonobo-2 >=gnome-base/libgnomeui-2 ) >=dev-util/intltool-0.40 dev-util/pkgconfig app-text/scrollkeeper nls? ( >=sys-devel/gettext-0.14.1 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
 x11-libs/gtk+:2 >media-libs/libgphoto2-2.4 >=media-libs/libexif-0.3.2 media-libs/libexif-gtk gimp? ( >=media-gfx/gimp-2 ) gnome? ( >=gnome-base/libbonobo-2 >=gnome-base/libgnomeui-2 )
 0
 mirror://sourceforge/gphoto/gtkam-0.1.17.tar.gz
diff --git a/metadata/cache/media-gfx/gtkimageview-1.6.4 b/metadata/cache/media-gfx/gtkimageview-1.6.4
index 8bbe1f7eb5f7..3473de5065e5 100644
--- a/metadata/cache/media-gfx/gtkimageview-1.6.4
+++ b/metadata/cache/media-gfx/gtkimageview-1.6.4
@@ -1,4 +1,4 @@
-gnome-base/gnome-common dev-util/gtk-doc-am doc? ( >=dev-util/gtk-doc-1.8 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+gnome-base/gnome-common dev-util/gtk-doc-am doc? ( >=dev-util/gtk-doc-1.8 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 >=x11-libs/gtk+-2.6:2
 0
 http://trac.bjourne.webfactional.com/attachment/wiki/WikiStart/gtkimageview-1.6.4.tar.gz?format=raw -> gtkimageview-1.6.4.tar.gz
diff --git a/metadata/cache/media-gfx/icoutils-0.29.1-r1 b/metadata/cache/media-gfx/icoutils-0.29.1-r1
index 0086409e6b44..c5e4ad7e001d 100644
--- a/metadata/cache/media-gfx/icoutils-0.29.1-r1
+++ b/metadata/cache/media-gfx/icoutils-0.29.1-r1
@@ -1,4 +1,4 @@
-media-libs/libpng nls? ( virtual/libintl ) >=dev-lang/perl-5.6 >=dev-perl/libwww-perl-5.64 nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+media-libs/libpng nls? ( virtual/libintl ) >=dev-lang/perl-5.6 >=dev-perl/libwww-perl-5.64 nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 media-libs/libpng nls? ( virtual/libintl ) >=dev-lang/perl-5.6 >=dev-perl/libwww-perl-5.64
 0
 http://savannah.nongnu.org/download/icoutils/icoutils-0.29.1.tar.bz2
diff --git a/metadata/cache/media-gfx/imageworsener-0.9.8 b/metadata/cache/media-gfx/imageworsener-0.9.8
index f3ab976d24bb..a4d11f05e443 100644
--- a/metadata/cache/media-gfx/imageworsener-0.9.8
+++ b/metadata/cache/media-gfx/imageworsener-0.9.8
@@ -1,4 +1,4 @@
-png? ( media-libs/libpng:0 ) jpeg? ( virtual/jpeg ) webp? ( >=media-libs/libwebp-0.1.3 ) zlib? ( sys-libs/zlib ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+png? ( media-libs/libpng:0 ) jpeg? ( virtual/jpeg ) webp? ( >=media-libs/libwebp-0.1.3 ) zlib? ( sys-libs/zlib ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 png? ( media-libs/libpng:0 ) jpeg? ( virtual/jpeg ) webp? ( >=media-libs/libwebp-0.1.3 ) zlib? ( sys-libs/zlib )
 0
 http://entropymine.com/imageworsener/imageworsener-src-0.9.8.tar.gz
diff --git a/metadata/cache/media-gfx/inkscape-0.48.2 b/metadata/cache/media-gfx/inkscape-0.48.2
index 7104c9ad34f2..627be23ed64e 100644
--- a/metadata/cache/media-gfx/inkscape-0.48.2
+++ b/metadata/cache/media-gfx/inkscape-0.48.2
@@ -1,4 +1,4 @@
->=app-text/poppler-0.12.3-r3[cairo,xpdf-headers] dev-cpp/glibmm >=dev-cpp/gtkmm-2.18.0:2.4 >=dev-libs/boehm-gc-6.4 >=dev-libs/glib-2.6.5 >=dev-libs/libsigc++-2.0.12 >=dev-libs/libxml2-2.6.20 >=dev-libs/libxslt-1.0.15 dev-libs/popt dev-python/lxml media-gfx/imagemagick[cxx] media-libs/fontconfig media-libs/freetype:2 >=media-libs/libpng-1.2 app-text/libwpd:0.9 app-text/libwpg:0.2 sci-libs/gsl x11-libs/libXft >=x11-libs/gtk+-2.10.7:2 >=x11-libs/pango-1.4.0 || ( dev-lang/python[xml] dev-python/pyxml ) gnome? ( >=gnome-base/gnome-vfs-2.0 ) lcms? ( media-libs/lcms:0 ) spell? ( app-text/aspell app-text/gtkspell:2 ) dev-libs/boost sys-devel/gettext dev-util/pkgconfig x11-libs/libX11 >=dev-util/intltool-0.29 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
+>=app-text/poppler-0.12.3-r3[cairo,xpdf-headers] dev-cpp/glibmm >=dev-cpp/gtkmm-2.18.0:2.4 >=dev-libs/boehm-gc-6.4 >=dev-libs/glib-2.6.5 >=dev-libs/libsigc++-2.0.12 >=dev-libs/libxml2-2.6.20 >=dev-libs/libxslt-1.0.15 dev-libs/popt dev-python/lxml media-gfx/imagemagick[cxx] media-libs/fontconfig media-libs/freetype:2 >=media-libs/libpng-1.2 app-text/libwpd:0.9 app-text/libwpg:0.2 sci-libs/gsl x11-libs/libXft >=x11-libs/gtk+-2.10.7:2 >=x11-libs/pango-1.4.0 || ( dev-lang/python[xml] dev-python/pyxml ) gnome? ( >=gnome-base/gnome-vfs-2.0 ) lcms? ( media-libs/lcms:0 ) spell? ( app-text/aspell app-text/gtkspell:2 ) dev-libs/boost sys-devel/gettext dev-util/pkgconfig x11-libs/libX11 >=dev-util/intltool-0.29 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
 >=app-text/poppler-0.12.3-r3[cairo,xpdf-headers] dev-cpp/glibmm >=dev-cpp/gtkmm-2.18.0:2.4 >=dev-libs/boehm-gc-6.4 >=dev-libs/glib-2.6.5 >=dev-libs/libsigc++-2.0.12 >=dev-libs/libxml2-2.6.20 >=dev-libs/libxslt-1.0.15 dev-libs/popt dev-python/lxml media-gfx/imagemagick[cxx] media-libs/fontconfig media-libs/freetype:2 >=media-libs/libpng-1.2 app-text/libwpd:0.9 app-text/libwpg:0.2 sci-libs/gsl x11-libs/libXft >=x11-libs/gtk+-2.10.7:2 >=x11-libs/pango-1.4.0 || ( dev-lang/python[xml] dev-python/pyxml ) gnome? ( >=gnome-base/gnome-vfs-2.0 ) lcms? ( media-libs/lcms:0 ) spell? ( app-text/aspell app-text/gtkspell:2 ) dev-python/numpy media-gfx/uniconvertor dia? ( app-office/dia ) gs? ( app-text/ghostscript-gpl ) wmf? ( media-libs/libwmf )
 0
 mirror://sourceforge/inkscape/inkscape-0.48.2.tar.bz2
diff --git a/metadata/cache/media-gfx/inkscape-0.48.3.1 b/metadata/cache/media-gfx/inkscape-0.48.3.1
index 39e3d99dbd25..68f8b36d9013 100644
--- a/metadata/cache/media-gfx/inkscape-0.48.3.1
+++ b/metadata/cache/media-gfx/inkscape-0.48.3.1
@@ -1,4 +1,4 @@
->=app-text/poppler-0.12.3-r3[cairo,xpdf-headers] dev-cpp/glibmm >=dev-cpp/gtkmm-2.18.0:2.4 >=dev-libs/boehm-gc-6.4 >=dev-libs/glib-2.6.5 >=dev-libs/libsigc++-2.0.12 >=dev-libs/libxml2-2.6.20 >=dev-libs/libxslt-1.0.15 dev-libs/popt dev-python/lxml media-gfx/imagemagick[cxx] media-libs/fontconfig media-libs/freetype:2 >=media-libs/libpng-1.2 app-text/libwpd:0.9 app-text/libwpg:0.2 sci-libs/gsl x11-libs/libX11 >=x11-libs/gtk+-2.10.7:2 >=x11-libs/pango-1.4.0 gnome? ( >=gnome-base/gnome-vfs-2.0 ) lcms? ( media-libs/lcms:2 ) spell? ( app-text/aspell app-text/gtkspell:2 ) dev-libs/boost sys-devel/gettext dev-util/pkgconfig >=dev-util/intltool-0.29 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 dev-lang/python dev-lang/python[xml]
+>=app-text/poppler-0.12.3-r3[cairo,xpdf-headers] dev-cpp/glibmm >=dev-cpp/gtkmm-2.18.0:2.4 >=dev-libs/boehm-gc-6.4 >=dev-libs/glib-2.6.5 >=dev-libs/libsigc++-2.0.12 >=dev-libs/libxml2-2.6.20 >=dev-libs/libxslt-1.0.15 dev-libs/popt dev-python/lxml media-gfx/imagemagick[cxx] media-libs/fontconfig media-libs/freetype:2 >=media-libs/libpng-1.2 app-text/libwpd:0.9 app-text/libwpg:0.2 sci-libs/gsl x11-libs/libX11 >=x11-libs/gtk+-2.10.7:2 >=x11-libs/pango-1.4.0 gnome? ( >=gnome-base/gnome-vfs-2.0 ) lcms? ( media-libs/lcms:2 ) spell? ( app-text/aspell app-text/gtkspell:2 ) dev-libs/boost sys-devel/gettext dev-util/pkgconfig >=dev-util/intltool-0.29 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 dev-lang/python dev-lang/python[xml]
 >=app-text/poppler-0.12.3-r3[cairo,xpdf-headers] dev-cpp/glibmm >=dev-cpp/gtkmm-2.18.0:2.4 >=dev-libs/boehm-gc-6.4 >=dev-libs/glib-2.6.5 >=dev-libs/libsigc++-2.0.12 >=dev-libs/libxml2-2.6.20 >=dev-libs/libxslt-1.0.15 dev-libs/popt dev-python/lxml media-gfx/imagemagick[cxx] media-libs/fontconfig media-libs/freetype:2 >=media-libs/libpng-1.2 app-text/libwpd:0.9 app-text/libwpg:0.2 sci-libs/gsl x11-libs/libX11 >=x11-libs/gtk+-2.10.7:2 >=x11-libs/pango-1.4.0 gnome? ( >=gnome-base/gnome-vfs-2.0 ) lcms? ( media-libs/lcms:2 ) spell? ( app-text/aspell app-text/gtkspell:2 ) dev-python/numpy media-gfx/uniconvertor dia? ( app-office/dia ) gs? ( app-text/ghostscript-gpl ) wmf? ( media-libs/libwmf ) dev-lang/python dev-lang/python[xml]
 0
 mirror://sourceforge/inkscape/inkscape-0.48.3.1.tar.bz2
diff --git a/metadata/cache/media-gfx/iscan-2.26.2 b/metadata/cache/media-gfx/iscan-2.26.2
index f12df9089fb1..2629371d44e6 100644
--- a/metadata/cache/media-gfx/iscan-2.26.2
+++ b/metadata/cache/media-gfx/iscan-2.26.2
@@ -1,4 +1,4 @@
-media-gfx/iscan-data media-gfx/sane-backends >=sys-fs/udev-103 >=dev-libs/libusb-0.1.12 X? ( x11-libs/gtk+:2 gimp? ( media-gfx/gimp ) png? ( media-libs/libpng ) jpeg? ( virtual/jpeg ) tiff? ( media-libs/tiff ) ) dev-util/pkgconfig X? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+media-gfx/iscan-data media-gfx/sane-backends >=sys-fs/udev-103 >=dev-libs/libusb-0.1.12 X? ( x11-libs/gtk+:2 gimp? ( media-gfx/gimp ) png? ( media-libs/libpng ) jpeg? ( virtual/jpeg ) tiff? ( media-libs/tiff ) ) dev-util/pkgconfig X? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 media-gfx/iscan-data media-gfx/sane-backends >=sys-fs/udev-103 >=dev-libs/libusb-0.1.12 X? ( x11-libs/gtk+:2 gimp? ( media-gfx/gimp ) png? ( media-libs/libpng ) jpeg? ( virtual/jpeg ) tiff? ( media-libs/tiff ) )
 0
 http://linux.avasys.jp/drivers/iscan/2.26.2/iscan_2.26.2-1.tar.gz doc? ( http://linux.avasys.jp/drivers/iscan/doc/userg_revL_e.pdf )
diff --git a/metadata/cache/media-gfx/mscgen-0.18 b/metadata/cache/media-gfx/mscgen-0.18
index bf2019b6fdbd..2bb2c8469402 100644
--- a/metadata/cache/media-gfx/mscgen-0.18
+++ b/metadata/cache/media-gfx/mscgen-0.18
@@ -1,4 +1,4 @@
-png? ( media-libs/gd[png,truetype?] ) dev-util/pkgconfig sys-devel/bison sys-devel/flex || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+png? ( media-libs/gd[png,truetype?] ) dev-util/pkgconfig sys-devel/bison sys-devel/flex || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 png? ( media-libs/gd[png,truetype?] )
 0
 http://www.mcternan.me.uk/mscgen/software/mscgen-src-0.18.tar.gz
diff --git a/metadata/cache/media-gfx/mscgen-0.20 b/metadata/cache/media-gfx/mscgen-0.20
index 48025bb13ac1..2c66d2f16ce5 100644
--- a/metadata/cache/media-gfx/mscgen-0.20
+++ b/metadata/cache/media-gfx/mscgen-0.20
@@ -1,4 +1,4 @@
-png? ( media-libs/gd[png,truetype?] ) dev-util/pkgconfig sys-devel/bison sys-devel/flex || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+png? ( media-libs/gd[png,truetype?] ) dev-util/pkgconfig sys-devel/bison sys-devel/flex || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 png? ( media-libs/gd[png,truetype?] )
 0
 http://www.mcternan.me.uk/mscgen/software/mscgen-src-0.20.tar.gz
diff --git a/metadata/cache/media-gfx/nip2-7.26.3 b/metadata/cache/media-gfx/nip2-7.26.3
index 2440dfef03c0..97a64673311c 100644
--- a/metadata/cache/media-gfx/nip2-7.26.3
+++ b/metadata/cache/media-gfx/nip2-7.26.3
@@ -1,4 +1,4 @@
->=dev-libs/glib-2.14:2 dev-libs/libxml2 x11-misc/xdg-utils >=media-libs/vips-7.26 >=x11-libs/gtk+-2.18:2 goffice? ( x11-libs/goffice:0.8 ) gsl? ( sci-libs/gsl ) fftw? ( sci-libs/fftw:3.0 ) sys-devel/bison sys-devel/flex test? ( media-libs/vips[jpeg,lcms,tiff] ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+>=dev-libs/glib-2.14:2 dev-libs/libxml2 x11-misc/xdg-utils >=media-libs/vips-7.26 >=x11-libs/gtk+-2.18:2 goffice? ( x11-libs/goffice:0.8 ) gsl? ( sci-libs/gsl ) fftw? ( sci-libs/fftw:3.0 ) sys-devel/bison sys-devel/flex test? ( media-libs/vips[jpeg,lcms,tiff] ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 >=dev-libs/glib-2.14:2 dev-libs/libxml2 x11-misc/xdg-utils >=media-libs/vips-7.26 >=x11-libs/gtk+-2.18:2 goffice? ( x11-libs/goffice:0.8 ) gsl? ( sci-libs/gsl ) fftw? ( sci-libs/fftw:3.0 )
 0
 http://www.vips.ecs.soton.ac.uk/supported/7.26/nip2-7.26.3.tar.gz
diff --git a/metadata/cache/media-gfx/nip2-7.26.4 b/metadata/cache/media-gfx/nip2-7.26.4
index 123bf234078d..a409d533752b 100644
--- a/metadata/cache/media-gfx/nip2-7.26.4
+++ b/metadata/cache/media-gfx/nip2-7.26.4
@@ -1,4 +1,4 @@
->=dev-libs/glib-2.14:2 dev-libs/libxml2 x11-misc/xdg-utils >=media-libs/vips-7.26 >=x11-libs/gtk+-2.18:2 goffice? ( x11-libs/goffice:0.8 ) gsl? ( sci-libs/gsl ) fftw? ( sci-libs/fftw:3.0 ) sys-devel/bison sys-devel/flex test? ( media-libs/vips[jpeg,lcms,tiff] ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+>=dev-libs/glib-2.14:2 dev-libs/libxml2 x11-misc/xdg-utils >=media-libs/vips-7.26 >=x11-libs/gtk+-2.18:2 goffice? ( x11-libs/goffice:0.8 ) gsl? ( sci-libs/gsl ) fftw? ( sci-libs/fftw:3.0 ) sys-devel/bison sys-devel/flex test? ( media-libs/vips[jpeg,lcms,tiff] ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 >=dev-libs/glib-2.14:2 dev-libs/libxml2 x11-misc/xdg-utils >=media-libs/vips-7.26 >=x11-libs/gtk+-2.18:2 goffice? ( x11-libs/goffice:0.8 ) gsl? ( sci-libs/gsl ) fftw? ( sci-libs/fftw:3.0 )
 0
 http://www.vips.ecs.soton.ac.uk/supported/7.26/nip2-7.26.4.tar.gz
diff --git a/metadata/cache/media-gfx/openexr_viewers-1.0.2 b/metadata/cache/media-gfx/openexr_viewers-1.0.2
index f7400ab0bb85..885a573c586e 100644
--- a/metadata/cache/media-gfx/openexr_viewers-1.0.2
+++ b/metadata/cache/media-gfx/openexr_viewers-1.0.2
@@ -1,4 +1,4 @@
->=media-libs/ilmbase-1.0.2 >=media-libs/openexr-1.7.0 media-libs/ctl media-libs/openexr_ctl opengl? ( virtual/opengl x11-libs/fltk:1[opengl] video_cards_nvidia? ( media-gfx/nvidia-cg-toolkit ) ) !<media-libs/openexr-1.5.0 dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=media-libs/ilmbase-1.0.2 >=media-libs/openexr-1.7.0 media-libs/ctl media-libs/openexr_ctl opengl? ( virtual/opengl x11-libs/fltk:1[opengl] video_cards_nvidia? ( media-gfx/nvidia-cg-toolkit ) ) !<media-libs/openexr-1.5.0 dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=media-libs/ilmbase-1.0.2 >=media-libs/openexr-1.7.0 media-libs/ctl media-libs/openexr_ctl opengl? ( virtual/opengl x11-libs/fltk:1[opengl] video_cards_nvidia? ( media-gfx/nvidia-cg-toolkit ) ) !<media-libs/openexr-1.5.0
 0
 http://download.savannah.gnu.org/releases/openexr/openexr_viewers-1.0.2.tar.gz
diff --git a/metadata/cache/media-gfx/photoprint-0.4.2_pre2 b/metadata/cache/media-gfx/photoprint-0.4.2_pre2
index d463977d761a..2365280e47ec 100644
--- a/metadata/cache/media-gfx/photoprint-0.4.2_pre2
+++ b/metadata/cache/media-gfx/photoprint-0.4.2_pre2
@@ -1,4 +1,4 @@
-cups? ( net-print/cups ) dev-libs/glib:2 media-libs/lcms:0 media-libs/netpbm media-libs/tiff >=net-print/gutenprint-5 virtual/jpeg >=x11-libs/gtk+-2.4:2 x11-libs/libX11 x11-proto/xproto sys-devel/gettext dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+cups? ( net-print/cups ) dev-libs/glib:2 media-libs/lcms:0 media-libs/netpbm media-libs/tiff >=net-print/gutenprint-5 virtual/jpeg >=x11-libs/gtk+-2.4:2 x11-libs/libX11 x11-proto/xproto sys-devel/gettext dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 cups? ( net-print/cups ) dev-libs/glib:2 media-libs/lcms:0 media-libs/netpbm media-libs/tiff >=net-print/gutenprint-5 virtual/jpeg >=x11-libs/gtk+-2.4:2 x11-libs/libX11 x11-proto/xproto
 0
 http://www.blackfiveimaging.co.uk/photoprint/photoprint-0.4.2-pre2.tar.gz
diff --git a/metadata/cache/media-gfx/pngnq-1.0 b/metadata/cache/media-gfx/pngnq-1.0
index 51f1355c1070..99a3271c5745 100644
--- a/metadata/cache/media-gfx/pngnq-1.0
+++ b/metadata/cache/media-gfx/pngnq-1.0
@@ -1,4 +1,4 @@
-media-libs/libpng || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+media-libs/libpng || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 media-libs/libpng
 0
 mirror://sourceforge/pngnq/pngnq-1.0.tar.gz
diff --git a/metadata/cache/media-gfx/pngtools-0.4-r2 b/metadata/cache/media-gfx/pngtools-0.4-r2
index 2a629faee496..32b08813b828 100644
--- a/metadata/cache/media-gfx/pngtools-0.4-r2
+++ b/metadata/cache/media-gfx/pngtools-0.4-r2
@@ -1,4 +1,4 @@
->=media-libs/libpng-1.4:0 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=media-libs/libpng-1.4:0 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=media-libs/libpng-1.4:0
 0
 http://www.stillhq.com/pngtools/source/pngtools_0_4.tgz
diff --git a/metadata/cache/media-gfx/povray-3.7.0_rc3 b/metadata/cache/media-gfx/povray-3.7.0_rc3
index 91f75fde037b..93deaf2524d0 100644
--- a/metadata/cache/media-gfx/povray-3.7.0_rc3
+++ b/metadata/cache/media-gfx/povray-3.7.0_rc3
@@ -1,4 +1,4 @@
->=dev-libs/boost-1.41 virtual/jpeg media-libs/libpng:0 sys-libs/zlib openexr? ( media-libs/ilmbase media-libs/openexr ) tiff? ( >=media-libs/tiff-3.6.1:0 ) X? ( media-libs/libsdl ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-libs/boost-1.41 virtual/jpeg media-libs/libpng:0 sys-libs/zlib openexr? ( media-libs/ilmbase media-libs/openexr ) tiff? ( >=media-libs/tiff-3.6.1:0 ) X? ( media-libs/libsdl ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=dev-libs/boost-1.41 virtual/jpeg media-libs/libpng:0 sys-libs/zlib openexr? ( media-libs/ilmbase media-libs/openexr ) tiff? ( >=media-libs/tiff-3.6.1:0 ) X? ( media-libs/libsdl )
 0
 http://www.povray.org/redirect/www.povray.org/beta/source/povray-3.7.0.RC3.tar.bz2
diff --git a/metadata/cache/media-gfx/povray-3.7.0_rc3-r1 b/metadata/cache/media-gfx/povray-3.7.0_rc3-r1
index 9f78593cd853..94ba4def6408 100644
--- a/metadata/cache/media-gfx/povray-3.7.0_rc3-r1
+++ b/metadata/cache/media-gfx/povray-3.7.0_rc3-r1
@@ -1,4 +1,4 @@
->=dev-libs/boost-1.41 virtual/jpeg media-libs/libpng:0 sys-libs/zlib openexr? ( media-libs/ilmbase media-libs/openexr ) mkl? ( sci-libs/mkl ) tiff? ( >=media-libs/tiff-3.6.1:0 ) X? ( media-libs/libsdl ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-libs/boost-1.41 virtual/jpeg media-libs/libpng:0 sys-libs/zlib openexr? ( media-libs/ilmbase media-libs/openexr ) mkl? ( sci-libs/mkl ) tiff? ( >=media-libs/tiff-3.6.1:0 ) X? ( media-libs/libsdl ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=dev-libs/boost-1.41 virtual/jpeg media-libs/libpng:0 sys-libs/zlib openexr? ( media-libs/ilmbase media-libs/openexr ) mkl? ( sci-libs/mkl ) tiff? ( >=media-libs/tiff-3.6.1:0 ) X? ( media-libs/libsdl )
 0
 http://www.povray.org/redirect/www.povray.org/beta/source/povray-3.7.0.RC3.tar.bz2
diff --git a/metadata/cache/media-gfx/povray-3.7.0_rc5 b/metadata/cache/media-gfx/povray-3.7.0_rc5
index b3f1b00606b1..728942fc6b75 100644
--- a/metadata/cache/media-gfx/povray-3.7.0_rc5
+++ b/metadata/cache/media-gfx/povray-3.7.0_rc5
@@ -1,4 +1,4 @@
->=dev-libs/boost-1.41 media-libs/libpng:0 sys-libs/zlib virtual/jpeg openexr? ( media-libs/ilmbase media-libs/openexr ) mkl? ( sci-libs/mkl ) tiff? ( media-libs/tiff:0 ) X? ( media-libs/libsdl ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-libs/boost-1.41 media-libs/libpng:0 sys-libs/zlib virtual/jpeg openexr? ( media-libs/ilmbase media-libs/openexr ) mkl? ( sci-libs/mkl ) tiff? ( media-libs/tiff:0 ) X? ( media-libs/libsdl ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=dev-libs/boost-1.41 media-libs/libpng:0 sys-libs/zlib virtual/jpeg openexr? ( media-libs/ilmbase media-libs/openexr ) mkl? ( sci-libs/mkl ) tiff? ( media-libs/tiff:0 ) X? ( media-libs/libsdl )
 0
 http://www.povray.org/redirect/www.povray.org/beta/source/povray-3.7.0.RC5.tar.gz
diff --git a/metadata/cache/media-gfx/pstoedit-3.50 b/metadata/cache/media-gfx/pstoedit-3.50
index d8b6be5103d3..c60e7929685f 100644
--- a/metadata/cache/media-gfx/pstoedit-3.50
+++ b/metadata/cache/media-gfx/pstoedit-3.50
@@ -1,4 +1,4 @@
-media-libs/libpng media-libs/gd app-text/ghostscript-gpl emf? ( >=media-libs/libemf-1.0.3 ) imagemagick? ( media-gfx/imagemagick[cxx] ) plotutils? ( media-libs/plotutils ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+media-libs/libpng media-libs/gd app-text/ghostscript-gpl emf? ( >=media-libs/libemf-1.0.3 ) imagemagick? ( media-gfx/imagemagick[cxx] ) plotutils? ( media-libs/plotutils ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 media-libs/libpng media-libs/gd app-text/ghostscript-gpl emf? ( >=media-libs/libemf-1.0.3 ) imagemagick? ( media-gfx/imagemagick[cxx] ) plotutils? ( media-libs/plotutils )
 0
 mirror://sourceforge/pstoedit/pstoedit-3.50.tar.gz
diff --git a/metadata/cache/media-gfx/pstoedit-3.50-r1 b/metadata/cache/media-gfx/pstoedit-3.50-r1
index 244a8ef93282..6a692417b466 100644
--- a/metadata/cache/media-gfx/pstoedit-3.50-r1
+++ b/metadata/cache/media-gfx/pstoedit-3.50-r1
@@ -1,4 +1,4 @@
->=media-libs/libpng-1.4.3 >=media-libs/gd-2.0.35-r1 >=app-text/ghostscript-gpl-8.71-r1 emf? ( >=media-libs/libemf-1.0.3 ) flash? ( >=media-libs/ming-0.4.3 ) imagemagick? ( >=media-gfx/imagemagick-6.6.1.2[cxx] ) plotutils? ( media-libs/plotutils ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=media-libs/libpng-1.4.3 >=media-libs/gd-2.0.35-r1 >=app-text/ghostscript-gpl-8.71-r1 emf? ( >=media-libs/libemf-1.0.3 ) flash? ( >=media-libs/ming-0.4.3 ) imagemagick? ( >=media-gfx/imagemagick-6.6.1.2[cxx] ) plotutils? ( media-libs/plotutils ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=media-libs/libpng-1.4.3 >=media-libs/gd-2.0.35-r1 >=app-text/ghostscript-gpl-8.71-r1 emf? ( >=media-libs/libemf-1.0.3 ) flash? ( >=media-libs/ming-0.4.3 ) imagemagick? ( >=media-gfx/imagemagick-6.6.1.2[cxx] ) plotutils? ( media-libs/plotutils )
 0
 mirror://sourceforge/pstoedit/pstoedit-3.50.tar.gz
diff --git a/metadata/cache/media-gfx/pstoedit-3.60 b/metadata/cache/media-gfx/pstoedit-3.60
index 5c599731ed77..6b547b6c8de0 100644
--- a/metadata/cache/media-gfx/pstoedit-3.60
+++ b/metadata/cache/media-gfx/pstoedit-3.60
@@ -1,4 +1,4 @@
->=media-libs/libpng-1.4.3 >=media-libs/gd-2.0.35-r1 >=app-text/ghostscript-gpl-8.71-r1 emf? ( >=media-libs/libemf-1.0.3 ) flash? ( >=media-libs/ming-0.4.3 ) imagemagick? ( >=media-gfx/imagemagick-6.6.1.2[cxx] ) plotutils? ( media-libs/plotutils ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=media-libs/libpng-1.4.3 >=media-libs/gd-2.0.35-r1 >=app-text/ghostscript-gpl-8.71-r1 emf? ( >=media-libs/libemf-1.0.3 ) flash? ( >=media-libs/ming-0.4.3 ) imagemagick? ( >=media-gfx/imagemagick-6.6.1.2[cxx] ) plotutils? ( media-libs/plotutils ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=media-libs/libpng-1.4.3 >=media-libs/gd-2.0.35-r1 >=app-text/ghostscript-gpl-8.71-r1 emf? ( >=media-libs/libemf-1.0.3 ) flash? ( >=media-libs/ming-0.4.3 ) imagemagick? ( >=media-gfx/imagemagick-6.6.1.2[cxx] ) plotutils? ( media-libs/plotutils )
 0
 mirror://sourceforge/pstoedit/pstoedit-3.60.tar.gz
diff --git a/metadata/cache/media-gfx/qrencode-3.1.1 b/metadata/cache/media-gfx/qrencode-3.1.1
index 182f8437a348..ed2e69c5174b 100644
--- a/metadata/cache/media-gfx/qrencode-3.1.1
+++ b/metadata/cache/media-gfx/qrencode-3.1.1
@@ -1,4 +1,4 @@
-media-libs/libpng dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+media-libs/libpng dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 media-libs/libpng
 0
 http://fukuchi.org/works/qrencode/qrencode-3.1.1.tar.bz2
diff --git a/metadata/cache/media-gfx/qrencode-3.2.0 b/metadata/cache/media-gfx/qrencode-3.2.0
index b36a08d823e9..bdcd60ea4147 100644
--- a/metadata/cache/media-gfx/qrencode-3.2.0
+++ b/metadata/cache/media-gfx/qrencode-3.2.0
@@ -1,4 +1,4 @@
-media-libs/libpng dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+media-libs/libpng dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 media-libs/libpng
 0
 http://fukuchi.org/works/qrencode/qrencode-3.2.0.tar.bz2
diff --git a/metadata/cache/media-gfx/rawstudio-2.0 b/metadata/cache/media-gfx/rawstudio-2.0
index 01656ebf38df..5385178f65a7 100644
--- a/metadata/cache/media-gfx/rawstudio-2.0
+++ b/metadata/cache/media-gfx/rawstudio-2.0
@@ -1,4 +1,4 @@
-dev-db/sqlite:3 dev-libs/libxml2 >=dev-libs/openssl-1 >=gnome-base/gconf-2 media-libs/flickcurl =media-libs/lcms-1* media-libs/lensfun media-libs/libgphoto2 media-libs/tiff media-gfx/exiv2 net-misc/curl sci-libs/fftw:3.0 sys-apps/dbus sys-libs/zlib virtual/jpeg x11-libs/gtk+:2 x11-libs/libX11 dev-util/pkgconfig sys-devel/gettext || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-db/sqlite:3 dev-libs/libxml2 >=dev-libs/openssl-1 >=gnome-base/gconf-2 media-libs/flickcurl =media-libs/lcms-1* media-libs/lensfun media-libs/libgphoto2 media-libs/tiff media-gfx/exiv2 net-misc/curl sci-libs/fftw:3.0 sys-apps/dbus sys-libs/zlib virtual/jpeg x11-libs/gtk+:2 x11-libs/libX11 dev-util/pkgconfig sys-devel/gettext || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-db/sqlite:3 dev-libs/libxml2 >=dev-libs/openssl-1 >=gnome-base/gconf-2 media-libs/flickcurl =media-libs/lcms-1* media-libs/lensfun media-libs/libgphoto2 media-libs/tiff media-gfx/exiv2 net-misc/curl sci-libs/fftw:3.0 sys-apps/dbus sys-libs/zlib virtual/jpeg x11-libs/gtk+:2 x11-libs/libX11
 0
 http://rawstudio.org/files/release/rawstudio-2.0.tar.gz
diff --git a/metadata/cache/media-gfx/sam2p-0.47 b/metadata/cache/media-gfx/sam2p-0.47
index 9677f73caee5..2677550f9af5 100644
--- a/metadata/cache/media-gfx/sam2p-0.47
+++ b/metadata/cache/media-gfx/sam2p-0.47
@@ -1,4 +1,4 @@
-dev-lang/perl || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-lang/perl || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 http://sam2p.googlecode.com/files/sam2p-0.47.tar.gz
diff --git a/metadata/cache/media-gfx/sam2p-0.48 b/metadata/cache/media-gfx/sam2p-0.48
index 8ad1c1f1fe9e..400453e35be6 100644
--- a/metadata/cache/media-gfx/sam2p-0.48
+++ b/metadata/cache/media-gfx/sam2p-0.48
@@ -1,4 +1,4 @@
-dev-lang/perl || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-lang/perl || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 http://sam2p.googlecode.com/files/sam2p-0.48.tar.gz
diff --git a/metadata/cache/media-gfx/sam2p-0.49.1 b/metadata/cache/media-gfx/sam2p-0.49.1
index fe94182a808d..3779f72ea9ce 100644
--- a/metadata/cache/media-gfx/sam2p-0.49.1
+++ b/metadata/cache/media-gfx/sam2p-0.49.1
@@ -1,4 +1,4 @@
-dev-lang/perl || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-lang/perl || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 http://sam2p.googlecode.com/files/sam2p-0.49.1.tar.gz
diff --git a/metadata/cache/media-gfx/sfftobmp-3.1.1 b/metadata/cache/media-gfx/sfftobmp-3.1.1
index 630af5ecd52d..3ef7b327bb81 100644
--- a/metadata/cache/media-gfx/sfftobmp-3.1.1
+++ b/metadata/cache/media-gfx/sfftobmp-3.1.1
@@ -1,4 +1,4 @@
-dev-libs/boost media-libs/tiff virtual/jpeg app-arch/unzip || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-libs/boost media-libs/tiff virtual/jpeg app-arch/unzip || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-libs/boost media-libs/tiff virtual/jpeg
 0
 mirror://sourceforge/sfftools/sfftobmp3_1_1.zip
diff --git a/metadata/cache/media-gfx/sfftobmp-3.1.2 b/metadata/cache/media-gfx/sfftobmp-3.1.2
index 705b505e871c..416c8b79ebec 100644
--- a/metadata/cache/media-gfx/sfftobmp-3.1.2
+++ b/metadata/cache/media-gfx/sfftobmp-3.1.2
@@ -1,4 +1,4 @@
-dev-libs/boost media-libs/tiff virtual/jpeg:0 app-arch/unzip || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-libs/boost media-libs/tiff virtual/jpeg:0 app-arch/unzip || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-libs/boost media-libs/tiff virtual/jpeg:0
 0
 mirror://sourceforge/sfftools/sfftobmp3_1_2_src.zip
diff --git a/metadata/cache/media-gfx/simple-scan-2.32.0.2 b/metadata/cache/media-gfx/simple-scan-2.32.0.2
index bc372c5519a5..33e8cb10c0fb 100644
--- a/metadata/cache/media-gfx/simple-scan-2.32.0.2
+++ b/metadata/cache/media-gfx/simple-scan-2.32.0.2
@@ -1,4 +1,4 @@
->=x11-libs/gtk+-2.18.0:2 dev-libs/glib:2 gnome-base/gconf:2 >=media-gfx/sane-backends-1.0.20 virtual/jpeg || ( >=sys-fs/udev-171[gudev] >=sys-fs/udev-145[extras] ) sys-libs/zlib x11-libs/cairo app-text/gnome-doc-utils gnome-base/gnome-common >=dev-util/intltool-0.35.0 dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+>=x11-libs/gtk+-2.18.0:2 dev-libs/glib:2 gnome-base/gconf:2 >=media-gfx/sane-backends-1.0.20 virtual/jpeg || ( >=sys-fs/udev-171[gudev] >=sys-fs/udev-145[extras] ) sys-libs/zlib x11-libs/cairo app-text/gnome-doc-utils gnome-base/gnome-common >=dev-util/intltool-0.35.0 dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 >=x11-libs/gtk+-2.18.0:2 dev-libs/glib:2 gnome-base/gconf:2 >=media-gfx/sane-backends-1.0.20 virtual/jpeg || ( >=sys-fs/udev-171[gudev] >=sys-fs/udev-145[extras] ) sys-libs/zlib x11-libs/cairo x11-misc/xdg-utils x11-themes/gnome-icon-theme
 0
 http://launchpad.net/simple-scan/trunk/2.32.0.2/+download/simple-scan-2.32.0.2.tar.gz
diff --git a/metadata/cache/media-gfx/simple-scan-3.2.1 b/metadata/cache/media-gfx/simple-scan-3.2.1
index 08481062376c..72d049a7a30a 100644
--- a/metadata/cache/media-gfx/simple-scan-3.2.1
+++ b/metadata/cache/media-gfx/simple-scan-3.2.1
@@ -1,4 +1,4 @@
->=dev-libs/glib-2.28:2 >=media-gfx/sane-backends-1.0.20 virtual/jpeg || ( >=sys-fs/udev-171[gudev] >=sys-fs/udev-145[extras] ) sys-libs/zlib x11-libs/cairo >=x11-libs/gtk+-3:3 x11-misc/colord[scanner] app-text/gnome-doc-utils dev-lang/vala:0.14 gnome-base/gnome-common >=dev-util/intltool-0.35.0 dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
+>=dev-libs/glib-2.28:2 >=media-gfx/sane-backends-1.0.20 virtual/jpeg || ( >=sys-fs/udev-171[gudev] >=sys-fs/udev-145[extras] ) sys-libs/zlib x11-libs/cairo >=x11-libs/gtk+-3:3 x11-misc/colord[scanner] app-text/gnome-doc-utils dev-lang/vala:0.14 gnome-base/gnome-common >=dev-util/intltool-0.35.0 dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
 >=dev-libs/glib-2.28:2 >=media-gfx/sane-backends-1.0.20 virtual/jpeg || ( >=sys-fs/udev-171[gudev] >=sys-fs/udev-145[extras] ) sys-libs/zlib x11-libs/cairo >=x11-libs/gtk+-3:3 x11-misc/colord[scanner] x11-misc/xdg-utils x11-themes/gnome-icon-theme
 0
 http://launchpad.net/simple-scan/trunk/3.2.1/+download/simple-scan-3.2.1.tar.bz2
diff --git a/metadata/cache/media-gfx/splashutils-1.5.4.3-r3 b/metadata/cache/media-gfx/splashutils-1.5.4.3-r3
index ca381ee0e405..f31f03a2311a 100644
--- a/metadata/cache/media-gfx/splashutils-1.5.4.3-r3
+++ b/metadata/cache/media-gfx/splashutils-1.5.4.3-r3
@@ -1,4 +1,4 @@
-gpm? ( sys-libs/gpm ) truetype? ( >=media-libs/freetype-2[static-libs] || ( <app-arch/bzip2-1.0.6-r3 app-arch/bzip2[static-libs] ) ) png? ( >=media-libs/libpng-1.4.3[static-libs] ) mng? ( media-libs/lcms:0[static-libs] || ( media-libs/libmng[static-libs] <media-libs/libmng-1.0.10-r1 ) ) virtual/jpeg[static-libs] >=sys-apps/baselayout-1.9.4-r5 app-arch/cpio media-gfx/fbgrab !sys-apps/lcdsplash >=dev-libs/klibc-1.5 dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+gpm? ( sys-libs/gpm ) truetype? ( >=media-libs/freetype-2[static-libs] || ( <app-arch/bzip2-1.0.6-r3 app-arch/bzip2[static-libs] ) ) png? ( >=media-libs/libpng-1.4.3[static-libs] ) mng? ( media-libs/lcms:0[static-libs] || ( media-libs/libmng[static-libs] <media-libs/libmng-1.0.10-r1 ) ) virtual/jpeg[static-libs] >=sys-apps/baselayout-1.9.4-r5 app-arch/cpio media-gfx/fbgrab !sys-apps/lcdsplash >=dev-libs/klibc-1.5 dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 gpm? ( sys-libs/gpm ) truetype? ( >=media-libs/freetype-2[static-libs] || ( <app-arch/bzip2-1.0.6-r3 app-arch/bzip2[static-libs] ) ) png? ( >=media-libs/libpng-1.4.3[static-libs] ) mng? ( media-libs/lcms:0[static-libs] || ( media-libs/libmng[static-libs] <media-libs/libmng-1.0.10-r1 ) ) virtual/jpeg[static-libs] >=sys-apps/baselayout-1.9.4-r5 app-arch/cpio media-gfx/fbgrab !sys-apps/lcdsplash
 0
 mirror://berlios/fbsplash/splashutils-lite-1.5.4.3.tar.bz2 mirror://berlios/fbsplash/splashutils-gentoo-1.0.16.tar.bz2 mirror://gentoo/miscsplashutils-0.1.8.tar.bz2 mirror://sourceforge/libpng/libpng-1.4.3.tar.bz2 ftp://ftp.uu.net/graphics/jpeg/jpegsrc.v8a.tar.gz mirror://sourceforge/freetype/freetype-2.3.12.tar.bz2 http://www.gzip.org/zlib/zlib-1.2.3.tar.bz2
diff --git a/metadata/cache/media-gfx/splashutils-1.5.4.4 b/metadata/cache/media-gfx/splashutils-1.5.4.4
index 137351908b84..33556b00c62a 100644
--- a/metadata/cache/media-gfx/splashutils-1.5.4.4
+++ b/metadata/cache/media-gfx/splashutils-1.5.4.4
@@ -1,4 +1,4 @@
-gpm? ( sys-libs/gpm ) truetype? ( >=media-libs/freetype-2[static-libs] || ( <app-arch/bzip2-1.0.6-r3 app-arch/bzip2[static-libs] ) || ( <sys-libs/zlib-1.2.5.1-r2 sys-libs/zlib[static-libs] ) ) png? ( >=media-libs/libpng-1.4.3[static-libs] ) mng? ( media-libs/lcms:0[static-libs] || ( media-libs/libmng[static-libs] <media-libs/libmng-1.0.10-r1 ) ) virtual/jpeg[static-libs] >=sys-apps/baselayout-1.9.4-r5 app-arch/cpio media-gfx/fbgrab !sys-apps/lcdsplash >=dev-libs/klibc-1.5 dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+gpm? ( sys-libs/gpm ) truetype? ( >=media-libs/freetype-2[static-libs] || ( <app-arch/bzip2-1.0.6-r3 app-arch/bzip2[static-libs] ) || ( <sys-libs/zlib-1.2.5.1-r2 sys-libs/zlib[static-libs] ) ) png? ( >=media-libs/libpng-1.4.3[static-libs] ) mng? ( media-libs/lcms:0[static-libs] || ( media-libs/libmng[static-libs] <media-libs/libmng-1.0.10-r1 ) ) virtual/jpeg[static-libs] >=sys-apps/baselayout-1.9.4-r5 app-arch/cpio media-gfx/fbgrab !sys-apps/lcdsplash >=dev-libs/klibc-1.5 dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 gpm? ( sys-libs/gpm ) truetype? ( >=media-libs/freetype-2[static-libs] || ( <app-arch/bzip2-1.0.6-r3 app-arch/bzip2[static-libs] ) || ( <sys-libs/zlib-1.2.5.1-r2 sys-libs/zlib[static-libs] ) ) png? ( >=media-libs/libpng-1.4.3[static-libs] ) mng? ( media-libs/lcms:0[static-libs] || ( media-libs/libmng[static-libs] <media-libs/libmng-1.0.10-r1 ) ) virtual/jpeg[static-libs] >=sys-apps/baselayout-1.9.4-r5 app-arch/cpio media-gfx/fbgrab !sys-apps/lcdsplash
 0
 mirror://berlios/fbsplash/splashutils-lite-1.5.4.4.tar.bz2 mirror://berlios/fbsplash/splashutils-gentoo-1.0.17.tar.bz2 mirror://gentoo/miscsplashutils-0.1.8.tar.bz2 mirror://sourceforge/libpng/libpng-1.4.3.tar.bz2 ftp://ftp.uu.net/graphics/jpeg/jpegsrc.v8a.tar.gz mirror://sourceforge/freetype/freetype-2.3.12.tar.bz2 http://www.gzip.org/zlib/zlib-1.2.3.tar.bz2
diff --git a/metadata/cache/media-gfx/tif22pnm-0.14 b/metadata/cache/media-gfx/tif22pnm-0.14
index 9445a852e35b..6441123be583 100644
--- a/metadata/cache/media-gfx/tif22pnm-0.14
+++ b/metadata/cache/media-gfx/tif22pnm-0.14
@@ -1,4 +1,4 @@
->=media-libs/libpng-1.2:0 media-libs/tiff:0 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=media-libs/libpng-1.2:0 media-libs/tiff:0 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=media-libs/libpng-1.2:0 media-libs/tiff:0
 0
 http://sam2p.googlecode.com/files/tif22pnm-0.14.tar.gz
diff --git a/metadata/cache/media-gfx/tintii-2.5.3 b/metadata/cache/media-gfx/tintii-2.5.3
index cb15c59a6953..70cd7660df85 100644
--- a/metadata/cache/media-gfx/tintii-2.5.3
+++ b/metadata/cache/media-gfx/tintii-2.5.3
@@ -1,4 +1,4 @@
-x11-libs/wxGTK:2.8[X] dev-libs/boost || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+x11-libs/wxGTK:2.8[X] dev-libs/boost || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 x11-libs/wxGTK:2.8[X]
 0
 mirror://sourceforge/tint/tintii-2.5.3.tar.gz
diff --git a/metadata/cache/media-gfx/tintii-2.6.1 b/metadata/cache/media-gfx/tintii-2.6.1
index 8607f81f9c49..64bddf36533a 100644
--- a/metadata/cache/media-gfx/tintii-2.6.1
+++ b/metadata/cache/media-gfx/tintii-2.6.1
@@ -1,4 +1,4 @@
-x11-libs/wxGTK:2.8[X] dev-libs/boost || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+x11-libs/wxGTK:2.8[X] dev-libs/boost || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 x11-libs/wxGTK:2.8[X]
 0
 http://www.indii.org/files/tint/releases/tintii-2.6.1.tar.gz
diff --git a/metadata/cache/media-gfx/ufraw-0.18 b/metadata/cache/media-gfx/ufraw-0.18
index 6ae84fb11b64..bdfce5d27bf2 100644
--- a/metadata/cache/media-gfx/ufraw-0.18
+++ b/metadata/cache/media-gfx/ufraw-0.18
@@ -1,4 +1,4 @@
-dev-libs/glib:2 >=media-gfx/exiv2-0.11 virtual/jpeg =media-libs/lcms-1* >=media-libs/lensfun-0.2.5 media-libs/tiff fits? ( sci-libs/cfitsio ) gnome? ( >=gnome-base/gconf-2 ) gtk? ( >=x11-libs/gtk+-2.6:2 >=media-gfx/gtkimageview-1.5 ) gimp? ( >=x11-libs/gtk+-2.6:2 >=media-gfx/gtkimageview-1.5 >=media-gfx/gimp-2 ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+dev-libs/glib:2 >=media-gfx/exiv2-0.11 virtual/jpeg =media-libs/lcms-1* >=media-libs/lensfun-0.2.5 media-libs/tiff fits? ( sci-libs/cfitsio ) gnome? ( >=gnome-base/gconf-2 ) gtk? ( >=x11-libs/gtk+-2.6:2 >=media-gfx/gtkimageview-1.5 ) gimp? ( >=x11-libs/gtk+-2.6:2 >=media-gfx/gtkimageview-1.5 >=media-gfx/gimp-2 ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 dev-libs/glib:2 >=media-gfx/exiv2-0.11 virtual/jpeg =media-libs/lcms-1* >=media-libs/lensfun-0.2.5 media-libs/tiff fits? ( sci-libs/cfitsio ) gnome? ( >=gnome-base/gconf-2 ) gtk? ( >=x11-libs/gtk+-2.6:2 >=media-gfx/gtkimageview-1.5 ) gimp? ( >=x11-libs/gtk+-2.6:2 >=media-gfx/gtkimageview-1.5 >=media-gfx/gimp-2 )
 0
 mirror://sourceforge/ufraw/ufraw-0.18.tar.gz
diff --git a/metadata/cache/media-gfx/viewer-0.8.0 b/metadata/cache/media-gfx/viewer-0.8.0
index 2928a9c79f5a..d0fe7f740380 100644
--- a/metadata/cache/media-gfx/viewer-0.8.0
+++ b/metadata/cache/media-gfx/viewer-0.8.0
@@ -1,4 +1,4 @@
-virtual/opengl media-libs/freeglut x11-libs/libXmu x11-libs/libXt x11-libs/libICE x11-libs/libSM || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+virtual/opengl media-libs/freeglut x11-libs/libXmu x11-libs/libXt x11-libs/libICE x11-libs/libSM || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 virtual/opengl media-libs/freeglut x11-libs/libXmu x11-libs/libXt x11-libs/libICE x11-libs/libSM
 0
 http://www-users.cs.umn.edu/~wburdick/ftp/geowall/viewer-0.8.0.tar.gz
diff --git a/metadata/cache/media-gfx/xloadimage-4.1-r11 b/metadata/cache/media-gfx/xloadimage-4.1-r11
index f8439319678c..3c578c6a5e9a 100644
--- a/metadata/cache/media-gfx/xloadimage-4.1-r11
+++ b/metadata/cache/media-gfx/xloadimage-4.1-r11
@@ -1,4 +1,4 @@
-x11-libs/libX11 tiff? ( media-libs/tiff ) png? ( media-libs/libpng ) jpeg? ( virtual/jpeg:0 ) !media-gfx/xli || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+x11-libs/libX11 tiff? ( media-libs/tiff ) png? ( media-libs/libpng ) jpeg? ( virtual/jpeg:0 ) !media-gfx/xli || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 x11-libs/libX11 tiff? ( media-libs/tiff ) png? ( media-libs/libpng ) jpeg? ( virtual/jpeg:0 )
 0
 ftp://ftp.x.org/R5contrib/xloadimage.4.1.tar.gz mirror://gentoo/xloadimage-4.1-gentoo-r1.diff.bz2
diff --git a/metadata/cache/media-gfx/xsvg-0.2.1 b/metadata/cache/media-gfx/xsvg-0.2.1
index a9674a277801..05e85947da6b 100644
--- a/metadata/cache/media-gfx/xsvg-0.2.1
+++ b/metadata/cache/media-gfx/xsvg-0.2.1
@@ -1,4 +1,4 @@
-x11-libs/cairo[X] x11-libs/libsvg-cairo x11-libs/libXt x11-libs/libXcursor || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+x11-libs/cairo[X] x11-libs/libsvg-cairo x11-libs/libXt x11-libs/libXcursor || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 x11-libs/cairo[X] x11-libs/libsvg-cairo
 0
 http://cairographics.org/snapshots/xsvg-0.2.1.tar.gz
diff --git a/metadata/cache/media-gfx/zbar-0.10-r1 b/metadata/cache/media-gfx/zbar-0.10-r1
index a7a69373936a..d85bdda1f1df 100644
--- a/metadata/cache/media-gfx/zbar-0.10-r1
+++ b/metadata/cache/media-gfx/zbar-0.10-r1
@@ -1,4 +1,4 @@
-gtk? ( =dev-libs/glib-2* =x11-libs/gtk+-2* ) imagemagick? ( >=media-gfx/imagemagick-6.2.6 ) jpeg? ( virtual/jpeg ) python? ( gtk? ( dev-python/pygtk ) ) qt4? ( x11-libs/qt-core x11-libs/qt-gui ) X? ( x11-libs/libXext xv? ( x11-libs/libXv ) ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool =dev-lang/python-2*
+gtk? ( =dev-libs/glib-2* =x11-libs/gtk+-2* ) imagemagick? ( >=media-gfx/imagemagick-6.2.6 ) jpeg? ( virtual/jpeg ) python? ( gtk? ( dev-python/pygtk ) ) qt4? ( x11-libs/qt-core x11-libs/qt-gui ) X? ( x11-libs/libXext xv? ( x11-libs/libXv ) ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool =dev-lang/python-2*
 gtk? ( =dev-libs/glib-2* =x11-libs/gtk+-2* ) imagemagick? ( >=media-gfx/imagemagick-6.2.6 ) jpeg? ( virtual/jpeg ) python? ( gtk? ( dev-python/pygtk ) ) qt4? ( x11-libs/qt-core x11-libs/qt-gui ) X? ( x11-libs/libXext xv? ( x11-libs/libXv ) ) =dev-lang/python-2*
 0
 mirror://sourceforge/zbar/zbar-0.10.tar.bz2
diff --git a/metadata/cache/media-libs/FusionSound-1.1.1-r1 b/metadata/cache/media-libs/FusionSound-1.1.1-r1
index 870d2db89c63..3498c0781144 100644
--- a/metadata/cache/media-libs/FusionSound-1.1.1-r1
+++ b/metadata/cache/media-libs/FusionSound-1.1.1-r1
@@ -1,4 +1,4 @@
->=dev-libs/DirectFB-1.1.1 alsa? ( media-libs/alsa-lib ) timidity? ( media-libs/libtimidity media-sound/timidity++ ) vorbis? ( media-libs/libvorbis ) mad? ( media-libs/libmad ) cddb? ( media-libs/libcddb ) ffmpeg? ( >=virtual/ffmpeg-0.6.90_rc0 ) !net-zope/zodb dev-util/pkgconfig sys-apps/sed || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-libs/DirectFB-1.1.1 alsa? ( media-libs/alsa-lib ) timidity? ( media-libs/libtimidity media-sound/timidity++ ) vorbis? ( media-libs/libvorbis ) mad? ( media-libs/libmad ) cddb? ( media-libs/libcddb ) ffmpeg? ( >=virtual/ffmpeg-0.6.90_rc0 ) !net-zope/zodb dev-util/pkgconfig sys-apps/sed || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=dev-libs/DirectFB-1.1.1 alsa? ( media-libs/alsa-lib ) timidity? ( media-libs/libtimidity media-sound/timidity++ ) vorbis? ( media-libs/libvorbis ) mad? ( media-libs/libmad ) cddb? ( media-libs/libcddb ) ffmpeg? ( >=virtual/ffmpeg-0.6.90_rc0 ) !net-zope/zodb
 0
 http://www.directfb.org/downloads/Core/FusionSound-1.1.1.tar.gz
diff --git a/metadata/cache/media-libs/a52dec-0.7.4-r6 b/metadata/cache/media-libs/a52dec-0.7.4-r6
index e3a666b9acd9..f597d399c0a1 100644
--- a/metadata/cache/media-libs/a52dec-0.7.4-r6
+++ b/metadata/cache/media-libs/a52dec-0.7.4-r6
@@ -1,4 +1,4 @@
-djbfft? ( sci-libs/djbfft ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+djbfft? ( sci-libs/djbfft ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 djbfft? ( sci-libs/djbfft )
 0
 http://liba52.sourceforge.net/files/a52dec-0.7.4.tar.gz
diff --git a/metadata/cache/media-libs/aalib-1.4_rc5-r4 b/metadata/cache/media-libs/aalib-1.4_rc5-r4
index 9d88042ae98e..9f93790faee1 100644
--- a/metadata/cache/media-libs/aalib-1.4_rc5-r4
+++ b/metadata/cache/media-libs/aalib-1.4_rc5-r4
@@ -1,4 +1,4 @@
-X? ( x11-libs/libX11 ) slang? ( >=sys-libs/slang-1.4.2 ) >=sys-libs/ncurses-5.1 X? ( x11-proto/xproto ) gpm? ( sys-libs/gpm ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+X? ( x11-libs/libX11 ) slang? ( >=sys-libs/slang-1.4.2 ) >=sys-libs/ncurses-5.1 X? ( x11-proto/xproto ) gpm? ( sys-libs/gpm ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 X? ( x11-libs/libX11 ) slang? ( >=sys-libs/slang-1.4.2 )
 0
 mirror://sourceforge/aa-project/aalib-1.4rc5.tar.gz
diff --git a/metadata/cache/media-libs/alsa-lib-1.0.25-r1 b/metadata/cache/media-libs/alsa-lib-1.0.25-r1
index 8e3dd4d78184..62aaacc95551 100644
--- a/metadata/cache/media-libs/alsa-lib-1.0.25-r1
+++ b/metadata/cache/media-libs/alsa-lib-1.0.25-r1
@@ -1,4 +1,4 @@
->=media-sound/alsa-headers-1.0.25 doc? ( >=app-doc/doxygen-1.2.6 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( =dev-lang/python-2* )
+>=media-sound/alsa-headers-1.0.25 doc? ( >=app-doc/doxygen-1.2.6 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( =dev-lang/python-2* )
 python? ( =dev-lang/python-2* )
 0
 mirror://alsaproject/lib/alsa-lib-1.0.25.tar.bz2
diff --git a/metadata/cache/media-libs/alsa-oss-1.0.25 b/metadata/cache/media-libs/alsa-oss-1.0.25
index 80cf05e3e07a..4c0472b30a4a 100644
--- a/metadata/cache/media-libs/alsa-oss-1.0.25
+++ b/metadata/cache/media-libs/alsa-oss-1.0.25
@@ -1,4 +1,4 @@
->=media-libs/alsa-lib-1.0.25 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=media-libs/alsa-lib-1.0.25 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=media-libs/alsa-lib-1.0.25
 0
 mirror://alsaproject/oss-lib/alsa-oss-1.0.25.tar.bz2
diff --git a/metadata/cache/media-libs/atlas-c++-0.6.1-r1 b/metadata/cache/media-libs/atlas-c++-0.6.1-r1
index 8e82b0f7ece4..547ccc774d59 100644
--- a/metadata/cache/media-libs/atlas-c++-0.6.1-r1
+++ b/metadata/cache/media-libs/atlas-c++-0.6.1-r1
@@ -1,4 +1,4 @@
-doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 mirror://sourceforge/worldforge/Atlas-C++-0.6.1.tar.bz2
diff --git a/metadata/cache/media-libs/atlas-c++-0.6.2 b/metadata/cache/media-libs/atlas-c++-0.6.2
index 0665bbfa9122..3ddffe56c9b3 100644
--- a/metadata/cache/media-libs/atlas-c++-0.6.2
+++ b/metadata/cache/media-libs/atlas-c++-0.6.2
@@ -1,4 +1,4 @@
-doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 mirror://sourceforge/worldforge/Atlas-C++-0.6.2.tar.bz2
diff --git a/metadata/cache/media-libs/aubio-0.3.2-r1 b/metadata/cache/media-libs/aubio-0.3.2-r1
index 5273e36930d5..6295515d5dec 100644
--- a/metadata/cache/media-libs/aubio-0.3.2-r1
+++ b/metadata/cache/media-libs/aubio-0.3.2-r1
@@ -1,4 +1,4 @@
-sci-libs/fftw:3.0 media-libs/libsndfile media-libs/libsamplerate || ( dev-lang/python:2.7 dev-lang/python:2.6 ) alsa? ( media-libs/alsa-lib ) jack? ( media-sound/jack-audio-connection-kit ) lash? ( media-sound/lash ) >=dev-lang/swig-1.3.0 dev-util/pkgconfig doc? ( app-doc/doxygen virtual/latex-base ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
+sci-libs/fftw:3.0 media-libs/libsndfile media-libs/libsamplerate || ( dev-lang/python:2.7 dev-lang/python:2.6 ) alsa? ( media-libs/alsa-lib ) jack? ( media-sound/jack-audio-connection-kit ) lash? ( media-sound/lash ) >=dev-lang/swig-1.3.0 dev-util/pkgconfig doc? ( app-doc/doxygen virtual/latex-base ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
 sci-libs/fftw:3.0 media-libs/libsndfile media-libs/libsamplerate || ( dev-lang/python:2.7 dev-lang/python:2.6 ) alsa? ( media-libs/alsa-lib ) jack? ( media-sound/jack-audio-connection-kit ) lash? ( media-sound/lash ) || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
 0
 http://aubio.piem.org/pub/aubio-0.3.2.tar.gz
diff --git a/metadata/cache/media-libs/aubio-0.3.2-r2 b/metadata/cache/media-libs/aubio-0.3.2-r2
index 61cd49a02aaa..dc856e43b4e4 100644
--- a/metadata/cache/media-libs/aubio-0.3.2-r2
+++ b/metadata/cache/media-libs/aubio-0.3.2-r2
@@ -1,4 +1,4 @@
-sci-libs/fftw:3.0 media-libs/libsndfile media-libs/libsamplerate alsa? ( media-libs/alsa-lib ) jack? ( media-sound/jack-audio-connection-kit ) lash? ( media-sound/lash ) >=dev-lang/swig-1.3.0 dev-util/pkgconfig doc? ( app-doc/doxygen virtual/latex-base ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
+sci-libs/fftw:3.0 media-libs/libsndfile media-libs/libsamplerate alsa? ( media-libs/alsa-lib ) jack? ( media-sound/jack-audio-connection-kit ) lash? ( media-sound/lash ) >=dev-lang/swig-1.3.0 dev-util/pkgconfig doc? ( app-doc/doxygen virtual/latex-base ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
 sci-libs/fftw:3.0 media-libs/libsndfile media-libs/libsamplerate alsa? ( media-libs/alsa-lib ) jack? ( media-sound/jack-audio-connection-kit ) lash? ( media-sound/lash ) || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
 0
 http://aubio.piem.org/pub/aubio-0.3.2.tar.gz
diff --git a/metadata/cache/media-libs/audiofile-0.3.1 b/metadata/cache/media-libs/audiofile-0.3.1
index e482033c2fcf..91d0635c3efb 100644
--- a/metadata/cache/media-libs/audiofile-0.3.1
+++ b/metadata/cache/media-libs/audiofile-0.3.1
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 http://www.68k.org/~michael/audiofile/audiofile-0.3.1.tar.gz
diff --git a/metadata/cache/media-libs/audiofile-0.3.2 b/metadata/cache/media-libs/audiofile-0.3.2
index 6a41ce539d59..f4ade7cb6bdc 100644
--- a/metadata/cache/media-libs/audiofile-0.3.2
+++ b/metadata/cache/media-libs/audiofile-0.3.2
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils
+|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils
 
 0
 mirror://gnome/sources/audiofile/0.3/audiofile-0.3.2.tar.xz
diff --git a/metadata/cache/media-libs/audiofile-0.3.3 b/metadata/cache/media-libs/audiofile-0.3.3
index 2170ed69dcef..c426a6e50501 100644
--- a/metadata/cache/media-libs/audiofile-0.3.3
+++ b/metadata/cache/media-libs/audiofile-0.3.3
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils
+|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils
 
 0
 mirror://gnome/sources/audiofile/0.3/audiofile-0.3.3.tar.xz
diff --git a/metadata/cache/media-libs/babl-0.1.4-r2 b/metadata/cache/media-libs/babl-0.1.4-r2
index b50024367535..2eb80eaf36bb 100644
--- a/metadata/cache/media-libs/babl-0.1.4-r2
+++ b/metadata/cache/media-libs/babl-0.1.4-r2
@@ -1,4 +1,4 @@
-introspection? ( >=dev-libs/gobject-introspection-0.6.8 ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+introspection? ( >=dev-libs/gobject-introspection-0.6.8 ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 introspection? ( >=dev-libs/gobject-introspection-0.6.8 )
 0
 ftp://ftp.gimp.org/pub/babl/0.1/babl-0.1.4.tar.bz2
diff --git a/metadata/cache/media-libs/babl-0.1.6 b/metadata/cache/media-libs/babl-0.1.6
index a91afa3f9720..7acc35b05843 100644
--- a/metadata/cache/media-libs/babl-0.1.6
+++ b/metadata/cache/media-libs/babl-0.1.6
@@ -1,4 +1,4 @@
-introspection? ( >=dev-libs/gobject-introspection-0.10 ) >=sys-devel/libtool-2.2 vala? ( dev-lang/vala:0.14[vapigen] ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+introspection? ( >=dev-libs/gobject-introspection-0.10 ) >=sys-devel/libtool-2.2 vala? ( dev-lang/vala:0.14[vapigen] ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 introspection? ( >=dev-libs/gobject-introspection-0.10 )
 0
 ftp://ftp.gimp.org/pub/babl/0.1/babl-0.1.6.tar.bz2
diff --git a/metadata/cache/media-libs/bio2jack-0.9-r1 b/metadata/cache/media-libs/bio2jack-0.9-r1
index e5eb177ce6ce..4d9056e2dc43 100644
--- a/metadata/cache/media-libs/bio2jack-0.9-r1
+++ b/metadata/cache/media-libs/bio2jack-0.9-r1
@@ -1,4 +1,4 @@
-media-libs/libsamplerate media-sound/jack-audio-connection-kit dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+media-libs/libsamplerate media-sound/jack-audio-connection-kit dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 media-libs/libsamplerate media-sound/jack-audio-connection-kit
 0
 mirror://sourceforge/bio2jack/bio2jack-0.9.tar.gz
diff --git a/metadata/cache/media-libs/cal3d-0.11.0-r1 b/metadata/cache/media-libs/cal3d-0.11.0-r1
index ef329a41f89a..d6b205f42a69 100644
--- a/metadata/cache/media-libs/cal3d-0.11.0-r1
+++ b/metadata/cache/media-libs/cal3d-0.11.0-r1
@@ -1,4 +1,4 @@
-doc? ( app-doc/doxygen app-text/docbook-sgml-utils ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+doc? ( app-doc/doxygen app-text/docbook-sgml-utils ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 http://download.gna.org/cal3d/sources/cal3d-0.11.0.tar.gz
diff --git a/metadata/cache/media-libs/ccaudio2-2.0.5 b/metadata/cache/media-libs/ccaudio2-2.0.5
index a9ee3b06ad50..45b0f8a33c82 100644
--- a/metadata/cache/media-libs/ccaudio2-2.0.5
+++ b/metadata/cache/media-libs/ccaudio2-2.0.5
@@ -1,4 +1,4 @@
-dev-libs/ucommon gsm? ( media-sound/gsm ) speex? ( media-libs/speex ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-libs/ucommon gsm? ( media-sound/gsm ) speex? ( media-libs/speex ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-libs/ucommon gsm? ( media-sound/gsm ) speex? ( media-libs/speex )
 0
 mirror://gnu/ccaudio/ccaudio2-2.0.5.tar.gz
diff --git a/metadata/cache/media-libs/celt-0.6.1 b/metadata/cache/media-libs/celt-0.6.1
index dc9e85704eb7..d67342e20f86 100644
--- a/metadata/cache/media-libs/celt-0.6.1
+++ b/metadata/cache/media-libs/celt-0.6.1
@@ -1,4 +1,4 @@
-ogg? ( media-libs/libogg ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+ogg? ( media-libs/libogg ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 ogg? ( media-libs/libogg )
 0
 http://downloads.us.xiph.org/releases/celt/celt-0.6.1.tar.gz
diff --git a/metadata/cache/media-libs/clutter-gst-1.4.6 b/metadata/cache/media-libs/clutter-gst-1.4.6
index c0e8c591ab85..916c4e190373 100644
--- a/metadata/cache/media-libs/clutter-gst-1.4.6
+++ b/metadata/cache/media-libs/clutter-gst-1.4.6
@@ -1,4 +1,4 @@
->=dev-libs/glib-2.20:2 >=media-libs/clutter-1.4.0:1.0[introspection?] >=media-libs/gstreamer-0.10.26:0.10[introspection?] media-libs/gst-plugins-base:0.10[introspection?] introspection? ( >=dev-libs/gobject-introspection-0.6.8 ) =dev-lang/python-2* doc? ( >=dev-util/gtk-doc-1.8 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 dev-util/pkgconfig app-arch/xz-utils
+>=dev-libs/glib-2.20:2 >=media-libs/clutter-1.4.0:1.0[introspection?] >=media-libs/gstreamer-0.10.26:0.10[introspection?] media-libs/gst-plugins-base:0.10[introspection?] introspection? ( >=dev-libs/gobject-introspection-0.6.8 ) =dev-lang/python-2* doc? ( >=dev-util/gtk-doc-1.8 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4 dev-util/pkgconfig app-arch/xz-utils
 >=dev-libs/glib-2.20:2 >=media-libs/clutter-1.4.0:1.0[introspection?] >=media-libs/gstreamer-0.10.26:0.10[introspection?] media-libs/gst-plugins-base:0.10[introspection?] introspection? ( >=dev-libs/gobject-introspection-0.6.8 )
 1.0
 mirror://gnome/sources/clutter-gst/1.4/clutter-gst-1.4.6.tar.xz
diff --git a/metadata/cache/media-libs/clutter-gtk-0.10.8 b/metadata/cache/media-libs/clutter-gtk-0.10.8
index ae5ecdc1fd92..20e7cbdcc140 100644
--- a/metadata/cache/media-libs/clutter-gtk-0.10.8
+++ b/metadata/cache/media-libs/clutter-gtk-0.10.8
@@ -1,4 +1,4 @@
->=x11-libs/gtk+-2.19.5:2[introspection?] >=media-libs/clutter-1.2:1.0[introspection?] introspection? ( >=dev-libs/gobject-introspection-0.9.3 ) >=dev-util/gtk-doc-am-1.14 doc? ( >=dev-util/gtk-doc-1.14 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 dev-util/pkgconfig
+>=x11-libs/gtk+-2.19.5:2[introspection?] >=media-libs/clutter-1.2:1.0[introspection?] introspection? ( >=dev-libs/gobject-introspection-0.9.3 ) >=dev-util/gtk-doc-am-1.14 doc? ( >=dev-util/gtk-doc-1.14 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 dev-util/pkgconfig
 >=x11-libs/gtk+-2.19.5:2[introspection?] >=media-libs/clutter-1.2:1.0[introspection?] introspection? ( >=dev-libs/gobject-introspection-0.9.3 )
 0.10
 http://www.clutter-project.org/sources/clutter-gtk/0.10/clutter-gtk-0.10.8.tar.bz2
diff --git a/metadata/cache/media-libs/compface-1.5.1 b/metadata/cache/media-libs/compface-1.5.1
index c83fb865ae72..e01552891448 100644
--- a/metadata/cache/media-libs/compface-1.5.1
+++ b/metadata/cache/media-libs/compface-1.5.1
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 http://ftp.xemacs.org/pub/xemacs/aux/compface-1.5.1.tar.gz
diff --git a/metadata/cache/media-libs/dssi-1.1.0 b/metadata/cache/media-libs/dssi-1.1.0
index ecb859377a04..229e1810ade0 100644
--- a/metadata/cache/media-libs/dssi-1.1.0
+++ b/metadata/cache/media-libs/dssi-1.1.0
@@ -1,4 +1,4 @@
-media-libs/alsa-lib >=media-libs/liblo-0.12 >=media-sound/jack-audio-connection-kit-0.99.14 >=media-libs/ladspa-sdk-1.12-r2 >=media-libs/libsndfile-1.0.11 >=media-libs/libsamplerate-0.1.1-r1 qt4? ( x11-libs/qt-gui:4 ) sys-apps/sed dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+media-libs/alsa-lib >=media-libs/liblo-0.12 >=media-sound/jack-audio-connection-kit-0.99.14 >=media-libs/ladspa-sdk-1.12-r2 >=media-libs/libsndfile-1.0.11 >=media-libs/libsamplerate-0.1.1-r1 qt4? ( x11-libs/qt-gui:4 ) sys-apps/sed dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 media-libs/alsa-lib >=media-libs/liblo-0.12 >=media-sound/jack-audio-connection-kit-0.99.14 >=media-libs/ladspa-sdk-1.12-r2 >=media-libs/libsndfile-1.0.11 >=media-libs/libsamplerate-0.1.1-r1 qt4? ( x11-libs/qt-gui:4 )
 0
 mirror://sourceforge/dssi/dssi-1.1.0.tar.gz
diff --git a/metadata/cache/media-libs/dssi-1.1.1 b/metadata/cache/media-libs/dssi-1.1.1
index db964586c0df..23b84c360d75 100644
--- a/metadata/cache/media-libs/dssi-1.1.1
+++ b/metadata/cache/media-libs/dssi-1.1.1
@@ -1,4 +1,4 @@
-media-libs/alsa-lib >=media-libs/liblo-0.12 >=media-sound/jack-audio-connection-kit-0.99.14 >=media-libs/ladspa-sdk-1.12-r2 >=media-libs/libsndfile-1.0.11 >=media-libs/libsamplerate-0.1.1-r1 qt4? ( x11-libs/qt-gui:4 ) sys-apps/sed dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+media-libs/alsa-lib >=media-libs/liblo-0.12 >=media-sound/jack-audio-connection-kit-0.99.14 >=media-libs/ladspa-sdk-1.12-r2 >=media-libs/libsndfile-1.0.11 >=media-libs/libsamplerate-0.1.1-r1 qt4? ( x11-libs/qt-gui:4 ) sys-apps/sed dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 media-libs/alsa-lib >=media-libs/liblo-0.12 >=media-sound/jack-audio-connection-kit-0.99.14 >=media-libs/ladspa-sdk-1.12-r2 >=media-libs/libsndfile-1.0.11 >=media-libs/libsamplerate-0.1.1-r1 qt4? ( x11-libs/qt-gui:4 )
 0
 mirror://sourceforge/dssi/dssi-1.1.1.tar.gz
diff --git a/metadata/cache/media-libs/exempi-2.1.1 b/metadata/cache/media-libs/exempi-2.1.1
index 64937a564f92..98276ac9046f 100644
--- a/metadata/cache/media-libs/exempi-2.1.1
+++ b/metadata/cache/media-libs/exempi-2.1.1
@@ -1,4 +1,4 @@
-dev-libs/expat virtual/libiconv sys-libs/zlib sys-devel/gettext || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-libs/expat virtual/libiconv sys-libs/zlib sys-devel/gettext || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-libs/expat virtual/libiconv sys-libs/zlib
 2
 http://libopenraw.freedesktop.org/download/exempi-2.1.1.tar.gz
diff --git a/metadata/cache/media-libs/exempi-2.2.0 b/metadata/cache/media-libs/exempi-2.2.0
index e84c3971d54d..b81bba28bfe0 100644
--- a/metadata/cache/media-libs/exempi-2.2.0
+++ b/metadata/cache/media-libs/exempi-2.2.0
@@ -1,4 +1,4 @@
->=dev-libs/expat-2 virtual/libiconv sys-libs/zlib sys-devel/gettext || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-libs/expat-2 virtual/libiconv sys-libs/zlib sys-devel/gettext || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=dev-libs/expat-2 virtual/libiconv sys-libs/zlib
 2
 http://libopenraw.freedesktop.org/download/exempi-2.2.0.tar.gz
diff --git a/metadata/cache/media-libs/faac-1.28-r1 b/metadata/cache/media-libs/faac-1.28-r1
index 56a665614e1a..80a25d87adbb 100644
--- a/metadata/cache/media-libs/faac-1.28-r1
+++ b/metadata/cache/media-libs/faac-1.28-r1
@@ -1,4 +1,4 @@
-~media-libs/libmp4v2-1.9.1 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+~media-libs/libmp4v2-1.9.1 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 ~media-libs/libmp4v2-1.9.1
 0
 mirror://sourceforge/faac/faac-1.28.tar.gz
diff --git a/metadata/cache/media-libs/faac-1.28-r3 b/metadata/cache/media-libs/faac-1.28-r3
index fac1814acb36..46ace0c33828 100644
--- a/metadata/cache/media-libs/faac-1.28-r3
+++ b/metadata/cache/media-libs/faac-1.28-r3
@@ -1,4 +1,4 @@
-media-libs/libmp4v2 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+media-libs/libmp4v2 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 media-libs/libmp4v2
 0
 mirror://sourceforge/faac/faac-1.28.tar.gz
diff --git a/metadata/cache/media-libs/faad2-2.7-r2 b/metadata/cache/media-libs/faad2-2.7-r2
index 25cc9e3f4d15..b651ba645430 100644
--- a/metadata/cache/media-libs/faad2-2.7-r2
+++ b/metadata/cache/media-libs/faad2-2.7-r2
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 mirror://sourceforge/faac/faad2-2.7.tar.gz
diff --git a/metadata/cache/media-libs/ffmpegsource-2.16 b/metadata/cache/media-libs/ffmpegsource-2.16
index aa5d532dfd05..65d73ae73c31 100644
--- a/metadata/cache/media-libs/ffmpegsource-2.16
+++ b/metadata/cache/media-libs/ffmpegsource-2.16
@@ -1,4 +1,4 @@
-sys-libs/zlib virtual/ffmpeg dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+sys-libs/zlib virtual/ffmpeg dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 sys-libs/zlib virtual/ffmpeg
 0
 https://ffmpegsource.googlecode.com/files/ffms-2.16-src.tar.bz2
diff --git a/metadata/cache/media-libs/ffmpegsource-2.16.2.1_pre587 b/metadata/cache/media-libs/ffmpegsource-2.16.2.1_pre587
index cb10ef3d270d..67de7f5997e0 100644
--- a/metadata/cache/media-libs/ffmpegsource-2.16.2.1_pre587
+++ b/metadata/cache/media-libs/ffmpegsource-2.16.2.1_pre587
@@ -1,4 +1,4 @@
-sys-libs/zlib || ( >=media-video/ffmpeg-0.9 >=media-video/libav-0.8_pre20111116 ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+sys-libs/zlib || ( >=media-video/ffmpeg-0.9 >=media-video/libav-0.8_pre20111116 ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 sys-libs/zlib || ( >=media-video/ffmpeg-0.9 >=media-video/libav-0.8_pre20111116 )
 0
 http://rion-overlay.googlecode.com/files/ffmpegsource-2.16.2.1_pre587.tar.xz
diff --git a/metadata/cache/media-libs/ffmpegsource-2.17 b/metadata/cache/media-libs/ffmpegsource-2.17
index 0ab8189992c1..42e8e7599167 100644
--- a/metadata/cache/media-libs/ffmpegsource-2.17
+++ b/metadata/cache/media-libs/ffmpegsource-2.17
@@ -1,4 +1,4 @@
-sys-libs/zlib >=virtual/ffmpeg-0.9 dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+sys-libs/zlib >=virtual/ffmpeg-0.9 dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 sys-libs/zlib >=virtual/ffmpeg-0.9
 0
 https://ffmpegsource.googlecode.com/files/ffms-2.17-src.tar.bz2
diff --git a/metadata/cache/media-libs/ffmpegsource-9999 b/metadata/cache/media-libs/ffmpegsource-9999
index b6a597df3cc8..7814f9ea74ce 100644
--- a/metadata/cache/media-libs/ffmpegsource-9999
+++ b/metadata/cache/media-libs/ffmpegsource-9999
@@ -1,4 +1,4 @@
-sys-libs/zlib >=virtual/ffmpeg-0.9 dev-util/pkgconfig dev-vcs/subversion net-misc/rsync || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+sys-libs/zlib >=virtual/ffmpeg-0.9 dev-util/pkgconfig dev-vcs/subversion net-misc/rsync || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 sys-libs/zlib >=virtual/ffmpeg-0.9
 0
 
diff --git a/metadata/cache/media-libs/flac-1.2.1-r3 b/metadata/cache/media-libs/flac-1.2.1-r3
index cb291081668d..45db45a93d35 100644
--- a/metadata/cache/media-libs/flac-1.2.1-r3
+++ b/metadata/cache/media-libs/flac-1.2.1-r3
@@ -1,4 +1,4 @@
-ogg? ( >=media-libs/libogg-1.1.3 ) x86? ( dev-lang/nasm ) !elibc_uclibc? ( sys-devel/gettext ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+ogg? ( >=media-libs/libogg-1.1.3 ) x86? ( dev-lang/nasm ) !elibc_uclibc? ( sys-devel/gettext ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 ogg? ( >=media-libs/libogg-1.1.3 )
 0
 mirror://sourceforge/flac/flac-1.2.1.tar.gz mirror://gentoo/flac-1.2.1-embedded-m4.tar.bz2
diff --git a/metadata/cache/media-libs/flac-1.2.1-r4 b/metadata/cache/media-libs/flac-1.2.1-r4
index 178fcad74d77..29baf281010e 100644
--- a/metadata/cache/media-libs/flac-1.2.1-r4
+++ b/metadata/cache/media-libs/flac-1.2.1-r4
@@ -1,4 +1,4 @@
-ogg? ( >=media-libs/libogg-1.1.3 ) x86? ( dev-lang/nasm ) !elibc_uclibc? ( sys-devel/gettext ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+ogg? ( >=media-libs/libogg-1.1.3 ) x86? ( dev-lang/nasm ) !elibc_uclibc? ( sys-devel/gettext ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 ogg? ( >=media-libs/libogg-1.1.3 )
 0
 mirror://sourceforge/flac/flac-1.2.1.tar.gz mirror://gentoo/flac-1.2.1-embedded-m4.tar.bz2
diff --git a/metadata/cache/media-libs/flickcurl-1.21 b/metadata/cache/media-libs/flickcurl-1.21
index e3c0d8c54715..97bf12200e05 100644
--- a/metadata/cache/media-libs/flickcurl-1.21
+++ b/metadata/cache/media-libs/flickcurl-1.21
@@ -1,4 +1,4 @@
->=net-misc/curl-7.10.0 >=dev-libs/libxml2-2.6.8:2 raptor? ( media-libs/raptor:2 ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=net-misc/curl-7.10.0 >=dev-libs/libxml2-2.6.8:2 raptor? ( media-libs/raptor:2 ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=net-misc/curl-7.10.0 >=dev-libs/libxml2-2.6.8:2 raptor? ( media-libs/raptor:2 )
 0
 mirror://gentoo/flickcurl-1.21.tar.gz
diff --git a/metadata/cache/media-libs/flickcurl-1.22 b/metadata/cache/media-libs/flickcurl-1.22
index 3bcff28e6722..266311b2de9e 100644
--- a/metadata/cache/media-libs/flickcurl-1.22
+++ b/metadata/cache/media-libs/flickcurl-1.22
@@ -1,4 +1,4 @@
->=net-misc/curl-7.10.0 >=dev-libs/libxml2-2.6.8:2 raptor? ( media-libs/raptor:2 ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=net-misc/curl-7.10.0 >=dev-libs/libxml2-2.6.8:2 raptor? ( media-libs/raptor:2 ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=net-misc/curl-7.10.0 >=dev-libs/libxml2-2.6.8:2 raptor? ( media-libs/raptor:2 )
 0
 http://download.dajobe.org/flickcurl/flickcurl-1.22.tar.gz
diff --git a/metadata/cache/media-libs/fnlib-0.5-r2 b/metadata/cache/media-libs/fnlib-0.5-r2
index 32ef36df6752..af23fa373f81 100644
--- a/metadata/cache/media-libs/fnlib-0.5-r2
+++ b/metadata/cache/media-libs/fnlib-0.5-r2
@@ -1,4 +1,4 @@
-media-libs/imlib || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+media-libs/imlib || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 media-libs/imlib
 0
 mirror://sourceforge/enlightenment/fnlib-0.5.tar.gz
diff --git a/metadata/cache/media-libs/fontconfig-2.8.0-r1 b/metadata/cache/media-libs/fontconfig-2.8.0-r1
index c8febb9c06d7..b3c686d179ad 100644
--- a/metadata/cache/media-libs/fontconfig-2.8.0-r1
+++ b/metadata/cache/media-libs/fontconfig-2.8.0-r1
@@ -1,4 +1,4 @@
->=media-libs/freetype-2.2.1 >=dev-libs/expat-1.95.3 dev-util/pkgconfig doc? ( app-text/docbook-sgml-utils[jadetex] =app-text/docbook-sgml-dtd-3.1* ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=media-libs/freetype-2.2.1 >=dev-libs/expat-1.95.3 dev-util/pkgconfig doc? ( app-text/docbook-sgml-utils[jadetex] =app-text/docbook-sgml-dtd-3.1* ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=media-libs/freetype-2.2.1 >=dev-libs/expat-1.95.3
 1.0
 http://fontconfig.org/release/fontconfig-2.8.0.tar.gz
diff --git a/metadata/cache/media-libs/fontconfig-2.8.0-r2 b/metadata/cache/media-libs/fontconfig-2.8.0-r2
index a16a1366a64b..0c645297097c 100644
--- a/metadata/cache/media-libs/fontconfig-2.8.0-r2
+++ b/metadata/cache/media-libs/fontconfig-2.8.0-r2
@@ -1,4 +1,4 @@
->=media-libs/freetype-2.2.1 >=dev-libs/expat-1.95.3 dev-util/pkgconfig doc? ( app-text/docbook-sgml-utils[jadetex] =app-text/docbook-sgml-dtd-3.1* ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=media-libs/freetype-2.2.1 >=dev-libs/expat-1.95.3 dev-util/pkgconfig doc? ( app-text/docbook-sgml-utils[jadetex] =app-text/docbook-sgml-dtd-3.1* ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=media-libs/freetype-2.2.1 >=dev-libs/expat-1.95.3
 1.0
 http://fontconfig.org/release/fontconfig-2.8.0.tar.gz
diff --git a/metadata/cache/media-libs/freealut-1.1.0-r1 b/metadata/cache/media-libs/freealut-1.1.0-r1
index b056529e7cc3..7da6cb5d2b37 100644
--- a/metadata/cache/media-libs/freealut-1.1.0-r1
+++ b/metadata/cache/media-libs/freealut-1.1.0-r1
@@ -1,4 +1,4 @@
-media-libs/openal || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+media-libs/openal || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 media-libs/openal
 0
 http://connect.creativelabs.com/openal/Downloads/ALUT/freealut-1.1.0.tar.gz
diff --git a/metadata/cache/media-libs/freeglut-2.6.0 b/metadata/cache/media-libs/freeglut-2.6.0
index 852edc971bbe..0279b36723f4 100644
--- a/metadata/cache/media-libs/freeglut-2.6.0
+++ b/metadata/cache/media-libs/freeglut-2.6.0
@@ -1,4 +1,4 @@
-virtual/opengl virtual/glu >=x11-libs/libXi-1.3 x11-libs/libXxf86vm || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+virtual/opengl virtual/glu >=x11-libs/libXi-1.3 x11-libs/libXxf86vm || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 virtual/opengl virtual/glu >=x11-libs/libXi-1.3 x11-libs/libXxf86vm
 0
 mirror://sourceforge/freeglut/freeglut-2.6.0.tar.gz mpx? ( http://tisch.sourceforge.net/freeglut-2.6.0-mpx-r6.patch )
diff --git a/metadata/cache/media-libs/freetype-2.4.9 b/metadata/cache/media-libs/freetype-2.4.9
index e80dc558b1b8..d0306233f9cb 100644
--- a/metadata/cache/media-libs/freetype-2.4.9
+++ b/metadata/cache/media-libs/freetype-2.4.9
@@ -1,4 +1,4 @@
-sys-libs/zlib bzip2? ( app-arch/bzip2 ) X? ( x11-libs/libX11 x11-libs/libXau x11-libs/libXdmcp ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+sys-libs/zlib bzip2? ( app-arch/bzip2 ) X? ( x11-libs/libX11 x11-libs/libXau x11-libs/libXdmcp ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 sys-libs/zlib bzip2? ( app-arch/bzip2 ) X? ( x11-libs/libX11 x11-libs/libXau x11-libs/libXdmcp )
 2
 mirror://sourceforge/freetype/freetype-2.4.9.tar.bz2 utils? ( mirror://sourceforge/freetype/ft2demos-2.4.9.tar.bz2 ) doc? ( mirror://sourceforge/freetype/freetype-doc-2.4.9.tar.bz2 )
diff --git a/metadata/cache/media-libs/freetype-2.4.9-r1 b/metadata/cache/media-libs/freetype-2.4.9-r1
index 28ae7d5360ae..1137276e5180 100644
--- a/metadata/cache/media-libs/freetype-2.4.9-r1
+++ b/metadata/cache/media-libs/freetype-2.4.9-r1
@@ -1,4 +1,4 @@
-sys-libs/zlib bzip2? ( app-arch/bzip2 ) X? ( x11-libs/libX11 x11-libs/libXau x11-libs/libXdmcp ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+sys-libs/zlib bzip2? ( app-arch/bzip2 ) X? ( x11-libs/libX11 x11-libs/libXau x11-libs/libXdmcp ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 sys-libs/zlib bzip2? ( app-arch/bzip2 ) X? ( x11-libs/libX11 x11-libs/libXau x11-libs/libXdmcp )
 2
 mirror://sourceforge/freetype/freetype-2.4.9.tar.bz2 utils? ( mirror://sourceforge/freetype/ft2demos-2.4.9.tar.bz2 ) doc? ( mirror://sourceforge/freetype/freetype-doc-2.4.9.tar.bz2 )
diff --git a/metadata/cache/media-libs/freeverb3-2.5.13-r2 b/metadata/cache/media-libs/freeverb3-2.5.13-r2
index c934a7a5d5a3..50f3a2da37be 100644
--- a/metadata/cache/media-libs/freeverb3-2.5.13-r2
+++ b/metadata/cache/media-libs/freeverb3-2.5.13-r2
@@ -1,4 +1,4 @@
->=sci-libs/fftw-3.0.1 audacious? ( <media-sound/audacious-2.5 media-libs/libsndfile ) jack? ( media-sound/jack-audio-connection-kit media-libs/libsndfile ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=sci-libs/fftw-3.0.1 audacious? ( <media-sound/audacious-2.5 media-libs/libsndfile ) jack? ( media-sound/jack-audio-connection-kit media-libs/libsndfile ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=sci-libs/fftw-3.0.1 audacious? ( <media-sound/audacious-2.5 media-libs/libsndfile ) jack? ( media-sound/jack-audio-connection-kit media-libs/libsndfile )
 0
 mirror://sourceforge/freeverb3/freeverb3-2.5.13.tar.gz
diff --git a/metadata/cache/media-libs/ftgl-2.1.3_rc5 b/metadata/cache/media-libs/ftgl-2.1.3_rc5
index 27a66ff11a9d..1155be65f035 100644
--- a/metadata/cache/media-libs/ftgl-2.1.3_rc5
+++ b/metadata/cache/media-libs/ftgl-2.1.3_rc5
@@ -1,4 +1,4 @@
->=media-libs/freetype-2.0.9 virtual/opengl virtual/glu media-libs/freeglut || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=media-libs/freetype-2.0.9 virtual/opengl virtual/glu media-libs/freeglut || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=media-libs/freetype-2.0.9 virtual/opengl virtual/glu media-libs/freeglut
 0
 mirror://sourceforge/ftgl/ftgl-2.1.3-rc5.tar.bz2
diff --git a/metadata/cache/media-libs/gavl-1.1.0 b/metadata/cache/media-libs/gavl-1.1.0
index 1c9ca9ba26a1..e183c8d58ab7 100644
--- a/metadata/cache/media-libs/gavl-1.1.0
+++ b/metadata/cache/media-libs/gavl-1.1.0
@@ -1,4 +1,4 @@
-doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 mirror://sourceforge/gmerlin/gavl-1.1.0.tar.gz
diff --git a/metadata/cache/media-libs/gavl-1.1.0-r1 b/metadata/cache/media-libs/gavl-1.1.0-r1
index 92c85414cc27..f378fded93b4 100644
--- a/metadata/cache/media-libs/gavl-1.1.0-r1
+++ b/metadata/cache/media-libs/gavl-1.1.0-r1
@@ -1,4 +1,4 @@
-doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 mirror://sourceforge/gmerlin/gavl-1.1.0.tar.gz
diff --git a/metadata/cache/media-libs/gd-2.0.35-r3 b/metadata/cache/media-libs/gd-2.0.35-r3
index 40ebff954920..d4e610bef4c0 100644
--- a/metadata/cache/media-libs/gd-2.0.35-r3
+++ b/metadata/cache/media-libs/gd-2.0.35-r3
@@ -1,4 +1,4 @@
-fontconfig? ( media-libs/fontconfig ) jpeg? ( virtual/jpeg ) png? ( >=media-libs/libpng-1.2:0 ) truetype? ( >=media-libs/freetype-2.1.5 ) xpm? ( x11-libs/libXpm x11-libs/libXt ) zlib? ( sys-libs/zlib ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+fontconfig? ( media-libs/fontconfig ) jpeg? ( virtual/jpeg ) png? ( >=media-libs/libpng-1.2:0 ) truetype? ( >=media-libs/freetype-2.1.5 ) xpm? ( x11-libs/libXpm x11-libs/libXt ) zlib? ( sys-libs/zlib ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 fontconfig? ( media-libs/fontconfig ) jpeg? ( virtual/jpeg ) png? ( >=media-libs/libpng-1.2:0 ) truetype? ( >=media-libs/freetype-2.1.5 ) xpm? ( x11-libs/libXpm x11-libs/libXt ) zlib? ( sys-libs/zlib )
 2
 http://libgd.org/releases/gd-2.0.35.tar.bz2
diff --git a/metadata/cache/media-libs/gegl-0.1.6 b/metadata/cache/media-libs/gegl-0.1.6
index c2e0ba744e0b..03bb2bd72419 100644
--- a/metadata/cache/media-libs/gegl-0.1.6
+++ b/metadata/cache/media-libs/gegl-0.1.6
@@ -1,4 +1,4 @@
->=media-libs/babl-0.1.4 dev-libs/glib:2 x11-libs/gtk+:2 x11-libs/gdk-pixbuf:2 x11-libs/pango sys-libs/zlib cairo? ( x11-libs/cairo ) exif? ( media-gfx/exiv2 ) ffmpeg? ( virtual/ffmpeg ) graphviz? ( media-gfx/graphviz ) jpeg? ( virtual/jpeg ) jpeg2k? ( media-libs/jasper ) lua? ( dev-lang/lua ) openexr? ( media-libs/openexr ) png? ( media-libs/libpng ) raw? ( media-libs/libopenraw ) sdl? ( media-libs/libsdl ) svg? ( gnome-base/librsvg:2 ) umfpack? ( sci-libs/umfpack ) v4l? ( media-libs/libv4l ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=media-libs/babl-0.1.4 dev-libs/glib:2 x11-libs/gtk+:2 x11-libs/gdk-pixbuf:2 x11-libs/pango sys-libs/zlib cairo? ( x11-libs/cairo ) exif? ( media-gfx/exiv2 ) ffmpeg? ( virtual/ffmpeg ) graphviz? ( media-gfx/graphviz ) jpeg? ( virtual/jpeg ) jpeg2k? ( media-libs/jasper ) lua? ( dev-lang/lua ) openexr? ( media-libs/openexr ) png? ( media-libs/libpng ) raw? ( media-libs/libopenraw ) sdl? ( media-libs/libsdl ) svg? ( gnome-base/librsvg:2 ) umfpack? ( sci-libs/umfpack ) v4l? ( media-libs/libv4l ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=media-libs/babl-0.1.4 dev-libs/glib:2 x11-libs/gtk+:2 x11-libs/gdk-pixbuf:2 x11-libs/pango sys-libs/zlib cairo? ( x11-libs/cairo ) exif? ( media-gfx/exiv2 ) ffmpeg? ( virtual/ffmpeg ) graphviz? ( media-gfx/graphviz ) jpeg? ( virtual/jpeg ) jpeg2k? ( media-libs/jasper ) lua? ( dev-lang/lua ) openexr? ( media-libs/openexr ) png? ( media-libs/libpng ) raw? ( media-libs/libopenraw ) sdl? ( media-libs/libsdl ) svg? ( gnome-base/librsvg:2 ) umfpack? ( sci-libs/umfpack ) v4l? ( media-libs/libv4l )
 0
 ftp://ftp.gimp.org/pub/gegl/0.1/gegl-0.1.6.tar.bz2
diff --git a/metadata/cache/media-libs/gegl-0.1.8 b/metadata/cache/media-libs/gegl-0.1.8
index 5aed1d8aea0e..1418daf2416b 100644
--- a/metadata/cache/media-libs/gegl-0.1.8
+++ b/metadata/cache/media-libs/gegl-0.1.8
@@ -1,4 +1,4 @@
->=media-libs/babl-0.1.6 >=dev-libs/glib-2.28:2 >=x11-libs/gdk-pixbuf-2.18:2 x11-libs/pango sys-libs/zlib cairo? ( x11-libs/cairo ) exif? ( media-gfx/exiv2 ) ffmpeg? ( virtual/ffmpeg ) graphviz? ( media-gfx/graphviz ) jpeg? ( virtual/jpeg ) jpeg2k? ( >=media-libs/jasper-1.900.1 ) lua? ( >=dev-lang/lua-5.1 ) openexr? ( media-libs/openexr ) png? ( media-libs/libpng ) raw? ( >=media-libs/libopenraw-0.0.5 ) sdl? ( media-libs/libsdl ) svg? ( >=gnome-base/librsvg-2.14:2 ) umfpack? ( sci-libs/umfpack ) v4l? ( media-libs/libv4l ) dev-lang/perl introspection? ( >=dev-libs/gobject-introspection-0.10 >=dev-python/pygobject-2.26:2 ) lensfun? ( >=media-libs/lensfun-0.2.5 ) dev-util/pkgconfig >=sys-devel/libtool-2.2 vala? ( dev-lang/vala:0.14[vapigen] ) >=sys-apps/sed-4 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=media-libs/babl-0.1.6 >=dev-libs/glib-2.28:2 >=x11-libs/gdk-pixbuf-2.18:2 x11-libs/pango sys-libs/zlib cairo? ( x11-libs/cairo ) exif? ( media-gfx/exiv2 ) ffmpeg? ( virtual/ffmpeg ) graphviz? ( media-gfx/graphviz ) jpeg? ( virtual/jpeg ) jpeg2k? ( >=media-libs/jasper-1.900.1 ) lua? ( >=dev-lang/lua-5.1 ) openexr? ( media-libs/openexr ) png? ( media-libs/libpng ) raw? ( >=media-libs/libopenraw-0.0.5 ) sdl? ( media-libs/libsdl ) svg? ( >=gnome-base/librsvg-2.14:2 ) umfpack? ( sci-libs/umfpack ) v4l? ( media-libs/libv4l ) dev-lang/perl introspection? ( >=dev-libs/gobject-introspection-0.10 >=dev-python/pygobject-2.26:2 ) lensfun? ( >=media-libs/lensfun-0.2.5 ) dev-util/pkgconfig >=sys-devel/libtool-2.2 vala? ( dev-lang/vala:0.14[vapigen] ) >=sys-apps/sed-4 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=media-libs/babl-0.1.6 >=dev-libs/glib-2.28:2 >=x11-libs/gdk-pixbuf-2.18:2 x11-libs/pango sys-libs/zlib cairo? ( x11-libs/cairo ) exif? ( media-gfx/exiv2 ) ffmpeg? ( virtual/ffmpeg ) graphviz? ( media-gfx/graphviz ) jpeg? ( virtual/jpeg ) jpeg2k? ( >=media-libs/jasper-1.900.1 ) lua? ( >=dev-lang/lua-5.1 ) openexr? ( media-libs/openexr ) png? ( media-libs/libpng ) raw? ( >=media-libs/libopenraw-0.0.5 ) sdl? ( media-libs/libsdl ) svg? ( >=gnome-base/librsvg-2.14:2 ) umfpack? ( sci-libs/umfpack ) v4l? ( media-libs/libv4l ) dev-lang/perl introspection? ( >=dev-libs/gobject-introspection-0.10 >=dev-python/pygobject-2.26:2 ) lensfun? ( >=media-libs/lensfun-0.2.5 )
 0
 ftp://ftp.gimp.org/pub/gegl/0.1/gegl-0.1.8.tar.bz2
diff --git a/metadata/cache/media-libs/grilo-0.1.17 b/metadata/cache/media-libs/grilo-0.1.17
index 61560f25bf08..58ce4ef27904 100644
--- a/metadata/cache/media-libs/grilo-0.1.17
+++ b/metadata/cache/media-libs/grilo-0.1.17
@@ -1,4 +1,4 @@
->=dev-libs/glib-2.22:2 dev-libs/libxml2:2 network? ( >=net-libs/libsoup-2.33.4:2.4 ) test-ui? ( >=x11-libs/gtk+-3.0:3 ) introspection? ( >=dev-libs/gobject-introspection-0.9 ) >=dev-util/pkgconfig-0.9 gnome-base/gnome-common doc? ( >=dev-util/gtk-doc-1.10 ) vala? ( dev-lang/vala:0.12[vapigen] ) test? ( dev-python/pygobject:2[introspection?] media-plugins/grilo-plugins ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
+>=dev-libs/glib-2.22:2 dev-libs/libxml2:2 network? ( >=net-libs/libsoup-2.33.4:2.4 ) test-ui? ( >=x11-libs/gtk+-3.0:3 ) introspection? ( >=dev-libs/gobject-introspection-0.9 ) >=dev-util/pkgconfig-0.9 gnome-base/gnome-common doc? ( >=dev-util/gtk-doc-1.10 ) vala? ( dev-lang/vala:0.12[vapigen] ) test? ( dev-python/pygobject:2[introspection?] media-plugins/grilo-plugins ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
 >=dev-libs/glib-2.22:2 dev-libs/libxml2:2 network? ( >=net-libs/libsoup-2.33.4:2.4 ) test-ui? ( >=x11-libs/gtk+-3.0:3 ) introspection? ( >=dev-libs/gobject-introspection-0.9 )
 0
 mirror://gnome/sources/grilo/0.1/grilo-0.1.17.tar.xz
diff --git a/metadata/cache/media-libs/grilo-0.1.18 b/metadata/cache/media-libs/grilo-0.1.18
index 0557bbda74cd..091e5db19cb2 100644
--- a/metadata/cache/media-libs/grilo-0.1.18
+++ b/metadata/cache/media-libs/grilo-0.1.18
@@ -1,4 +1,4 @@
->=dev-libs/glib-2.22:2 dev-libs/libxml2:2 network? ( >=net-libs/libsoup-2.33.4:2.4 ) test-ui? ( >=x11-libs/gtk+-3.0:3 ) introspection? ( >=dev-libs/gobject-introspection-0.9 ) >=dev-util/pkgconfig-0.9 gnome-base/gnome-common doc? ( >=dev-util/gtk-doc-1.10 ) vala? ( dev-lang/vala:0.12[vapigen] ) test? ( dev-python/pygobject:2[introspection?] media-plugins/grilo-plugins ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
+>=dev-libs/glib-2.22:2 dev-libs/libxml2:2 network? ( >=net-libs/libsoup-2.33.4:2.4 ) test-ui? ( >=x11-libs/gtk+-3.0:3 ) introspection? ( >=dev-libs/gobject-introspection-0.9 ) >=dev-util/pkgconfig-0.9 gnome-base/gnome-common doc? ( >=dev-util/gtk-doc-1.10 ) vala? ( dev-lang/vala:0.12[vapigen] ) test? ( dev-python/pygobject:2[introspection?] media-plugins/grilo-plugins ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
 >=dev-libs/glib-2.22:2 dev-libs/libxml2:2 network? ( >=net-libs/libsoup-2.33.4:2.4 ) test-ui? ( >=x11-libs/gtk+-3.0:3 ) introspection? ( >=dev-libs/gobject-introspection-0.9 )
 0
 mirror://gnome/sources/grilo/0.1/grilo-0.1.18.tar.xz
diff --git a/metadata/cache/media-libs/guilib-1.2.1 b/metadata/cache/media-libs/guilib-1.2.1
index e91b7c7816ce..2bb0dd944107 100644
--- a/metadata/cache/media-libs/guilib-1.2.1
+++ b/metadata/cache/media-libs/guilib-1.2.1
@@ -1,4 +1,4 @@
->=media-libs/libsdl-1.0.1 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=media-libs/libsdl-1.0.1 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=media-libs/libsdl-1.0.1
 0
 http://www.libsdl.org/projects/GUIlib/src/GUIlib-1.2.1.tar.gz
diff --git a/metadata/cache/media-libs/harfbuzz-9999 b/metadata/cache/media-libs/harfbuzz-9999
index b5b55846e047..204929a70d8c 100644
--- a/metadata/cache/media-libs/harfbuzz-9999
+++ b/metadata/cache/media-libs/harfbuzz-9999
@@ -1,4 +1,4 @@
-cairo? ( x11-libs/cairo ) glib? ( dev-libs/glib:2 ) graphite? ( media-gfx/graphite2 ) icu? ( dev-libs/icu ) truetype? ( media-libs/freetype:2 ) dev-util/gtk-doc-am dev-util/pkgconfig dev-util/ragel dev-vcs/git || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+cairo? ( x11-libs/cairo ) glib? ( dev-libs/glib:2 ) graphite? ( media-gfx/graphite2 ) icu? ( dev-libs/icu ) truetype? ( media-libs/freetype:2 ) dev-util/gtk-doc-am dev-util/pkgconfig dev-util/ragel dev-vcs/git || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 cairo? ( x11-libs/cairo ) glib? ( dev-libs/glib:2 ) graphite? ( media-gfx/graphite2 ) icu? ( dev-libs/icu ) truetype? ( media-libs/freetype:2 )
 0
 
diff --git a/metadata/cache/media-libs/id3lib-3.8.3-r8 b/metadata/cache/media-libs/id3lib-3.8.3-r8
index 9261c64a80e6..0def02bbdf3d 100644
--- a/metadata/cache/media-libs/id3lib-3.8.3-r8
+++ b/metadata/cache/media-libs/id3lib-3.8.3-r8
@@ -1,4 +1,4 @@
-sys-libs/zlib doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+sys-libs/zlib doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 sys-libs/zlib
 0
 mirror://sourceforge/id3lib/id3lib-3.8.3.tar.gz
diff --git a/metadata/cache/media-libs/imlib-1.9.15-r3 b/metadata/cache/media-libs/imlib-1.9.15-r3
index 7c44123ca176..17ad927967df 100644
--- a/metadata/cache/media-libs/imlib-1.9.15-r3
+++ b/metadata/cache/media-libs/imlib-1.9.15-r3
@@ -1,4 +1,4 @@
->=media-libs/tiff-3.5.5 >=media-libs/giflib-4.1.0 >=media-libs/libpng-1.2.1 virtual/jpeg x11-libs/libICE x11-libs/libSM x11-libs/libXext || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=media-libs/tiff-3.5.5 >=media-libs/giflib-4.1.0 >=media-libs/libpng-1.2.1 virtual/jpeg x11-libs/libICE x11-libs/libSM x11-libs/libXext || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=media-libs/tiff-3.5.5 >=media-libs/giflib-4.1.0 >=media-libs/libpng-1.2.1 virtual/jpeg x11-libs/libICE x11-libs/libSM x11-libs/libXext
 0
 mirror://gnome/sources/imlib/1.9/imlib-1.9.15.tar.bz2 mirror://gentoo/gtk-1-for-imlib.m4.bz2
diff --git a/metadata/cache/media-libs/jbig2dec-0.11-r1 b/metadata/cache/media-libs/jbig2dec-0.11-r1
index e40d68813f95..08db907b4675 100644
--- a/metadata/cache/media-libs/jbig2dec-0.11-r1
+++ b/metadata/cache/media-libs/jbig2dec-0.11-r1
@@ -1,4 +1,4 @@
-png? ( >=media-libs/libpng-1.2:0 ) test? ( app-arch/unzip ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+png? ( >=media-libs/libpng-1.2:0 ) test? ( app-arch/unzip ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 png? ( >=media-libs/libpng-1.2:0 )
 0
 http://ghostscript.com/~giles/jbig2/jbig2dec/jbig2dec-0.11.tar.gz test? ( http://jbig2dec.sourceforge.net/ubc/jb2streams.zip )
diff --git a/metadata/cache/media-libs/lcms-1.19 b/metadata/cache/media-libs/lcms-1.19
index 384bb1489333..2bc48bdbcf87 100644
--- a/metadata/cache/media-libs/lcms-1.19
+++ b/metadata/cache/media-libs/lcms-1.19
@@ -1,4 +1,4 @@
-tiff? ( media-libs/tiff:0 ) jpeg? ( virtual/jpeg ) zlib? ( sys-libs/zlib ) python? ( >=dev-lang/swig-1.3.31 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( =dev-lang/python-2* )
+tiff? ( media-libs/tiff:0 ) jpeg? ( virtual/jpeg ) zlib? ( sys-libs/zlib ) python? ( >=dev-lang/swig-1.3.31 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( =dev-lang/python-2* )
 tiff? ( media-libs/tiff:0 ) jpeg? ( virtual/jpeg ) zlib? ( sys-libs/zlib ) python? ( =dev-lang/python-2* )
 0
 http://www.littlecms.com/lcms-1.19.tar.gz
diff --git a/metadata/cache/media-libs/libXcm-0.5.0-r1 b/metadata/cache/media-libs/libXcm-0.5.0-r1
index f7de6bf4667f..3259f79ca2d8 100644
--- a/metadata/cache/media-libs/libXcm-0.5.0-r1
+++ b/metadata/cache/media-libs/libXcm-0.5.0-r1
@@ -1,4 +1,4 @@
-X? ( x11-libs/libXmu x11-libs/libXfixes x11-libs/libX11 x11-proto/xproto ) app-doc/doxygen || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+X? ( x11-libs/libXmu x11-libs/libXfixes x11-libs/libX11 x11-proto/xproto ) app-doc/doxygen || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 X? ( x11-libs/libXmu x11-libs/libXfixes x11-libs/libX11 x11-proto/xproto )
 0
 mirror://sourceforge/oyranos/libXcm/libXcm-0.4.x/libXcm-0.5.0.tar.bz2
diff --git a/metadata/cache/media-libs/libaacplus-2.0.2 b/metadata/cache/media-libs/libaacplus-2.0.2
index 8f9e53eb1658..dbcdb3e1491e 100644
--- a/metadata/cache/media-libs/libaacplus-2.0.2
+++ b/metadata/cache/media-libs/libaacplus-2.0.2
@@ -1,4 +1,4 @@
-!media-sound/aacplusenc fftw? ( sci-libs/fftw:3.0 ) app-arch/unzip dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+!media-sound/aacplusenc fftw? ( sci-libs/fftw:3.0 ) app-arch/unzip dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 !media-sound/aacplusenc fftw? ( sci-libs/fftw:3.0 )
 0
 http://dev.gentoo.org/~aballier/libaacplus-2.0.2.tar.gz http://tipok.ath.cx/downloads/media/aac+/libaacplus/libaacplus-2.0.2.tar.gz http://217.20.164.161/~tipok/aacplus/libaacplus-2.0.2.tar.gz http://www.3gpp.org/ftp/Specs/archive/26_series/26.410/26410-800.zip
diff --git a/metadata/cache/media-libs/libafterimage-1.20 b/metadata/cache/media-libs/libafterimage-1.20
index 667c63399a12..43b54cf0bf99 100644
--- a/metadata/cache/media-libs/libafterimage-1.20
+++ b/metadata/cache/media-libs/libafterimage-1.20
@@ -1,4 +1,4 @@
-x11-libs/libSM x11-libs/libXext x11-libs/libXrender png? ( >=media-libs/libpng-1.4:0 ) jpeg? ( virtual/jpeg ) gif? ( media-libs/giflib ) svg? ( gnome-base/librsvg ) tiff? ( media-libs/tiff:0 ) truetype? ( media-libs/freetype ) dev-util/pkgconfig x11-proto/xextproto !!x11-wm/afterstep || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+x11-libs/libSM x11-libs/libXext x11-libs/libXrender png? ( >=media-libs/libpng-1.4:0 ) jpeg? ( virtual/jpeg ) gif? ( media-libs/giflib ) svg? ( gnome-base/librsvg ) tiff? ( media-libs/tiff:0 ) truetype? ( media-libs/freetype ) dev-util/pkgconfig x11-proto/xextproto !!x11-wm/afterstep || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 x11-libs/libSM x11-libs/libXext x11-libs/libXrender png? ( >=media-libs/libpng-1.4:0 ) jpeg? ( virtual/jpeg ) gif? ( media-libs/giflib ) svg? ( gnome-base/librsvg ) tiff? ( media-libs/tiff:0 ) truetype? ( media-libs/freetype )
 0
 ftp://ftp.afterstep.org/stable/libAfterImage/libAfterImage-1.20.tar.bz2
diff --git a/metadata/cache/media-libs/libart_lgpl-2.3.21-r1 b/metadata/cache/media-libs/libart_lgpl-2.3.21-r1
index 88ca4e5540ca..858cea991cfa 100644
--- a/metadata/cache/media-libs/libart_lgpl-2.3.21-r1
+++ b/metadata/cache/media-libs/libart_lgpl-2.3.21-r1
@@ -1,4 +1,4 @@
-dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 
 0
 mirror://gnome/sources/libart_lgpl/2.3/libart_lgpl-2.3.21.tar.bz2
diff --git a/metadata/cache/media-libs/libbluray-0.2.1-r1 b/metadata/cache/media-libs/libbluray-0.2.1-r1
index 942f91d71055..9307fbf4c049 100644
--- a/metadata/cache/media-libs/libbluray-0.2.1-r1
+++ b/metadata/cache/media-libs/libbluray-0.2.1-r1
@@ -1,4 +1,4 @@
-xml? ( dev-libs/libxml2 ) java? ( >=virtual/jdk-1.6 dev-java/ant-core ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool java? ( >=dev-java/java-config-2.1.9-r1 )
+xml? ( dev-libs/libxml2 ) java? ( >=virtual/jdk-1.6 dev-java/ant-core ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool java? ( >=dev-java/java-config-2.1.9-r1 )
 xml? ( dev-libs/libxml2 ) aacs? ( media-libs/libaacs ) java? ( >=virtual/jre-1.6 ) java? ( >=dev-java/java-config-2.1.9-r1 )
 0
 ftp://ftp.videolan.org/pub/videolan/libbluray/0.2.1/libbluray-0.2.1.tar.bz2 http://dev.gentoo.org/~radhermit/distfiles/libbluray-0.2.1-bdj.patch.gz
diff --git a/metadata/cache/media-libs/libbluray-9999 b/metadata/cache/media-libs/libbluray-9999
index e6d06d816bc8..390949934ea4 100644
--- a/metadata/cache/media-libs/libbluray-9999
+++ b/metadata/cache/media-libs/libbluray-9999
@@ -1,4 +1,4 @@
-dev-libs/libxml2 java? ( >=virtual/jdk-1.6 dev-java/ant-core ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool java? ( >=dev-java/java-config-2.1.9-r1 ) dev-vcs/git
+dev-libs/libxml2 java? ( >=virtual/jdk-1.6 dev-java/ant-core ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool java? ( >=dev-java/java-config-2.1.9-r1 ) dev-vcs/git
 dev-libs/libxml2 aacs? ( media-libs/libaacs ) java? ( >=virtual/jre-1.6 ) java? ( >=dev-java/java-config-2.1.9-r1 )
 0
 
diff --git a/metadata/cache/media-libs/libcaca-0.99_beta17 b/metadata/cache/media-libs/libcaca-0.99_beta17
index dd86c16faf52..1af64f76b52f 100644
--- a/metadata/cache/media-libs/libcaca-0.99_beta17
+++ b/metadata/cache/media-libs/libcaca-0.99_beta17
@@ -1,4 +1,4 @@
-imlib? ( media-libs/imlib2 ) mono? ( dev-lang/mono ) ncurses? ( >=sys-libs/ncurses-5.3 ) opengl? ( virtual/opengl media-libs/freeglut truetype? ( >=media-libs/ftgl-2.1.3_rc5 ) ) ruby? ( =dev-lang/ruby-1.8* ) slang? ( >=sys-libs/slang-2 ) X? ( x11-libs/libX11 x11-libs/libXt ) dev-util/pkgconfig doc? ( app-doc/doxygen virtual/latex-base dev-texlive/texlive-fontsrecommended ) java? ( >=virtual/jdk-1.5 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool java? ( >=dev-java/java-config-2.1.9-r1 )
+imlib? ( media-libs/imlib2 ) mono? ( dev-lang/mono ) ncurses? ( >=sys-libs/ncurses-5.3 ) opengl? ( virtual/opengl media-libs/freeglut truetype? ( >=media-libs/ftgl-2.1.3_rc5 ) ) ruby? ( =dev-lang/ruby-1.8* ) slang? ( >=sys-libs/slang-2 ) X? ( x11-libs/libX11 x11-libs/libXt ) dev-util/pkgconfig doc? ( app-doc/doxygen virtual/latex-base dev-texlive/texlive-fontsrecommended ) java? ( >=virtual/jdk-1.5 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool java? ( >=dev-java/java-config-2.1.9-r1 )
 imlib? ( media-libs/imlib2 ) mono? ( dev-lang/mono ) ncurses? ( >=sys-libs/ncurses-5.3 ) opengl? ( virtual/opengl media-libs/freeglut truetype? ( >=media-libs/ftgl-2.1.3_rc5 ) ) ruby? ( =dev-lang/ruby-1.8* ) slang? ( >=sys-libs/slang-2 ) X? ( x11-libs/libX11 x11-libs/libXt ) java? ( >=virtual/jre-1.5 ) java? ( >=dev-java/java-config-2.1.9-r1 )
 0
 http://libcaca.zoy.org/files/libcaca/libcaca-0.99.beta17.tar.gz
diff --git a/metadata/cache/media-libs/libcanberra-0.28-r5 b/metadata/cache/media-libs/libcanberra-0.28-r5
index 8a87740ec69e..69b150b9bd24 100644
--- a/metadata/cache/media-libs/libcanberra-0.28-r5
+++ b/metadata/cache/media-libs/libcanberra-0.28-r5
@@ -1,4 +1,4 @@
-media-libs/libvorbis >=sys-devel/libtool-2.2.6b alsa? ( media-libs/alsa-lib udev? ( >=sys-fs/udev-160 ) ) gstreamer? ( >=media-libs/gstreamer-0.10.15 ) gtk? ( >=x11-libs/gtk+-2.20.0:2 gnome-base/gconf:2 ) gtk3? ( x11-libs/gtk+:3 gnome-base/gconf:2 ) pulseaudio? ( >=media-sound/pulseaudio-0.9.11 ) tdb? ( sys-libs/tdb ) >=dev-util/pkgconfig-0.17 >=sys-apps/sed-4 !<sys-apps/systemd-29-r4 !=sys-apps/systemd-37-r1 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+media-libs/libvorbis >=sys-devel/libtool-2.2.6b alsa? ( media-libs/alsa-lib udev? ( >=sys-fs/udev-160 ) ) gstreamer? ( >=media-libs/gstreamer-0.10.15 ) gtk? ( >=x11-libs/gtk+-2.20.0:2 gnome-base/gconf:2 ) gtk3? ( x11-libs/gtk+:3 gnome-base/gconf:2 ) pulseaudio? ( >=media-sound/pulseaudio-0.9.11 ) tdb? ( sys-libs/tdb ) >=dev-util/pkgconfig-0.17 >=sys-apps/sed-4 !<sys-apps/systemd-29-r4 !=sys-apps/systemd-37-r1 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 media-libs/libvorbis >=sys-devel/libtool-2.2.6b alsa? ( media-libs/alsa-lib udev? ( >=sys-fs/udev-160 ) ) gstreamer? ( >=media-libs/gstreamer-0.10.15 ) gtk? ( >=x11-libs/gtk+-2.20.0:2 gnome-base/gconf:2 ) gtk3? ( x11-libs/gtk+:3 gnome-base/gconf:2 ) pulseaudio? ( >=media-sound/pulseaudio-0.9.11 ) tdb? ( sys-libs/tdb ) gnome? ( gnome-base/gsettings-desktop-schemas ) sound? ( x11-themes/sound-theme-freedesktop )
 0
 http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.28.tar.gz
diff --git a/metadata/cache/media-libs/libcdr-0.0.4 b/metadata/cache/media-libs/libcdr-0.0.5
similarity index 88%
rename from metadata/cache/media-libs/libcdr-0.0.4
rename to metadata/cache/media-libs/libcdr-0.0.5
index 72b414798283..104a88b46f78 100644
--- a/metadata/cache/media-libs/libcdr-0.0.4
+++ b/metadata/cache/media-libs/libcdr-0.0.5
@@ -1,7 +1,7 @@
 app-text/libwpd:0.9 app-text/libwpg:0.2 media-libs/lcms:2 sys-libs/zlib dev-util/pkgconfig sys-devel/libtool doc? ( app-doc/doxygen )
 app-text/libwpd:0.9 app-text/libwpg:0.2 media-libs/lcms:2 sys-libs/zlib
 0
-http://dev-www.libreoffice.org/src/libcdr-0.0.4.tar.xz
+http://dev-www.libreoffice.org/src/libcdr-0.0.5.tar.xz
 
 http://cgit.freedesktop.org/libreoffice/libcdr/tree/
 LGPL-2.1
diff --git a/metadata/cache/media-libs/libcdr-9999 b/metadata/cache/media-libs/libcdr-9999
index cf4fa5ab7b3a..fc15eb4f5cb4 100644
--- a/metadata/cache/media-libs/libcdr-9999
+++ b/metadata/cache/media-libs/libcdr-9999
@@ -1,4 +1,4 @@
-app-text/libwpd:0.9 app-text/libwpg:0.2 media-libs/lcms:2 sys-libs/zlib dev-util/pkgconfig sys-devel/libtool doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
+app-text/libwpd:0.9 app-text/libwpg:0.2 media-libs/lcms:2 sys-libs/zlib dev-util/pkgconfig sys-devel/libtool doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
 app-text/libwpd:0.9 app-text/libwpg:0.2 media-libs/lcms:2 sys-libs/zlib
 0
 
diff --git a/metadata/cache/media-libs/libchamplain-0.12.1 b/metadata/cache/media-libs/libchamplain-0.12.1
index 37534996a01a..16858b031d60 100644
--- a/metadata/cache/media-libs/libchamplain-0.12.1
+++ b/metadata/cache/media-libs/libchamplain-0.12.1
@@ -1,4 +1,4 @@
->=dev-libs/glib-2.16:2 >=x11-libs/cairo-1.4 >=media-libs/clutter-1.2:1.0[introspection?] >=media-libs/memphis-0.2.1:0.2[introspection?] >=net-libs/libsoup-gnome-2.4.1:2.4 dev-db/sqlite:3 gtk? ( >=x11-libs/gtk+-2.90:3[introspection?] >=media-libs/clutter-gtk-0.90:1.0 ) introspection? ( >=dev-libs/gobject-introspection-0.6.3 ) dev-util/pkgconfig doc? ( >=dev-util/gtk-doc-1.9 ) vala? ( >=dev-lang/vala-0.14.2-r1:0.14[vapigen] ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
+>=dev-libs/glib-2.16:2 >=x11-libs/cairo-1.4 >=media-libs/clutter-1.2:1.0[introspection?] >=media-libs/memphis-0.2.1:0.2[introspection?] >=net-libs/libsoup-gnome-2.4.1:2.4 dev-db/sqlite:3 gtk? ( >=x11-libs/gtk+-2.90:3[introspection?] >=media-libs/clutter-gtk-0.90:1.0 ) introspection? ( >=dev-libs/gobject-introspection-0.6.3 ) dev-util/pkgconfig doc? ( >=dev-util/gtk-doc-1.9 ) vala? ( >=dev-lang/vala-0.14.2-r1:0.14[vapigen] ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
 >=dev-libs/glib-2.16:2 >=x11-libs/cairo-1.4 >=media-libs/clutter-1.2:1.0[introspection?] >=media-libs/memphis-0.2.1:0.2[introspection?] >=net-libs/libsoup-gnome-2.4.1:2.4 dev-db/sqlite:3 gtk? ( >=x11-libs/gtk+-2.90:3[introspection?] >=media-libs/clutter-gtk-0.90:1.0 ) introspection? ( >=dev-libs/gobject-introspection-0.6.3 )
 0.12
 mirror://gnome/sources/libchamplain/0.12/libchamplain-0.12.1.tar.xz
diff --git a/metadata/cache/media-libs/libclastfm-0.4_p20120315 b/metadata/cache/media-libs/libclastfm-0.4_p20120315
index 91c24d9d1728..c0a92969ab95 100644
--- a/metadata/cache/media-libs/libclastfm-0.4_p20120315
+++ b/metadata/cache/media-libs/libclastfm-0.4_p20120315
@@ -1,4 +1,4 @@
-net-misc/curl dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+net-misc/curl dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 net-misc/curl
 0
 http://dev.gentoo.org/~ssuominen/libclastfm-0.4_p20120315.tar.xz
diff --git a/metadata/cache/media-libs/libdc1394-2.1.3-r1 b/metadata/cache/media-libs/libdc1394-2.1.3-r1
index 7f73cbeb7125..2ed9ebece768 100644
--- a/metadata/cache/media-libs/libdc1394-2.1.3-r1
+++ b/metadata/cache/media-libs/libdc1394-2.1.3-r1
@@ -1,4 +1,4 @@
->=sys-libs/libraw1394-1.2.0 virtual/libusb:1 X? ( x11-libs/libSM x11-libs/libXv ) dev-util/pkgconfig doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=sys-libs/libraw1394-1.2.0 virtual/libusb:1 X? ( x11-libs/libSM x11-libs/libXv ) dev-util/pkgconfig doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=sys-libs/libraw1394-1.2.0 virtual/libusb:1 X? ( x11-libs/libSM x11-libs/libXv )
 2
 mirror://sourceforge/libdc1394/libdc1394-2.1.3.tar.gz
diff --git a/metadata/cache/media-libs/libdca-0.0.5-r2 b/metadata/cache/media-libs/libdca-0.0.5-r2
index 727d507daddf..2a23e1bf2ceb 100644
--- a/metadata/cache/media-libs/libdca-0.0.5-r2
+++ b/metadata/cache/media-libs/libdca-0.0.5-r2
@@ -1,4 +1,4 @@
-!media-libs/libdts || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+!media-libs/libdts || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 !media-libs/libdts
 0
 http://www.videolan.org/pub/videolan/libdca/0.0.5/libdca-0.0.5.tar.bz2 mirror://gentoo/libdca-0.0.5-constant.patch.bz2
diff --git a/metadata/cache/media-libs/libdvdcss-1.2.11 b/metadata/cache/media-libs/libdvdcss-1.2.11
index a044c3fedc2a..52854f1bc482 100644
--- a/metadata/cache/media-libs/libdvdcss-1.2.11
+++ b/metadata/cache/media-libs/libdvdcss-1.2.11
@@ -1,4 +1,4 @@
-doc? ( app-doc/doxygen virtual/latex-base dev-tex/xcolor dev-texlive/texlive-latexextra ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+doc? ( app-doc/doxygen virtual/latex-base dev-tex/xcolor dev-texlive/texlive-latexextra ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 1.2
 http://www.videolan.org/pub/libdvdcss/1.2.11/libdvdcss-1.2.11.tar.bz2
diff --git a/metadata/cache/media-libs/libdvdcss-1.2.12 b/metadata/cache/media-libs/libdvdcss-1.2.12
index 92b820c92679..42d17d7abf0a 100644
--- a/metadata/cache/media-libs/libdvdcss-1.2.12
+++ b/metadata/cache/media-libs/libdvdcss-1.2.12
@@ -1,4 +1,4 @@
-doc? ( app-doc/doxygen virtual/latex-base dev-tex/xcolor dev-texlive/texlive-latexextra ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+doc? ( app-doc/doxygen virtual/latex-base dev-tex/xcolor dev-texlive/texlive-latexextra ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 1.2
 http://www.videolan.org/pub/libdvdcss/1.2.12/libdvdcss-1.2.12.tar.bz2
diff --git a/metadata/cache/media-libs/libdvdnav-4.2.0 b/metadata/cache/media-libs/libdvdnav-4.2.0
index 8185fdefa81f..b8cc85fbfc5e 100644
--- a/metadata/cache/media-libs/libdvdnav-4.2.0
+++ b/metadata/cache/media-libs/libdvdnav-4.2.0
@@ -1,4 +1,4 @@
->=media-libs/libdvdread-4.2.0 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=media-libs/libdvdread-4.2.0 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=media-libs/libdvdread-4.2.0
 0
 http://dvdnav.mplayerhq.hu/releases/libdvdnav-4.2.0.tar.bz2
diff --git a/metadata/cache/media-libs/libdvdnav-9999 b/metadata/cache/media-libs/libdvdnav-9999
index 56fc92cf01a5..2b3d56792aaa 100644
--- a/metadata/cache/media-libs/libdvdnav-9999
+++ b/metadata/cache/media-libs/libdvdnav-9999
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/subversion net-misc/rsync
+|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/subversion net-misc/rsync
 
 0
 
diff --git a/metadata/cache/media-libs/libdvdread-4.2.0 b/metadata/cache/media-libs/libdvdread-4.2.0
index fb47d647d7b4..c8a6de1948dd 100644
--- a/metadata/cache/media-libs/libdvdread-4.2.0
+++ b/metadata/cache/media-libs/libdvdread-4.2.0
@@ -1,4 +1,4 @@
-!<media-libs/libdvdnav-4.2.0 css? ( media-libs/libdvdcss ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+!<media-libs/libdvdnav-4.2.0 css? ( media-libs/libdvdcss ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 !<media-libs/libdvdnav-4.2.0 css? ( media-libs/libdvdcss )
 0
 http://dvdnav.mplayerhq.hu/releases/libdvdread-4.2.0.tar.bz2
diff --git a/metadata/cache/media-libs/libdvdread-9999 b/metadata/cache/media-libs/libdvdread-9999
index 17edaeece83f..7dd2122cd42b 100644
--- a/metadata/cache/media-libs/libdvdread-9999
+++ b/metadata/cache/media-libs/libdvdread-9999
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/subversion net-misc/rsync
+|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/subversion net-misc/rsync
 
 0
 
diff --git a/metadata/cache/media-libs/libemf-1.0.4 b/metadata/cache/media-libs/libemf-1.0.4
index cee040c7b410..7a8eea734ea4 100644
--- a/metadata/cache/media-libs/libemf-1.0.4
+++ b/metadata/cache/media-libs/libemf-1.0.4
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 mirror://sourceforge/libemf/libEMF-1.0.4.tar.gz
diff --git a/metadata/cache/media-libs/libexif-gtk-0.3.5-r2 b/metadata/cache/media-libs/libexif-gtk-0.3.5-r2
index 4621b9d39d00..8390147c15a5 100644
--- a/metadata/cache/media-libs/libexif-gtk-0.3.5-r2
+++ b/metadata/cache/media-libs/libexif-gtk-0.3.5-r2
@@ -1,4 +1,4 @@
-x11-libs/gtk+:2 >=media-libs/libexif-0.6.12 dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+x11-libs/gtk+:2 >=media-libs/libexif-0.6.12 dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 x11-libs/gtk+:2 >=media-libs/libexif-0.6.12
 0
 mirror://sourceforge/libexif/libexif-gtk-0.3.5.tar.gz
diff --git a/metadata/cache/media-libs/libgphoto2-2.4.11-r1 b/metadata/cache/media-libs/libgphoto2-2.4.11-r1
index 38296eb11049..e4ff145920b1 100644
--- a/metadata/cache/media-libs/libgphoto2-2.4.11-r1
+++ b/metadata/cache/media-libs/libgphoto2-2.4.11-r1
@@ -1,4 +1,4 @@
-virtual/libusb:0 cameras_ax203? ( media-libs/gd ) cameras_st2205? ( media-libs/gd ) zeroconf? ( || ( net-dns/avahi[mdnsresponder-compat] net-misc/mDNSResponder ) ) exif? ( >=media-libs/libexif-0.5.9 ) gd? ( media-libs/gd[jpeg=] ) jpeg? ( virtual/jpeg ) sys-devel/libtool dev-util/pkgconfig sys-devel/flex >=sys-devel/gettext-0.14.1 doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+virtual/libusb:0 cameras_ax203? ( media-libs/gd ) cameras_st2205? ( media-libs/gd ) zeroconf? ( || ( net-dns/avahi[mdnsresponder-compat] net-misc/mDNSResponder ) ) exif? ( >=media-libs/libexif-0.5.9 ) gd? ( media-libs/gd[jpeg=] ) jpeg? ( virtual/jpeg ) sys-devel/libtool dev-util/pkgconfig sys-devel/flex >=sys-devel/gettext-0.14.1 doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 virtual/libusb:0 cameras_ax203? ( media-libs/gd ) cameras_st2205? ( media-libs/gd ) zeroconf? ( || ( net-dns/avahi[mdnsresponder-compat] net-misc/mDNSResponder ) ) exif? ( >=media-libs/libexif-0.5.9 ) gd? ( media-libs/gd[jpeg=] ) jpeg? ( virtual/jpeg ) sys-devel/libtool !<sys-fs/udev-136
 0
 mirror://sourceforge/gphoto/libgphoto2-2.4.11.tar.bz2
diff --git a/metadata/cache/media-libs/libgphoto2-2.4.12 b/metadata/cache/media-libs/libgphoto2-2.4.12
index e8f254ddfa6c..ea0ff8d9921a 100644
--- a/metadata/cache/media-libs/libgphoto2-2.4.12
+++ b/metadata/cache/media-libs/libgphoto2-2.4.12
@@ -1,4 +1,4 @@
-virtual/libusb:0 cameras_ax203? ( media-libs/gd ) cameras_st2205? ( media-libs/gd ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) exif? ( >=media-libs/libexif-0.5.9 ) gd? ( media-libs/gd[jpeg=] ) jpeg? ( virtual/jpeg ) sys-devel/libtool dev-util/pkgconfig sys-devel/flex >=sys-devel/gettext-0.14.1 doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+virtual/libusb:0 cameras_ax203? ( media-libs/gd ) cameras_st2205? ( media-libs/gd ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) exif? ( >=media-libs/libexif-0.5.9 ) gd? ( media-libs/gd[jpeg=] ) jpeg? ( virtual/jpeg ) sys-devel/libtool dev-util/pkgconfig sys-devel/flex >=sys-devel/gettext-0.14.1 doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 virtual/libusb:0 cameras_ax203? ( media-libs/gd ) cameras_st2205? ( media-libs/gd ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) exif? ( >=media-libs/libexif-0.5.9 ) gd? ( media-libs/gd[jpeg=] ) jpeg? ( virtual/jpeg ) sys-devel/libtool !<sys-fs/udev-136
 0
 mirror://sourceforge/gphoto/libgphoto2-2.4.12.tar.bz2
diff --git a/metadata/cache/media-libs/liblrdf-0.5.0 b/metadata/cache/media-libs/liblrdf-0.5.0
index e5d4b44afac2..246d9a68f2ba 100644
--- a/metadata/cache/media-libs/liblrdf-0.5.0
+++ b/metadata/cache/media-libs/liblrdf-0.5.0
@@ -1,4 +1,4 @@
->=dev-libs/openssl-1 media-libs/raptor:2 >=media-libs/ladspa-sdk-1.12 dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-libs/openssl-1 media-libs/raptor:2 >=media-libs/ladspa-sdk-1.12 dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=dev-libs/openssl-1 media-libs/raptor:2 >=media-libs/ladspa-sdk-1.12
 0
 http://github.com/swh/LRDF/tarball/0.5.0 -> liblrdf-0.5.0.tar.gz
diff --git a/metadata/cache/media-libs/libmad-0.15.1b-r7 b/metadata/cache/media-libs/libmad-0.15.1b-r7
index b2509393ef28..488f962f0ddf 100644
--- a/metadata/cache/media-libs/libmad-0.15.1b-r7
+++ b/metadata/cache/media-libs/libmad-0.15.1b-r7
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 mirror://sourceforge/mad/libmad-0.15.1b.tar.gz
diff --git a/metadata/cache/media-libs/libmediainfo-0.7.50 b/metadata/cache/media-libs/libmediainfo-0.7.50
index f39050a31d9e..05acb9b7a57a 100644
--- a/metadata/cache/media-libs/libmediainfo-0.7.50
+++ b/metadata/cache/media-libs/libmediainfo-0.7.50
@@ -1,4 +1,4 @@
-sys-libs/zlib >=dev-libs/tinyxml-2.6.2[stl] >=media-libs/libzen-0.4.21-r1[static-libs=] curl? ( net-misc/curl ) mms? ( >=media-libs/libmms-0.6.1[static-libs=] ) dev-util/pkgconfig doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+sys-libs/zlib >=dev-libs/tinyxml-2.6.2[stl] >=media-libs/libzen-0.4.21-r1[static-libs=] curl? ( net-misc/curl ) mms? ( >=media-libs/libmms-0.6.1[static-libs=] ) dev-util/pkgconfig doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 sys-libs/zlib >=dev-libs/tinyxml-2.6.2[stl] >=media-libs/libzen-0.4.21-r1[static-libs=] curl? ( net-misc/curl ) mms? ( >=media-libs/libmms-0.6.1[static-libs=] )
 0
 mirror://sourceforge/mediainfo/source/libmediainfo/0.7.50/libmediainfo_0.7.50.tar.bz2
diff --git a/metadata/cache/media-libs/libmediainfo-0.7.51 b/metadata/cache/media-libs/libmediainfo-0.7.51
index fb73fc7234a3..633b66904711 100644
--- a/metadata/cache/media-libs/libmediainfo-0.7.51
+++ b/metadata/cache/media-libs/libmediainfo-0.7.51
@@ -1,4 +1,4 @@
-sys-libs/zlib >=dev-libs/tinyxml-2.6.2[stl] >=media-libs/libzen-0.4.23[static-libs=] curl? ( net-misc/curl ) mms? ( >=media-libs/libmms-0.6.1[static-libs=] ) dev-util/pkgconfig doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+sys-libs/zlib >=dev-libs/tinyxml-2.6.2[stl] >=media-libs/libzen-0.4.23[static-libs=] curl? ( net-misc/curl ) mms? ( >=media-libs/libmms-0.6.1[static-libs=] ) dev-util/pkgconfig doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 sys-libs/zlib >=dev-libs/tinyxml-2.6.2[stl] >=media-libs/libzen-0.4.23[static-libs=] curl? ( net-misc/curl ) mms? ( >=media-libs/libmms-0.6.1[static-libs=] )
 0
 mirror://sourceforge/mediainfo/source/libmediainfo/0.7.51/libmediainfo_0.7.51.tar.bz2
diff --git a/metadata/cache/media-libs/libmediainfo-0.7.52 b/metadata/cache/media-libs/libmediainfo-0.7.52
index f7aca3598ef6..4d48a227350e 100644
--- a/metadata/cache/media-libs/libmediainfo-0.7.52
+++ b/metadata/cache/media-libs/libmediainfo-0.7.52
@@ -1,4 +1,4 @@
-sys-libs/zlib >=dev-libs/tinyxml-2.6.2[stl] >=media-libs/libzen-0.4.23[static-libs=] curl? ( net-misc/curl ) mms? ( >=media-libs/libmms-0.6.1[static-libs=] ) dev-util/pkgconfig doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+sys-libs/zlib >=dev-libs/tinyxml-2.6.2[stl] >=media-libs/libzen-0.4.23[static-libs=] curl? ( net-misc/curl ) mms? ( >=media-libs/libmms-0.6.1[static-libs=] ) dev-util/pkgconfig doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 sys-libs/zlib >=dev-libs/tinyxml-2.6.2[stl] >=media-libs/libzen-0.4.23[static-libs=] curl? ( net-misc/curl ) mms? ( >=media-libs/libmms-0.6.1[static-libs=] )
 0
 mirror://sourceforge/mediainfo/source/libmediainfo/0.7.52/libmediainfo_0.7.52.tar.bz2
diff --git a/metadata/cache/media-libs/libmediainfo-0.7.53 b/metadata/cache/media-libs/libmediainfo-0.7.53
index cb89b0802697..230c990c71e6 100644
--- a/metadata/cache/media-libs/libmediainfo-0.7.53
+++ b/metadata/cache/media-libs/libmediainfo-0.7.53
@@ -1,4 +1,4 @@
-sys-libs/zlib >=dev-libs/tinyxml-2.6.2[stl] >=media-libs/libzen-0.4.24[static-libs=] curl? ( net-misc/curl ) mms? ( >=media-libs/libmms-0.6.1[static-libs=] ) dev-util/pkgconfig doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+sys-libs/zlib >=dev-libs/tinyxml-2.6.2[stl] >=media-libs/libzen-0.4.24[static-libs=] curl? ( net-misc/curl ) mms? ( >=media-libs/libmms-0.6.1[static-libs=] ) dev-util/pkgconfig doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 sys-libs/zlib >=dev-libs/tinyxml-2.6.2[stl] >=media-libs/libzen-0.4.24[static-libs=] curl? ( net-misc/curl ) mms? ( >=media-libs/libmms-0.6.1[static-libs=] )
 0
 mirror://sourceforge/mediainfo/source/libmediainfo/0.7.53/libmediainfo_0.7.53.tar.bz2
diff --git a/metadata/cache/media-libs/libmediainfo-0.7.54 b/metadata/cache/media-libs/libmediainfo-0.7.54
index d34e49ea1a9d..7369d5350e34 100644
--- a/metadata/cache/media-libs/libmediainfo-0.7.54
+++ b/metadata/cache/media-libs/libmediainfo-0.7.54
@@ -1,4 +1,4 @@
-sys-libs/zlib >=dev-libs/tinyxml-2.6.2[stl] >=media-libs/libzen-0.4.25[static-libs=] curl? ( net-misc/curl ) mms? ( >=media-libs/libmms-0.6.1[static-libs=] ) dev-util/pkgconfig doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+sys-libs/zlib >=dev-libs/tinyxml-2.6.2[stl] >=media-libs/libzen-0.4.25[static-libs=] curl? ( net-misc/curl ) mms? ( >=media-libs/libmms-0.6.1[static-libs=] ) dev-util/pkgconfig doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 sys-libs/zlib >=dev-libs/tinyxml-2.6.2[stl] >=media-libs/libzen-0.4.25[static-libs=] curl? ( net-misc/curl ) mms? ( >=media-libs/libmms-0.6.1[static-libs=] )
 0
 mirror://sourceforge/mediainfo/source/libmediainfo/0.7.54/libmediainfo_0.7.54.tar.bz2
diff --git a/metadata/cache/media-libs/libmikmod-3.1.12-r1 b/metadata/cache/media-libs/libmikmod-3.1.12-r1
index 763cd07872e0..114da10ac8fc 100644
--- a/metadata/cache/media-libs/libmikmod-3.1.12-r1
+++ b/metadata/cache/media-libs/libmikmod-3.1.12-r1
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 2
 mirror://sourceforge/mikmod/libmikmod-3.1.12.tar.gz
diff --git a/metadata/cache/media-libs/libmikmod-3.2.0_beta2-r3 b/metadata/cache/media-libs/libmikmod-3.2.0_beta2-r3
index 0c7ef1d748ae..07a91b69c799 100644
--- a/metadata/cache/media-libs/libmikmod-3.2.0_beta2-r3
+++ b/metadata/cache/media-libs/libmikmod-3.2.0_beta2-r3
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 http://mikmod.raphnet.net/files/libmikmod-3.2.0-beta2.tar.gz
diff --git a/metadata/cache/media-libs/libmikmod-3.2.0_beta2-r5 b/metadata/cache/media-libs/libmikmod-3.2.0_beta2-r5
index d89b2e090ac2..de8674e4eb8e 100644
--- a/metadata/cache/media-libs/libmikmod-3.2.0_beta2-r5
+++ b/metadata/cache/media-libs/libmikmod-3.2.0_beta2-r5
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 http://mikmod.raphnet.net/files/libmikmod-3.2.0-beta2.tar.gz
diff --git a/metadata/cache/media-libs/libmng-1.0.10-r1 b/metadata/cache/media-libs/libmng-1.0.10-r1
index 1f7a273ad4bd..f7adb9bdbfcb 100644
--- a/metadata/cache/media-libs/libmng-1.0.10-r1
+++ b/metadata/cache/media-libs/libmng-1.0.10-r1
@@ -1,4 +1,4 @@
-virtual/jpeg >=sys-libs/zlib-1.1.4 lcms? ( =media-libs/lcms-1* ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+virtual/jpeg >=sys-libs/zlib-1.1.4 lcms? ( =media-libs/lcms-1* ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 virtual/jpeg >=sys-libs/zlib-1.1.4 lcms? ( =media-libs/lcms-1* )
 0
 mirror://sourceforge/libmng/libmng-1.0.10.tar.gz
diff --git a/metadata/cache/media-libs/libmodplug-0.8.8.2 b/metadata/cache/media-libs/libmodplug-0.8.8.2
index 63aff61b3df8..8bde53ade1cd 100644
--- a/metadata/cache/media-libs/libmodplug-0.8.8.2
+++ b/metadata/cache/media-libs/libmodplug-0.8.8.2
@@ -1,4 +1,4 @@
-dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 mirror://sourceforge/modplug-xmms/libmodplug-0.8.8.2.tar.gz
diff --git a/metadata/cache/media-libs/libmodplug-0.8.8.4 b/metadata/cache/media-libs/libmodplug-0.8.8.4
index eac4aa2b2c55..cd9a88000683 100644
--- a/metadata/cache/media-libs/libmodplug-0.8.8.4
+++ b/metadata/cache/media-libs/libmodplug-0.8.8.4
@@ -1,4 +1,4 @@
-dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 mirror://sourceforge/modplug-xmms/libmodplug-0.8.8.4.tar.gz
diff --git a/metadata/cache/media-libs/libmp3splt-0.7 b/metadata/cache/media-libs/libmp3splt-0.7
index 6cdd5aa818ed..9378eb043dc7 100644
--- a/metadata/cache/media-libs/libmp3splt-0.7
+++ b/metadata/cache/media-libs/libmp3splt-0.7
@@ -1,4 +1,4 @@
-media-libs/libmad media-libs/libvorbis media-libs/libogg media-libs/libid3tag pcre? ( dev-libs/libpcre ) doc? ( app-doc/doxygen media-gfx/graphviz ) sys-apps/findutils || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+media-libs/libmad media-libs/libvorbis media-libs/libogg media-libs/libid3tag pcre? ( dev-libs/libpcre ) doc? ( app-doc/doxygen media-gfx/graphviz ) sys-apps/findutils || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 media-libs/libmad media-libs/libvorbis media-libs/libogg media-libs/libid3tag pcre? ( dev-libs/libpcre )
 0
 mirror://sourceforge/mp3splt/libmp3splt-0.7.tar.gz
diff --git a/metadata/cache/media-libs/libmp3splt-0.7.0.920 b/metadata/cache/media-libs/libmp3splt-0.7.0.920
index d54a5e55be2c..18129bd8885c 100644
--- a/metadata/cache/media-libs/libmp3splt-0.7.0.920
+++ b/metadata/cache/media-libs/libmp3splt-0.7.0.920
@@ -1,4 +1,4 @@
-media-libs/libmad media-libs/libvorbis media-libs/libogg media-libs/libid3tag pcre? ( dev-libs/libpcre ) doc? ( app-doc/doxygen media-gfx/graphviz ) sys-apps/findutils || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+media-libs/libmad media-libs/libvorbis media-libs/libogg media-libs/libid3tag pcre? ( dev-libs/libpcre ) doc? ( app-doc/doxygen media-gfx/graphviz ) sys-apps/findutils || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 media-libs/libmad media-libs/libvorbis media-libs/libogg media-libs/libid3tag pcre? ( dev-libs/libpcre )
 0
 http://ioalex.net/testing_downloads/snapshots/920/libmp3splt-0.7.0.920.tar.gz
diff --git a/metadata/cache/media-libs/libmp3splt-0.7.1 b/metadata/cache/media-libs/libmp3splt-0.7.1
index 5325ac38b465..ec8e9c89bc9a 100644
--- a/metadata/cache/media-libs/libmp3splt-0.7.1
+++ b/metadata/cache/media-libs/libmp3splt-0.7.1
@@ -1,4 +1,4 @@
-media-libs/libmad media-libs/libvorbis media-libs/libogg media-libs/libid3tag pcre? ( dev-libs/libpcre ) doc? ( app-doc/doxygen media-gfx/graphviz ) sys-apps/findutils || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+media-libs/libmad media-libs/libvorbis media-libs/libogg media-libs/libid3tag pcre? ( dev-libs/libpcre ) doc? ( app-doc/doxygen media-gfx/graphviz ) sys-apps/findutils || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 media-libs/libmad media-libs/libvorbis media-libs/libogg media-libs/libid3tag pcre? ( dev-libs/libpcre )
 0
 mirror://sourceforge/mp3splt/libmp3splt-0.7.1.tar.gz
diff --git a/metadata/cache/media-libs/libmpd-9999 b/metadata/cache/media-libs/libmpd-9999
index d36bd7998ab8..60757d308992 100644
--- a/metadata/cache/media-libs/libmpd-9999
+++ b/metadata/cache/media-libs/libmpd-9999
@@ -1,4 +1,4 @@
->=dev-libs/glib-2.16:2 dev-util/pkgconfig doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
+>=dev-libs/glib-2.16:2 dev-util/pkgconfig doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
 >=dev-libs/glib-2.16:2
 0
 
diff --git a/metadata/cache/media-libs/libmpeg2-0.5.1-r1 b/metadata/cache/media-libs/libmpeg2-0.5.1-r1
index e4b1bdec0d50..f8b7fad8a7c7 100644
--- a/metadata/cache/media-libs/libmpeg2-0.5.1-r1
+++ b/metadata/cache/media-libs/libmpeg2-0.5.1-r1
@@ -1,4 +1,4 @@
-sdl? ( media-libs/libsdl ) X? ( x11-libs/libXv x11-libs/libICE x11-libs/libSM x11-libs/libXt ) X? ( x11-proto/xextproto ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+sdl? ( media-libs/libsdl ) X? ( x11-libs/libXv x11-libs/libICE x11-libs/libSM x11-libs/libXt ) X? ( x11-proto/xextproto ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 sdl? ( media-libs/libsdl ) X? ( x11-libs/libXv x11-libs/libICE x11-libs/libSM x11-libs/libXt )
 0
 http://libmpeg2.sourceforge.net/files/libmpeg2-0.5.1.tar.gz
diff --git a/metadata/cache/media-libs/libmpeg3-1.7 b/metadata/cache/media-libs/libmpeg3-1.7
index ce951dc2f0dd..1119e1fb19e6 100644
--- a/metadata/cache/media-libs/libmpeg3-1.7
+++ b/metadata/cache/media-libs/libmpeg3-1.7
@@ -1,4 +1,4 @@
-sys-libs/zlib virtual/jpeg media-libs/a52dec mmx? ( dev-lang/nasm ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+sys-libs/zlib virtual/jpeg media-libs/a52dec mmx? ( dev-lang/nasm ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 sys-libs/zlib virtual/jpeg media-libs/a52dec
 0
 mirror://sourceforge/heroines/libmpeg3-1.7-src.tar.bz2 mirror://gentoo/libmpeg3-1.7-gentoo.tar.bz2
diff --git a/metadata/cache/media-libs/liboggz-1.1.1 b/metadata/cache/media-libs/liboggz-1.1.1
index eff8f4502db4..8dd01f025995 100644
--- a/metadata/cache/media-libs/liboggz-1.1.1
+++ b/metadata/cache/media-libs/liboggz-1.1.1
@@ -1,4 +1,4 @@
->=media-libs/libogg-1.2.0 dev-util/pkgconfig doc? ( app-doc/doxygen ) test? ( app-text/docbook-sgml-utils ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=media-libs/libogg-1.2.0 dev-util/pkgconfig doc? ( app-doc/doxygen ) test? ( app-text/docbook-sgml-utils ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=media-libs/libogg-1.2.0
 0
 http://downloads.xiph.org/releases/liboggz/liboggz-1.1.1.tar.gz
diff --git a/metadata/cache/media-libs/libpgf-6.09.44-r1 b/metadata/cache/media-libs/libpgf-6.09.44-r1
index 63d841906f8a..d7d3581c276d 100644
--- a/metadata/cache/media-libs/libpgf-6.09.44-r1
+++ b/metadata/cache/media-libs/libpgf-6.09.44-r1
@@ -1,4 +1,4 @@
-doc? ( app-doc/doxygen ) app-arch/unzip || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+doc? ( app-doc/doxygen ) app-arch/unzip || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 mirror://sourceforge/libpgf/libpgf-6.09.44-src.zip
diff --git a/metadata/cache/media-libs/libpgf-6.11.24 b/metadata/cache/media-libs/libpgf-6.11.24
index e25fa6bd4ed3..533519684b58 100644
--- a/metadata/cache/media-libs/libpgf-6.11.24
+++ b/metadata/cache/media-libs/libpgf-6.11.24
@@ -1,4 +1,4 @@
-doc? ( app-doc/doxygen ) app-arch/unzip || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+doc? ( app-doc/doxygen ) app-arch/unzip || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 mirror://sourceforge/libpgf/libpgf-6.11.24-src.zip
diff --git a/metadata/cache/media-libs/libpgf-6.11.28 b/metadata/cache/media-libs/libpgf-6.11.28
index 9b70df553da8..182553884f72 100644
--- a/metadata/cache/media-libs/libpgf-6.11.28
+++ b/metadata/cache/media-libs/libpgf-6.11.28
@@ -1,4 +1,4 @@
-doc? ( app-doc/doxygen ) app-arch/unzip || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+doc? ( app-doc/doxygen ) app-arch/unzip || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 http://dev.gentoo.org/~dilfridge/distfiles/libpgf-6.11.28.tar.bz2
diff --git a/metadata/cache/media-libs/libpgf-6.11.32 b/metadata/cache/media-libs/libpgf-6.11.32
index f078a5fdc1da..355c06ae8aad 100644
--- a/metadata/cache/media-libs/libpgf-6.11.32
+++ b/metadata/cache/media-libs/libpgf-6.11.32
@@ -1,4 +1,4 @@
-doc? ( app-doc/doxygen ) app-arch/unzip || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+doc? ( app-doc/doxygen ) app-arch/unzip || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 http://dev.gentoo.org/~dilfridge/distfiles/libpgf-6.11.32.tar.bz2
diff --git a/metadata/cache/media-libs/libptp2-1.1.10 b/metadata/cache/media-libs/libptp2-1.1.10
index f8ee8f527388..c6629e105d17 100644
--- a/metadata/cache/media-libs/libptp2-1.1.10
+++ b/metadata/cache/media-libs/libptp2-1.1.10
@@ -1,4 +1,4 @@
-virtual/libusb:0 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+virtual/libusb:0 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 virtual/libusb:0
 0
 mirror://sourceforge/libptp/libptp2-1.1.10.tar.gz
diff --git a/metadata/cache/media-libs/libraw-0.14.5 b/metadata/cache/media-libs/libraw-0.14.5
index f8b177892a49..57b9b9a58713 100644
--- a/metadata/cache/media-libs/libraw-0.14.5
+++ b/metadata/cache/media-libs/libraw-0.14.5
@@ -1,4 +1,4 @@
-jpeg2k? ( media-libs/jasper ) lcms? ( media-libs/lcms:2 ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+jpeg2k? ( media-libs/jasper ) lcms? ( media-libs/lcms:2 ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 jpeg2k? ( media-libs/jasper ) lcms? ( media-libs/lcms:2 )
 0
 http://www.libraw.org/data/LibRaw-0.14.5.tar.gz demosaic? ( http://www.libraw.org/data/LibRaw-demosaic-pack-GPL2-0.14.5.tar.gz http://www.libraw.org/data/LibRaw-demosaic-pack-GPL3-0.14.5.tar.gz )
diff --git a/metadata/cache/media-libs/libsamplerate-0.1.8 b/metadata/cache/media-libs/libsamplerate-0.1.8
index 69152af11212..66b042e1b514 100644
--- a/metadata/cache/media-libs/libsamplerate-0.1.8
+++ b/metadata/cache/media-libs/libsamplerate-0.1.8
@@ -1,4 +1,4 @@
-sndfile? ( >=media-libs/libsndfile-1.0.2 ) >=dev-util/pkgconfig-0.14 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+sndfile? ( >=media-libs/libsndfile-1.0.2 ) >=dev-util/pkgconfig-0.14 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 sndfile? ( >=media-libs/libsndfile-1.0.2 )
 0
 http://www.mega-nerd.com/SRC/libsamplerate-0.1.8.tar.gz
diff --git a/metadata/cache/media-libs/libsndfile-1.0.25 b/metadata/cache/media-libs/libsndfile-1.0.25
index d59c8feb55f7..617df244f752 100644
--- a/metadata/cache/media-libs/libsndfile-1.0.25
+++ b/metadata/cache/media-libs/libsndfile-1.0.25
@@ -1,4 +1,4 @@
-!minimal? ( >=media-libs/flac-1.2.1 >=media-libs/libogg-1.1.3 >=media-libs/libvorbis-1.2.3 ) alsa? ( media-libs/alsa-lib ) sqlite? ( >=dev-db/sqlite-3.2 ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+!minimal? ( >=media-libs/flac-1.2.1 >=media-libs/libogg-1.1.3 >=media-libs/libvorbis-1.2.3 ) alsa? ( media-libs/alsa-lib ) sqlite? ( >=dev-db/sqlite-3.2 ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 !minimal? ( >=media-libs/flac-1.2.1 >=media-libs/libogg-1.1.3 >=media-libs/libvorbis-1.2.3 ) alsa? ( media-libs/alsa-lib ) sqlite? ( >=dev-db/sqlite-3.2 )
 0
 http://www.mega-nerd.com/libsndfile/files/libsndfile-1.0.25.tar.gz
diff --git a/metadata/cache/media-libs/libsoundtouch-1.6.0 b/metadata/cache/media-libs/libsoundtouch-1.6.0
index 2a5394304db8..35813d566d9f 100644
--- a/metadata/cache/media-libs/libsoundtouch-1.6.0
+++ b/metadata/cache/media-libs/libsoundtouch-1.6.0
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 http://www.surina.net/soundtouch/soundtouch-1.6.0.tar.gz
diff --git a/metadata/cache/media-libs/libtheora-1.1.1 b/metadata/cache/media-libs/libtheora-1.1.1
index ff7398ce170f..ce1caf4e1503 100644
--- a/metadata/cache/media-libs/libtheora-1.1.1
+++ b/metadata/cache/media-libs/libtheora-1.1.1
@@ -1,4 +1,4 @@
-media-libs/libogg encode? ( media-libs/libvorbis ) examples? ( media-libs/libpng media-libs/libvorbis >=media-libs/libsdl-0.11.0 ) doc? ( app-doc/doxygen ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+media-libs/libogg encode? ( media-libs/libvorbis ) examples? ( media-libs/libpng media-libs/libvorbis >=media-libs/libsdl-0.11.0 ) doc? ( app-doc/doxygen ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 media-libs/libogg encode? ( media-libs/libvorbis ) examples? ( media-libs/libpng media-libs/libvorbis >=media-libs/libsdl-0.11.0 )
 0
 http://downloads.xiph.org/releases/theora/libtheora-1.1.1.tar.bz2
diff --git a/metadata/cache/media-libs/libtimidity-0.1.0-r1 b/metadata/cache/media-libs/libtimidity-0.1.0-r1
index ae7e06f64ab2..d325442db98e 100644
--- a/metadata/cache/media-libs/libtimidity-0.1.0-r1
+++ b/metadata/cache/media-libs/libtimidity-0.1.0-r1
@@ -1,4 +1,4 @@
-ao? ( media-libs/libao ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+ao? ( media-libs/libao ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 ao? ( media-libs/libao )
 0
 mirror://sourceforge/libtimidity/libtimidity-0.1.0.tar.bz2
diff --git a/metadata/cache/media-libs/libvisio-9999 b/metadata/cache/media-libs/libvisio-9999
index 9b3fdd6c460a..01b04174293c 100644
--- a/metadata/cache/media-libs/libvisio-9999
+++ b/metadata/cache/media-libs/libvisio-9999
@@ -1,4 +1,4 @@
-app-text/libwpd:0.9 app-text/libwpg:0.2 >=dev-libs/boost-1.46 dev-util/pkgconfig sys-devel/libtool doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
+app-text/libwpd:0.9 app-text/libwpg:0.2 >=dev-libs/boost-1.46 dev-util/pkgconfig sys-devel/libtool doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
 app-text/libwpd:0.9 app-text/libwpg:0.2
 0
 
diff --git a/metadata/cache/media-libs/libvorbis-1.3.1 b/metadata/cache/media-libs/libvorbis-1.3.1
index 83e0c3bc767d..10156377f616 100644
--- a/metadata/cache/media-libs/libvorbis-1.3.1
+++ b/metadata/cache/media-libs/libvorbis-1.3.1
@@ -1,4 +1,4 @@
-media-libs/libogg dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+media-libs/libogg dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 media-libs/libogg
 0
 http://downloads.xiph.org/releases/vorbis/libvorbis-1.3.1.tar.bz2
diff --git a/metadata/cache/media-libs/libvorbis-1.3.2 b/metadata/cache/media-libs/libvorbis-1.3.2
index 3db40cf52065..55c570f04e7b 100644
--- a/metadata/cache/media-libs/libvorbis-1.3.2
+++ b/metadata/cache/media-libs/libvorbis-1.3.2
@@ -1,4 +1,4 @@
-media-libs/libogg app-arch/xz-utils dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+media-libs/libogg app-arch/xz-utils dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 media-libs/libogg
 0
 http://downloads.xiph.org/releases/vorbis/libvorbis-1.3.2.tar.xz
diff --git a/metadata/cache/media-libs/libvorbis-1.3.3 b/metadata/cache/media-libs/libvorbis-1.3.3
index 4e93dad03772..6ca12ee2696e 100644
--- a/metadata/cache/media-libs/libvorbis-1.3.3
+++ b/metadata/cache/media-libs/libvorbis-1.3.3
@@ -1,4 +1,4 @@
-media-libs/libogg app-arch/xz-utils dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+media-libs/libogg app-arch/xz-utils dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 media-libs/libogg
 0
 http://downloads.xiph.org/releases/vorbis/libvorbis-1.3.3.tar.xz
diff --git a/metadata/cache/media-libs/libwmf-0.2.8.4-r3 b/metadata/cache/media-libs/libwmf-0.2.8.4-r3
index 76db68e82ef7..f3c29916d767 100644
--- a/metadata/cache/media-libs/libwmf-0.2.8.4-r3
+++ b/metadata/cache/media-libs/libwmf-0.2.8.4-r3
@@ -1,4 +1,4 @@
-app-text/ghostscript-gpl xml? ( dev-libs/libxml2 ) expat? ( dev-libs/expat ) >=media-libs/freetype-2.0.1 sys-libs/zlib >=media-libs/libpng-1.4 virtual/jpeg X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 ) gtk? ( x11-libs/gtk+:2 ) dev-util/pkgconfig X? ( x11-libs/libXt x11-libs/libXpm ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+app-text/ghostscript-gpl xml? ( dev-libs/libxml2 ) expat? ( dev-libs/expat ) >=media-libs/freetype-2.0.1 sys-libs/zlib >=media-libs/libpng-1.4 virtual/jpeg X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 ) gtk? ( x11-libs/gtk+:2 ) dev-util/pkgconfig X? ( x11-libs/libXt x11-libs/libXpm ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 app-text/ghostscript-gpl xml? ( dev-libs/libxml2 ) expat? ( dev-libs/expat ) >=media-libs/freetype-2.0.1 sys-libs/zlib >=media-libs/libpng-1.4 virtual/jpeg X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 ) gtk? ( x11-libs/gtk+:2 )
 0
 mirror://sourceforge/wvware/libwmf-0.2.8.4.tar.gz
diff --git a/metadata/cache/media-libs/libwmf-0.2.8.4-r4 b/metadata/cache/media-libs/libwmf-0.2.8.4-r4
index b307f62fc2b6..f71c11cc96a4 100644
--- a/metadata/cache/media-libs/libwmf-0.2.8.4-r4
+++ b/metadata/cache/media-libs/libwmf-0.2.8.4-r4
@@ -1,4 +1,4 @@
-app-text/ghostscript-gpl media-fonts/urw-fonts >=media-libs/freetype-2.0.1 >=media-libs/libpng-1.4 sys-libs/zlib x11-libs/gdk-pixbuf:2[X?] virtual/jpeg xml? ( expat? ( dev-libs/expat ) !expat? ( dev-libs/libxml2 ) ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 ) dev-util/pkgconfig X? ( x11-libs/libXt x11-libs/libXpm ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+app-text/ghostscript-gpl media-fonts/urw-fonts >=media-libs/freetype-2.0.1 >=media-libs/libpng-1.4 sys-libs/zlib x11-libs/gdk-pixbuf:2[X?] virtual/jpeg xml? ( expat? ( dev-libs/expat ) !expat? ( dev-libs/libxml2 ) ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 ) dev-util/pkgconfig X? ( x11-libs/libXt x11-libs/libXpm ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 app-text/ghostscript-gpl media-fonts/urw-fonts >=media-libs/freetype-2.0.1 >=media-libs/libpng-1.4 sys-libs/zlib x11-libs/gdk-pixbuf:2[X?] virtual/jpeg xml? ( expat? ( dev-libs/expat ) !expat? ( dev-libs/libxml2 ) ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 )
 0
 mirror://sourceforge/wvware/libwmf-0.2.8.4.tar.gz
diff --git a/metadata/cache/media-libs/libzen-0.4.22 b/metadata/cache/media-libs/libzen-0.4.22
index 56a4abbe7131..984d7106e8c4 100644
--- a/metadata/cache/media-libs/libzen-0.4.22
+++ b/metadata/cache/media-libs/libzen-0.4.22
@@ -1,4 +1,4 @@
-sys-libs/zlib doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+sys-libs/zlib doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 sys-libs/zlib
 0
 mirror://sourceforge/zenlib/ZenLib%20-%20Sources/0.4.22/libzen_0.4.22.tar.bz2
diff --git a/metadata/cache/media-libs/libzen-0.4.23 b/metadata/cache/media-libs/libzen-0.4.23
index b2976cb96656..f287ab78fa23 100644
--- a/metadata/cache/media-libs/libzen-0.4.23
+++ b/metadata/cache/media-libs/libzen-0.4.23
@@ -1,4 +1,4 @@
-sys-libs/zlib doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+sys-libs/zlib doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 sys-libs/zlib
 0
 mirror://sourceforge/zenlib/ZenLib%20-%20Sources/0.4.23/libzen_0.4.23.tar.bz2
diff --git a/metadata/cache/media-libs/libzen-0.4.24 b/metadata/cache/media-libs/libzen-0.4.24
index 5776014f48a9..0407f0b63e80 100644
--- a/metadata/cache/media-libs/libzen-0.4.24
+++ b/metadata/cache/media-libs/libzen-0.4.24
@@ -1,4 +1,4 @@
-sys-libs/zlib doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+sys-libs/zlib doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 sys-libs/zlib
 0
 mirror://sourceforge/zenlib/ZenLib%20-%20Sources/0.4.24/libzen_0.4.24.tar.bz2
diff --git a/metadata/cache/media-libs/libzen-0.4.25 b/metadata/cache/media-libs/libzen-0.4.25
index ead24ebf6b93..164c5cf6add3 100644
--- a/metadata/cache/media-libs/libzen-0.4.25
+++ b/metadata/cache/media-libs/libzen-0.4.25
@@ -1,4 +1,4 @@
-sys-libs/zlib doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+sys-libs/zlib doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 sys-libs/zlib
 0
 mirror://sourceforge/zenlib/ZenLib%20-%20Sources/0.4.25/libzen_0.4.25.tar.bz2
diff --git a/metadata/cache/media-libs/mediastreamer-2.3.0-r1 b/metadata/cache/media-libs/mediastreamer-2.3.0-r1
index 333616710afa..49a2738f73eb 100644
--- a/metadata/cache/media-libs/mediastreamer-2.3.0-r1
+++ b/metadata/cache/media-libs/mediastreamer-2.3.0-r1
@@ -1,4 +1,4 @@
->=net-libs/ortp-0.15.0_p1 alsa? ( media-libs/alsa-lib ) gsm? ( media-sound/gsm ) jack? ( media-libs/libsamplerate media-sound/jack-audio-connection-kit ) portaudio? ( media-libs/portaudio ) speex? ( >=media-libs/speex-1.2_beta3 ) video? ( media-libs/libsdl[video,X] media-video/ffmpeg theora? ( media-libs/libtheora ) X? ( x11-libs/libX11 ) ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=net-libs/ortp-0.15.0_p1 alsa? ( media-libs/alsa-lib ) gsm? ( media-sound/gsm ) jack? ( media-libs/libsamplerate media-sound/jack-audio-connection-kit ) portaudio? ( media-libs/portaudio ) speex? ( >=media-libs/speex-1.2_beta3 ) video? ( media-libs/libsdl[video,X] media-video/ffmpeg theora? ( media-libs/libtheora ) X? ( x11-libs/libX11 ) ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=net-libs/ortp-0.15.0_p1 alsa? ( media-libs/alsa-lib ) gsm? ( media-sound/gsm ) jack? ( media-libs/libsamplerate media-sound/jack-audio-connection-kit ) portaudio? ( media-libs/portaudio ) speex? ( >=media-libs/speex-1.2_beta3 ) video? ( media-libs/libsdl[video,X] media-video/ffmpeg theora? ( media-libs/libtheora ) X? ( x11-libs/libX11 ) )
 0
 http://download.savannah.nongnu.org/releases/linphone/mediastreamer/mediastreamer-2.3.0.tar.gz
diff --git a/metadata/cache/media-libs/mediastreamer-2.7.3-r3 b/metadata/cache/media-libs/mediastreamer-2.7.3-r3
index dd1ab6cbdc4e..6fad7fa2738b 100644
--- a/metadata/cache/media-libs/mediastreamer-2.7.3-r3
+++ b/metadata/cache/media-libs/mediastreamer-2.7.3-r3
@@ -1,4 +1,4 @@
->=net-libs/ortp-0.16.2[ipv6?] alsa? ( media-libs/alsa-lib ) gsm? ( media-sound/gsm ) jack? ( >=media-libs/libsamplerate-0.0.13 media-sound/jack-audio-connection-kit ) portaudio? ( media-libs/portaudio ) pulseaudio? ( >=media-sound/pulseaudio-0.9.21 ) speex? ( >=media-libs/speex-1.2_beta3 ) video? ( virtual/ffmpeg v4l? ( media-libs/libv4l sys-kernel/linux-headers ) theora? ( media-libs/libtheora ) sdl? ( media-libs/libsdl[video,X] ) X? ( x11-libs/libX11 x11-libs/libXv ) ) dev-util/pkgconfig x11-proto/videoproto || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=net-libs/ortp-0.16.2[ipv6?] alsa? ( media-libs/alsa-lib ) gsm? ( media-sound/gsm ) jack? ( >=media-libs/libsamplerate-0.0.13 media-sound/jack-audio-connection-kit ) portaudio? ( media-libs/portaudio ) pulseaudio? ( >=media-sound/pulseaudio-0.9.21 ) speex? ( >=media-libs/speex-1.2_beta3 ) video? ( virtual/ffmpeg v4l? ( media-libs/libv4l sys-kernel/linux-headers ) theora? ( media-libs/libtheora ) sdl? ( media-libs/libsdl[video,X] ) X? ( x11-libs/libX11 x11-libs/libXv ) ) dev-util/pkgconfig x11-proto/videoproto || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=net-libs/ortp-0.16.2[ipv6?] alsa? ( media-libs/alsa-lib ) gsm? ( media-sound/gsm ) jack? ( >=media-libs/libsamplerate-0.0.13 media-sound/jack-audio-connection-kit ) portaudio? ( media-libs/portaudio ) pulseaudio? ( >=media-sound/pulseaudio-0.9.21 ) speex? ( >=media-libs/speex-1.2_beta3 ) video? ( virtual/ffmpeg v4l? ( media-libs/libv4l sys-kernel/linux-headers ) theora? ( media-libs/libtheora ) sdl? ( media-libs/libsdl[video,X] ) X? ( x11-libs/libX11 x11-libs/libXv ) )
 0
 mirror://nongnu/linphone/mediastreamer/mediastreamer-2.7.3.tar.gz
diff --git a/metadata/cache/media-libs/mesa-7.10.3 b/metadata/cache/media-libs/mesa-7.10.3
index eab1b88a7b7d..c0a4ae1062a1 100644
--- a/metadata/cache/media-libs/mesa-7.10.3
+++ b/metadata/cache/media-libs/mesa-7.10.3
@@ -1,4 +1,4 @@
->=x11-proto/dri2proto-2.2 >=x11-proto/glproto-1.4.11 !<x11-base/xorg-server-1.7 !<=x11-proto/xf86driproto-2.0.3 classic? ( app-admin/eselect-mesa ) gallium? ( app-admin/eselect-mesa ) >=app-admin/eselect-opengl-1.1.1-r2 dev-libs/expat dev-libs/libxml2[python] sys-libs/talloc x11-libs/libICE >=x11-libs/libX11-1.3.99.901 x11-libs/libXdamage x11-libs/libXext x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm motif? ( x11-libs/openmotif !x11-libs/libGLw ) gallium? ( llvm? ( amd64? ( dev-libs/udis86 ) x86? ( dev-libs/udis86 ) x86-fbsd? ( dev-libs/udis86 ) <sys-devel/llvm-3 ) ) >=x11-libs/libdrm-2.4.24[video_cards_nouveau?,video_cards_vmware?] video_cards_intel? ( >=x11-libs/libdrm-2.4.24[video_cards_intel] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.24[video_cards_radeon] ) =dev-lang/python-2* dev-util/pkgconfig sys-devel/bison sys-devel/flex x11-misc/makedepend x11-proto/inputproto >=x11-proto/xextproto-7.0.99.1 x11-proto/xf86driproto x11-proto/xf86vidmodeproto || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=x11-proto/dri2proto-2.2 >=x11-proto/glproto-1.4.11 !<x11-base/xorg-server-1.7 !<=x11-proto/xf86driproto-2.0.3 classic? ( app-admin/eselect-mesa ) gallium? ( app-admin/eselect-mesa ) >=app-admin/eselect-opengl-1.1.1-r2 dev-libs/expat dev-libs/libxml2[python] sys-libs/talloc x11-libs/libICE >=x11-libs/libX11-1.3.99.901 x11-libs/libXdamage x11-libs/libXext x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm motif? ( x11-libs/openmotif !x11-libs/libGLw ) gallium? ( llvm? ( amd64? ( dev-libs/udis86 ) x86? ( dev-libs/udis86 ) x86-fbsd? ( dev-libs/udis86 ) <sys-devel/llvm-3 ) ) >=x11-libs/libdrm-2.4.24[video_cards_nouveau?,video_cards_vmware?] video_cards_intel? ( >=x11-libs/libdrm-2.4.24[video_cards_intel] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.24[video_cards_radeon] ) =dev-lang/python-2* dev-util/pkgconfig sys-devel/bison sys-devel/flex x11-misc/makedepend x11-proto/inputproto >=x11-proto/xextproto-7.0.99.1 x11-proto/xf86driproto x11-proto/xf86vidmodeproto || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=x11-proto/dri2proto-2.2 >=x11-proto/glproto-1.4.11 !<x11-base/xorg-server-1.7 !<=x11-proto/xf86driproto-2.0.3 classic? ( app-admin/eselect-mesa ) gallium? ( app-admin/eselect-mesa ) >=app-admin/eselect-opengl-1.1.1-r2 dev-libs/expat dev-libs/libxml2[python] sys-libs/talloc x11-libs/libICE >=x11-libs/libX11-1.3.99.901 x11-libs/libXdamage x11-libs/libXext x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm motif? ( x11-libs/openmotif !x11-libs/libGLw ) gallium? ( llvm? ( amd64? ( dev-libs/udis86 ) x86? ( dev-libs/udis86 ) x86-fbsd? ( dev-libs/udis86 ) <sys-devel/llvm-3 ) ) >=x11-libs/libdrm-2.4.24[video_cards_nouveau?,video_cards_vmware?] video_cards_intel? ( >=x11-libs/libdrm-2.4.24[video_cards_intel] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.24[video_cards_radeon] )
 0
 ftp://ftp.freedesktop.org/pub/mesa/7.10.3/MesaLib-7.10.3.tar.bz2 mirror://gentoo/mesa-7.10.1-gentoo-patches-01.tar.bz2
diff --git a/metadata/cache/media-libs/mesa-7.11 b/metadata/cache/media-libs/mesa-7.11
index 18cfe4fe24fa..3bf02a071315 100644
--- a/metadata/cache/media-libs/mesa-7.11
+++ b/metadata/cache/media-libs/mesa-7.11
@@ -1,4 +1,4 @@
->=x11-proto/dri2proto-2.2 >=x11-proto/glproto-1.4.11 !<x11-base/xorg-server-1.7 !<=x11-proto/xf86driproto-2.0.3 classic? ( app-admin/eselect-mesa ) gallium? ( app-admin/eselect-mesa ) app-admin/eselect-opengl dev-libs/expat gbm? ( sys-fs/udev ) x11-libs/libICE >=x11-libs/libX11-1.3.99.901 x11-libs/libXdamage x11-libs/libXext x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm motif? ( x11-libs/openmotif !x11-libs/libGLw ) gallium? ( llvm? ( <sys-devel/llvm-3 ) ) >=x11-libs/libdrm-2.4.24[video_cards_nouveau?,video_cards_vmware?] video_cards_intel? ( >=x11-libs/libdrm-2.4.24[video_cards_intel] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.24[video_cards_radeon] ) =dev-lang/python-2* dev-libs/libxml2[python] dev-util/pkgconfig sys-devel/bison sys-devel/flex x11-misc/makedepend x11-proto/inputproto >=x11-proto/xextproto-7.0.99.1 x11-proto/xf86driproto x11-proto/xf86vidmodeproto || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=x11-proto/dri2proto-2.2 >=x11-proto/glproto-1.4.11 !<x11-base/xorg-server-1.7 !<=x11-proto/xf86driproto-2.0.3 classic? ( app-admin/eselect-mesa ) gallium? ( app-admin/eselect-mesa ) app-admin/eselect-opengl dev-libs/expat gbm? ( sys-fs/udev ) x11-libs/libICE >=x11-libs/libX11-1.3.99.901 x11-libs/libXdamage x11-libs/libXext x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm motif? ( x11-libs/openmotif !x11-libs/libGLw ) gallium? ( llvm? ( <sys-devel/llvm-3 ) ) >=x11-libs/libdrm-2.4.24[video_cards_nouveau?,video_cards_vmware?] video_cards_intel? ( >=x11-libs/libdrm-2.4.24[video_cards_intel] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.24[video_cards_radeon] ) =dev-lang/python-2* dev-libs/libxml2[python] dev-util/pkgconfig sys-devel/bison sys-devel/flex x11-misc/makedepend x11-proto/inputproto >=x11-proto/xextproto-7.0.99.1 x11-proto/xf86driproto x11-proto/xf86vidmodeproto || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=x11-proto/dri2proto-2.2 >=x11-proto/glproto-1.4.11 !<x11-base/xorg-server-1.7 !<=x11-proto/xf86driproto-2.0.3 classic? ( app-admin/eselect-mesa ) gallium? ( app-admin/eselect-mesa ) app-admin/eselect-opengl dev-libs/expat gbm? ( sys-fs/udev ) x11-libs/libICE >=x11-libs/libX11-1.3.99.901 x11-libs/libXdamage x11-libs/libXext x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm motif? ( x11-libs/openmotif !x11-libs/libGLw ) gallium? ( llvm? ( <sys-devel/llvm-3 ) ) >=x11-libs/libdrm-2.4.24[video_cards_nouveau?,video_cards_vmware?] video_cards_intel? ( >=x11-libs/libdrm-2.4.24[video_cards_intel] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.24[video_cards_radeon] )
 0
 ftp://ftp.freedesktop.org/pub/mesa/7.11/MesaLib-7.11.tar.bz2
diff --git a/metadata/cache/media-libs/mesa-7.11.2 b/metadata/cache/media-libs/mesa-7.11.2
index c32fc5ad74eb..b60c644f8a01 100644
--- a/metadata/cache/media-libs/mesa-7.11.2
+++ b/metadata/cache/media-libs/mesa-7.11.2
@@ -1,4 +1,4 @@
->=x11-proto/dri2proto-2.2 >=x11-proto/glproto-1.4.11 !<x11-base/xorg-server-1.7 !<=x11-proto/xf86driproto-2.0.3 classic? ( app-admin/eselect-mesa ) gallium? ( app-admin/eselect-mesa ) app-admin/eselect-opengl dev-libs/expat gbm? ( sys-fs/udev ) x11-libs/libICE >=x11-libs/libX11-1.3.99.901 x11-libs/libXdamage x11-libs/libXext x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm motif? ( x11-libs/openmotif !x11-libs/libGLw ) gallium? ( llvm? ( >=sys-devel/llvm-2.8 ) ) >=x11-libs/libdrm-2.4.24[video_cards_nouveau?,video_cards_vmware?] video_cards_intel? ( >=x11-libs/libdrm-2.4.24[video_cards_intel] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.24[video_cards_radeon] ) =dev-lang/python-2* dev-libs/libxml2[python] dev-util/pkgconfig sys-devel/bison sys-devel/flex x11-misc/makedepend x11-proto/inputproto >=x11-proto/xextproto-7.0.99.1 x11-proto/xf86driproto x11-proto/xf86vidmodeproto || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=x11-proto/dri2proto-2.2 >=x11-proto/glproto-1.4.11 !<x11-base/xorg-server-1.7 !<=x11-proto/xf86driproto-2.0.3 classic? ( app-admin/eselect-mesa ) gallium? ( app-admin/eselect-mesa ) app-admin/eselect-opengl dev-libs/expat gbm? ( sys-fs/udev ) x11-libs/libICE >=x11-libs/libX11-1.3.99.901 x11-libs/libXdamage x11-libs/libXext x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm motif? ( x11-libs/openmotif !x11-libs/libGLw ) gallium? ( llvm? ( >=sys-devel/llvm-2.8 ) ) >=x11-libs/libdrm-2.4.24[video_cards_nouveau?,video_cards_vmware?] video_cards_intel? ( >=x11-libs/libdrm-2.4.24[video_cards_intel] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.24[video_cards_radeon] ) =dev-lang/python-2* dev-libs/libxml2[python] dev-util/pkgconfig sys-devel/bison sys-devel/flex x11-misc/makedepend x11-proto/inputproto >=x11-proto/xextproto-7.0.99.1 x11-proto/xf86driproto x11-proto/xf86vidmodeproto || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=x11-proto/dri2proto-2.2 >=x11-proto/glproto-1.4.11 !<x11-base/xorg-server-1.7 !<=x11-proto/xf86driproto-2.0.3 classic? ( app-admin/eselect-mesa ) gallium? ( app-admin/eselect-mesa ) app-admin/eselect-opengl dev-libs/expat gbm? ( sys-fs/udev ) x11-libs/libICE >=x11-libs/libX11-1.3.99.901 x11-libs/libXdamage x11-libs/libXext x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm motif? ( x11-libs/openmotif !x11-libs/libGLw ) gallium? ( llvm? ( >=sys-devel/llvm-2.8 ) ) >=x11-libs/libdrm-2.4.24[video_cards_nouveau?,video_cards_vmware?] video_cards_intel? ( >=x11-libs/libdrm-2.4.24[video_cards_intel] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.24[video_cards_radeon] )
 0
 ftp://ftp.freedesktop.org/pub/mesa/7.11.2/MesaLib-7.11.2.tar.bz2 mirror://gentoo/mesa-7.11.2-gentoo-patches-01.tar.bz2
diff --git a/metadata/cache/media-libs/mesa-7.9.2 b/metadata/cache/media-libs/mesa-7.9.2
index 5ff150817581..f9e60107ccab 100644
--- a/metadata/cache/media-libs/mesa-7.9.2
+++ b/metadata/cache/media-libs/mesa-7.9.2
@@ -1,4 +1,4 @@
-!<x11-base/xorg-server-1.7 !<=x11-proto/xf86driproto-2.0.3 >=app-admin/eselect-mesa-0.0.3 >=app-admin/eselect-opengl-1.1.1-r2 dev-libs/expat dev-libs/libxml2[python] sys-libs/talloc x11-libs/libICE >=x11-libs/libX11-1.3.99.901 x11-libs/libXdamage x11-libs/libXext x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm motif? ( x11-libs/openmotif !x11-libs/libGLw ) gallium? ( llvm? ( amd64? ( dev-libs/udis86 ) x86? ( dev-libs/udis86 ) x86-fbsd? ( dev-libs/udis86 ) <sys-devel/llvm-2.9 ) ) >=x11-libs/libdrm-2.4.23[video_cards_nouveau?,video_cards_vmware?] video_cards_nouveau? ( <x11-libs/libdrm-2.4.24 ) video_cards_intel? ( >=x11-libs/libdrm-2.4.23[video_cards_intel] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.23[video_cards_radeon] ) =dev-lang/python-2* dev-util/pkgconfig sys-devel/bison sys-devel/flex x11-misc/makedepend >=x11-proto/dri2proto-2.2 >=x11-proto/glproto-1.4.11 x11-proto/inputproto >=x11-proto/xextproto-7.0.99.1 x11-proto/xf86driproto x11-proto/xf86vidmodeproto || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+!<x11-base/xorg-server-1.7 !<=x11-proto/xf86driproto-2.0.3 >=app-admin/eselect-mesa-0.0.3 >=app-admin/eselect-opengl-1.1.1-r2 dev-libs/expat dev-libs/libxml2[python] sys-libs/talloc x11-libs/libICE >=x11-libs/libX11-1.3.99.901 x11-libs/libXdamage x11-libs/libXext x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm motif? ( x11-libs/openmotif !x11-libs/libGLw ) gallium? ( llvm? ( amd64? ( dev-libs/udis86 ) x86? ( dev-libs/udis86 ) x86-fbsd? ( dev-libs/udis86 ) <sys-devel/llvm-2.9 ) ) >=x11-libs/libdrm-2.4.23[video_cards_nouveau?,video_cards_vmware?] video_cards_nouveau? ( <x11-libs/libdrm-2.4.24 ) video_cards_intel? ( >=x11-libs/libdrm-2.4.23[video_cards_intel] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.23[video_cards_radeon] ) =dev-lang/python-2* dev-util/pkgconfig sys-devel/bison sys-devel/flex x11-misc/makedepend >=x11-proto/dri2proto-2.2 >=x11-proto/glproto-1.4.11 x11-proto/inputproto >=x11-proto/xextproto-7.0.99.1 x11-proto/xf86driproto x11-proto/xf86vidmodeproto || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 !<x11-base/xorg-server-1.7 !<=x11-proto/xf86driproto-2.0.3 >=app-admin/eselect-mesa-0.0.3 >=app-admin/eselect-opengl-1.1.1-r2 dev-libs/expat dev-libs/libxml2[python] sys-libs/talloc x11-libs/libICE >=x11-libs/libX11-1.3.99.901 x11-libs/libXdamage x11-libs/libXext x11-libs/libXi x11-libs/libXmu x11-libs/libXxf86vm motif? ( x11-libs/openmotif !x11-libs/libGLw ) gallium? ( llvm? ( amd64? ( dev-libs/udis86 ) x86? ( dev-libs/udis86 ) x86-fbsd? ( dev-libs/udis86 ) <sys-devel/llvm-2.9 ) ) >=x11-libs/libdrm-2.4.23[video_cards_nouveau?,video_cards_vmware?] video_cards_nouveau? ( <x11-libs/libdrm-2.4.24 ) video_cards_intel? ( >=x11-libs/libdrm-2.4.23[video_cards_intel] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.23[video_cards_radeon] )
 0
 ftp://ftp.freedesktop.org/pub/mesa/7.9.2/MesaLib-7.9.2.tar.bz2
diff --git a/metadata/cache/media-libs/mesa-8.0 b/metadata/cache/media-libs/mesa-8.0
index 2fb84be3e4ed..56ed58607925 100644
--- a/metadata/cache/media-libs/mesa-8.0
+++ b/metadata/cache/media-libs/mesa-8.0
@@ -1,4 +1,4 @@
->=x11-proto/dri2proto-2.6 >=x11-proto/glproto-1.4.15 !<x11-base/xorg-server-1.7 !<=x11-proto/xf86driproto-2.0.3 classic? ( app-admin/eselect-mesa ) gallium? ( app-admin/eselect-mesa ) >=app-admin/eselect-opengl-1.2.2 dev-libs/expat gbm? ( sys-fs/udev ) >=x11-libs/libX11-1.3.99.901 x11-libs/libXdamage x11-libs/libXext x11-libs/libXxf86vm >=x11-libs/libxcb-1.8 d3d? ( app-emulation/wine ) vdpau? ( >=x11-libs/libvdpau-0.4.1 ) wayland? ( dev-libs/wayland ) xvmc? ( x11-libs/libXvMC ) >=x11-libs/libdrm-2.4.31[video_cards_nouveau?,video_cards_vmware?] video_cards_i915? ( >=x11-libs/libdrm-2.4.31[video_cards_intel] ) video_cards_i965? ( >=x11-libs/libdrm-2.4.31[video_cards_intel] ) video_cards_intel? ( >=x11-libs/libdrm-2.4.31[video_cards_intel] ) video_cards_r100? ( >=x11-libs/libdrm-2.4.31[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.31[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.31[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.31[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.31[video_cards_radeon] ) llvm? ( >=sys-devel/llvm-2.9 ) =dev-lang/python-2* dev-libs/libxml2[python] dev-util/pkgconfig sys-devel/bison sys-devel/flex x11-misc/makedepend >=x11-proto/xextproto-7.0.99.1 x11-proto/xf86driproto x11-proto/xf86vidmodeproto || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=x11-proto/dri2proto-2.6 >=x11-proto/glproto-1.4.15 !<x11-base/xorg-server-1.7 !<=x11-proto/xf86driproto-2.0.3 classic? ( app-admin/eselect-mesa ) gallium? ( app-admin/eselect-mesa ) >=app-admin/eselect-opengl-1.2.2 dev-libs/expat gbm? ( sys-fs/udev ) >=x11-libs/libX11-1.3.99.901 x11-libs/libXdamage x11-libs/libXext x11-libs/libXxf86vm >=x11-libs/libxcb-1.8 d3d? ( app-emulation/wine ) vdpau? ( >=x11-libs/libvdpau-0.4.1 ) wayland? ( dev-libs/wayland ) xvmc? ( x11-libs/libXvMC ) >=x11-libs/libdrm-2.4.31[video_cards_nouveau?,video_cards_vmware?] video_cards_i915? ( >=x11-libs/libdrm-2.4.31[video_cards_intel] ) video_cards_i965? ( >=x11-libs/libdrm-2.4.31[video_cards_intel] ) video_cards_intel? ( >=x11-libs/libdrm-2.4.31[video_cards_intel] ) video_cards_r100? ( >=x11-libs/libdrm-2.4.31[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.31[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.31[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.31[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.31[video_cards_radeon] ) llvm? ( >=sys-devel/llvm-2.9 ) =dev-lang/python-2* dev-libs/libxml2[python] dev-util/pkgconfig sys-devel/bison sys-devel/flex x11-misc/makedepend >=x11-proto/xextproto-7.0.99.1 x11-proto/xf86driproto x11-proto/xf86vidmodeproto || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=x11-proto/dri2proto-2.6 >=x11-proto/glproto-1.4.15 !<x11-base/xorg-server-1.7 !<=x11-proto/xf86driproto-2.0.3 classic? ( app-admin/eselect-mesa ) gallium? ( app-admin/eselect-mesa ) >=app-admin/eselect-opengl-1.2.2 dev-libs/expat gbm? ( sys-fs/udev ) >=x11-libs/libX11-1.3.99.901 x11-libs/libXdamage x11-libs/libXext x11-libs/libXxf86vm >=x11-libs/libxcb-1.8 d3d? ( app-emulation/wine ) vdpau? ( >=x11-libs/libvdpau-0.4.1 ) wayland? ( dev-libs/wayland ) xvmc? ( x11-libs/libXvMC ) >=x11-libs/libdrm-2.4.31[video_cards_nouveau?,video_cards_vmware?] video_cards_i915? ( >=x11-libs/libdrm-2.4.31[video_cards_intel] ) video_cards_i965? ( >=x11-libs/libdrm-2.4.31[video_cards_intel] ) video_cards_intel? ( >=x11-libs/libdrm-2.4.31[video_cards_intel] ) video_cards_r100? ( >=x11-libs/libdrm-2.4.31[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.31[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.31[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.31[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.31[video_cards_radeon] )
 0
 ftp://ftp.freedesktop.org/pub/mesa/8.0/MesaLib-8.0.tar.bz2
diff --git a/metadata/cache/media-libs/mesa-8.0.1 b/metadata/cache/media-libs/mesa-8.0.1
index e96e04da1178..edc631a127b4 100644
--- a/metadata/cache/media-libs/mesa-8.0.1
+++ b/metadata/cache/media-libs/mesa-8.0.1
@@ -1,4 +1,4 @@
->=x11-proto/dri2proto-2.6 >=x11-proto/glproto-1.4.15 !<x11-base/xorg-server-1.7 !<=x11-proto/xf86driproto-2.0.3 classic? ( app-admin/eselect-mesa ) gallium? ( app-admin/eselect-mesa ) >=app-admin/eselect-opengl-1.2.2 dev-libs/expat gbm? ( sys-fs/udev ) >=x11-libs/libX11-1.3.99.901 x11-libs/libXdamage x11-libs/libXext x11-libs/libXxf86vm >=x11-libs/libxcb-1.8 d3d? ( app-emulation/wine ) vdpau? ( >=x11-libs/libvdpau-0.4.1 ) wayland? ( dev-libs/wayland ) xvmc? ( x11-libs/libXvMC ) >=x11-libs/libdrm-2.4.31[video_cards_nouveau?,video_cards_vmware?] video_cards_i915? ( >=x11-libs/libdrm-2.4.31[video_cards_intel] ) video_cards_i965? ( >=x11-libs/libdrm-2.4.31[video_cards_intel] ) video_cards_intel? ( >=x11-libs/libdrm-2.4.31[video_cards_intel] ) video_cards_r100? ( >=x11-libs/libdrm-2.4.31[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.31[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.31[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.31[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.31[video_cards_radeon] ) llvm? ( >=sys-devel/llvm-2.9 ) =dev-lang/python-2* dev-libs/libxml2[python] dev-util/pkgconfig sys-devel/bison sys-devel/flex x11-misc/makedepend >=x11-proto/xextproto-7.0.99.1 x11-proto/xf86driproto x11-proto/xf86vidmodeproto || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=x11-proto/dri2proto-2.6 >=x11-proto/glproto-1.4.15 !<x11-base/xorg-server-1.7 !<=x11-proto/xf86driproto-2.0.3 classic? ( app-admin/eselect-mesa ) gallium? ( app-admin/eselect-mesa ) >=app-admin/eselect-opengl-1.2.2 dev-libs/expat gbm? ( sys-fs/udev ) >=x11-libs/libX11-1.3.99.901 x11-libs/libXdamage x11-libs/libXext x11-libs/libXxf86vm >=x11-libs/libxcb-1.8 d3d? ( app-emulation/wine ) vdpau? ( >=x11-libs/libvdpau-0.4.1 ) wayland? ( dev-libs/wayland ) xvmc? ( x11-libs/libXvMC ) >=x11-libs/libdrm-2.4.31[video_cards_nouveau?,video_cards_vmware?] video_cards_i915? ( >=x11-libs/libdrm-2.4.31[video_cards_intel] ) video_cards_i965? ( >=x11-libs/libdrm-2.4.31[video_cards_intel] ) video_cards_intel? ( >=x11-libs/libdrm-2.4.31[video_cards_intel] ) video_cards_r100? ( >=x11-libs/libdrm-2.4.31[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.31[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.31[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.31[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.31[video_cards_radeon] ) llvm? ( >=sys-devel/llvm-2.9 ) =dev-lang/python-2* dev-libs/libxml2[python] dev-util/pkgconfig sys-devel/bison sys-devel/flex x11-misc/makedepend >=x11-proto/xextproto-7.0.99.1 x11-proto/xf86driproto x11-proto/xf86vidmodeproto || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=x11-proto/dri2proto-2.6 >=x11-proto/glproto-1.4.15 !<x11-base/xorg-server-1.7 !<=x11-proto/xf86driproto-2.0.3 classic? ( app-admin/eselect-mesa ) gallium? ( app-admin/eselect-mesa ) >=app-admin/eselect-opengl-1.2.2 dev-libs/expat gbm? ( sys-fs/udev ) >=x11-libs/libX11-1.3.99.901 x11-libs/libXdamage x11-libs/libXext x11-libs/libXxf86vm >=x11-libs/libxcb-1.8 d3d? ( app-emulation/wine ) vdpau? ( >=x11-libs/libvdpau-0.4.1 ) wayland? ( dev-libs/wayland ) xvmc? ( x11-libs/libXvMC ) >=x11-libs/libdrm-2.4.31[video_cards_nouveau?,video_cards_vmware?] video_cards_i915? ( >=x11-libs/libdrm-2.4.31[video_cards_intel] ) video_cards_i965? ( >=x11-libs/libdrm-2.4.31[video_cards_intel] ) video_cards_intel? ( >=x11-libs/libdrm-2.4.31[video_cards_intel] ) video_cards_r100? ( >=x11-libs/libdrm-2.4.31[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.31[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.31[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.31[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.31[video_cards_radeon] )
 0
 ftp://ftp.freedesktop.org/pub/mesa/8.0.1/MesaLib-8.0.1.tar.bz2
diff --git a/metadata/cache/media-libs/mesa-8.0.1-r2 b/metadata/cache/media-libs/mesa-8.0.1-r2
index 42651b5a2d74..29726b8443f6 100644
--- a/metadata/cache/media-libs/mesa-8.0.1-r2
+++ b/metadata/cache/media-libs/mesa-8.0.1-r2
@@ -1,4 +1,4 @@
->=x11-proto/dri2proto-2.6 >=x11-proto/glproto-1.4.15 !<x11-base/xorg-server-1.7 !<=x11-proto/xf86driproto-2.0.3 classic? ( app-admin/eselect-mesa ) gallium? ( app-admin/eselect-mesa ) >=app-admin/eselect-opengl-1.2.5 dev-libs/expat gbm? ( sys-fs/udev ) >=x11-libs/libX11-1.3.99.901 x11-libs/libXdamage x11-libs/libXext x11-libs/libXxf86vm >=x11-libs/libxcb-1.8 d3d? ( app-emulation/wine ) vdpau? ( >=x11-libs/libvdpau-0.4.1 ) wayland? ( dev-libs/wayland ) xvmc? ( x11-libs/libXvMC ) >=x11-libs/libdrm-2.4.31[video_cards_nouveau?,video_cards_vmware?] video_cards_i915? ( >=x11-libs/libdrm-2.4.31[video_cards_intel] ) video_cards_i965? ( >=x11-libs/libdrm-2.4.31[video_cards_intel] ) video_cards_intel? ( >=x11-libs/libdrm-2.4.31[video_cards_intel] ) video_cards_r100? ( >=x11-libs/libdrm-2.4.31[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.31[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.31[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.31[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.31[video_cards_radeon] ) llvm? ( >=sys-devel/llvm-2.9 ) =dev-lang/python-2* dev-libs/libxml2[python] dev-util/pkgconfig sys-devel/bison sys-devel/flex x11-misc/makedepend >=x11-proto/xextproto-7.0.99.1 x11-proto/xf86driproto x11-proto/xf86vidmodeproto || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=x11-proto/dri2proto-2.6 >=x11-proto/glproto-1.4.15 !<x11-base/xorg-server-1.7 !<=x11-proto/xf86driproto-2.0.3 classic? ( app-admin/eselect-mesa ) gallium? ( app-admin/eselect-mesa ) >=app-admin/eselect-opengl-1.2.5 dev-libs/expat gbm? ( sys-fs/udev ) >=x11-libs/libX11-1.3.99.901 x11-libs/libXdamage x11-libs/libXext x11-libs/libXxf86vm >=x11-libs/libxcb-1.8 d3d? ( app-emulation/wine ) vdpau? ( >=x11-libs/libvdpau-0.4.1 ) wayland? ( dev-libs/wayland ) xvmc? ( x11-libs/libXvMC ) >=x11-libs/libdrm-2.4.31[video_cards_nouveau?,video_cards_vmware?] video_cards_i915? ( >=x11-libs/libdrm-2.4.31[video_cards_intel] ) video_cards_i965? ( >=x11-libs/libdrm-2.4.31[video_cards_intel] ) video_cards_intel? ( >=x11-libs/libdrm-2.4.31[video_cards_intel] ) video_cards_r100? ( >=x11-libs/libdrm-2.4.31[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.31[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.31[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.31[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.31[video_cards_radeon] ) llvm? ( >=sys-devel/llvm-2.9 ) =dev-lang/python-2* dev-libs/libxml2[python] dev-util/pkgconfig sys-devel/bison sys-devel/flex x11-misc/makedepend >=x11-proto/xextproto-7.0.99.1 x11-proto/xf86driproto x11-proto/xf86vidmodeproto || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=x11-proto/dri2proto-2.6 >=x11-proto/glproto-1.4.15 !<x11-base/xorg-server-1.7 !<=x11-proto/xf86driproto-2.0.3 classic? ( app-admin/eselect-mesa ) gallium? ( app-admin/eselect-mesa ) >=app-admin/eselect-opengl-1.2.5 dev-libs/expat gbm? ( sys-fs/udev ) >=x11-libs/libX11-1.3.99.901 x11-libs/libXdamage x11-libs/libXext x11-libs/libXxf86vm >=x11-libs/libxcb-1.8 d3d? ( app-emulation/wine ) vdpau? ( >=x11-libs/libvdpau-0.4.1 ) wayland? ( dev-libs/wayland ) xvmc? ( x11-libs/libXvMC ) >=x11-libs/libdrm-2.4.31[video_cards_nouveau?,video_cards_vmware?] video_cards_i915? ( >=x11-libs/libdrm-2.4.31[video_cards_intel] ) video_cards_i965? ( >=x11-libs/libdrm-2.4.31[video_cards_intel] ) video_cards_intel? ( >=x11-libs/libdrm-2.4.31[video_cards_intel] ) video_cards_r100? ( >=x11-libs/libdrm-2.4.31[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.31[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.31[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.31[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.31[video_cards_radeon] )
 0
 ftp://ftp.freedesktop.org/pub/mesa/8.0.1/MesaLib-8.0.1.tar.bz2
diff --git a/metadata/cache/media-libs/ming-0.4.3-r1 b/metadata/cache/media-libs/ming-0.4.3-r1
index 68f1dddc26ea..943b6fd54e09 100644
--- a/metadata/cache/media-libs/ming-0.4.3-r1
+++ b/metadata/cache/media-libs/ming-0.4.3-r1
@@ -1,4 +1,4 @@
-sys-devel/flex virtual/yacc || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php? ( php_targets_php5-3? ( dev-lang/php:5.3 ) ) dev-lang/perl[-build] python? ( =dev-lang/python-2* )
+sys-devel/flex virtual/yacc || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php? ( php_targets_php5-3? ( dev-lang/php:5.3 ) ) dev-lang/perl[-build] python? ( =dev-lang/python-2* )
 perl? ( dev-lang/perl ) python? ( dev-lang/python ) media-libs/freetype media-libs/libpng media-libs/giflib sys-libs/zlib !media-libs/libswf php? ( || ( =media-libs/ming-0.4.3-r1[php_targets_php5-3] ) php_targets_php5-3? ( dev-lang/php:5.3 ) ) dev-lang/perl[-build] python? ( =dev-lang/python-2* )
 0
 mirror://sourceforge/ming/ming-0.4.3.tar.bz2
diff --git a/metadata/cache/media-libs/ming-0.4.3-r2 b/metadata/cache/media-libs/ming-0.4.3-r2
index dd034626f6f5..af154ca32e82 100644
--- a/metadata/cache/media-libs/ming-0.4.3-r2
+++ b/metadata/cache/media-libs/ming-0.4.3-r2
@@ -1,4 +1,4 @@
-sys-devel/flex virtual/yacc || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php? ( php_targets_php5-3? ( dev-lang/php:5.3 ) ) dev-lang/perl[-build] python? ( =dev-lang/python-2* )
+sys-devel/flex virtual/yacc || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php? ( php_targets_php5-3? ( dev-lang/php:5.3 ) ) dev-lang/perl[-build] python? ( =dev-lang/python-2* )
 perl? ( dev-lang/perl ) python? ( dev-lang/python ) media-libs/freetype media-libs/libpng media-libs/giflib sys-libs/zlib !media-libs/libswf php? ( || ( =media-libs/ming-0.4.3-r2[php_targets_php5-3] ) php_targets_php5-3? ( dev-lang/php:5.3 ) ) dev-lang/perl[-build] python? ( =dev-lang/python-2* )
 0
 mirror://sourceforge/ming/ming-0.4.3.tar.bz2
diff --git a/metadata/cache/media-libs/openexr_ctl-1.0.1-r1 b/metadata/cache/media-libs/openexr_ctl-1.0.1-r1
index 042d29c3226b..7d3808e0621b 100644
--- a/metadata/cache/media-libs/openexr_ctl-1.0.1-r1
+++ b/metadata/cache/media-libs/openexr_ctl-1.0.1-r1
@@ -1,4 +1,4 @@
-media-libs/ilmbase media-libs/openexr media-libs/ctl dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+media-libs/ilmbase media-libs/openexr media-libs/ctl dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 media-libs/ilmbase media-libs/openexr media-libs/ctl
 0
 mirror://sourceforge/ampasctl/openexr_ctl-1.0.1.tar.gz
diff --git a/metadata/cache/media-libs/openjpeg-1.5.0 b/metadata/cache/media-libs/openjpeg-1.5.0
new file mode 100644
index 000000000000..55d92a0bfdaf
--- /dev/null
+++ b/metadata/cache/media-libs/openjpeg-1.5.0
@@ -0,0 +1,22 @@
+media-libs/lcms:2 media-libs/libpng:0 media-libs/tiff:0 sys-libs/zlib doc? ( app-doc/doxygen ) >=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
+media-libs/lcms:2 media-libs/libpng:0 media-libs/tiff:0 sys-libs/zlib
+0
+http://openjpeg.googlecode.com/files/openjpeg-1.5.0.tar.gz
+test
+http://code.google.com/p/openjpeg/
+BSD-2
+An open-source JPEG 2000 library
+~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd
+base cmake-utils eutils flag-o-matic multilib toolchain-funcs user
+doc test
+
+
+
+4
+
+compile configure install prepare test unpack
+
+
+
+
+
diff --git a/metadata/cache/media-libs/opus-0.9.8 b/metadata/cache/media-libs/opus-0.9.8
index 10e533061193..b58c8239dad2 100644
--- a/metadata/cache/media-libs/opus-0.9.8
+++ b/metadata/cache/media-libs/opus-0.9.8
@@ -1,4 +1,4 @@
-doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 http://downloads.xiph.org/releases/opus/opus-0.9.8.tar.gz
diff --git a/metadata/cache/media-libs/paragui-1.1.8 b/metadata/cache/media-libs/paragui-1.1.8
index 5c1f31322e59..38bcf86fb84f 100644
--- a/metadata/cache/media-libs/paragui-1.1.8
+++ b/metadata/cache/media-libs/paragui-1.1.8
@@ -1,4 +1,4 @@
-media-libs/libsdl media-libs/sdl-image =dev-libs/libsigc++-1.2* >=media-libs/freetype-2 >=media-libs/libpng-1.4 dev-games/physfs virtual/jpeg dev-libs/expat sys-libs/zlib dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+media-libs/libsdl media-libs/sdl-image =dev-libs/libsigc++-1.2* >=media-libs/freetype-2 >=media-libs/libpng-1.4 dev-games/physfs virtual/jpeg dev-libs/expat sys-libs/zlib dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 media-libs/libsdl media-libs/sdl-image =dev-libs/libsigc++-1.2* >=media-libs/freetype-2 >=media-libs/libpng-1.4 dev-games/physfs virtual/jpeg dev-libs/expat sys-libs/zlib
 0
 http://download.savannah.gnu.org/releases/paragui/paragui-1.1.8.tar.gz
diff --git a/metadata/cache/media-libs/plotutils-2.6 b/metadata/cache/media-libs/plotutils-2.6
index d7d790df9fdd..b6d20902bc01 100644
--- a/metadata/cache/media-libs/plotutils-2.6
+++ b/metadata/cache/media-libs/plotutils-2.6
@@ -1,4 +1,4 @@
-png? ( media-libs/libpng sys-libs/zlib ) X? ( x11-libs/libXaw x11-proto/xextproto ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+png? ( media-libs/libpng sys-libs/zlib ) X? ( x11-libs/libXaw x11-proto/xextproto ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 png? ( media-libs/libpng sys-libs/zlib ) X? ( x11-libs/libXaw x11-proto/xextproto )
 0
 mirror://gnu/plotutils/plotutils-2.6.tar.gz
diff --git a/metadata/cache/media-libs/pymemphis-0.2.1 b/metadata/cache/media-libs/pymemphis-0.2.1
index 699ba37e8329..6d09d7e76418 100644
--- a/metadata/cache/media-libs/pymemphis-0.2.1
+++ b/metadata/cache/media-libs/pymemphis-0.2.1
@@ -1,4 +1,4 @@
-dev-python/pycairo dev-python/pygobject:2 media-libs/memphis || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool =dev-lang/python-2*
+dev-python/pycairo dev-python/pygobject:2 media-libs/memphis || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool =dev-lang/python-2*
 dev-python/pycairo dev-python/pygobject:2 media-libs/memphis =dev-lang/python-2*
 0
 mirror://gentoo/pymemphis-0.2.1.tar.gz
diff --git a/metadata/cache/media-libs/raptor-2.0.4 b/metadata/cache/media-libs/raptor-2.0.4
index 7d2c0e18e878..cb3697e4eac7 100644
--- a/metadata/cache/media-libs/raptor-2.0.4
+++ b/metadata/cache/media-libs/raptor-2.0.4
@@ -1,4 +1,4 @@
-unicode? ( dev-libs/glib:2 ) xml? ( >=dev-libs/libxml2-2.6.8 ) !xml? ( dev-libs/expat ) curl? ( net-misc/curl ) json? ( dev-libs/yajl ) dev-libs/libxslt !<media-libs/raptor-1.4.21-r1 dev-util/pkgconfig sys-devel/flex dev-util/gtk-doc-am || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+unicode? ( dev-libs/glib:2 ) xml? ( >=dev-libs/libxml2-2.6.8 ) !xml? ( dev-libs/expat ) curl? ( net-misc/curl ) json? ( dev-libs/yajl ) dev-libs/libxslt !<media-libs/raptor-1.4.21-r1 dev-util/pkgconfig sys-devel/flex dev-util/gtk-doc-am || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 unicode? ( dev-libs/glib:2 ) xml? ( >=dev-libs/libxml2-2.6.8 ) !xml? ( dev-libs/expat ) curl? ( net-misc/curl ) json? ( dev-libs/yajl ) dev-libs/libxslt !<media-libs/raptor-1.4.21-r1
 2
 http://download.librdf.org/source/raptor2-2.0.4.tar.gz
diff --git a/metadata/cache/media-libs/resid-0.16_p2 b/metadata/cache/media-libs/resid-0.16_p2
index b3449ac7e2f0..e86e82725f29 100644
--- a/metadata/cache/media-libs/resid-0.16_p2
+++ b/metadata/cache/media-libs/resid-0.16_p2
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 mirror://sourceforge/sidplay2/resid-0.16-p2.tgz
diff --git a/metadata/cache/media-libs/schroedinger-1.0.10 b/metadata/cache/media-libs/schroedinger-1.0.10
index dad3fea67620..8ab8c16bfc45 100644
--- a/metadata/cache/media-libs/schroedinger-1.0.10
+++ b/metadata/cache/media-libs/schroedinger-1.0.10
@@ -1,4 +1,4 @@
->=dev-lang/orc-0.4.10 dev-util/pkgconfig dev-util/gtk-doc-am || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-lang/orc-0.4.10 dev-util/pkgconfig dev-util/gtk-doc-am || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=dev-lang/orc-0.4.10
 0
 http://www.diracvideo.org/download/schroedinger/schroedinger-1.0.10.tar.gz
diff --git a/metadata/cache/media-libs/schroedinger-1.0.10-r1 b/metadata/cache/media-libs/schroedinger-1.0.10-r1
index 347bff465b52..7af7ff9db066 100644
--- a/metadata/cache/media-libs/schroedinger-1.0.10-r1
+++ b/metadata/cache/media-libs/schroedinger-1.0.10-r1
@@ -1,4 +1,4 @@
->=dev-lang/orc-0.4.13 dev-util/pkgconfig dev-util/gtk-doc-am || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-lang/orc-0.4.13 dev-util/pkgconfig dev-util/gtk-doc-am || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=dev-lang/orc-0.4.13
 0
 http://www.diracvideo.org/download/schroedinger/schroedinger-1.0.10.tar.gz
diff --git a/metadata/cache/media-libs/schroedinger-1.0.11 b/metadata/cache/media-libs/schroedinger-1.0.11
index f36992656ca5..87558625b347 100644
--- a/metadata/cache/media-libs/schroedinger-1.0.11
+++ b/metadata/cache/media-libs/schroedinger-1.0.11
@@ -1,4 +1,4 @@
->=dev-lang/orc-0.4.16 dev-util/pkgconfig dev-util/gtk-doc-am || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-lang/orc-0.4.16 dev-util/pkgconfig dev-util/gtk-doc-am || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=dev-lang/orc-0.4.16
 0
 http://www.diracvideo.org/download/schroedinger/schroedinger-1.0.11.tar.gz
diff --git a/metadata/cache/media-libs/schroedinger-1.0.9 b/metadata/cache/media-libs/schroedinger-1.0.9
index 9984f213350d..1906e1bcfa5e 100644
--- a/metadata/cache/media-libs/schroedinger-1.0.9
+++ b/metadata/cache/media-libs/schroedinger-1.0.9
@@ -1,4 +1,4 @@
->=dev-lang/orc-0.4.3 <dev-lang/orc-0.4.10 dev-util/pkgconfig dev-util/gtk-doc-am || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-lang/orc-0.4.3 <dev-lang/orc-0.4.10 dev-util/pkgconfig dev-util/gtk-doc-am || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=dev-lang/orc-0.4.3 <dev-lang/orc-0.4.10
 0
 http://www.diracvideo.org/download/schroedinger/schroedinger-1.0.9.tar.gz
diff --git a/metadata/cache/media-libs/sdl-gfx-2.0.22 b/metadata/cache/media-libs/sdl-gfx-2.0.22
index d0b39a77bd80..74fee1d96231 100644
--- a/metadata/cache/media-libs/sdl-gfx-2.0.22
+++ b/metadata/cache/media-libs/sdl-gfx-2.0.22
@@ -1,4 +1,4 @@
-media-libs/libsdl[video] || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+media-libs/libsdl[video] || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 media-libs/libsdl[video]
 0
 http://www.ferzkopp.net/Software/SDL_gfx-2.0/SDL_gfx-2.0.22.tar.gz
diff --git a/metadata/cache/media-libs/sdl-gfx-2.0.23 b/metadata/cache/media-libs/sdl-gfx-2.0.23
index 9b741b9cac57..619a198bb0d4 100644
--- a/metadata/cache/media-libs/sdl-gfx-2.0.23
+++ b/metadata/cache/media-libs/sdl-gfx-2.0.23
@@ -1,4 +1,4 @@
-media-libs/libsdl[video] || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+media-libs/libsdl[video] || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 media-libs/libsdl[video]
 0
 http://www.ferzkopp.net/Software/SDL_gfx-2.0/SDL_gfx-2.0.23.tar.gz
diff --git a/metadata/cache/media-libs/sdl-ttf-2.0.10 b/metadata/cache/media-libs/sdl-ttf-2.0.10
index b85db21a8e6a..b4cfe43431be 100644
--- a/metadata/cache/media-libs/sdl-ttf-2.0.10
+++ b/metadata/cache/media-libs/sdl-ttf-2.0.10
@@ -1,4 +1,4 @@
-X? ( x11-libs/libXt ) media-libs/libsdl >=media-libs/freetype-2.3 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+X? ( x11-libs/libXt ) media-libs/libsdl >=media-libs/freetype-2.3 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 X? ( x11-libs/libXt ) media-libs/libsdl >=media-libs/freetype-2.3
 0
 http://www.libsdl.org/projects/SDL_ttf/release/SDL_ttf-2.0.10.tar.gz
diff --git a/metadata/cache/media-libs/sdl-ttf-2.0.11 b/metadata/cache/media-libs/sdl-ttf-2.0.11
index 50e77ea0655e..d1874530f244 100644
--- a/metadata/cache/media-libs/sdl-ttf-2.0.11
+++ b/metadata/cache/media-libs/sdl-ttf-2.0.11
@@ -1,4 +1,4 @@
-X? ( x11-libs/libXt ) media-libs/libsdl >=media-libs/freetype-2.3 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+X? ( x11-libs/libXt ) media-libs/libsdl >=media-libs/freetype-2.3 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 X? ( x11-libs/libXt ) media-libs/libsdl >=media-libs/freetype-2.3
 0
 http://www.libsdl.org/projects/SDL_ttf/release/SDL_ttf-2.0.11.tar.gz
diff --git a/metadata/cache/media-libs/sg-1.4 b/metadata/cache/media-libs/sg-1.4
index 4829847866d2..38c2b862f2c5 100644
--- a/metadata/cache/media-libs/sg-1.4
+++ b/metadata/cache/media-libs/sg-1.4
@@ -1,4 +1,4 @@
-dev-libs/maloc x11-libs/libXaw x11-libs/openmotif opengl? ( || ( <media-libs/mesa-8[motif] ( media-libs/mesa x11-libs/libGLw ) media-libs/opengl-apple ) ) doc? ( media-gfx/graphviz app-doc/doxygen ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-libs/maloc x11-libs/libXaw x11-libs/openmotif opengl? ( || ( <media-libs/mesa-8[motif] ( media-libs/mesa x11-libs/libGLw ) media-libs/opengl-apple ) ) doc? ( media-gfx/graphviz app-doc/doxygen ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-libs/maloc x11-libs/libXaw x11-libs/openmotif opengl? ( || ( <media-libs/mesa-8[motif] ( media-libs/mesa x11-libs/libGLw ) media-libs/opengl-apple ) )
 0
 http://www.fetk.org/codes/download/sg-1.4.tar.gz
diff --git a/metadata/cache/media-libs/sg-1.5 b/metadata/cache/media-libs/sg-1.5
index a0a7909c01e7..31b5a4083e78 100644
--- a/metadata/cache/media-libs/sg-1.5
+++ b/metadata/cache/media-libs/sg-1.5
@@ -1,4 +1,4 @@
-dev-libs/maloc x11-libs/libXaw x11-libs/openmotif opengl? ( || ( <media-libs/mesa-8[motif] ( media-libs/mesa x11-libs/libGLw ) media-libs/opengl-apple ) ) doc? ( media-gfx/graphviz app-doc/doxygen ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-libs/maloc x11-libs/libXaw x11-libs/openmotif opengl? ( || ( <media-libs/mesa-8[motif] ( media-libs/mesa x11-libs/libGLw ) media-libs/opengl-apple ) ) doc? ( media-gfx/graphviz app-doc/doxygen ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-libs/maloc x11-libs/libXaw x11-libs/openmotif opengl? ( || ( <media-libs/mesa-8[motif] ( media-libs/mesa x11-libs/libGLw ) media-libs/opengl-apple ) )
 0
 http://www.fetk.org/codes/download/sg-1.5.tar.gz
diff --git a/metadata/cache/media-libs/shivavg-0.2.1 b/metadata/cache/media-libs/shivavg-0.2.1
index fec94a1e6c8a..7378706ff413 100644
--- a/metadata/cache/media-libs/shivavg-0.2.1
+++ b/metadata/cache/media-libs/shivavg-0.2.1
@@ -1,4 +1,4 @@
-virtual/glu media-libs/freeglut virtual/opengl || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+virtual/glu media-libs/freeglut virtual/opengl || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 virtual/glu media-libs/freeglut virtual/opengl
 0
 mirror://sourceforge/shivavg/ShivaVG-0.2.1.zip
diff --git a/metadata/cache/media-libs/smpeg-0.4.4-r9 b/metadata/cache/media-libs/smpeg-0.4.4-r9
index c1fa37480849..a3376f77cf9f 100644
--- a/metadata/cache/media-libs/smpeg-0.4.4-r9
+++ b/metadata/cache/media-libs/smpeg-0.4.4-r9
@@ -1,4 +1,4 @@
->=media-libs/libsdl-1.2.0 opengl? ( virtual/opengl ) X? ( x11-libs/libXext x11-libs/libXi x11-libs/libX11 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=media-libs/libsdl-1.2.0 opengl? ( virtual/opengl ) X? ( x11-libs/libXext x11-libs/libXi x11-libs/libX11 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=media-libs/libsdl-1.2.0 opengl? ( virtual/opengl ) X? ( x11-libs/libXext x11-libs/libXi x11-libs/libX11 )
 0
 ftp://ftp.lokigames.com/pub/open-source/smpeg/smpeg-0.4.4.tar.gz mirror://gentoo/smpeg-0.4.4-gtkm4.patch.bz2
diff --git a/metadata/cache/media-libs/speex-1.2_rc1 b/metadata/cache/media-libs/speex-1.2_rc1
index 6b094b8e4a7c..473999b5e539 100644
--- a/metadata/cache/media-libs/speex-1.2_rc1
+++ b/metadata/cache/media-libs/speex-1.2_rc1
@@ -1,4 +1,4 @@
-ogg? ( media-libs/libogg ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+ogg? ( media-libs/libogg ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 ogg? ( media-libs/libogg )
 0
 http://downloads.xiph.org/releases/speex/speex-1.2rc1.tar.gz
diff --git a/metadata/cache/media-libs/speex-1.2_rc1-r1 b/metadata/cache/media-libs/speex-1.2_rc1-r1
index 116bc00f8973..2f48307d965f 100644
--- a/metadata/cache/media-libs/speex-1.2_rc1-r1
+++ b/metadata/cache/media-libs/speex-1.2_rc1-r1
@@ -1,4 +1,4 @@
-ogg? ( media-libs/libogg ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+ogg? ( media-libs/libogg ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 ogg? ( media-libs/libogg )
 0
 http://downloads.xiph.org/releases/speex/speex-1.2rc1.tar.gz
diff --git a/metadata/cache/media-libs/stk-4.4.2 b/metadata/cache/media-libs/stk-4.4.2
index 3e052020b821..dd2601aea3c0 100644
--- a/metadata/cache/media-libs/stk-4.4.2
+++ b/metadata/cache/media-libs/stk-4.4.2
@@ -1,4 +1,4 @@
-alsa? ( media-libs/alsa-lib ) jack? ( media-sound/jack-audio-connection-kit ) dev-util/pkgconfig dev-lang/perl || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+alsa? ( media-libs/alsa-lib ) jack? ( media-sound/jack-audio-connection-kit ) dev-util/pkgconfig dev-lang/perl || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 alsa? ( media-libs/alsa-lib ) jack? ( media-sound/jack-audio-connection-kit )
 0
 http://ccrma.stanford.edu/software/stk/release/stk-4.4.2.tar.gz
diff --git a/metadata/cache/media-libs/stk-4.4.3 b/metadata/cache/media-libs/stk-4.4.3
index 32bf82d90f66..510db541fd70 100644
--- a/metadata/cache/media-libs/stk-4.4.3
+++ b/metadata/cache/media-libs/stk-4.4.3
@@ -1,4 +1,4 @@
-alsa? ( media-libs/alsa-lib ) jack? ( media-sound/jack-audio-connection-kit ) dev-util/pkgconfig dev-lang/perl || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+alsa? ( media-libs/alsa-lib ) jack? ( media-sound/jack-audio-connection-kit ) dev-util/pkgconfig dev-lang/perl || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 alsa? ( media-libs/alsa-lib ) jack? ( media-sound/jack-audio-connection-kit )
 0
 http://ccrma.stanford.edu/software/stk/release/stk-4.4.3.tar.gz
diff --git a/metadata/cache/media-libs/stk-4.4.3-r1 b/metadata/cache/media-libs/stk-4.4.3-r1
index 32bf82d90f66..510db541fd70 100644
--- a/metadata/cache/media-libs/stk-4.4.3-r1
+++ b/metadata/cache/media-libs/stk-4.4.3-r1
@@ -1,4 +1,4 @@
-alsa? ( media-libs/alsa-lib ) jack? ( media-sound/jack-audio-connection-kit ) dev-util/pkgconfig dev-lang/perl || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+alsa? ( media-libs/alsa-lib ) jack? ( media-sound/jack-audio-connection-kit ) dev-util/pkgconfig dev-lang/perl || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 alsa? ( media-libs/alsa-lib ) jack? ( media-sound/jack-audio-connection-kit )
 0
 http://ccrma.stanford.edu/software/stk/release/stk-4.4.3.tar.gz
diff --git a/metadata/cache/media-libs/tremor-0_pre20120120 b/metadata/cache/media-libs/tremor-0_pre20120120
index b3a1db11046b..a2795fb58e02 100644
--- a/metadata/cache/media-libs/tremor-0_pre20120120
+++ b/metadata/cache/media-libs/tremor-0_pre20120120
@@ -1,4 +1,4 @@
-media-libs/libogg dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+media-libs/libogg dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 media-libs/libogg
 0
 mirror://gentoo/tremor-0_pre20120120.tar.xz
diff --git a/metadata/cache/media-libs/tse3-0.3.1-r1 b/metadata/cache/media-libs/tse3-0.3.1-r1
index 2f31bf3601ab..f88c2e6cc88d 100644
--- a/metadata/cache/media-libs/tse3-0.3.1-r1
+++ b/metadata/cache/media-libs/tse3-0.3.1-r1
@@ -1,4 +1,4 @@
-alsa? ( media-libs/alsa-lib ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+alsa? ( media-libs/alsa-lib ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 alsa? ( media-libs/alsa-lib )
 0
 mirror://sourceforge/tse3/tse3-0.3.1.tar.gz mirror://gentoo/tse3-0.3.1-awe_voice.h.tbz2
diff --git a/metadata/cache/media-libs/tunepimp-0.5.3-r3 b/metadata/cache/media-libs/tunepimp-0.5.3-r3
index e7bbcfbd6abc..6c03cef2a92f 100644
--- a/metadata/cache/media-libs/tunepimp-0.5.3-r3
+++ b/metadata/cache/media-libs/tunepimp-0.5.3-r3
@@ -1,4 +1,4 @@
-sys-libs/zlib dev-libs/expat net-misc/curl media-libs/flac media-libs/libmad >=media-libs/musicbrainz-2.1:1 >=media-libs/libmp4v2-1.9 media-libs/libofa media-libs/libvorbis sys-libs/readline dev-util/pkgconfig !media-sound/trm || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( =dev-lang/python-2* )
+sys-libs/zlib dev-libs/expat net-misc/curl media-libs/flac media-libs/libmad >=media-libs/musicbrainz-2.1:1 >=media-libs/libmp4v2-1.9 media-libs/libofa media-libs/libvorbis sys-libs/readline dev-util/pkgconfig !media-sound/trm || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( =dev-lang/python-2* )
 sys-libs/zlib dev-libs/expat net-misc/curl media-libs/flac media-libs/libmad >=media-libs/musicbrainz-2.1:1 >=media-libs/libmp4v2-1.9 media-libs/libofa media-libs/libvorbis sys-libs/readline python? ( =dev-lang/python-2* )
 0
 http://ftp.musicbrainz.org/pub/musicbrainz/libtunepimp-0.5.3.tar.gz
diff --git a/metadata/cache/media-libs/vo-aacenc-0.1.0 b/metadata/cache/media-libs/vo-aacenc-0.1.0
index a904e11e9eeb..ed2d7a126585 100644
--- a/metadata/cache/media-libs/vo-aacenc-0.1.0
+++ b/metadata/cache/media-libs/vo-aacenc-0.1.0
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 mirror://sourceforge/opencore-amr/vo-aacenc-0.1.0.tar.gz
diff --git a/metadata/cache/media-libs/vo-aacenc-0.1.1 b/metadata/cache/media-libs/vo-aacenc-0.1.1
index 1c51c8157dc7..ddbd4c7211c3 100644
--- a/metadata/cache/media-libs/vo-aacenc-0.1.1
+++ b/metadata/cache/media-libs/vo-aacenc-0.1.1
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 mirror://sourceforge/opencore-amr/vo-aacenc-0.1.1.tar.gz
diff --git a/metadata/cache/media-libs/vo-aacenc-0.1.2 b/metadata/cache/media-libs/vo-aacenc-0.1.2
index 7a0164f4da3b..6076ae6c31bb 100644
--- a/metadata/cache/media-libs/vo-aacenc-0.1.2
+++ b/metadata/cache/media-libs/vo-aacenc-0.1.2
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 mirror://sourceforge/opencore-amr/vo-aacenc-0.1.2.tar.gz
diff --git a/metadata/cache/media-libs/vo-aacenc-9999 b/metadata/cache/media-libs/vo-aacenc-9999
index 95a5cecdeb35..a0636c6c8bf7 100644
--- a/metadata/cache/media-libs/vo-aacenc-9999
+++ b/metadata/cache/media-libs/vo-aacenc-9999
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
+|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
 
 0
 
diff --git a/metadata/cache/media-libs/vo-amrwbenc-0.1.0 b/metadata/cache/media-libs/vo-amrwbenc-0.1.0
index 2cb41b3be40e..ab463bff60fa 100644
--- a/metadata/cache/media-libs/vo-amrwbenc-0.1.0
+++ b/metadata/cache/media-libs/vo-amrwbenc-0.1.0
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 mirror://sourceforge/opencore-amr/vo-amrwbenc-0.1.0.tar.gz
diff --git a/metadata/cache/media-libs/vo-amrwbenc-0.1.1 b/metadata/cache/media-libs/vo-amrwbenc-0.1.1
index 7b46d89713b5..2de77289fe1a 100644
--- a/metadata/cache/media-libs/vo-amrwbenc-0.1.1
+++ b/metadata/cache/media-libs/vo-amrwbenc-0.1.1
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 mirror://sourceforge/opencore-amr/vo-amrwbenc-0.1.1.tar.gz
diff --git a/metadata/cache/media-libs/vo-amrwbenc-0.1.2 b/metadata/cache/media-libs/vo-amrwbenc-0.1.2
index 58fbb5d06ba1..b3a5ac2d4fe0 100644
--- a/metadata/cache/media-libs/vo-amrwbenc-0.1.2
+++ b/metadata/cache/media-libs/vo-amrwbenc-0.1.2
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 mirror://sourceforge/opencore-amr/vo-amrwbenc-0.1.2.tar.gz
diff --git a/metadata/cache/media-libs/vo-amrwbenc-9999 b/metadata/cache/media-libs/vo-amrwbenc-9999
index aa5b0865f742..d94671dca7b2 100644
--- a/metadata/cache/media-libs/vo-amrwbenc-9999
+++ b/metadata/cache/media-libs/vo-amrwbenc-9999
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
+|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
 
 0
 
diff --git a/metadata/cache/media-libs/xine-lib-1.2.9999 b/metadata/cache/media-libs/xine-lib-1.2.9999
index 9f54eca9079c..3aff38c012b1 100644
--- a/metadata/cache/media-libs/xine-lib-1.2.9999
+++ b/metadata/cache/media-libs/xine-lib-1.2.9999
@@ -1,4 +1,4 @@
-dev-libs/libxdg-basedir media-libs/libdvdnav sys-libs/zlib virtual/ffmpeg virtual/libiconv virtual/libintl a52? ( media-libs/a52dec ) aac? ( media-libs/faad2 ) aalib? ( media-libs/aalib ) alsa? ( media-libs/alsa-lib ) bluray? ( >=media-libs/libbluray-0.2.1 ) css? ( >=media-libs/libdvdcss-1.2.10 ) directfb? ( dev-libs/DirectFB ) dts? ( media-libs/libdca ) dxr3? ( media-libs/libfame ) flac? ( media-libs/flac ) fusion? ( media-libs/FusionSound ) gtk? ( x11-libs/gdk-pixbuf:2 ) imagemagick? ( || ( media-gfx/imagemagick media-gfx/graphicsmagick ) ) jack? ( >=media-sound/jack-audio-connection-kit-0.100 ) libcaca? ( media-libs/libcaca ) mad? ( media-libs/libmad ) mng? ( media-libs/libmng ) modplug? ( >=media-libs/libmodplug-0.8.8.1 ) musepack? ( >=media-sound/musepack-tools-444 ) opengl? ( virtual/glu virtual/opengl ) pulseaudio? ( media-sound/pulseaudio ) real? ( amd64? ( media-libs/amd64codecs ) x86? ( media-libs/win32codecs ) x86-fbsd? ( media-libs/win32codecs ) ) samba? ( net-fs/samba ) sdl? ( media-libs/libsdl ) speex? ( media-libs/libogg media-libs/speex ) theora? ( media-libs/libogg media-libs/libtheora ) truetype? ( media-libs/fontconfig media-libs/freetype:2 ) v4l? ( media-libs/libv4l ) vcd? ( >=media-video/vcdimager-0.7.23 dev-libs/libcdio[-minimal] ) vdpau? ( x11-libs/libvdpau ) vorbis? ( media-libs/libogg media-libs/libvorbis ) wavpack? ( media-sound/wavpack ) win32codecs? ( media-libs/win32codecs ) X? ( x11-libs/libX11 x11-libs/libXext ) xcb? ( x11-libs/libxcb ) xinerama? ( x11-libs/libXinerama ) xv? ( x11-libs/libXv ) xvmc? ( x11-libs/libXvMC ) app-arch/xz-utils dev-util/pkgconfig sys-devel/gettext >=sys-devel/libtool-2.2.6b bluray? ( !media-libs/libbluray-xine ) oss? ( virtual/os-headers ) v4l? ( virtual/os-headers ) X? ( x11-libs/libXt x11-proto/xf86vidmodeproto x11-proto/xproto ) xv? ( x11-proto/videoproto ) xvmc? ( x11-proto/videoproto ) xinerama? ( x11-proto/xineramaproto ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/mercurial
+dev-libs/libxdg-basedir media-libs/libdvdnav sys-libs/zlib virtual/ffmpeg virtual/libiconv virtual/libintl a52? ( media-libs/a52dec ) aac? ( media-libs/faad2 ) aalib? ( media-libs/aalib ) alsa? ( media-libs/alsa-lib ) bluray? ( >=media-libs/libbluray-0.2.1 ) css? ( >=media-libs/libdvdcss-1.2.10 ) directfb? ( dev-libs/DirectFB ) dts? ( media-libs/libdca ) dxr3? ( media-libs/libfame ) flac? ( media-libs/flac ) fusion? ( media-libs/FusionSound ) gtk? ( x11-libs/gdk-pixbuf:2 ) imagemagick? ( || ( media-gfx/imagemagick media-gfx/graphicsmagick ) ) jack? ( >=media-sound/jack-audio-connection-kit-0.100 ) libcaca? ( media-libs/libcaca ) mad? ( media-libs/libmad ) mng? ( media-libs/libmng ) modplug? ( >=media-libs/libmodplug-0.8.8.1 ) musepack? ( >=media-sound/musepack-tools-444 ) opengl? ( virtual/glu virtual/opengl ) pulseaudio? ( media-sound/pulseaudio ) real? ( amd64? ( media-libs/amd64codecs ) x86? ( media-libs/win32codecs ) x86-fbsd? ( media-libs/win32codecs ) ) samba? ( net-fs/samba ) sdl? ( media-libs/libsdl ) speex? ( media-libs/libogg media-libs/speex ) theora? ( media-libs/libogg media-libs/libtheora ) truetype? ( media-libs/fontconfig media-libs/freetype:2 ) v4l? ( media-libs/libv4l ) vcd? ( >=media-video/vcdimager-0.7.23 dev-libs/libcdio[-minimal] ) vdpau? ( x11-libs/libvdpau ) vorbis? ( media-libs/libogg media-libs/libvorbis ) wavpack? ( media-sound/wavpack ) win32codecs? ( media-libs/win32codecs ) X? ( x11-libs/libX11 x11-libs/libXext ) xcb? ( x11-libs/libxcb ) xinerama? ( x11-libs/libXinerama ) xv? ( x11-libs/libXv ) xvmc? ( x11-libs/libXvMC ) app-arch/xz-utils dev-util/pkgconfig sys-devel/gettext >=sys-devel/libtool-2.2.6b bluray? ( !media-libs/libbluray-xine ) oss? ( virtual/os-headers ) v4l? ( virtual/os-headers ) X? ( x11-libs/libXt x11-proto/xf86vidmodeproto x11-proto/xproto ) xv? ( x11-proto/videoproto ) xvmc? ( x11-proto/videoproto ) xinerama? ( x11-proto/xineramaproto ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/mercurial
 dev-libs/libxdg-basedir media-libs/libdvdnav sys-libs/zlib virtual/ffmpeg virtual/libiconv virtual/libintl a52? ( media-libs/a52dec ) aac? ( media-libs/faad2 ) aalib? ( media-libs/aalib ) alsa? ( media-libs/alsa-lib ) bluray? ( >=media-libs/libbluray-0.2.1 ) css? ( >=media-libs/libdvdcss-1.2.10 ) directfb? ( dev-libs/DirectFB ) dts? ( media-libs/libdca ) dxr3? ( media-libs/libfame ) flac? ( media-libs/flac ) fusion? ( media-libs/FusionSound ) gtk? ( x11-libs/gdk-pixbuf:2 ) imagemagick? ( || ( media-gfx/imagemagick media-gfx/graphicsmagick ) ) jack? ( >=media-sound/jack-audio-connection-kit-0.100 ) libcaca? ( media-libs/libcaca ) mad? ( media-libs/libmad ) mng? ( media-libs/libmng ) modplug? ( >=media-libs/libmodplug-0.8.8.1 ) musepack? ( >=media-sound/musepack-tools-444 ) opengl? ( virtual/glu virtual/opengl ) pulseaudio? ( media-sound/pulseaudio ) real? ( amd64? ( media-libs/amd64codecs ) x86? ( media-libs/win32codecs ) x86-fbsd? ( media-libs/win32codecs ) ) samba? ( net-fs/samba ) sdl? ( media-libs/libsdl ) speex? ( media-libs/libogg media-libs/speex ) theora? ( media-libs/libogg media-libs/libtheora ) truetype? ( media-libs/fontconfig media-libs/freetype:2 ) v4l? ( media-libs/libv4l ) vcd? ( >=media-video/vcdimager-0.7.23 dev-libs/libcdio[-minimal] ) vdpau? ( x11-libs/libvdpau ) vorbis? ( media-libs/libogg media-libs/libvorbis ) wavpack? ( media-sound/wavpack ) win32codecs? ( media-libs/win32codecs ) X? ( x11-libs/libX11 x11-libs/libXext ) xcb? ( x11-libs/libxcb ) xinerama? ( x11-libs/libXinerama ) xv? ( x11-libs/libXv ) xvmc? ( x11-libs/libXvMC )
 1
 
diff --git a/metadata/cache/media-plugins/alsa-plugins-1.0.24 b/metadata/cache/media-plugins/alsa-plugins-1.0.24
index d9514c733319..9b79abaf40d2 100644
--- a/metadata/cache/media-plugins/alsa-plugins-1.0.24
+++ b/metadata/cache/media-plugins/alsa-plugins-1.0.24
@@ -1,4 +1,4 @@
->=media-libs/alsa-lib-1.0.24[alsa_pcm_plugins_ioplug(+)] ffmpeg? ( virtual/ffmpeg media-libs/alsa-lib[alsa_pcm_plugins_rate(+),alsa_pcm_plugins_plug(+)] ) jack? ( >=media-sound/jack-audio-connection-kit-0.98 ) libsamplerate? ( media-libs/libsamplerate media-libs/alsa-lib[alsa_pcm_plugins_rate(+),alsa_pcm_plugins_plug(+)] ) pulseaudio? ( media-sound/pulseaudio ) speex? ( media-libs/speex media-libs/alsa-lib[alsa_pcm_plugins_rate(+),alsa_pcm_plugins_plug(+)] ) !media-plugins/alsa-jack dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=media-libs/alsa-lib-1.0.24[alsa_pcm_plugins_ioplug(+)] ffmpeg? ( virtual/ffmpeg media-libs/alsa-lib[alsa_pcm_plugins_rate(+),alsa_pcm_plugins_plug(+)] ) jack? ( >=media-sound/jack-audio-connection-kit-0.98 ) libsamplerate? ( media-libs/libsamplerate media-libs/alsa-lib[alsa_pcm_plugins_rate(+),alsa_pcm_plugins_plug(+)] ) pulseaudio? ( media-sound/pulseaudio ) speex? ( media-libs/speex media-libs/alsa-lib[alsa_pcm_plugins_rate(+),alsa_pcm_plugins_plug(+)] ) !media-plugins/alsa-jack dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=media-libs/alsa-lib-1.0.24[alsa_pcm_plugins_ioplug(+)] ffmpeg? ( virtual/ffmpeg media-libs/alsa-lib[alsa_pcm_plugins_rate(+),alsa_pcm_plugins_plug(+)] ) jack? ( >=media-sound/jack-audio-connection-kit-0.98 ) libsamplerate? ( media-libs/libsamplerate media-libs/alsa-lib[alsa_pcm_plugins_rate(+),alsa_pcm_plugins_plug(+)] ) pulseaudio? ( media-sound/pulseaudio ) speex? ( media-libs/speex media-libs/alsa-lib[alsa_pcm_plugins_rate(+),alsa_pcm_plugins_plug(+)] ) !media-plugins/alsa-jack
 0
 mirror://alsaproject/plugins/alsa-plugins-1.0.24.tar.bz2
diff --git a/metadata/cache/media-plugins/alsa-plugins-1.0.25 b/metadata/cache/media-plugins/alsa-plugins-1.0.25
index c0d7e97832de..cf77b567e7b5 100644
--- a/metadata/cache/media-plugins/alsa-plugins-1.0.25
+++ b/metadata/cache/media-plugins/alsa-plugins-1.0.25
@@ -1,4 +1,4 @@
->=media-libs/alsa-lib-1.0.25 ffmpeg? ( virtual/ffmpeg media-libs/alsa-lib ) jack? ( >=media-sound/jack-audio-connection-kit-0.98 ) libsamplerate? ( media-libs/libsamplerate media-libs/alsa-lib ) pulseaudio? ( media-sound/pulseaudio ) speex? ( media-libs/speex media-libs/alsa-lib ) !media-plugins/alsa-jack dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=media-libs/alsa-lib-1.0.25 ffmpeg? ( virtual/ffmpeg media-libs/alsa-lib ) jack? ( >=media-sound/jack-audio-connection-kit-0.98 ) libsamplerate? ( media-libs/libsamplerate media-libs/alsa-lib ) pulseaudio? ( media-sound/pulseaudio ) speex? ( media-libs/speex media-libs/alsa-lib ) !media-plugins/alsa-jack dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=media-libs/alsa-lib-1.0.25 ffmpeg? ( virtual/ffmpeg media-libs/alsa-lib ) jack? ( >=media-sound/jack-audio-connection-kit-0.98 ) libsamplerate? ( media-libs/libsamplerate media-libs/alsa-lib ) pulseaudio? ( media-sound/pulseaudio ) speex? ( media-libs/speex media-libs/alsa-lib ) !media-plugins/alsa-jack
 0
 mirror://alsaproject/plugins/alsa-plugins-1.0.25.tar.bz2
diff --git a/metadata/cache/media-plugins/alsa-plugins-1.0.25-r1 b/metadata/cache/media-plugins/alsa-plugins-1.0.25-r1
index b829e5cd10a3..6f9bbd077545 100644
--- a/metadata/cache/media-plugins/alsa-plugins-1.0.25-r1
+++ b/metadata/cache/media-plugins/alsa-plugins-1.0.25-r1
@@ -1,4 +1,4 @@
->=media-libs/alsa-lib-1.0.25 ffmpeg? ( virtual/ffmpeg media-libs/alsa-lib ) jack? ( >=media-sound/jack-audio-connection-kit-0.98 ) libsamplerate? ( media-libs/libsamplerate media-libs/alsa-lib ) pulseaudio? ( media-sound/pulseaudio ) speex? ( media-libs/speex media-libs/alsa-lib ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=media-libs/alsa-lib-1.0.25 ffmpeg? ( virtual/ffmpeg media-libs/alsa-lib ) jack? ( >=media-sound/jack-audio-connection-kit-0.98 ) libsamplerate? ( media-libs/libsamplerate media-libs/alsa-lib ) pulseaudio? ( media-sound/pulseaudio ) speex? ( media-libs/speex media-libs/alsa-lib ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=media-libs/alsa-lib-1.0.25 ffmpeg? ( virtual/ffmpeg media-libs/alsa-lib ) jack? ( >=media-sound/jack-audio-connection-kit-0.98 ) libsamplerate? ( media-libs/libsamplerate media-libs/alsa-lib ) pulseaudio? ( media-sound/pulseaudio ) speex? ( media-libs/speex media-libs/alsa-lib )
 0
 mirror://alsaproject/plugins/alsa-plugins-1.0.25.tar.bz2
diff --git a/metadata/cache/media-plugins/frei0r-plugins-1.1.22-r1 b/metadata/cache/media-plugins/frei0r-plugins-1.1.22-r1
index 02d01f81a6ca..351d05dbe46a 100644
--- a/metadata/cache/media-plugins/frei0r-plugins-1.1.22-r1
+++ b/metadata/cache/media-plugins/frei0r-plugins-1.1.22-r1
@@ -1,4 +1,4 @@
-facedetect? ( media-libs/opencv ) scale0tilt? ( media-libs/gavl ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+facedetect? ( media-libs/opencv ) scale0tilt? ( media-libs/gavl ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 facedetect? ( media-libs/opencv ) scale0tilt? ( media-libs/gavl )
 0
 http://propirate.net/frei0r/frei0r-plugins-1.1.22.tar.gz
diff --git a/metadata/cache/media-plugins/gimp-lqr-0.7.1 b/metadata/cache/media-plugins/gimp-lqr-0.7.1
index 37023cfaae41..229dcde1b158 100644
--- a/metadata/cache/media-plugins/gimp-lqr-0.7.1
+++ b/metadata/cache/media-plugins/gimp-lqr-0.7.1
@@ -1,4 +1,4 @@
-media-gfx/gimp media-libs/liblqr || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+media-gfx/gimp media-libs/liblqr || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 media-gfx/gimp media-libs/liblqr
 0
 http://liquidrescale.wikidot.com/local--files/en:download-page-sources/gimp-lqr-plugin-0.7.1.tar.bz2
diff --git a/metadata/cache/media-plugins/gmpc-awn-0.20.0 b/metadata/cache/media-plugins/gmpc-awn-0.20.0
index 6ce254c2d456..b967df13eeba 100644
--- a/metadata/cache/media-plugins/gmpc-awn-0.20.0
+++ b/metadata/cache/media-plugins/gmpc-awn-0.20.0
@@ -1,4 +1,4 @@
->=media-sound/gmpc-0.20.0 dev-util/pkgconfig nls? ( dev-util/intltool sys-devel/gettext ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=media-sound/gmpc-0.20.0 dev-util/pkgconfig nls? ( dev-util/intltool sys-devel/gettext ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=media-sound/gmpc-0.20.0
 0
 http://download.sarine.nl/Programs/gmpc/0.20.0/gmpc-awn-0.20.0.tar.gz
diff --git a/metadata/cache/media-plugins/gmpc-awn-11.8.16 b/metadata/cache/media-plugins/gmpc-awn-11.8.16
index 3687c240bf97..b57efbdeb7cf 100644
--- a/metadata/cache/media-plugins/gmpc-awn-11.8.16
+++ b/metadata/cache/media-plugins/gmpc-awn-11.8.16
@@ -1,4 +1,4 @@
->=media-sound/gmpc-11.8.16 dev-util/pkgconfig nls? ( dev-util/intltool sys-devel/gettext ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=media-sound/gmpc-11.8.16 dev-util/pkgconfig nls? ( dev-util/intltool sys-devel/gettext ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=media-sound/gmpc-11.8.16
 0
 http://download.sarine.nl/Programs/gmpc/11.8/gmpc-awn-11.8.16.tar.gz
diff --git a/metadata/cache/media-plugins/grilo-plugins-0.1.17-r2 b/metadata/cache/media-plugins/grilo-plugins-0.1.17-r2
index 25eb436f9fac..85e78bb09971 100644
--- a/metadata/cache/media-plugins/grilo-plugins-0.1.17-r2
+++ b/metadata/cache/media-plugins/grilo-plugins-0.1.17-r2
@@ -1,4 +1,4 @@
->=dev-libs/glib-2.26:2 =media-libs/grilo-0.1.17[network] dev-libs/gmime:2.6 dev-libs/libxml2:2 dev-db/sqlite:3 tracker? ( >=app-misc/tracker-0.10.5 ) youtube? ( >=dev-libs/libgdata-0.7 >=media-libs/libquvi-0.2.15 ) upnp? ( >=net-libs/gupnp-0.13 >=net-libs/gupnp-av-0.5 ) vimeo? ( net-libs/libsoup:2.4 dev-libs/libgcrypt ) >=dev-util/pkgconfig-0.9 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
+>=dev-libs/glib-2.26:2 =media-libs/grilo-0.1.17[network] dev-libs/gmime:2.6 dev-libs/libxml2:2 dev-db/sqlite:3 tracker? ( >=app-misc/tracker-0.10.5 ) youtube? ( >=dev-libs/libgdata-0.7 >=media-libs/libquvi-0.2.15 ) upnp? ( >=net-libs/gupnp-0.13 >=net-libs/gupnp-av-0.5 ) vimeo? ( net-libs/libsoup:2.4 dev-libs/libgcrypt ) >=dev-util/pkgconfig-0.9 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
 >=dev-libs/glib-2.26:2 =media-libs/grilo-0.1.17[network] dev-libs/gmime:2.6 dev-libs/libxml2:2 dev-db/sqlite:3 tracker? ( >=app-misc/tracker-0.10.5 ) youtube? ( >=dev-libs/libgdata-0.7 >=media-libs/libquvi-0.2.15 ) upnp? ( >=net-libs/gupnp-0.13 >=net-libs/gupnp-av-0.5 ) vimeo? ( net-libs/libsoup:2.4 dev-libs/libgcrypt )
 0
 mirror://gnome/sources/grilo-plugins/0.1/grilo-plugins-0.1.17.tar.xz
diff --git a/metadata/cache/media-plugins/grilo-plugins-0.1.18 b/metadata/cache/media-plugins/grilo-plugins-0.1.18
index 7c6a25f39963..0c5bafbdfae4 100644
--- a/metadata/cache/media-plugins/grilo-plugins-0.1.18
+++ b/metadata/cache/media-plugins/grilo-plugins-0.1.18
@@ -1,4 +1,4 @@
->=dev-libs/glib-2.26:2 =media-libs/grilo-0.1.18[network] dev-libs/gmime:2.6 dev-libs/libxml2:2 dev-db/sqlite:3 tracker? ( >=app-misc/tracker-0.10.5 ) youtube? ( >=dev-libs/libgdata-0.7 >=media-libs/libquvi-0.2.15 ) upnp? ( >=net-libs/gupnp-0.13 >=net-libs/gupnp-av-0.5 ) vimeo? ( net-libs/libsoup:2.4 dev-libs/libgcrypt ) >=dev-util/pkgconfig-0.9 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
+>=dev-libs/glib-2.26:2 =media-libs/grilo-0.1.18[network] dev-libs/gmime:2.6 dev-libs/libxml2:2 dev-db/sqlite:3 tracker? ( >=app-misc/tracker-0.10.5 ) youtube? ( >=dev-libs/libgdata-0.7 >=media-libs/libquvi-0.2.15 ) upnp? ( >=net-libs/gupnp-0.13 >=net-libs/gupnp-av-0.5 ) vimeo? ( net-libs/libsoup:2.4 dev-libs/libgcrypt ) >=dev-util/pkgconfig-0.9 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
 >=dev-libs/glib-2.26:2 =media-libs/grilo-0.1.18[network] dev-libs/gmime:2.6 dev-libs/libxml2:2 dev-db/sqlite:3 tracker? ( >=app-misc/tracker-0.10.5 ) youtube? ( >=dev-libs/libgdata-0.7 >=media-libs/libquvi-0.2.15 ) upnp? ( >=net-libs/gupnp-0.13 >=net-libs/gupnp-av-0.5 ) vimeo? ( net-libs/libsoup:2.4 dev-libs/libgcrypt )
 0
 mirror://gnome/sources/grilo-plugins/0.1/grilo-plugins-0.1.18.tar.xz
diff --git a/metadata/cache/media-plugins/libvisual-plugins-0.4.0-r2 b/metadata/cache/media-plugins/libvisual-plugins-0.4.0-r2
index 41dfd5541a5f..000c72fe3bb9 100644
--- a/metadata/cache/media-plugins/libvisual-plugins-0.4.0-r2
+++ b/metadata/cache/media-plugins/libvisual-plugins-0.4.0-r2
@@ -1,4 +1,4 @@
-~media-libs/libvisual-0.4.0 opengl? ( virtual/opengl ) jack? ( >=media-sound/jack-audio-connection-kit-0.98 ) gtk? ( x11-libs/gtk+:2 ) alsa? ( media-libs/alsa-lib ) media-libs/fontconfig x11-libs/libX11 x11-libs/libXext x11-libs/libXrender x11-libs/libXt >=dev-util/pkgconfig-0.14 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+~media-libs/libvisual-0.4.0 opengl? ( virtual/opengl ) jack? ( >=media-sound/jack-audio-connection-kit-0.98 ) gtk? ( x11-libs/gtk+:2 ) alsa? ( media-libs/alsa-lib ) media-libs/fontconfig x11-libs/libX11 x11-libs/libXext x11-libs/libXrender x11-libs/libXt >=dev-util/pkgconfig-0.14 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 ~media-libs/libvisual-0.4.0 opengl? ( virtual/opengl ) jack? ( >=media-sound/jack-audio-connection-kit-0.98 ) gtk? ( x11-libs/gtk+:2 ) alsa? ( media-libs/alsa-lib ) media-libs/fontconfig x11-libs/libX11 x11-libs/libXext x11-libs/libXrender
 0.4
 mirror://sourceforge/libvisual/libvisual-plugins-0.4.0.tar.gz mirror://gentoo/libvisual-plugins-0.4.0-patches-4.tar.bz2 mirror://gentoo/libvisual-plugins-0.4.0-m4-1.tar.bz2
diff --git a/metadata/cache/media-plugins/live-2012.01.07 b/metadata/cache/media-plugins/live-2012.01.07
index a235ffd26306..a73a96c0fbe7 100644
--- a/metadata/cache/media-plugins/live-2012.01.07
+++ b/metadata/cache/media-plugins/live-2012.01.07
@@ -6,7 +6,7 @@ http://www.live555.com/liveMedia/public/live.2012.01.07.tar.gz
 http://www.live555.com/
 LGPL-2.1
 Source-code libraries for standards-based RTP/RTCP/RTSP multimedia streaming, suitable for embedded and/or low-cost streaming applications
-~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 eutils flag-o-matic multilib toolchain-funcs user
 
 
diff --git a/metadata/cache/media-plugins/live-2012.02.29 b/metadata/cache/media-plugins/live-2012.02.29
deleted file mode 100644
index 78c62278b2f4..000000000000
--- a/metadata/cache/media-plugins/live-2012.02.29
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-0
-http://www.live555.com/liveMedia/public/live.2012.02.29.tar.gz
-
-http://www.live555.com/
-LGPL-2.1
-Source-code libraries for standards-based RTP/RTCP/RTSP multimedia streaming, suitable for embedded and/or low-cost streaming applications
-~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
-eutils flag-o-matic multilib toolchain-funcs user
-
-
-
-
-3
-
-compile configure install postinst prepare
-
-
-
-
-
diff --git a/metadata/cache/media-plugins/npapi-vlc-2.0.0 b/metadata/cache/media-plugins/npapi-vlc-2.0.0
index a516272a4299..fdd564613e8c 100644
--- a/metadata/cache/media-plugins/npapi-vlc-2.0.0
+++ b/metadata/cache/media-plugins/npapi-vlc-2.0.0
@@ -1,4 +1,4 @@
->=media-video/vlc-1.1 x11-libs/libX11 !gtk? ( x11-libs/libXpm x11-libs/libSM x11-libs/libICE ) gtk? ( x11-libs/gtk+:2 ) !<media-video/vlc-1.2[nsplugin] app-arch/xz-utils dev-util/pkgconfig >=net-misc/npapi-sdk-0.27 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=media-video/vlc-1.1 x11-libs/libX11 !gtk? ( x11-libs/libXpm x11-libs/libSM x11-libs/libICE ) gtk? ( x11-libs/gtk+:2 ) !<media-video/vlc-1.2[nsplugin] app-arch/xz-utils dev-util/pkgconfig >=net-misc/npapi-sdk-0.27 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=media-video/vlc-1.1 x11-libs/libX11 !gtk? ( x11-libs/libXpm x11-libs/libSM x11-libs/libICE ) gtk? ( x11-libs/gtk+:2 ) !<media-video/vlc-1.2[nsplugin]
 0
 http://download.videolan.org/pub/videolan/vlc/2.0.0/npapi-vlc-2.0.0.tar.xz
diff --git a/metadata/cache/media-plugins/npapi-vlc-9999 b/metadata/cache/media-plugins/npapi-vlc-9999
index 9f22e747f09d..0c741172d30d 100644
--- a/metadata/cache/media-plugins/npapi-vlc-9999
+++ b/metadata/cache/media-plugins/npapi-vlc-9999
@@ -1,4 +1,4 @@
->=media-video/vlc-1.1 x11-libs/libX11 !gtk? ( x11-libs/libXpm x11-libs/libSM x11-libs/libICE ) gtk? ( x11-libs/gtk+:2 ) !<media-video/vlc-1.2[nsplugin] dev-util/pkgconfig >=net-misc/npapi-sdk-0.27 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
+>=media-video/vlc-1.1 x11-libs/libX11 !gtk? ( x11-libs/libXpm x11-libs/libSM x11-libs/libICE ) gtk? ( x11-libs/gtk+:2 ) !<media-video/vlc-1.2[nsplugin] dev-util/pkgconfig >=net-misc/npapi-sdk-0.27 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
 >=media-video/vlc-1.1 x11-libs/libX11 !gtk? ( x11-libs/libXpm x11-libs/libSM x11-libs/libICE ) gtk? ( x11-libs/gtk+:2 ) !<media-video/vlc-1.2[nsplugin]
 0
 
diff --git a/metadata/cache/media-plugins/xbmc-addon-xvdr-9999 b/metadata/cache/media-plugins/xbmc-addon-xvdr-9999
index 49dcfc3030d2..1365de83dbf8 100644
--- a/metadata/cache/media-plugins/xbmc-addon-xvdr-9999
+++ b/metadata/cache/media-plugins/xbmc-addon-xvdr-9999
@@ -1,4 +1,4 @@
-dev-vcs/git || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-vcs/git || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 
diff --git a/metadata/cache/media-radio/ax25-tools-0.0.10_rc2 b/metadata/cache/media-radio/ax25-tools-0.0.10_rc2
index 645b38e6f7d9..c3ddc1ac58dc 100644
--- a/metadata/cache/media-radio/ax25-tools-0.0.10_rc2
+++ b/metadata/cache/media-radio/ax25-tools-0.0.10_rc2
@@ -1,4 +1,4 @@
-dev-libs/libax25 X? ( x11-libs/libX11 media-libs/mesa ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-libs/libax25 X? ( x11-libs/libX11 media-libs/mesa ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-libs/libax25 X? ( x11-libs/libX11 media-libs/mesa )
 0
 http://www.linux-ax25.org/pub/ax25-tools/ax25-tools-0.0.10-rc2.tar.gz
diff --git a/metadata/cache/media-radio/ax25-tools-0.0.10_rc2-r1 b/metadata/cache/media-radio/ax25-tools-0.0.10_rc2-r1
index 645b38e6f7d9..c3ddc1ac58dc 100644
--- a/metadata/cache/media-radio/ax25-tools-0.0.10_rc2-r1
+++ b/metadata/cache/media-radio/ax25-tools-0.0.10_rc2-r1
@@ -1,4 +1,4 @@
-dev-libs/libax25 X? ( x11-libs/libX11 media-libs/mesa ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-libs/libax25 X? ( x11-libs/libX11 media-libs/mesa ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-libs/libax25 X? ( x11-libs/libX11 media-libs/mesa )
 0
 http://www.linux-ax25.org/pub/ax25-tools/ax25-tools-0.0.10-rc2.tar.gz
diff --git a/metadata/cache/media-radio/gpredict-1.1 b/metadata/cache/media-radio/gpredict-1.1
index 8e0dd23b3aa7..314cfdaf62a0 100644
--- a/metadata/cache/media-radio/gpredict-1.1
+++ b/metadata/cache/media-radio/gpredict-1.1
@@ -1,4 +1,4 @@
->=dev-libs/glib-2.16.0:2 >=x11-libs/gtk+-2.12:2 >=x11-libs/goocanvas-0.9:0 net-misc/curl dev-util/pkgconfig sys-devel/gettext || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-libs/glib-2.16.0:2 >=x11-libs/gtk+-2.12:2 >=x11-libs/goocanvas-0.9:0 net-misc/curl dev-util/pkgconfig sys-devel/gettext || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=dev-libs/glib-2.16.0:2 >=x11-libs/gtk+-2.12:2 >=x11-libs/goocanvas-0.9:0 net-misc/curl
 0
 mirror://sourceforge/gpredict/gpredict-1.1.tar.gz
diff --git a/metadata/cache/media-radio/gpredict-1.2 b/metadata/cache/media-radio/gpredict-1.2
index bde6386fa40e..6e3682da3ee3 100644
--- a/metadata/cache/media-radio/gpredict-1.2
+++ b/metadata/cache/media-radio/gpredict-1.2
@@ -1,4 +1,4 @@
->=dev-libs/glib-2.22.0:2 >=x11-libs/gtk+-2.18.0:2 >=x11-libs/goocanvas-0.14:0 net-misc/curl dev-util/pkgconfig sys-devel/gettext || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-libs/glib-2.22.0:2 >=x11-libs/gtk+-2.18.0:2 >=x11-libs/goocanvas-0.14:0 net-misc/curl dev-util/pkgconfig sys-devel/gettext || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=dev-libs/glib-2.22.0:2 >=x11-libs/gtk+-2.18.0:2 >=x11-libs/goocanvas-0.14:0 net-misc/curl
 0
 mirror://sourceforge/gpredict/gpredict-1.2.tar.gz
diff --git a/metadata/cache/media-radio/gpredict-1.3 b/metadata/cache/media-radio/gpredict-1.3
index edbe70d121db..0ff727ece966 100644
--- a/metadata/cache/media-radio/gpredict-1.3
+++ b/metadata/cache/media-radio/gpredict-1.3
@@ -1,4 +1,4 @@
->=dev-libs/glib-2.22.0:2 >=x11-libs/gtk+-2.18.0:2 >=x11-libs/goocanvas-0.14:0 net-misc/curl dev-util/pkgconfig sys-devel/gettext || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-libs/glib-2.22.0:2 >=x11-libs/gtk+-2.18.0:2 >=x11-libs/goocanvas-0.14:0 net-misc/curl dev-util/pkgconfig sys-devel/gettext || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=dev-libs/glib-2.22.0:2 >=x11-libs/gtk+-2.18.0:2 >=x11-libs/goocanvas-0.14:0 net-misc/curl
 0
 mirror://sourceforge/gpredict/gpredict-1.3.tar.gz
diff --git a/metadata/cache/media-radio/tucnak2-2.43 b/metadata/cache/media-radio/tucnak2-2.43
index 03431f97925a..8936e7023f37 100644
--- a/metadata/cache/media-radio/tucnak2-2.43
+++ b/metadata/cache/media-radio/tucnak2-2.43
@@ -1,4 +1,4 @@
->=dev-libs/glib-2 media-libs/libsndfile >=media-libs/libsdl-1.2 alsa? ( media-libs/alsa-lib ) fftw? ( sci-libs/fftw:3.0 ) ftdi? ( dev-embedded/libftdi ) gpm? ( sys-libs/gpm ) hamlib? ( media-libs/hamlib ) >=media-libs/libpng-1.2 dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-libs/glib-2 media-libs/libsndfile >=media-libs/libsdl-1.2 alsa? ( media-libs/alsa-lib ) fftw? ( sci-libs/fftw:3.0 ) ftdi? ( dev-embedded/libftdi ) gpm? ( sys-libs/gpm ) hamlib? ( media-libs/hamlib ) >=media-libs/libpng-1.2 dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=dev-libs/glib-2 media-libs/libsndfile >=media-libs/libsdl-1.2 alsa? ( media-libs/alsa-lib ) fftw? ( sci-libs/fftw:3.0 ) ftdi? ( dev-embedded/libftdi ) gpm? ( sys-libs/gpm ) hamlib? ( media-libs/hamlib ) >=media-libs/libpng-1.2
 0
 http://tucnak.nagano.cz/tucnak2-2.43.tar.gz
diff --git a/metadata/cache/media-radio/tucnak2-2.44 b/metadata/cache/media-radio/tucnak2-2.44
index ab4f4a018ea4..ec4f1d768fd8 100644
--- a/metadata/cache/media-radio/tucnak2-2.44
+++ b/metadata/cache/media-radio/tucnak2-2.44
@@ -1,4 +1,4 @@
->=dev-libs/glib-2 media-libs/libsndfile >=media-libs/libsdl-1.2 alsa? ( media-libs/alsa-lib ) fftw? ( sci-libs/fftw:3.0 ) ftdi? ( dev-embedded/libftdi ) gpm? ( sys-libs/gpm ) hamlib? ( media-libs/hamlib ) >=media-libs/libpng-1.2 dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-libs/glib-2 media-libs/libsndfile >=media-libs/libsdl-1.2 alsa? ( media-libs/alsa-lib ) fftw? ( sci-libs/fftw:3.0 ) ftdi? ( dev-embedded/libftdi ) gpm? ( sys-libs/gpm ) hamlib? ( media-libs/hamlib ) >=media-libs/libpng-1.2 dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=dev-libs/glib-2 media-libs/libsndfile >=media-libs/libsdl-1.2 alsa? ( media-libs/alsa-lib ) fftw? ( sci-libs/fftw:3.0 ) ftdi? ( dev-embedded/libftdi ) gpm? ( sys-libs/gpm ) hamlib? ( media-libs/hamlib ) >=media-libs/libpng-1.2
 0
 http://tucnak.nagano.cz/tucnak2-2.44.tar.gz
diff --git a/metadata/cache/media-radio/tucnak2-2.45 b/metadata/cache/media-radio/tucnak2-2.45
index 7f9686f6f189..1b8b6edf835f 100644
--- a/metadata/cache/media-radio/tucnak2-2.45
+++ b/metadata/cache/media-radio/tucnak2-2.45
@@ -1,4 +1,4 @@
->=dev-libs/glib-2 media-libs/libsndfile >=media-libs/libsdl-1.2 alsa? ( media-libs/alsa-lib ) fftw? ( sci-libs/fftw:3.0 ) ftdi? ( dev-embedded/libftdi ) gpm? ( sys-libs/gpm ) hamlib? ( media-libs/hamlib ) >=media-libs/libpng-1.2 dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-libs/glib-2 media-libs/libsndfile >=media-libs/libsdl-1.2 alsa? ( media-libs/alsa-lib ) fftw? ( sci-libs/fftw:3.0 ) ftdi? ( dev-embedded/libftdi ) gpm? ( sys-libs/gpm ) hamlib? ( media-libs/hamlib ) >=media-libs/libpng-1.2 dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=dev-libs/glib-2 media-libs/libsndfile >=media-libs/libsdl-1.2 alsa? ( media-libs/alsa-lib ) fftw? ( sci-libs/fftw:3.0 ) ftdi? ( dev-embedded/libftdi ) gpm? ( sys-libs/gpm ) hamlib? ( media-libs/hamlib ) >=media-libs/libpng-1.2
 0
 http://tucnak.nagano.cz/tucnak2-2.45.tar.gz
diff --git a/metadata/cache/media-radio/tucnak2-2.46 b/metadata/cache/media-radio/tucnak2-2.46
index 81b850e6b48a..9ee532be29bc 100644
--- a/metadata/cache/media-radio/tucnak2-2.46
+++ b/metadata/cache/media-radio/tucnak2-2.46
@@ -1,4 +1,4 @@
->=dev-libs/glib-2 media-libs/libsndfile >=media-libs/libsdl-1.2 alsa? ( media-libs/alsa-lib ) fftw? ( sci-libs/fftw:3.0 ) ftdi? ( dev-embedded/libftdi ) gpm? ( sys-libs/gpm ) hamlib? ( media-libs/hamlib ) >=media-libs/libpng-1.2 dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-libs/glib-2 media-libs/libsndfile >=media-libs/libsdl-1.2 alsa? ( media-libs/alsa-lib ) fftw? ( sci-libs/fftw:3.0 ) ftdi? ( dev-embedded/libftdi ) gpm? ( sys-libs/gpm ) hamlib? ( media-libs/hamlib ) >=media-libs/libpng-1.2 dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=dev-libs/glib-2 media-libs/libsndfile >=media-libs/libsdl-1.2 alsa? ( media-libs/alsa-lib ) fftw? ( sci-libs/fftw:3.0 ) ftdi? ( dev-embedded/libftdi ) gpm? ( sys-libs/gpm ) hamlib? ( media-libs/hamlib ) >=media-libs/libpng-1.2
 0
 http://tucnak.nagano.cz/tucnak2-2.46.tar.gz
diff --git a/metadata/cache/media-radio/unixcw-2.3-r6 b/metadata/cache/media-radio/unixcw-2.3-r6
index 512d4e9a9e48..3f8cf1c3fab4 100644
--- a/metadata/cache/media-radio/unixcw-2.3-r6
+++ b/metadata/cache/media-radio/unixcw-2.3-r6
@@ -1,4 +1,4 @@
-ncurses? ( sys-libs/ncurses ) qt4? ( x11-libs/qt-gui:4[qt3support] ) dev-util/pkgconfig !<=app-misc/cw-1.0.16-r1 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+ncurses? ( sys-libs/ncurses ) qt4? ( x11-libs/qt-gui:4[qt3support] ) dev-util/pkgconfig !<=app-misc/cw-1.0.16-r1 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 ncurses? ( sys-libs/ncurses ) qt4? ( x11-libs/qt-gui:4[qt3support] )
 0
 ftp://metalab.unc.edu/pub/Linux/apps/ham/morse/unixcw-2.3.tgz qt4? ( mirror://gentoo/unixcw-2.3-qt3to4.patch.gz )
diff --git a/metadata/cache/media-radio/wspr-2.00 b/metadata/cache/media-radio/wspr-2.00
index f90bd3a93254..d378de1f7854 100644
--- a/metadata/cache/media-radio/wspr-2.00
+++ b/metadata/cache/media-radio/wspr-2.00
@@ -1,4 +1,4 @@
-dev-python/imaging[tk] dev-python/numpy dev-python/pmw sci-libs/fftw:3.0 media-libs/hamlib media-libs/portaudio media-libs/libsamplerate virtual/fortran || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool =dev-lang/python-2* =dev-lang/python-2*[tk]
+dev-python/imaging[tk] dev-python/numpy dev-python/pmw sci-libs/fftw:3.0 media-libs/hamlib media-libs/portaudio media-libs/libsamplerate virtual/fortran || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool =dev-lang/python-2* =dev-lang/python-2*[tk]
 dev-python/imaging[tk] dev-python/numpy dev-python/pmw sci-libs/fftw:3.0 media-libs/hamlib media-libs/portaudio media-libs/libsamplerate virtual/fortran =dev-lang/python-2* =dev-lang/python-2*[tk]
 0
 http://www.physics.princeton.edu/pulsar/K1JT/wspr-2.00.r1714.tgz
diff --git a/metadata/cache/media-radio/xastir-1.9.8 b/metadata/cache/media-radio/xastir-1.9.8
index a621f912d21e..4fae338db070 100644
--- a/metadata/cache/media-radio/xastir-1.9.8
+++ b/metadata/cache/media-radio/xastir-1.9.8
@@ -1,4 +1,4 @@
->=x11-libs/openmotif-2.3:0 x11-libs/libXpm x11-apps/xfontsel dev-libs/libpcre net-misc/curl sys-libs/db sci-libs/shapelib geotiff? ( sci-libs/proj sci-libs/libgeotiff media-libs/tiff ) gdal? ( sci-libs/gdal ) imagemagick? ( media-gfx/imagemagick ) festival? ( app-accessibility/festival ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=x11-libs/openmotif-2.3:0 x11-libs/libXpm x11-apps/xfontsel dev-libs/libpcre net-misc/curl sys-libs/db sci-libs/shapelib geotiff? ( sci-libs/proj sci-libs/libgeotiff media-libs/tiff ) gdal? ( sci-libs/gdal ) imagemagick? ( media-gfx/imagemagick ) festival? ( app-accessibility/festival ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=x11-libs/openmotif-2.3:0 x11-libs/libXpm x11-apps/xfontsel dev-libs/libpcre net-misc/curl sys-libs/db sci-libs/shapelib geotiff? ( sci-libs/proj sci-libs/libgeotiff media-libs/tiff ) gdal? ( sci-libs/gdal ) imagemagick? ( media-gfx/imagemagick ) festival? ( app-accessibility/festival )
 0
 mirror://sourceforge/xastir/xastir-1.9.8.tar.gz
diff --git a/metadata/cache/media-radio/xastir-1.9.8-r1 b/metadata/cache/media-radio/xastir-1.9.8-r1
index f64fd2cf6b35..aba23afd50f3 100644
--- a/metadata/cache/media-radio/xastir-1.9.8-r1
+++ b/metadata/cache/media-radio/xastir-1.9.8-r1
@@ -1,4 +1,4 @@
->=x11-libs/openmotif-2.3:0 x11-libs/libXpm x11-apps/xfontsel dev-libs/libpcre net-misc/curl sys-libs/db sci-libs/shapelib geotiff? ( sci-libs/proj sci-libs/libgeotiff media-libs/tiff ) gdal? ( sci-libs/gdal ) imagemagick? ( media-gfx/imagemagick ) festival? ( app-accessibility/festival ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=x11-libs/openmotif-2.3:0 x11-libs/libXpm x11-apps/xfontsel dev-libs/libpcre net-misc/curl sys-libs/db sci-libs/shapelib geotiff? ( sci-libs/proj sci-libs/libgeotiff media-libs/tiff ) gdal? ( sci-libs/gdal ) imagemagick? ( media-gfx/imagemagick ) festival? ( app-accessibility/festival ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=x11-libs/openmotif-2.3:0 x11-libs/libXpm x11-apps/xfontsel dev-libs/libpcre net-misc/curl sys-libs/db sci-libs/shapelib geotiff? ( sci-libs/proj sci-libs/libgeotiff media-libs/tiff ) gdal? ( sci-libs/gdal ) imagemagick? ( media-gfx/imagemagick ) festival? ( app-accessibility/festival )
 0
 mirror://sourceforge/xastir/xastir-1.9.8.tar.gz
diff --git a/metadata/cache/media-radio/xastir-2.0.0 b/metadata/cache/media-radio/xastir-2.0.0
index 75e156b7d911..db50aa67696b 100644
--- a/metadata/cache/media-radio/xastir-2.0.0
+++ b/metadata/cache/media-radio/xastir-2.0.0
@@ -1,4 +1,4 @@
->=x11-libs/openmotif-2.3:0 x11-libs/libXpm x11-apps/xfontsel dev-libs/libpcre net-misc/curl sys-libs/db sci-libs/shapelib media-gfx/imagemagick geotiff? ( sci-libs/proj sci-libs/libgeotiff media-libs/tiff ) gdal? ( sci-libs/gdal ) festival? ( app-accessibility/festival ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=x11-libs/openmotif-2.3:0 x11-libs/libXpm x11-apps/xfontsel dev-libs/libpcre net-misc/curl sys-libs/db sci-libs/shapelib media-gfx/imagemagick geotiff? ( sci-libs/proj sci-libs/libgeotiff media-libs/tiff ) gdal? ( sci-libs/gdal ) festival? ( app-accessibility/festival ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=x11-libs/openmotif-2.3:0 x11-libs/libXpm x11-apps/xfontsel dev-libs/libpcre net-misc/curl sys-libs/db sci-libs/shapelib media-gfx/imagemagick geotiff? ( sci-libs/proj sci-libs/libgeotiff media-libs/tiff ) gdal? ( sci-libs/gdal ) festival? ( app-accessibility/festival )
 0
 mirror://sourceforge/xastir/xastir-2.0.0.tar.gz
diff --git a/metadata/cache/media-radio/xastir-2.0.0-r1 b/metadata/cache/media-radio/xastir-2.0.0-r1
index 660da8d77fc9..ffab8003d11a 100644
--- a/metadata/cache/media-radio/xastir-2.0.0-r1
+++ b/metadata/cache/media-radio/xastir-2.0.0-r1
@@ -1,4 +1,4 @@
->=x11-libs/openmotif-2.3:0 x11-libs/libXpm x11-apps/xfontsel dev-libs/libpcre net-misc/curl sys-libs/db sci-libs/shapelib !graphicsmagick? ( media-gfx/imagemagick[-hdri,-q32] ) graphicsmagick? ( media-gfx/graphicsmagick[-q32] ) geotiff? ( sci-libs/proj sci-libs/libgeotiff media-libs/tiff ) gdal? ( sci-libs/gdal ) festival? ( app-accessibility/festival ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=x11-libs/openmotif-2.3:0 x11-libs/libXpm x11-apps/xfontsel dev-libs/libpcre net-misc/curl sys-libs/db sci-libs/shapelib !graphicsmagick? ( media-gfx/imagemagick[-hdri,-q32] ) graphicsmagick? ( media-gfx/graphicsmagick[-q32] ) geotiff? ( sci-libs/proj sci-libs/libgeotiff media-libs/tiff ) gdal? ( sci-libs/gdal ) festival? ( app-accessibility/festival ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=x11-libs/openmotif-2.3:0 x11-libs/libXpm x11-apps/xfontsel dev-libs/libpcre net-misc/curl sys-libs/db sci-libs/shapelib !graphicsmagick? ( media-gfx/imagemagick[-hdri,-q32] ) graphicsmagick? ( media-gfx/graphicsmagick[-q32] ) geotiff? ( sci-libs/proj sci-libs/libgeotiff media-libs/tiff ) gdal? ( sci-libs/gdal ) festival? ( app-accessibility/festival )
 0
 mirror://sourceforge/xastir/xastir-2.0.0.tar.gz
diff --git a/metadata/cache/media-radio/xastir-2.0.0-r2 b/metadata/cache/media-radio/xastir-2.0.0-r2
index 035b9067fec9..47b3018a5d09 100644
--- a/metadata/cache/media-radio/xastir-2.0.0-r2
+++ b/metadata/cache/media-radio/xastir-2.0.0-r2
@@ -1,4 +1,4 @@
->=x11-libs/openmotif-2.3:0 x11-libs/libXpm x11-apps/xfontsel dev-libs/libpcre net-misc/curl sys-libs/db sci-libs/shapelib !graphicsmagick? ( media-gfx/imagemagick[-hdri,-q32] ) graphicsmagick? ( media-gfx/graphicsmagick[-q32] ) geotiff? ( sci-libs/proj sci-libs/libgeotiff media-libs/tiff ) gdal? ( sci-libs/gdal ) festival? ( app-accessibility/festival ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=x11-libs/openmotif-2.3:0 x11-libs/libXpm x11-apps/xfontsel dev-libs/libpcre net-misc/curl sys-libs/db sci-libs/shapelib !graphicsmagick? ( media-gfx/imagemagick[-hdri,-q32] ) graphicsmagick? ( media-gfx/graphicsmagick[-q32] ) geotiff? ( sci-libs/proj sci-libs/libgeotiff media-libs/tiff ) gdal? ( sci-libs/gdal ) festival? ( app-accessibility/festival ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=x11-libs/openmotif-2.3:0 x11-libs/libXpm x11-apps/xfontsel dev-libs/libpcre net-misc/curl sys-libs/db sci-libs/shapelib !graphicsmagick? ( media-gfx/imagemagick[-hdri,-q32] ) graphicsmagick? ( media-gfx/graphicsmagick[-q32] ) geotiff? ( sci-libs/proj sci-libs/libgeotiff media-libs/tiff ) gdal? ( sci-libs/gdal ) festival? ( app-accessibility/festival )
 0
 mirror://sourceforge/xastir/xastir-2.0.0.tar.gz
diff --git a/metadata/cache/media-radio/xlog-2.0.4 b/metadata/cache/media-radio/xlog-2.0.4
index fe1899286468..c5f092fa7bd6 100644
--- a/metadata/cache/media-radio/xlog-2.0.4
+++ b/metadata/cache/media-radio/xlog-2.0.4
@@ -1,4 +1,4 @@
-media-libs/hamlib dev-libs/glib:2 x11-libs/gtk+:2 sys-devel/gettext dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+media-libs/hamlib dev-libs/glib:2 x11-libs/gtk+:2 sys-devel/gettext dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 media-libs/hamlib dev-libs/glib:2 x11-libs/gtk+:2
 0
 http://savannah.nongnu.org/download/xlog/xlog-2.0.4.tar.gz
diff --git a/metadata/cache/media-radio/xlog-2.0.5 b/metadata/cache/media-radio/xlog-2.0.5
index 85141866b689..5e4edf6886ab 100644
--- a/metadata/cache/media-radio/xlog-2.0.5
+++ b/metadata/cache/media-radio/xlog-2.0.5
@@ -1,4 +1,4 @@
-media-libs/hamlib dev-libs/glib:2 x11-libs/gtk+:2 sys-devel/gettext dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+media-libs/hamlib dev-libs/glib:2 x11-libs/gtk+:2 sys-devel/gettext dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 media-libs/hamlib dev-libs/glib:2 x11-libs/gtk+:2
 0
 http://savannah.nongnu.org/download/xlog/xlog-2.0.5.tar.gz
diff --git a/metadata/cache/media-sound/aacgain-1.9 b/metadata/cache/media-sound/aacgain-1.9
index 2a4c4b2cd6de..162c96117cc3 100644
--- a/metadata/cache/media-sound/aacgain-1.9
+++ b/metadata/cache/media-sound/aacgain-1.9
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 http://sbriesen.de/gentoo/distfiles/aacgain-1.9.tar.xz http://mp4v2.googlecode.com/files/mp4v2-1.9.1.tar.bz2 mirror://sourceforge/mp3gain/mp3gain-1_5_2-src.zip mirror://sourceforge/faac/faad2-2.7.tar.gz
diff --git a/metadata/cache/media-sound/abcmidi-2012.02.05 b/metadata/cache/media-sound/abcmidi-2012.02.05
index 7a8c23393e29..107689cf05b5 100644
--- a/metadata/cache/media-sound/abcmidi-2012.02.05
+++ b/metadata/cache/media-sound/abcmidi-2012.02.05
@@ -1,4 +1,4 @@
-app-arch/unzip || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+app-arch/unzip || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 http://ifdo.pugmarks.com/~seymour/runabc/abcMIDI-2012-02-05.zip
diff --git a/metadata/cache/media-sound/abcmidi-2012.03.08 b/metadata/cache/media-sound/abcmidi-2012.03.08
index 2b31ef17e893..601ea78f060c 100644
--- a/metadata/cache/media-sound/abcmidi-2012.03.08
+++ b/metadata/cache/media-sound/abcmidi-2012.03.08
@@ -1,4 +1,4 @@
-app-arch/unzip || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+app-arch/unzip || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 http://ifdo.pugmarks.com/~seymour/runabc/abcMIDI-2012-03-08.zip
diff --git a/metadata/cache/media-sound/alsa-tools-1.0.23 b/metadata/cache/media-sound/alsa-tools-1.0.23
index be38f125bd50..169b6172570a 100644
--- a/metadata/cache/media-sound/alsa-tools-1.0.23
+++ b/metadata/cache/media-sound/alsa-tools-1.0.23
@@ -1,4 +1,4 @@
->=media-libs/alsa-lib-1.0.22 >=dev-python/pyalsa-1.0.22 fltk? ( x11-libs/fltk:1 ) gtk? ( x11-libs/gtk+:2 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=media-libs/alsa-lib-1.0.22 >=dev-python/pyalsa-1.0.22 fltk? ( x11-libs/fltk:1 ) gtk? ( x11-libs/gtk+:2 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=media-libs/alsa-lib-1.0.22 >=dev-python/pyalsa-1.0.22 fltk? ( x11-libs/fltk:1 ) gtk? ( x11-libs/gtk+:2 )
 0.9
 mirror://alsaproject/tools/alsa-tools-1.0.23.tar.bz2
diff --git a/metadata/cache/media-sound/alsa-tools-1.0.24.1 b/metadata/cache/media-sound/alsa-tools-1.0.24.1
index c3fc2b779e4e..451462116341 100644
--- a/metadata/cache/media-sound/alsa-tools-1.0.24.1
+++ b/metadata/cache/media-sound/alsa-tools-1.0.24.1
@@ -1,4 +1,4 @@
->=media-libs/alsa-lib-1.0.24.1 >=dev-python/pyalsa-1.0.24 fltk? ( >=x11-libs/fltk-1.1.10-r2:1 ) gtk? ( x11-libs/gtk+:2 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=media-libs/alsa-lib-1.0.24.1 >=dev-python/pyalsa-1.0.24 fltk? ( >=x11-libs/fltk-1.1.10-r2:1 ) gtk? ( x11-libs/gtk+:2 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=media-libs/alsa-lib-1.0.24.1 >=dev-python/pyalsa-1.0.24 fltk? ( >=x11-libs/fltk-1.1.10-r2:1 ) gtk? ( x11-libs/gtk+:2 )
 0.9
 mirror://alsaproject/tools/alsa-tools-1.0.24.1.tar.bz2
diff --git a/metadata/cache/media-sound/alsa-tools-1.0.25 b/metadata/cache/media-sound/alsa-tools-1.0.25
index 6eb884c9e631..e59d92deaff3 100644
--- a/metadata/cache/media-sound/alsa-tools-1.0.25
+++ b/metadata/cache/media-sound/alsa-tools-1.0.25
@@ -1,4 +1,4 @@
->=media-libs/alsa-lib-1.0.25 >=dev-python/pyalsa-1.0.25 fltk? ( >=x11-libs/fltk-1.1.10-r2:1 ) gtk? ( x11-libs/gtk+:2 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=media-libs/alsa-lib-1.0.25 >=dev-python/pyalsa-1.0.25 fltk? ( >=x11-libs/fltk-1.1.10-r2:1 ) gtk? ( x11-libs/gtk+:2 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=media-libs/alsa-lib-1.0.25 >=dev-python/pyalsa-1.0.25 fltk? ( >=x11-libs/fltk-1.1.10-r2:1 ) gtk? ( x11-libs/gtk+:2 )
 0.9
 mirror://alsaproject/tools/alsa-tools-1.0.25.tar.bz2
diff --git a/metadata/cache/media-sound/alsamixergui-0.9.0.1.2-r4 b/metadata/cache/media-sound/alsamixergui-0.9.0.1.2-r4
index ec4913007034..205bb1cffaf6 100644
--- a/metadata/cache/media-sound/alsamixergui-0.9.0.1.2-r4
+++ b/metadata/cache/media-sound/alsamixergui-0.9.0.1.2-r4
@@ -1,4 +1,4 @@
-media-libs/alsa-lib media-sound/alsa-utils x11-libs/fltk:1 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+media-libs/alsa-lib media-sound/alsa-utils x11-libs/fltk:1 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 media-libs/alsa-lib media-sound/alsa-utils x11-libs/fltk:1
 0
 mirror://gentoo/alsamixergui-0.9.0rc1-2.tar.gz
diff --git a/metadata/cache/media-sound/alsaplayer-0.99.81 b/metadata/cache/media-sound/alsaplayer-0.99.81
index 6a57095532e7..3e3c274c9ecd 100644
--- a/metadata/cache/media-sound/alsaplayer-0.99.81
+++ b/metadata/cache/media-sound/alsaplayer-0.99.81
@@ -1,4 +1,4 @@
-media-libs/libsndfile sys-libs/zlib alsa? ( media-libs/alsa-lib ) audiofile? ( media-libs/audiofile ) flac? ( media-libs/flac ) gtk? ( >=x11-libs/gtk+-2.10:2 ) id3tag? ( media-libs/libid3tag ) jack? ( >=media-sound/jack-audio-connection-kit-0.80 ) mad? ( media-libs/libmad ) mikmod? ( media-libs/libmikmod:0 ) nas? ( media-libs/nas ) ogg? ( media-libs/libogg ) opengl? ( virtual/opengl ) vorbis? ( media-libs/libvorbis ) xosd? ( x11-libs/xosd ) dev-util/pkgconfig doc? ( app-doc/doxygen ) nls? ( sys-devel/gettext ) oss? ( virtual/os-headers ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+media-libs/libsndfile sys-libs/zlib alsa? ( media-libs/alsa-lib ) audiofile? ( media-libs/audiofile ) flac? ( media-libs/flac ) gtk? ( >=x11-libs/gtk+-2.10:2 ) id3tag? ( media-libs/libid3tag ) jack? ( >=media-sound/jack-audio-connection-kit-0.80 ) mad? ( media-libs/libmad ) mikmod? ( media-libs/libmikmod:0 ) nas? ( media-libs/nas ) ogg? ( media-libs/libogg ) opengl? ( virtual/opengl ) vorbis? ( media-libs/libvorbis ) xosd? ( x11-libs/xosd ) dev-util/pkgconfig doc? ( app-doc/doxygen ) nls? ( sys-devel/gettext ) oss? ( virtual/os-headers ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 media-libs/libsndfile sys-libs/zlib alsa? ( media-libs/alsa-lib ) audiofile? ( media-libs/audiofile ) flac? ( media-libs/flac ) gtk? ( >=x11-libs/gtk+-2.10:2 ) id3tag? ( media-libs/libid3tag ) jack? ( >=media-sound/jack-audio-connection-kit-0.80 ) mad? ( media-libs/libmad ) mikmod? ( media-libs/libmikmod:0 ) nas? ( media-libs/nas ) ogg? ( media-libs/libogg ) opengl? ( virtual/opengl ) vorbis? ( media-libs/libvorbis ) xosd? ( x11-libs/xosd )
 0
 http://www.alsaplayer.org/alsaplayer-0.99.81.tar.bz2
diff --git a/metadata/cache/media-sound/ams-2.0.1 b/metadata/cache/media-sound/ams-2.0.1
index d287d4717c76..12427053e9af 100644
--- a/metadata/cache/media-sound/ams-2.0.1
+++ b/metadata/cache/media-sound/ams-2.0.1
@@ -1,4 +1,4 @@
-media-libs/alsa-lib media-sound/jack-audio-connection-kit x11-libs/qt-gui:4 x11-libs/qt-opengl:4 media-libs/ladspa-sdk media-libs/libclalsadrv !dev-ruby/amrita dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+media-libs/alsa-lib media-sound/jack-audio-connection-kit x11-libs/qt-gui:4 x11-libs/qt-opengl:4 media-libs/ladspa-sdk media-libs/libclalsadrv !dev-ruby/amrita dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 media-libs/alsa-lib media-sound/jack-audio-connection-kit x11-libs/qt-gui:4 x11-libs/qt-opengl:4 media-libs/ladspa-sdk media-libs/libclalsadrv !dev-ruby/amrita
 0
 mirror://sourceforge/alsamodular/ams-2.0.1.tar.bz2
diff --git a/metadata/cache/media-sound/amsynth-1.2.0 b/metadata/cache/media-sound/amsynth-1.2.0
index 7d46a64f0665..444a2ced8d68 100644
--- a/metadata/cache/media-sound/amsynth-1.2.0
+++ b/metadata/cache/media-sound/amsynth-1.2.0
@@ -1,4 +1,4 @@
-dev-cpp/gtkmm:2.4 sndfile? ( >=media-libs/libsndfile-1.0 ) alsa? ( >=media-libs/alsa-lib-0.9 media-sound/alsa-utils ) jack? ( media-sound/jack-audio-connection-kit ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-cpp/gtkmm:2.4 sndfile? ( >=media-libs/libsndfile-1.0 ) alsa? ( >=media-libs/alsa-lib-0.9 media-sound/alsa-utils ) jack? ( media-sound/jack-audio-connection-kit ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-cpp/gtkmm:2.4 sndfile? ( >=media-libs/libsndfile-1.0 ) alsa? ( >=media-libs/alsa-lib-0.9 media-sound/alsa-utils ) jack? ( media-sound/jack-audio-connection-kit )
 0
 mirror://sourceforge/amsynthe/amSynth-1.2.0.tar.gz
diff --git a/metadata/cache/media-sound/amsynth-1.2.2 b/metadata/cache/media-sound/amsynth-1.2.2
index eba536e7a226..e686ff36b8ae 100644
--- a/metadata/cache/media-sound/amsynth-1.2.2
+++ b/metadata/cache/media-sound/amsynth-1.2.2
@@ -1,4 +1,4 @@
-dev-cpp/gtkmm:2.4 sndfile? ( >=media-libs/libsndfile-1 ) alsa? ( media-libs/alsa-lib media-sound/alsa-utils ) jack? ( media-sound/jack-audio-connection-kit ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-cpp/gtkmm:2.4 sndfile? ( >=media-libs/libsndfile-1 ) alsa? ( media-libs/alsa-lib media-sound/alsa-utils ) jack? ( media-sound/jack-audio-connection-kit ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-cpp/gtkmm:2.4 sndfile? ( >=media-libs/libsndfile-1 ) alsa? ( media-libs/alsa-lib media-sound/alsa-utils ) jack? ( media-sound/jack-audio-connection-kit )
 0
 mirror://sourceforge/amsynthe/amSynth-1.2.2.tar.gz
diff --git a/metadata/cache/media-sound/amsynth-1.2.3-r1 b/metadata/cache/media-sound/amsynth-1.2.3-r1
index a6e4895667ce..a1b93ca56e35 100644
--- a/metadata/cache/media-sound/amsynth-1.2.3-r1
+++ b/metadata/cache/media-sound/amsynth-1.2.3-r1
@@ -1,4 +1,4 @@
-dev-cpp/gtkmm:2.4 sndfile? ( >=media-libs/libsndfile-1 ) alsa? ( media-libs/alsa-lib media-sound/alsa-utils ) jack? ( media-sound/jack-audio-connection-kit ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-cpp/gtkmm:2.4 sndfile? ( >=media-libs/libsndfile-1 ) alsa? ( media-libs/alsa-lib media-sound/alsa-utils ) jack? ( media-sound/jack-audio-connection-kit ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-cpp/gtkmm:2.4 sndfile? ( >=media-libs/libsndfile-1 ) alsa? ( media-libs/alsa-lib media-sound/alsa-utils ) jack? ( media-sound/jack-audio-connection-kit )
 0
 mirror://sourceforge/amsynthe/amSynth-1.2.3.tar.gz
diff --git a/metadata/cache/media-sound/aqualung-0.9_beta11-r1 b/metadata/cache/media-sound/aqualung-0.9_beta11-r1
index 6251499b946f..7ca342e5d8eb 100644
--- a/metadata/cache/media-sound/aqualung-0.9_beta11-r1
+++ b/metadata/cache/media-sound/aqualung-0.9_beta11-r1
@@ -1,4 +1,4 @@
-alsa? ( media-libs/alsa-lib ) cdda? ( dev-libs/libcdio[-minimal] ) cddb? ( media-libs/libcddb ) flac? ( media-libs/flac ) ffmpeg? ( >=virtual/ffmpeg-0.6.90 ) ifp? ( media-libs/libifp ) jack? ( media-sound/jack-audio-connection-kit ) ladspa? ( media-libs/liblrdf ) lame? ( media-sound/lame ) libsamplerate? ( media-libs/libsamplerate ) lua? ( dev-lang/lua ) mac? ( media-sound/mac ) modplug? ( media-libs/libmodplug ) mp3? ( media-libs/libmad ) musepack? ( >=media-sound/musepack-tools-444 ) pulseaudio? ( media-sound/pulseaudio ) sndfile? ( media-libs/libsndfile ) speex? ( media-libs/speex media-libs/liboggz ) vorbis? ( media-libs/libvorbis ) wavpack? ( media-sound/wavpack ) x11-libs/gtk+:2 dev-libs/libxml2 dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+alsa? ( media-libs/alsa-lib ) cdda? ( dev-libs/libcdio[-minimal] ) cddb? ( media-libs/libcddb ) flac? ( media-libs/flac ) ffmpeg? ( >=virtual/ffmpeg-0.6.90 ) ifp? ( media-libs/libifp ) jack? ( media-sound/jack-audio-connection-kit ) ladspa? ( media-libs/liblrdf ) lame? ( media-sound/lame ) libsamplerate? ( media-libs/libsamplerate ) lua? ( dev-lang/lua ) mac? ( media-sound/mac ) modplug? ( media-libs/libmodplug ) mp3? ( media-libs/libmad ) musepack? ( >=media-sound/musepack-tools-444 ) pulseaudio? ( media-sound/pulseaudio ) sndfile? ( media-libs/libsndfile ) speex? ( media-libs/speex media-libs/liboggz ) vorbis? ( media-libs/libvorbis ) wavpack? ( media-sound/wavpack ) x11-libs/gtk+:2 dev-libs/libxml2 dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 alsa? ( media-libs/alsa-lib ) cdda? ( dev-libs/libcdio[-minimal] ) cddb? ( media-libs/libcddb ) flac? ( media-libs/flac ) ffmpeg? ( >=virtual/ffmpeg-0.6.90 ) ifp? ( media-libs/libifp ) jack? ( media-sound/jack-audio-connection-kit ) ladspa? ( media-libs/liblrdf ) lame? ( media-sound/lame ) libsamplerate? ( media-libs/libsamplerate ) lua? ( dev-lang/lua ) mac? ( media-sound/mac ) modplug? ( media-libs/libmodplug ) mp3? ( media-libs/libmad ) musepack? ( >=media-sound/musepack-tools-444 ) pulseaudio? ( media-sound/pulseaudio ) sndfile? ( media-libs/libsndfile ) speex? ( media-libs/speex media-libs/liboggz ) vorbis? ( media-libs/libvorbis ) wavpack? ( media-sound/wavpack ) x11-libs/gtk+:2
 0
 mirror://sourceforge/aqualung/aqualung-0.9beta11.tar.gz
diff --git a/metadata/cache/media-sound/audacity-1.3.14 b/metadata/cache/media-sound/audacity-1.3.14
index 1751c9ee54a2..4830fc3cb1b0 100644
--- a/metadata/cache/media-sound/audacity-1.3.14
+++ b/metadata/cache/media-sound/audacity-1.3.14
@@ -1,4 +1,4 @@
-x11-libs/wxGTK:2.8[X] >=app-arch/zip-2.3 >=media-libs/libsndfile-1.0.0 dev-libs/expat libsamplerate? ( >=media-libs/libsamplerate-0.1.2 ) vorbis? ( >=media-libs/libvorbis-1.0 ) mp3? ( >=media-libs/libmad-0.14.2b ) flac? ( >=media-libs/flac-1.2.0[cxx] ) id3tag? ( media-libs/libid3tag ) soundtouch? ( >=media-libs/libsoundtouch-1.3.1 ) vamp? ( >=media-libs/vamp-plugin-sdk-2.0 ) twolame? ( media-sound/twolame ) ffmpeg? ( virtual/ffmpeg ) alsa? ( media-libs/alsa-lib ) jack? ( >=media-sound/jack-audio-connection-kit-0.103.0 ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+x11-libs/wxGTK:2.8[X] >=app-arch/zip-2.3 >=media-libs/libsndfile-1.0.0 dev-libs/expat libsamplerate? ( >=media-libs/libsamplerate-0.1.2 ) vorbis? ( >=media-libs/libvorbis-1.0 ) mp3? ( >=media-libs/libmad-0.14.2b ) flac? ( >=media-libs/flac-1.2.0[cxx] ) id3tag? ( media-libs/libid3tag ) soundtouch? ( >=media-libs/libsoundtouch-1.3.1 ) vamp? ( >=media-libs/vamp-plugin-sdk-2.0 ) twolame? ( media-sound/twolame ) ffmpeg? ( virtual/ffmpeg ) alsa? ( media-libs/alsa-lib ) jack? ( >=media-sound/jack-audio-connection-kit-0.103.0 ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 x11-libs/wxGTK:2.8[X] >=app-arch/zip-2.3 >=media-libs/libsndfile-1.0.0 dev-libs/expat libsamplerate? ( >=media-libs/libsamplerate-0.1.2 ) vorbis? ( >=media-libs/libvorbis-1.0 ) mp3? ( >=media-libs/libmad-0.14.2b ) flac? ( >=media-libs/flac-1.2.0[cxx] ) id3tag? ( media-libs/libid3tag ) soundtouch? ( >=media-libs/libsoundtouch-1.3.1 ) vamp? ( >=media-libs/vamp-plugin-sdk-2.0 ) twolame? ( media-sound/twolame ) ffmpeg? ( virtual/ffmpeg ) alsa? ( media-libs/alsa-lib ) jack? ( >=media-sound/jack-audio-connection-kit-0.103.0 ) mp3? ( >=media-sound/lame-3.70 )
 0
 http://audacity.googlecode.com/files/audacity-minsrc-1.3.14-beta.tar.bz2
diff --git a/metadata/cache/media-sound/audacity-2.0.0 b/metadata/cache/media-sound/audacity-2.0.0
index e3883a0df266..d1e939c91339 100644
--- a/metadata/cache/media-sound/audacity-2.0.0
+++ b/metadata/cache/media-sound/audacity-2.0.0
@@ -1,4 +1,4 @@
-x11-libs/wxGTK:2.8[X] >=app-arch/zip-2.3 >=media-libs/libsndfile-1.0.0 dev-libs/expat libsamplerate? ( >=media-libs/libsamplerate-0.1.2 ) vorbis? ( >=media-libs/libvorbis-1.0 ) mp3? ( >=media-libs/libmad-0.14.2b ) flac? ( >=media-libs/flac-1.2.0[cxx] ) id3tag? ( media-libs/libid3tag ) soundtouch? ( >=media-libs/libsoundtouch-1.3.1 ) vamp? ( >=media-libs/vamp-plugin-sdk-2.0 ) twolame? ( media-sound/twolame ) ffmpeg? ( virtual/ffmpeg ) alsa? ( media-libs/alsa-lib ) jack? ( >=media-sound/jack-audio-connection-kit-0.103.0 ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+x11-libs/wxGTK:2.8[X] >=app-arch/zip-2.3 >=media-libs/libsndfile-1.0.0 dev-libs/expat libsamplerate? ( >=media-libs/libsamplerate-0.1.2 ) vorbis? ( >=media-libs/libvorbis-1.0 ) mp3? ( >=media-libs/libmad-0.14.2b ) flac? ( >=media-libs/flac-1.2.0[cxx] ) id3tag? ( media-libs/libid3tag ) soundtouch? ( >=media-libs/libsoundtouch-1.3.1 ) vamp? ( >=media-libs/vamp-plugin-sdk-2.0 ) twolame? ( media-sound/twolame ) ffmpeg? ( virtual/ffmpeg ) alsa? ( media-libs/alsa-lib ) jack? ( >=media-sound/jack-audio-connection-kit-0.103.0 ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 x11-libs/wxGTK:2.8[X] >=app-arch/zip-2.3 >=media-libs/libsndfile-1.0.0 dev-libs/expat libsamplerate? ( >=media-libs/libsamplerate-0.1.2 ) vorbis? ( >=media-libs/libvorbis-1.0 ) mp3? ( >=media-libs/libmad-0.14.2b ) flac? ( >=media-libs/flac-1.2.0[cxx] ) id3tag? ( media-libs/libid3tag ) soundtouch? ( >=media-libs/libsoundtouch-1.3.1 ) vamp? ( >=media-libs/vamp-plugin-sdk-2.0 ) twolame? ( media-sound/twolame ) ffmpeg? ( virtual/ffmpeg ) alsa? ( media-libs/alsa-lib ) jack? ( >=media-sound/jack-audio-connection-kit-0.103.0 ) mp3? ( >=media-sound/lame-3.70 )
 0
 http://audacity.googlecode.com/files/audacity-minsrc-2.0.0.tar.bz2
diff --git a/metadata/cache/media-sound/audtty-0.1.12 b/metadata/cache/media-sound/audtty-0.1.12
index d456cce648a4..0d7ab11fd75c 100644
--- a/metadata/cache/media-sound/audtty-0.1.12
+++ b/metadata/cache/media-sound/audtty-0.1.12
@@ -1,4 +1,4 @@
-sys-libs/ncurses >=media-sound/audacious-2.4.4 dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+sys-libs/ncurses >=media-sound/audacious-2.4.4 dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 sys-libs/ncurses >=media-sound/audacious-2.4.4
 0
 http://www.code-monkeys.org/audtty/audtty-0.1.12.tar.gz
diff --git a/metadata/cache/media-sound/banshee-2.2.0-r1 b/metadata/cache/media-sound/banshee-2.2.0-r1
index 59bf16eb4e64..5ae8cf523fd7 100644
--- a/metadata/cache/media-sound/banshee-2.2.0-r1
+++ b/metadata/cache/media-sound/banshee-2.2.0-r1
@@ -1,4 +1,4 @@
->=dev-lang/mono-2.4.3 gnome-base/gnome-settings-daemon x11-themes/gnome-icon-theme sys-apps/dbus >=dev-dotnet/gtk-sharp-2.12:2 >=dev-dotnet/gconf-sharp-2.24.0:2 >=dev-dotnet/notify-sharp-0.4.0_pre20080912-r1 >=media-libs/gstreamer-0.10.21-r3:0.10 >=media-libs/gst-plugins-base-0.10.25.2:0.10 >=media-libs/gst-plugins-bad-0.10.7 >=media-libs/gst-plugins-good-0.10.7:0.10 >=media-libs/gst-plugins-ugly-0.10.7:0.10 >=media-plugins/gst-plugins-meta-0.10-r2:0.10 >=media-plugins/gst-plugins-gnomevfs-0.10.7:0.10 >=media-plugins/gst-plugins-gconf-0.10.7:0.10 cdda? ( || ( >=media-plugins/gst-plugins-cdparanoia-0.10.7:0.10 >=media-plugins/gst-plugins-cdio-0.10.7:0.10 ) ) media-libs/musicbrainz:1 dev-dotnet/dbus-sharp dev-dotnet/dbus-sharp-glib >=dev-dotnet/mono-addins-0.4[gtk] >=dev-dotnet/taglib-sharp-2.0.3.7 >=dev-db/sqlite-3.4:3 karma? ( >=media-libs/libkarma-0.1.0-r1 ) aac? ( >=media-plugins/gst-plugins-faad-0.10.7:0.10 ) boo? ( >=dev-lang/boo-0.8.1 ) daap? ( >=dev-dotnet/mono-zeroconf-0.8.0-r1 ) doc? ( virtual/monodoc >=app-text/gnome-doc-utils-0.17.3 ) encode? ( >=media-plugins/gst-plugins-lame-0.10.7:0.10 >=media-plugins/gst-plugins-taglib-0.10.7:0.10 ) ipod? ( >=media-libs/libgpod-0.7.95[mono] ) mtp? ( >=media-libs/libmtp-0.3.0 ) web? ( >=net-libs/webkit-gtk-1.2.2:2 >=net-libs/libsoup-2.26:2.4 >=net-libs/libsoup-gnome-2.26:2.4 ) youtube? ( >=dev-dotnet/google-gdata-sharp-1.4 ) udev? ( dev-dotnet/gudev-sharp dev-dotnet/gkeyfile-sharp dev-dotnet/gtk-sharp-beans dev-dotnet/gio-sharp ) app-arch/xz-utils dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 app-arch/xz-utils
+>=dev-lang/mono-2.4.3 gnome-base/gnome-settings-daemon x11-themes/gnome-icon-theme sys-apps/dbus >=dev-dotnet/gtk-sharp-2.12:2 >=dev-dotnet/gconf-sharp-2.24.0:2 >=dev-dotnet/notify-sharp-0.4.0_pre20080912-r1 >=media-libs/gstreamer-0.10.21-r3:0.10 >=media-libs/gst-plugins-base-0.10.25.2:0.10 >=media-libs/gst-plugins-bad-0.10.7 >=media-libs/gst-plugins-good-0.10.7:0.10 >=media-libs/gst-plugins-ugly-0.10.7:0.10 >=media-plugins/gst-plugins-meta-0.10-r2:0.10 >=media-plugins/gst-plugins-gnomevfs-0.10.7:0.10 >=media-plugins/gst-plugins-gconf-0.10.7:0.10 cdda? ( || ( >=media-plugins/gst-plugins-cdparanoia-0.10.7:0.10 >=media-plugins/gst-plugins-cdio-0.10.7:0.10 ) ) media-libs/musicbrainz:1 dev-dotnet/dbus-sharp dev-dotnet/dbus-sharp-glib >=dev-dotnet/mono-addins-0.4[gtk] >=dev-dotnet/taglib-sharp-2.0.3.7 >=dev-db/sqlite-3.4:3 karma? ( >=media-libs/libkarma-0.1.0-r1 ) aac? ( >=media-plugins/gst-plugins-faad-0.10.7:0.10 ) boo? ( >=dev-lang/boo-0.8.1 ) daap? ( >=dev-dotnet/mono-zeroconf-0.8.0-r1 ) doc? ( virtual/monodoc >=app-text/gnome-doc-utils-0.17.3 ) encode? ( >=media-plugins/gst-plugins-lame-0.10.7:0.10 >=media-plugins/gst-plugins-taglib-0.10.7:0.10 ) ipod? ( >=media-libs/libgpod-0.7.95[mono] ) mtp? ( >=media-libs/libmtp-0.3.0 ) web? ( >=net-libs/webkit-gtk-1.2.2:2 >=net-libs/libsoup-2.26:2.4 >=net-libs/libsoup-gnome-2.26:2.4 ) youtube? ( >=dev-dotnet/google-gdata-sharp-1.4 ) udev? ( dev-dotnet/gudev-sharp dev-dotnet/gkeyfile-sharp dev-dotnet/gtk-sharp-beans dev-dotnet/gio-sharp ) app-arch/xz-utils dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 app-arch/xz-utils
 >=dev-lang/mono-2.4.3 gnome-base/gnome-settings-daemon x11-themes/gnome-icon-theme sys-apps/dbus >=dev-dotnet/gtk-sharp-2.12:2 >=dev-dotnet/gconf-sharp-2.24.0:2 >=dev-dotnet/notify-sharp-0.4.0_pre20080912-r1 >=media-libs/gstreamer-0.10.21-r3:0.10 >=media-libs/gst-plugins-base-0.10.25.2:0.10 >=media-libs/gst-plugins-bad-0.10.7 >=media-libs/gst-plugins-good-0.10.7:0.10 >=media-libs/gst-plugins-ugly-0.10.7:0.10 >=media-plugins/gst-plugins-meta-0.10-r2:0.10 >=media-plugins/gst-plugins-gnomevfs-0.10.7:0.10 >=media-plugins/gst-plugins-gconf-0.10.7:0.10 cdda? ( || ( >=media-plugins/gst-plugins-cdparanoia-0.10.7:0.10 >=media-plugins/gst-plugins-cdio-0.10.7:0.10 ) ) media-libs/musicbrainz:1 dev-dotnet/dbus-sharp dev-dotnet/dbus-sharp-glib >=dev-dotnet/mono-addins-0.4[gtk] >=dev-dotnet/taglib-sharp-2.0.3.7 >=dev-db/sqlite-3.4:3 karma? ( >=media-libs/libkarma-0.1.0-r1 ) aac? ( >=media-plugins/gst-plugins-faad-0.10.7:0.10 ) boo? ( >=dev-lang/boo-0.8.1 ) daap? ( >=dev-dotnet/mono-zeroconf-0.8.0-r1 ) doc? ( virtual/monodoc >=app-text/gnome-doc-utils-0.17.3 ) encode? ( >=media-plugins/gst-plugins-lame-0.10.7:0.10 >=media-plugins/gst-plugins-taglib-0.10.7:0.10 ) ipod? ( >=media-libs/libgpod-0.7.95[mono] ) mtp? ( >=media-libs/libmtp-0.3.0 ) web? ( >=net-libs/webkit-gtk-1.2.2:2 >=net-libs/libsoup-2.26:2.4 >=net-libs/libsoup-gnome-2.26:2.4 ) youtube? ( >=dev-dotnet/google-gdata-sharp-1.4 ) udev? ( dev-dotnet/gudev-sharp dev-dotnet/gkeyfile-sharp dev-dotnet/gtk-sharp-beans dev-dotnet/gio-sharp )
 0
 mirror://gnome/sources/banshee/2.2/banshee-2.2.0.tar.xz
diff --git a/metadata/cache/media-sound/banshee-2.2.1 b/metadata/cache/media-sound/banshee-2.2.1
index ef7e2a0eeac1..a409e3603224 100644
--- a/metadata/cache/media-sound/banshee-2.2.1
+++ b/metadata/cache/media-sound/banshee-2.2.1
@@ -1,4 +1,4 @@
->=dev-lang/mono-2.4.3 gnome-base/gnome-settings-daemon x11-themes/gnome-icon-theme sys-apps/dbus >=dev-dotnet/gtk-sharp-2.12:2 >=dev-dotnet/gconf-sharp-2.24.0:2 >=dev-dotnet/notify-sharp-0.4.0_pre20080912-r1 >=media-libs/gstreamer-0.10.21-r3:0.10 >=media-libs/gst-plugins-base-0.10.25.2:0.10 media-libs/gst-plugins-bad media-libs/gst-plugins-good:0.10 media-libs/gst-plugins-ugly:0.10 >=media-plugins/gst-plugins-meta-0.10-r2:0.10 media-plugins/gst-plugins-gio:0.10 media-plugins/gst-plugins-gconf:0.10 cdda? ( || ( media-plugins/gst-plugins-cdparanoia:0.10 media-plugins/gst-plugins-cdio:0.10 ) ) media-libs/musicbrainz:1 dev-dotnet/dbus-sharp dev-dotnet/dbus-sharp-glib >=dev-dotnet/mono-addins-0.4[gtk] >=dev-dotnet/taglib-sharp-2.0.3.7 >=dev-db/sqlite-3.4:3 karma? ( >=media-libs/libkarma-0.1.0-r1 ) aac? ( media-plugins/gst-plugins-faad:0.10 ) boo? ( >=dev-lang/boo-0.8.1 ) bpm? ( media-plugins/gst-plugins-soundtouch:0.10 ) daap? ( >=dev-dotnet/mono-zeroconf-0.8.0-r1 ) doc? ( virtual/monodoc >=app-text/gnome-doc-utils-0.17.3 ) encode? ( media-plugins/gst-plugins-lame:0.10 media-plugins/gst-plugins-taglib:0.10 ) ios? ( >=media-libs/libgpod-0.7.95[mono] gnome-base/gvfs[ios] ) mtp? ( >=media-libs/libmtp-0.3.0 ) web? ( >=net-libs/webkit-gtk-1.2.2:2 >=net-libs/libsoup-2.26:2.4 >=net-libs/libsoup-gnome-2.26:2.4 ) youtube? ( >=dev-dotnet/google-gdata-sharp-1.4 ) udev? ( dev-dotnet/gudev-sharp dev-dotnet/gkeyfile-sharp dev-dotnet/gtk-sharp-beans dev-dotnet/gio-sharp ) app-arch/xz-utils dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 app-arch/xz-utils
+>=dev-lang/mono-2.4.3 gnome-base/gnome-settings-daemon x11-themes/gnome-icon-theme sys-apps/dbus >=dev-dotnet/gtk-sharp-2.12:2 >=dev-dotnet/gconf-sharp-2.24.0:2 >=dev-dotnet/notify-sharp-0.4.0_pre20080912-r1 >=media-libs/gstreamer-0.10.21-r3:0.10 >=media-libs/gst-plugins-base-0.10.25.2:0.10 media-libs/gst-plugins-bad media-libs/gst-plugins-good:0.10 media-libs/gst-plugins-ugly:0.10 >=media-plugins/gst-plugins-meta-0.10-r2:0.10 media-plugins/gst-plugins-gio:0.10 media-plugins/gst-plugins-gconf:0.10 cdda? ( || ( media-plugins/gst-plugins-cdparanoia:0.10 media-plugins/gst-plugins-cdio:0.10 ) ) media-libs/musicbrainz:1 dev-dotnet/dbus-sharp dev-dotnet/dbus-sharp-glib >=dev-dotnet/mono-addins-0.4[gtk] >=dev-dotnet/taglib-sharp-2.0.3.7 >=dev-db/sqlite-3.4:3 karma? ( >=media-libs/libkarma-0.1.0-r1 ) aac? ( media-plugins/gst-plugins-faad:0.10 ) boo? ( >=dev-lang/boo-0.8.1 ) bpm? ( media-plugins/gst-plugins-soundtouch:0.10 ) daap? ( >=dev-dotnet/mono-zeroconf-0.8.0-r1 ) doc? ( virtual/monodoc >=app-text/gnome-doc-utils-0.17.3 ) encode? ( media-plugins/gst-plugins-lame:0.10 media-plugins/gst-plugins-taglib:0.10 ) ios? ( >=media-libs/libgpod-0.7.95[mono] gnome-base/gvfs[ios] ) mtp? ( >=media-libs/libmtp-0.3.0 ) web? ( >=net-libs/webkit-gtk-1.2.2:2 >=net-libs/libsoup-2.26:2.4 >=net-libs/libsoup-gnome-2.26:2.4 ) youtube? ( >=dev-dotnet/google-gdata-sharp-1.4 ) udev? ( dev-dotnet/gudev-sharp dev-dotnet/gkeyfile-sharp dev-dotnet/gtk-sharp-beans dev-dotnet/gio-sharp ) app-arch/xz-utils dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 app-arch/xz-utils
 >=dev-lang/mono-2.4.3 gnome-base/gnome-settings-daemon x11-themes/gnome-icon-theme sys-apps/dbus >=dev-dotnet/gtk-sharp-2.12:2 >=dev-dotnet/gconf-sharp-2.24.0:2 >=dev-dotnet/notify-sharp-0.4.0_pre20080912-r1 >=media-libs/gstreamer-0.10.21-r3:0.10 >=media-libs/gst-plugins-base-0.10.25.2:0.10 media-libs/gst-plugins-bad media-libs/gst-plugins-good:0.10 media-libs/gst-plugins-ugly:0.10 >=media-plugins/gst-plugins-meta-0.10-r2:0.10 media-plugins/gst-plugins-gio:0.10 media-plugins/gst-plugins-gconf:0.10 cdda? ( || ( media-plugins/gst-plugins-cdparanoia:0.10 media-plugins/gst-plugins-cdio:0.10 ) ) media-libs/musicbrainz:1 dev-dotnet/dbus-sharp dev-dotnet/dbus-sharp-glib >=dev-dotnet/mono-addins-0.4[gtk] >=dev-dotnet/taglib-sharp-2.0.3.7 >=dev-db/sqlite-3.4:3 karma? ( >=media-libs/libkarma-0.1.0-r1 ) aac? ( media-plugins/gst-plugins-faad:0.10 ) boo? ( >=dev-lang/boo-0.8.1 ) bpm? ( media-plugins/gst-plugins-soundtouch:0.10 ) daap? ( >=dev-dotnet/mono-zeroconf-0.8.0-r1 ) doc? ( virtual/monodoc >=app-text/gnome-doc-utils-0.17.3 ) encode? ( media-plugins/gst-plugins-lame:0.10 media-plugins/gst-plugins-taglib:0.10 ) ios? ( >=media-libs/libgpod-0.7.95[mono] gnome-base/gvfs[ios] ) mtp? ( >=media-libs/libmtp-0.3.0 ) web? ( >=net-libs/webkit-gtk-1.2.2:2 >=net-libs/libsoup-2.26:2.4 >=net-libs/libsoup-gnome-2.26:2.4 ) youtube? ( >=dev-dotnet/google-gdata-sharp-1.4 ) udev? ( dev-dotnet/gudev-sharp dev-dotnet/gkeyfile-sharp dev-dotnet/gtk-sharp-beans dev-dotnet/gio-sharp )
 0
 mirror://gnome/sources/banshee/2.2/banshee-2.2.1.tar.xz
diff --git a/metadata/cache/media-sound/cdcd-0.6.6-r2 b/metadata/cache/media-sound/cdcd-0.6.6-r2
index 00ab0410f8c2..59f67abb86ba 100644
--- a/metadata/cache/media-sound/cdcd-0.6.6-r2
+++ b/metadata/cache/media-sound/cdcd-0.6.6-r2
@@ -1,4 +1,4 @@
-sys-libs/ncurses >=sys-libs/readline-4.2 >=media-libs/libcdaudio-0.99.4 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+sys-libs/ncurses >=sys-libs/readline-4.2 >=media-libs/libcdaudio-0.99.4 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 sys-libs/ncurses >=sys-libs/readline-4.2 >=media-libs/libcdaudio-0.99.4
 0
 mirror://sourceforge/libcdaudio/cdcd-0.6.6.tar.gz
diff --git a/metadata/cache/media-sound/cdparanoia-3.10.2-r4 b/metadata/cache/media-sound/cdparanoia-3.10.2-r4
index 14ae98db73da..88447b3deb7d 100644
--- a/metadata/cache/media-sound/cdparanoia-3.10.2-r4
+++ b/metadata/cache/media-sound/cdparanoia-3.10.2-r4
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 http://downloads.xiph.org/releases/cdparanoia/cdparanoia-III-10.2.src.tgz http://dev.gentoo.org/~ssuominen/cdparanoia-III-10.2-patches-2.tbz2
diff --git a/metadata/cache/media-sound/chordii-4.3 b/metadata/cache/media-sound/chordii-4.3
index 109126b53b20..f7734f6b457a 100644
--- a/metadata/cache/media-sound/chordii-4.3
+++ b/metadata/cache/media-sound/chordii-4.3
@@ -1,4 +1,4 @@
->=sys-devel/autoconf-2.67 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=sys-devel/autoconf-2.67 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 mirror://sourceforge/chordii/chordii-4.3.tar.gz doc? ( mirror://sourceforge/chordii/chordii-4.3-user_guide.pdf )
diff --git a/metadata/cache/media-sound/christine-0.7.0 b/metadata/cache/media-sound/christine-0.7.0
index 3b32670d0fd3..161e5fb94ce2 100644
--- a/metadata/cache/media-sound/christine-0.7.0
+++ b/metadata/cache/media-sound/christine-0.7.0
@@ -1,4 +1,4 @@
-=dev-python/gst-python-0.10* dev-python/pycairo dev-python/pygobject:2 =dev-python/pygtk-2* media-libs/mutagen libnotify? ( dev-python/notify-python ) readline? ( sys-libs/readline ) dev-util/pkgconfig nls? ( dev-util/intltool ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool =dev-lang/python-2.7* =dev-lang/python-2.7*[sqlite]
+=dev-python/gst-python-0.10* dev-python/pycairo dev-python/pygobject:2 =dev-python/pygtk-2* media-libs/mutagen libnotify? ( dev-python/notify-python ) readline? ( sys-libs/readline ) dev-util/pkgconfig nls? ( dev-util/intltool ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool =dev-lang/python-2.7* =dev-lang/python-2.7*[sqlite]
 =dev-python/gst-python-0.10* dev-python/pycairo dev-python/pygobject:2 =dev-python/pygtk-2* media-libs/mutagen libnotify? ( dev-python/notify-python ) readline? ( sys-libs/readline ) =media-plugins/gst-plugins-meta-0.10* =dev-lang/python-2.7* =dev-lang/python-2.7*[sqlite]
 0
 mirror://sourceforge/christine/christine-0.7.0.tar.bz2
diff --git a/metadata/cache/media-sound/cowbell-0.2.7.1 b/metadata/cache/media-sound/cowbell-0.2.7.1
index 642e4e6f042f..f2954e4fb4e1 100644
--- a/metadata/cache/media-sound/cowbell-0.2.7.1
+++ b/metadata/cache/media-sound/cowbell-0.2.7.1
@@ -1,4 +1,4 @@
-dev-lang/mono >=dev-dotnet/gtk-sharp-2.6 >=dev-dotnet/glade-sharp-2.6 >=media-libs/taglib-1.4 dev-util/pkgconfig >=dev-util/intltool-0.34.2 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+dev-lang/mono >=dev-dotnet/gtk-sharp-2.6 >=dev-dotnet/glade-sharp-2.6 >=media-libs/taglib-1.4 dev-util/pkgconfig >=dev-util/intltool-0.34.2 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 dev-lang/mono >=dev-dotnet/gtk-sharp-2.6 >=dev-dotnet/glade-sharp-2.6 >=media-libs/taglib-1.4
 0
 http://more-cowbell.org/releases/cowbell-0.2.7.1.tar.gz
diff --git a/metadata/cache/media-sound/csound-5.16.6-r1 b/metadata/cache/media-sound/csound-5.16.6-r1
deleted file mode 100644
index 47235baacd72..000000000000
--- a/metadata/cache/media-sound/csound-5.16.6-r1
+++ /dev/null
@@ -1,22 +0,0 @@
->=media-libs/libsndfile-1.0.16 alsa? ( media-libs/alsa-lib ) csoundac? ( x11-libs/fltk:1[threads?] dev-libs/boost =dev-lang/python-2* ) dssi? ( media-libs/dssi media-libs/ladspa-sdk ) fluidsynth? ( media-sound/fluidsynth ) fltk? ( x11-libs/fltk:1[threads?] ) image? ( media-libs/libpng ) jack? ( media-sound/jack-audio-connection-kit ) java? ( >=virtual/jdk-1.5 ) keyboard? ( x11-libs/fltk:1[threads?] ) linear? ( sci-mathematics/gmm ) lua? ( dev-lang/luajit:2 ) osc? ( media-libs/liblo ) portaudio? ( media-libs/portaudio ) portmidi? ( media-libs/portmidi ) pulseaudio? ( media-sound/pulseaudio ) stk? ( media-libs/stk ) tcl? ( >=dev-lang/tcl-8.5 >=dev-lang/tk-8.5 ) utils? ( !media-sound/snd ) vst? ( x11-libs/fltk:1[threads?] dev-libs/boost =dev-lang/python-2* ) sys-devel/flex virtual/yacc chua? ( dev-libs/boost ) csoundac? ( dev-lang/swig ) html? ( app-arch/unzip ) doc? ( app-arch/unzip ) nls? ( sys-devel/gettext ) test? ( =dev-lang/python-2* ) vst? ( dev-lang/swig ) python? ( =dev-lang/python-2* ) java? ( >=dev-java/java-config-2.1.9-r1 ) dev-util/scons
->=media-libs/libsndfile-1.0.16 alsa? ( media-libs/alsa-lib ) csoundac? ( x11-libs/fltk:1[threads?] dev-libs/boost =dev-lang/python-2* ) dssi? ( media-libs/dssi media-libs/ladspa-sdk ) fluidsynth? ( media-sound/fluidsynth ) fltk? ( x11-libs/fltk:1[threads?] ) image? ( media-libs/libpng ) jack? ( media-sound/jack-audio-connection-kit ) java? ( >=virtual/jdk-1.5 ) keyboard? ( x11-libs/fltk:1[threads?] ) linear? ( sci-mathematics/gmm ) lua? ( dev-lang/luajit:2 ) osc? ( media-libs/liblo ) portaudio? ( media-libs/portaudio ) portmidi? ( media-libs/portmidi ) pulseaudio? ( media-sound/pulseaudio ) stk? ( media-libs/stk ) tcl? ( >=dev-lang/tcl-8.5 >=dev-lang/tk-8.5 ) utils? ( !media-sound/snd ) vst? ( x11-libs/fltk:1[threads?] dev-libs/boost =dev-lang/python-2* ) python? ( =dev-lang/python-2* ) java? ( >=dev-java/java-config-2.1.9-r1 )
-0
-mirror://sourceforge/csound/Csound5.16.6.tar.gz html? ( linguas_fr? ( mirror://sourceforge/csound/Csound5.16_manual-fr_html.zip ) !linguas_fr? ( mirror://sourceforge/csound/Csound5.16_manual_html.zip ) ) doc? ( linguas_fr? ( mirror://sourceforge/csound/Csound5.16_manual-fr_pdf.zip ) !linguas_fr? ( mirror://sourceforge/csound/Csound5.16_manual_pdf.zip ) )
-
-http://csounds.com/
-LGPL-2.1
-A sound design and signal processing system providing facilities for composition and performance
-~amd64 ~x86
-eutils java-pkg-opt-2 java-utils-2 multilib python scons-utils toolchain-funcs user versionator
-+alsa beats chua csoundac +cxx debug double-precision dssi examples fltk +fluidsynth html +image jack java keyboard linear lua nls osc openmp doc portaudio portmidi pulseaudio python samples static-libs stk tcl test +threads +utils vim-syntax vst linguas_de linguas_en_GB linguas_en_US linguas_es_CO linguas_fr linguas_it linguas_ro linguas_ru elibc_FreeBSD java
-vst? ( csoundac ) java? ( cxx ) linear? ( double-precision ) lua? ( cxx ) python? ( cxx )
-
-
-4
-
-compile install preinst prepare setup test
-
-
-
-
-
diff --git a/metadata/cache/media-sound/csound-5.17.2 b/metadata/cache/media-sound/csound-5.17.2
new file mode 100644
index 000000000000..9c922f357a85
--- /dev/null
+++ b/metadata/cache/media-sound/csound-5.17.2
@@ -0,0 +1,22 @@
+>=media-libs/libsndfile-1.0.16 alsa? ( media-libs/alsa-lib ) csoundac? ( x11-libs/fltk:1[threads?] dev-libs/boost =dev-lang/python-2* ) dssi? ( media-libs/dssi media-libs/ladspa-sdk ) fluidsynth? ( media-sound/fluidsynth ) fltk? ( x11-libs/fltk:1[threads?] ) image? ( media-libs/libpng ) jack? ( media-sound/jack-audio-connection-kit ) java? ( >=virtual/jdk-1.5 ) keyboard? ( x11-libs/fltk:1[threads?] ) linear? ( sci-mathematics/gmm ) lua? ( luajit? ( dev-lang/luajit:2 ) !luajit? ( dev-lang/lua ) ) osc? ( media-libs/liblo ) portaudio? ( media-libs/portaudio ) portmidi? ( media-libs/portmidi ) pulseaudio? ( media-sound/pulseaudio ) stk? ( media-libs/stk ) tcl? ( >=dev-lang/tcl-8.5 >=dev-lang/tk-8.5 ) utils? ( !media-sound/snd ) vst? ( x11-libs/fltk:1[threads?] dev-libs/boost =dev-lang/python-2* ) sys-devel/flex virtual/yacc chua? ( dev-libs/boost ) csoundac? ( dev-lang/swig ) html? ( app-arch/unzip ) doc? ( app-arch/unzip ) nls? ( sys-devel/gettext ) test? ( =dev-lang/python-2* ) vst? ( dev-lang/swig ) python? ( =dev-lang/python-2* ) java? ( >=dev-java/java-config-2.1.9-r1 ) dev-util/scons
+>=media-libs/libsndfile-1.0.16 alsa? ( media-libs/alsa-lib ) csoundac? ( x11-libs/fltk:1[threads?] dev-libs/boost =dev-lang/python-2* ) dssi? ( media-libs/dssi media-libs/ladspa-sdk ) fluidsynth? ( media-sound/fluidsynth ) fltk? ( x11-libs/fltk:1[threads?] ) image? ( media-libs/libpng ) jack? ( media-sound/jack-audio-connection-kit ) java? ( >=virtual/jdk-1.5 ) keyboard? ( x11-libs/fltk:1[threads?] ) linear? ( sci-mathematics/gmm ) lua? ( luajit? ( dev-lang/luajit:2 ) !luajit? ( dev-lang/lua ) ) osc? ( media-libs/liblo ) portaudio? ( media-libs/portaudio ) portmidi? ( media-libs/portmidi ) pulseaudio? ( media-sound/pulseaudio ) stk? ( media-libs/stk ) tcl? ( >=dev-lang/tcl-8.5 >=dev-lang/tk-8.5 ) utils? ( !media-sound/snd ) vst? ( x11-libs/fltk:1[threads?] dev-libs/boost =dev-lang/python-2* ) python? ( =dev-lang/python-2* ) java? ( >=dev-java/java-config-2.1.9-r1 )
+0
+mirror://sourceforge/csound/Csound5.17.2.tar.gz html? ( linguas_fr? ( mirror://sourceforge/csound/Csound5.17_manual-fr_html.zip ) !linguas_fr? ( mirror://sourceforge/csound/Csound5.17_manual_html.zip ) ) doc? ( linguas_fr? ( mirror://sourceforge/csound/Csound5.17_manual-fr_pdf.zip ) !linguas_fr? ( mirror://sourceforge/csound/Csound5.17_manual_pdf.zip ) )
+
+http://csounds.com/
+LGPL-2.1
+A sound design and signal processing system providing facilities for composition and performance
+~amd64 ~x86
+eutils java-pkg-opt-2 java-utils-2 multilib python scons-utils toolchain-funcs user versionator
++alsa beats chua csoundac +cxx debug doc double-precision dssi examples fltk +fluidsynth html +image jack java keyboard linear lua luajit nls osc openmp portaudio portmidi pulseaudio python samples static-libs stk tcl test +threads +utils vim-syntax vst linguas_de linguas_en_GB linguas_en_US linguas_es_CO linguas_fr linguas_it linguas_ro linguas_ru elibc_FreeBSD java
+vst? ( csoundac ) java? ( cxx ) linear? ( double-precision ) lua? ( cxx ) python? ( cxx )
+
+
+4
+
+compile install preinst prepare setup test
+
+
+
+
+
diff --git a/metadata/cache/media-sound/ecasound-2.8.1 b/metadata/cache/media-sound/ecasound-2.8.1
index a0cf08125ef7..866e6310ada3 100644
--- a/metadata/cache/media-sound/ecasound-2.8.1
+++ b/metadata/cache/media-sound/ecasound-2.8.1
@@ -1,4 +1,4 @@
-sys-libs/readline alsa? ( media-libs/alsa-lib ) audiofile? ( media-libs/audiofile ) jack? ( media-sound/jack-audio-connection-kit ) libsamplerate? ( media-libs/libsamplerate ) media-libs/ladspa-sdk mikmod? ( media-libs/libmikmod:0 ) ncurses? ( sys-libs/ncurses ) oil? ( dev-libs/liboil ) osc? ( media-libs/liblo ) ruby? ( dev-lang/ruby ) sndfile? ( media-libs/libsndfile ) dev-util/pkgconfig python? ( =dev-lang/python-2* ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+sys-libs/readline alsa? ( media-libs/alsa-lib ) audiofile? ( media-libs/audiofile ) jack? ( media-sound/jack-audio-connection-kit ) libsamplerate? ( media-libs/libsamplerate ) media-libs/ladspa-sdk mikmod? ( media-libs/libmikmod:0 ) ncurses? ( sys-libs/ncurses ) oil? ( dev-libs/liboil ) osc? ( media-libs/liblo ) ruby? ( dev-lang/ruby ) sndfile? ( media-libs/libsndfile ) dev-util/pkgconfig python? ( =dev-lang/python-2* ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 sys-libs/readline alsa? ( media-libs/alsa-lib ) audiofile? ( media-libs/audiofile ) jack? ( media-sound/jack-audio-connection-kit ) libsamplerate? ( media-libs/libsamplerate ) media-libs/ladspa-sdk mikmod? ( media-libs/libmikmod:0 ) ncurses? ( sys-libs/ncurses ) oil? ( dev-libs/liboil ) osc? ( media-libs/liblo ) ruby? ( dev-lang/ruby ) sndfile? ( media-libs/libsndfile ) python? ( =dev-lang/python-2* )
 1
 http://ecasound.seul.org/download/ecasound-2.8.1.tar.gz
diff --git a/metadata/cache/media-sound/fluidsynth-1.0.9 b/metadata/cache/media-sound/fluidsynth-1.0.9
index b5431253e730..6a083d8ee11d 100644
--- a/metadata/cache/media-sound/fluidsynth-1.0.9
+++ b/metadata/cache/media-sound/fluidsynth-1.0.9
@@ -1,4 +1,4 @@
-jack? ( media-sound/jack-audio-connection-kit ) ladspa? ( >=media-libs/ladspa-sdk-1.12 >=media-libs/ladspa-cmt-1.15 ) alsa? ( media-libs/alsa-lib lash? ( >=media-sound/lash-0.5 ) ) pulseaudio? ( >=media-sound/pulseaudio-0.9.8 ) portaudio? ( >=media-libs/portaudio-19_pre ) readline? ( sys-libs/readline ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+jack? ( media-sound/jack-audio-connection-kit ) ladspa? ( >=media-libs/ladspa-sdk-1.12 >=media-libs/ladspa-cmt-1.15 ) alsa? ( media-libs/alsa-lib lash? ( >=media-sound/lash-0.5 ) ) pulseaudio? ( >=media-sound/pulseaudio-0.9.8 ) portaudio? ( >=media-libs/portaudio-19_pre ) readline? ( sys-libs/readline ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 jack? ( media-sound/jack-audio-connection-kit ) ladspa? ( >=media-libs/ladspa-sdk-1.12 >=media-libs/ladspa-cmt-1.15 ) alsa? ( media-libs/alsa-lib lash? ( >=media-sound/lash-0.5 ) ) pulseaudio? ( >=media-sound/pulseaudio-0.9.8 ) portaudio? ( >=media-libs/portaudio-19_pre ) readline? ( sys-libs/readline )
 0
 http://savannah.nongnu.org/download/fluid/fluidsynth-1.0.9.tar.gz
diff --git a/metadata/cache/media-sound/freewheeling-0.6 b/metadata/cache/media-sound/freewheeling-0.6
index ff16c6fabd99..be1f242c399b 100644
--- a/metadata/cache/media-sound/freewheeling-0.6
+++ b/metadata/cache/media-sound/freewheeling-0.6
@@ -1,4 +1,4 @@
-dev-libs/libxml2 media-libs/alsa-lib media-libs/freetype:2 media-libs/libvorbis media-libs/libsdl[audio,video,joystick] media-libs/libsndfile media-libs/sdl-gfx media-libs/sdl-ttf media-sound/jack-audio-connection-kit net-libs/gnutls x11-libs/libX11 fluidsynth? ( media-sound/fluidsynth ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-libs/libxml2 media-libs/alsa-lib media-libs/freetype:2 media-libs/libvorbis media-libs/libsdl[audio,video,joystick] media-libs/libsndfile media-libs/sdl-gfx media-libs/sdl-ttf media-sound/jack-audio-connection-kit net-libs/gnutls x11-libs/libX11 fluidsynth? ( media-sound/fluidsynth ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-libs/libxml2 media-libs/alsa-lib media-libs/freetype:2 media-libs/libvorbis media-libs/libsdl[audio,video,joystick] media-libs/libsndfile media-libs/sdl-gfx media-libs/sdl-ttf media-sound/jack-audio-connection-kit net-libs/gnutls x11-libs/libX11 fluidsynth? ( media-sound/fluidsynth )
 0
 mirror://sourceforge/freewheeling/fweelin-0.6-src.tar.bz2
diff --git a/metadata/cache/media-sound/gmorgan-0.25-r1 b/metadata/cache/media-sound/gmorgan-0.25-r1
index 899f376ca410..c3fe68e3f1e0 100644
--- a/metadata/cache/media-sound/gmorgan-0.25-r1
+++ b/metadata/cache/media-sound/gmorgan-0.25-r1
@@ -1,4 +1,4 @@
-media-libs/alsa-lib x11-libs/fltk:1 sys-devel/gettext || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+media-libs/alsa-lib x11-libs/fltk:1 sys-devel/gettext || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 media-libs/alsa-lib x11-libs/fltk:1
 0
 mirror://sourceforge/gmorgan/gmorgan-0.25.tar.gz
diff --git a/metadata/cache/media-sound/gmorgan-0.39 b/metadata/cache/media-sound/gmorgan-0.39
index 63bd5921dae4..f80e630e6c96 100644
--- a/metadata/cache/media-sound/gmorgan-0.39
+++ b/metadata/cache/media-sound/gmorgan-0.39
@@ -1,4 +1,4 @@
-media-libs/alsa-lib x11-libs/fltk:1 sys-devel/gettext || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+media-libs/alsa-lib x11-libs/fltk:1 sys-devel/gettext || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 media-libs/alsa-lib x11-libs/fltk:1
 0
 mirror://sourceforge/gmorgan/gmorgan_0.39.tar.gz
diff --git a/metadata/cache/media-sound/gmpc-0.20.0 b/metadata/cache/media-sound/gmpc-0.20.0
index e52e4c67c8e2..9ecd0ac188d2 100644
--- a/metadata/cache/media-sound/gmpc-0.20.0
+++ b/metadata/cache/media-sound/gmpc-0.20.0
@@ -1,4 +1,4 @@
->=dev-libs/glib-2.16:2 >=x11-libs/gtk+-2.12:2 x11-libs/libsexy >=gnome-base/libglade-2 >=media-libs/libmpd-0.19.2 net-libs/libsoup:2.4 dev-db/sqlite:3 xspf? ( >=media-libs/libxspf-1.2 ) dev-lang/vala:0.10 >=dev-util/gob-2.0.17 dev-util/pkgconfig nls? ( dev-util/intltool sys-devel/gettext ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+>=dev-libs/glib-2.16:2 >=x11-libs/gtk+-2.12:2 x11-libs/libsexy >=gnome-base/libglade-2 >=media-libs/libmpd-0.19.2 net-libs/libsoup:2.4 dev-db/sqlite:3 xspf? ( >=media-libs/libxspf-1.2 ) dev-lang/vala:0.10 >=dev-util/gob-2.0.17 dev-util/pkgconfig nls? ( dev-util/intltool sys-devel/gettext ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 >=dev-libs/glib-2.16:2 >=x11-libs/gtk+-2.12:2 x11-libs/libsexy >=gnome-base/libglade-2 >=media-libs/libmpd-0.19.2 net-libs/libsoup:2.4 dev-db/sqlite:3 xspf? ( >=media-libs/libxspf-1.2 )
 0
 http://download.sarine.nl/Programs/gmpc/0.20.0/gmpc-0.20.0.tar.gz
diff --git a/metadata/cache/media-sound/gnomoradio-0.15.1 b/metadata/cache/media-sound/gnomoradio-0.15.1
index e01e4ecccd16..f2a3da2c1ff5 100644
--- a/metadata/cache/media-sound/gnomoradio-0.15.1
+++ b/metadata/cache/media-sound/gnomoradio-0.15.1
@@ -1,4 +1,4 @@
-dev-cpp/gtkmm:2.4 dev-cpp/glibmm:2 >=dev-cpp/gconfmm-2.6 dev-cpp/libxmlpp:2.6 dev-libs/libsigc++:2 media-libs/libao vorbis? ( media-libs/libvorbis ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-cpp/gtkmm:2.4 dev-cpp/glibmm:2 >=dev-cpp/gconfmm-2.6 dev-cpp/libxmlpp:2.6 dev-libs/libsigc++:2 media-libs/libao vorbis? ( media-libs/libvorbis ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-cpp/gtkmm:2.4 dev-cpp/glibmm:2 >=dev-cpp/gconfmm-2.6 dev-cpp/libxmlpp:2.6 dev-libs/libsigc++:2 media-libs/libao vorbis? ( media-libs/libvorbis )
 0
 http://savannah.nongnu.org/download/gnomoradio/gnomoradio-0.15.1.tar.bz2
diff --git a/metadata/cache/media-sound/jack-rack-1.4.7-r1 b/metadata/cache/media-sound/jack-rack-1.4.7-r1
index 96525f4eadbb..0f57a28ff873 100644
--- a/metadata/cache/media-sound/jack-rack-1.4.7-r1
+++ b/metadata/cache/media-sound/jack-rack-1.4.7-r1
@@ -1,4 +1,4 @@
-x11-libs/gtk+:2 >=media-libs/ladspa-sdk-1.12 media-sound/jack-audio-connection-kit alsa? ( media-libs/alsa-lib ) lash? ( >=media-sound/lash-0.5 ) gnome? ( >=gnome-base/libgnomeui-2 ) nls? ( virtual/libintl ) xml? ( dev-libs/libxml2 media-libs/liblrdf ) dev-util/pkgconfig nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+x11-libs/gtk+:2 >=media-libs/ladspa-sdk-1.12 media-sound/jack-audio-connection-kit alsa? ( media-libs/alsa-lib ) lash? ( >=media-sound/lash-0.5 ) gnome? ( >=gnome-base/libgnomeui-2 ) nls? ( virtual/libintl ) xml? ( dev-libs/libxml2 media-libs/liblrdf ) dev-util/pkgconfig nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 x11-libs/gtk+:2 >=media-libs/ladspa-sdk-1.12 media-sound/jack-audio-connection-kit alsa? ( media-libs/alsa-lib ) lash? ( >=media-sound/lash-0.5 ) gnome? ( >=gnome-base/libgnomeui-2 ) nls? ( virtual/libintl ) xml? ( dev-libs/libxml2 media-libs/liblrdf )
 0
 mirror://sourceforge/jack-rack/jack-rack-1.4.7.tar.gz
diff --git a/metadata/cache/media-sound/jack-rack-1.4.8_rc1 b/metadata/cache/media-sound/jack-rack-1.4.8_rc1
index feb3ae921851..2908febd6684 100644
--- a/metadata/cache/media-sound/jack-rack-1.4.8_rc1
+++ b/metadata/cache/media-sound/jack-rack-1.4.8_rc1
@@ -1,4 +1,4 @@
->=x11-libs/gtk+-2.12:2 >=media-libs/ladspa-sdk-1.12 media-sound/jack-audio-connection-kit alsa? ( media-libs/alsa-lib ) lash? ( >=media-sound/lash-0.5 ) gnome? ( >=gnome-base/libgnomeui-2 ) virtual/libintl xml? ( dev-libs/libxml2 media-libs/liblrdf ) dev-util/pkgconfig sys-devel/gettext || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=x11-libs/gtk+-2.12:2 >=media-libs/ladspa-sdk-1.12 media-sound/jack-audio-connection-kit alsa? ( media-libs/alsa-lib ) lash? ( >=media-sound/lash-0.5 ) gnome? ( >=gnome-base/libgnomeui-2 ) virtual/libintl xml? ( dev-libs/libxml2 media-libs/liblrdf ) dev-util/pkgconfig sys-devel/gettext || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=x11-libs/gtk+-2.12:2 >=media-libs/ladspa-sdk-1.12 media-sound/jack-audio-connection-kit alsa? ( media-libs/alsa-lib ) lash? ( >=media-sound/lash-0.5 ) gnome? ( >=gnome-base/libgnomeui-2 ) virtual/libintl xml? ( dev-libs/libxml2 media-libs/liblrdf )
 0
 mirror://debian/pool/main/j/jack-rack/jack-rack_1.4.8~rc1.orig.tar.gz mirror://debian/pool/main/j/jack-rack/jack-rack_1.4.8~rc1-1.debian.tar.gz
diff --git a/metadata/cache/media-sound/jackbeat-0.7.6 b/metadata/cache/media-sound/jackbeat-0.7.6
index 8d33cad33c20..b1e9d1e3bd6c 100644
--- a/metadata/cache/media-sound/jackbeat-0.7.6
+++ b/metadata/cache/media-sound/jackbeat-0.7.6
@@ -1,4 +1,4 @@
-dev-libs/glib:2 >=dev-libs/libxml2-2.6:2 gnome-base/libglade:2.0 >=media-libs/liblo-0.22 >=media-libs/libsamplerate-0.1.2 >=media-libs/libsndfile-1.0.15 media-libs/alsa-lib media-libs/portaudio jack? ( >=media-sound/jack-audio-connection-kit-0.101 ) pulseaudio? ( >=media-sound/pulseaudio-0.9.10 ) x11-libs/cairo x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-2.12:2 x11-libs/pango dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-libs/glib:2 >=dev-libs/libxml2-2.6:2 gnome-base/libglade:2.0 >=media-libs/liblo-0.22 >=media-libs/libsamplerate-0.1.2 >=media-libs/libsndfile-1.0.15 media-libs/alsa-lib media-libs/portaudio jack? ( >=media-sound/jack-audio-connection-kit-0.101 ) pulseaudio? ( >=media-sound/pulseaudio-0.9.10 ) x11-libs/cairo x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-2.12:2 x11-libs/pango dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-libs/glib:2 >=dev-libs/libxml2-2.6:2 gnome-base/libglade:2.0 >=media-libs/liblo-0.22 >=media-libs/libsamplerate-0.1.2 >=media-libs/libsndfile-1.0.15 media-libs/alsa-lib media-libs/portaudio jack? ( >=media-sound/jack-audio-connection-kit-0.101 ) pulseaudio? ( >=media-sound/pulseaudio-0.9.10 ) x11-libs/cairo x11-libs/gdk-pixbuf:2 >=x11-libs/gtk+-2.12:2 x11-libs/pango
 0
 http://www.samalyse.com/jackbeat/files/jackbeat-0.7.6.tar.gz
diff --git a/metadata/cache/media-sound/lame-3.99.3 b/metadata/cache/media-sound/lame-3.99.3
index 57943d96ffd7..d94696edd491 100644
--- a/metadata/cache/media-sound/lame-3.99.3
+++ b/metadata/cache/media-sound/lame-3.99.3
@@ -1,4 +1,4 @@
->=sys-libs/ncurses-5.2 sndfile? ( >=media-libs/libsndfile-1.0.2 ) dev-util/pkgconfig mmx? ( dev-lang/nasm ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=sys-libs/ncurses-5.2 sndfile? ( >=media-libs/libsndfile-1.0.2 ) dev-util/pkgconfig mmx? ( dev-lang/nasm ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=sys-libs/ncurses-5.2 sndfile? ( >=media-libs/libsndfile-1.0.2 )
 0
 mirror://sourceforge/lame/lame-3.99.3.tar.gz
diff --git a/metadata/cache/media-sound/lame-3.99.5 b/metadata/cache/media-sound/lame-3.99.5
index 63a72fdc4161..72c7f0591253 100644
--- a/metadata/cache/media-sound/lame-3.99.5
+++ b/metadata/cache/media-sound/lame-3.99.5
@@ -1,4 +1,4 @@
->=sys-libs/ncurses-5.7-r7 sndfile? ( >=media-libs/libsndfile-1.0.2 ) dev-util/pkgconfig mmx? ( dev-lang/nasm ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=sys-libs/ncurses-5.7-r7 sndfile? ( >=media-libs/libsndfile-1.0.2 ) dev-util/pkgconfig mmx? ( dev-lang/nasm ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=sys-libs/ncurses-5.7-r7 sndfile? ( >=media-libs/libsndfile-1.0.2 )
 0
 mirror://sourceforge/lame/lame-3.99.5.tar.gz
diff --git a/metadata/cache/media-sound/lash-0.5.4-r1 b/metadata/cache/media-sound/lash-0.5.4-r1
index d90eed43c065..ae56b0895c66 100644
--- a/metadata/cache/media-sound/lash-0.5.4-r1
+++ b/metadata/cache/media-sound/lash-0.5.4-r1
@@ -1,4 +1,4 @@
-alsa? ( media-libs/alsa-lib ) media-sound/jack-audio-connection-kit dev-libs/libxml2 gtk? ( x11-libs/gtk+:2 ) python? ( dev-lang/python ) || ( sys-libs/readline dev-libs/libedit ) dev-util/pkgconfig python? ( >=dev-lang/swig-1.3.31 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+alsa? ( media-libs/alsa-lib ) media-sound/jack-audio-connection-kit dev-libs/libxml2 gtk? ( x11-libs/gtk+:2 ) python? ( dev-lang/python ) || ( sys-libs/readline dev-libs/libedit ) dev-util/pkgconfig python? ( >=dev-lang/swig-1.3.31 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 alsa? ( media-libs/alsa-lib ) media-sound/jack-audio-connection-kit dev-libs/libxml2 gtk? ( x11-libs/gtk+:2 ) python? ( dev-lang/python ) || ( sys-libs/readline dev-libs/libedit )
 0
 http://download.savannah.gnu.org/releases/lash/lash-0.5.4.tar.gz
diff --git a/metadata/cache/media-sound/lilypond-2.14.2 b/metadata/cache/media-sound/lilypond-2.14.2
index af1c26dd0849..bc7ef685cd83 100644
--- a/metadata/cache/media-sound/lilypond-2.14.2
+++ b/metadata/cache/media-sound/lilypond-2.14.2
@@ -1,4 +1,4 @@
->=app-text/ghostscript-gpl-8.15 >=dev-scheme/guile-1.8.2[deprecated,regex] media-fonts/urw-fonts media-libs/fontconfig media-libs/freetype:2 >=x11-libs/pango-1.12.3 emacs? ( virtual/emacs ) app-text/t1utils dev-lang/perl dev-texlive/texlive-metapost dev-util/pkgconfig media-gfx/fontforge >=sys-apps/texinfo-4.11 >=sys-devel/bison-2.0 sys-devel/flex sys-devel/gettext sys-devel/make =dev-lang/python-2* || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=app-text/ghostscript-gpl-8.15 >=dev-scheme/guile-1.8.2[deprecated,regex] media-fonts/urw-fonts media-libs/fontconfig media-libs/freetype:2 >=x11-libs/pango-1.12.3 emacs? ( virtual/emacs ) app-text/t1utils dev-lang/perl dev-texlive/texlive-metapost dev-util/pkgconfig media-gfx/fontforge >=sys-apps/texinfo-4.11 >=sys-devel/bison-2.0 sys-devel/flex sys-devel/gettext sys-devel/make =dev-lang/python-2* || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=app-text/ghostscript-gpl-8.15 >=dev-scheme/guile-1.8.2[deprecated,regex] media-fonts/urw-fonts media-libs/fontconfig media-libs/freetype:2 >=x11-libs/pango-1.12.3 emacs? ( virtual/emacs ) =dev-lang/python-2*
 0
 http://download.linuxaudio.org/lilypond/sources/v2.14/lilypond-2.14.2.tar.gz
diff --git a/metadata/cache/media-sound/lingot-0.9.0 b/metadata/cache/media-sound/lingot-0.9.0
index ec77bb815d43..b99da2935dfa 100644
--- a/metadata/cache/media-sound/lingot-0.9.0
+++ b/metadata/cache/media-sound/lingot-0.9.0
@@ -1,4 +1,4 @@
-x11-libs/gtk+:2 x11-libs/gdk-pixbuf:2 x11-libs/pango dev-libs/glib:2 gnome-base/libglade:2.0 alsa? ( media-libs/alsa-lib ) jack? ( >=media-sound/jack-audio-connection-kit-0.102 ) dev-util/pkgconfig dev-util/intltool sys-devel/gettext || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+x11-libs/gtk+:2 x11-libs/gdk-pixbuf:2 x11-libs/pango dev-libs/glib:2 gnome-base/libglade:2.0 alsa? ( media-libs/alsa-lib ) jack? ( >=media-sound/jack-audio-connection-kit-0.102 ) dev-util/pkgconfig dev-util/intltool sys-devel/gettext || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 x11-libs/gtk+:2 x11-libs/gdk-pixbuf:2 x11-libs/pango dev-libs/glib:2 gnome-base/libglade:2.0 alsa? ( media-libs/alsa-lib ) jack? ( >=media-sound/jack-audio-connection-kit-0.102 )
 0
 http://download.savannah.gnu.org/releases/lingot/lingot-0.9.0.tar.gz
diff --git a/metadata/cache/media-sound/lingot-0.9.1 b/metadata/cache/media-sound/lingot-0.9.1
index 8c104d79fff3..62515dea34cd 100644
--- a/metadata/cache/media-sound/lingot-0.9.1
+++ b/metadata/cache/media-sound/lingot-0.9.1
@@ -1,4 +1,4 @@
-x11-libs/gtk+:2 x11-libs/gdk-pixbuf:2 x11-libs/pango dev-libs/glib:2 gnome-base/libglade:2.0 alsa? ( media-libs/alsa-lib ) jack? ( >=media-sound/jack-audio-connection-kit-0.102 ) dev-util/pkgconfig dev-util/intltool sys-devel/gettext || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+x11-libs/gtk+:2 x11-libs/gdk-pixbuf:2 x11-libs/pango dev-libs/glib:2 gnome-base/libglade:2.0 alsa? ( media-libs/alsa-lib ) jack? ( >=media-sound/jack-audio-connection-kit-0.102 ) dev-util/pkgconfig dev-util/intltool sys-devel/gettext || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 x11-libs/gtk+:2 x11-libs/gdk-pixbuf:2 x11-libs/pango dev-libs/glib:2 gnome-base/libglade:2.0 alsa? ( media-libs/alsa-lib ) jack? ( >=media-sound/jack-audio-connection-kit-0.102 )
 0
 http://download.savannah.gnu.org/releases/lingot/lingot-0.9.1.tar.gz
diff --git a/metadata/cache/media-sound/madplay-0.15.2b-r1 b/metadata/cache/media-sound/madplay-0.15.2b-r1
index 17d4fa6d9ae5..35acf92f6d81 100644
--- a/metadata/cache/media-sound/madplay-0.15.2b-r1
+++ b/metadata/cache/media-sound/madplay-0.15.2b-r1
@@ -1,4 +1,4 @@
->=media-libs/libid3tag-0.15.1b >=media-libs/libmad-0.15.1b alsa? ( media-libs/alsa-lib ) nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=media-libs/libid3tag-0.15.1b >=media-libs/libmad-0.15.1b alsa? ( media-libs/alsa-lib ) nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=media-libs/libid3tag-0.15.1b >=media-libs/libmad-0.15.1b alsa? ( media-libs/alsa-lib )
 0
 mirror://sourceforge/mad/madplay-0.15.2b.tar.gz
diff --git a/metadata/cache/media-sound/meterbridge-0.9.3 b/metadata/cache/media-sound/meterbridge-0.9.3
index df7d8ed7ecf3..29589e1ae930 100644
--- a/metadata/cache/media-sound/meterbridge-0.9.3
+++ b/metadata/cache/media-sound/meterbridge-0.9.3
@@ -1,4 +1,4 @@
-media-sound/jack-audio-connection-kit >=media-libs/libsdl-1.2 >=media-libs/sdl-image-1.2.10[png] virtual/opengl dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+media-sound/jack-audio-connection-kit >=media-libs/libsdl-1.2 >=media-libs/sdl-image-1.2.10[png] virtual/opengl dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 media-sound/jack-audio-connection-kit >=media-libs/libsdl-1.2 >=media-libs/sdl-image-1.2.10[png] virtual/opengl
 0
 http://plugin.org.uk/meterbridge/meterbridge-0.9.3.tar.gz
diff --git a/metadata/cache/media-sound/milkytracker-0.90.80 b/metadata/cache/media-sound/milkytracker-0.90.80
index efe62daccdb2..4f92b1857ac4 100644
--- a/metadata/cache/media-sound/milkytracker-0.90.80
+++ b/metadata/cache/media-sound/milkytracker-0.90.80
@@ -1,4 +1,4 @@
->=media-libs/libsdl-1.2 alsa? ( media-libs/alsa-lib ) jack? ( media-sound/jack-audio-connection-kit ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=media-libs/libsdl-1.2 alsa? ( media-libs/alsa-lib ) jack? ( media-sound/jack-audio-connection-kit ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=media-libs/libsdl-1.2 alsa? ( media-libs/alsa-lib ) jack? ( media-sound/jack-audio-connection-kit )
 0
 mirror://gentoo/milkytracker-0.90.80.tar.bz2
diff --git a/metadata/cache/media-sound/milkytracker-0.90.85 b/metadata/cache/media-sound/milkytracker-0.90.85
index 9f56bf6c0802..66719982eb18 100644
--- a/metadata/cache/media-sound/milkytracker-0.90.85
+++ b/metadata/cache/media-sound/milkytracker-0.90.85
@@ -1,4 +1,4 @@
->=media-libs/libsdl-1.2 sys-libs/zlib alsa? ( media-libs/alsa-lib ) jack? ( media-sound/jack-audio-connection-kit ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=media-libs/libsdl-1.2 sys-libs/zlib alsa? ( media-libs/alsa-lib ) jack? ( media-sound/jack-audio-connection-kit ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=media-libs/libsdl-1.2 sys-libs/zlib alsa? ( media-libs/alsa-lib ) jack? ( media-sound/jack-audio-connection-kit )
 0
 http://milkytracker.org/files/milkytracker-0.90.85.tar.bz2
diff --git a/metadata/cache/media-sound/moc-2.5.0_alpha4_p20111211 b/metadata/cache/media-sound/moc-2.5.0_alpha4_p20111211
index c2d086aec324..66a46a55d3ba 100644
--- a/metadata/cache/media-sound/moc-2.5.0_alpha4_p20111211
+++ b/metadata/cache/media-sound/moc-2.5.0_alpha4_p20111211
@@ -1,4 +1,4 @@
->=sys-devel/libtool-2.2.6b >=sys-libs/db-4 sys-libs/ncurses[unicode?] aac? ( media-libs/faad2 ) alsa? ( media-libs/alsa-lib ) curl? ( net-misc/curl ) ffmpeg? ( virtual/ffmpeg ) flac? ( media-libs/flac ) jack? ( media-sound/jack-audio-connection-kit ) libsamplerate? ( media-libs/libsamplerate ) mad? ( media-libs/libmad sys-libs/zlib media-libs/libid3tag ) modplug? ( media-libs/libmodplug ) musepack? ( media-sound/musepack-tools media-libs/taglib ) sid? ( >=media-libs/libsidplay-2 ) sndfile? ( media-libs/libsndfile ) speex? ( media-libs/speex ) timidity? ( media-libs/libtimidity media-sound/timidity++ ) vorbis? ( media-libs/libvorbis ) wavpack? ( media-sound/wavpack ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=sys-devel/libtool-2.2.6b >=sys-libs/db-4 sys-libs/ncurses[unicode?] aac? ( media-libs/faad2 ) alsa? ( media-libs/alsa-lib ) curl? ( net-misc/curl ) ffmpeg? ( virtual/ffmpeg ) flac? ( media-libs/flac ) jack? ( media-sound/jack-audio-connection-kit ) libsamplerate? ( media-libs/libsamplerate ) mad? ( media-libs/libmad sys-libs/zlib media-libs/libid3tag ) modplug? ( media-libs/libmodplug ) musepack? ( media-sound/musepack-tools media-libs/taglib ) sid? ( >=media-libs/libsidplay-2 ) sndfile? ( media-libs/libsndfile ) speex? ( media-libs/speex ) timidity? ( media-libs/libtimidity media-sound/timidity++ ) vorbis? ( media-libs/libvorbis ) wavpack? ( media-sound/wavpack ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=sys-devel/libtool-2.2.6b >=sys-libs/db-4 sys-libs/ncurses[unicode?] aac? ( media-libs/faad2 ) alsa? ( media-libs/alsa-lib ) curl? ( net-misc/curl ) ffmpeg? ( virtual/ffmpeg ) flac? ( media-libs/flac ) jack? ( media-sound/jack-audio-connection-kit ) libsamplerate? ( media-libs/libsamplerate ) mad? ( media-libs/libmad sys-libs/zlib media-libs/libid3tag ) modplug? ( media-libs/libmodplug ) musepack? ( media-sound/musepack-tools media-libs/taglib ) sid? ( >=media-libs/libsidplay-2 ) sndfile? ( media-libs/libsndfile ) speex? ( media-libs/speex ) timidity? ( media-libs/libtimidity media-sound/timidity++ ) vorbis? ( media-libs/libvorbis ) wavpack? ( media-sound/wavpack )
 0
 http://dev.gentoo.org/~ssuominen/moc-2.5.0_alpha4_p20111211.tar.xz
diff --git a/metadata/cache/media-sound/mp3splt-gtk-0.5.9 b/metadata/cache/media-sound/mp3splt-gtk-0.5.9
index 5d8ee0b99122..c895098b9ad4 100644
--- a/metadata/cache/media-sound/mp3splt-gtk-0.5.9
+++ b/metadata/cache/media-sound/mp3splt-gtk-0.5.9
@@ -1,4 +1,4 @@
->=x11-libs/gtk+-2.6:2 >=media-libs/libmp3splt-0.5.6 audacious? ( media-sound/audacious ) gstreamer? ( media-libs/gst-plugins-base:0.10 ) nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=x11-libs/gtk+-2.6:2 >=media-libs/libmp3splt-0.5.6 audacious? ( media-sound/audacious ) gstreamer? ( media-libs/gst-plugins-base:0.10 ) nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=x11-libs/gtk+-2.6:2 >=media-libs/libmp3splt-0.5.6 audacious? ( media-sound/audacious ) gstreamer? ( media-libs/gst-plugins-base:0.10 )
 0
 mirror://sourceforge/mp3splt/mp3splt-gtk-0.5.9.tar.gz
diff --git a/metadata/cache/media-sound/mp3splt-gtk-0.7 b/metadata/cache/media-sound/mp3splt-gtk-0.7
index 2f76b064533d..6f4c6be408e2 100644
--- a/metadata/cache/media-sound/mp3splt-gtk-0.7
+++ b/metadata/cache/media-sound/mp3splt-gtk-0.7
@@ -1,4 +1,4 @@
->=x11-libs/gtk+-2.6:2 >=media-libs/libmp3splt-0.7 audacious? ( <media-sound/audacious-3.0 ) gstreamer? ( media-libs/gst-plugins-base:0.10 ) gnome? ( gnome-base/libgnomeui ) gnome? ( app-text/gnome-doc-utils app-text/rarian ) nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=x11-libs/gtk+-2.6:2 >=media-libs/libmp3splt-0.7 audacious? ( <media-sound/audacious-3.0 ) gstreamer? ( media-libs/gst-plugins-base:0.10 ) gnome? ( gnome-base/libgnomeui ) gnome? ( app-text/gnome-doc-utils app-text/rarian ) nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=x11-libs/gtk+-2.6:2 >=media-libs/libmp3splt-0.7 audacious? ( <media-sound/audacious-3.0 ) gstreamer? ( media-libs/gst-plugins-base:0.10 ) gnome? ( gnome-base/libgnomeui )
 0
 mirror://sourceforge/mp3splt/mp3splt-gtk-0.7.tar.gz
diff --git a/metadata/cache/media-sound/mp3splt-gtk-0.7.0.920 b/metadata/cache/media-sound/mp3splt-gtk-0.7.0.920
index e3f593a03cfd..a330689c868b 100644
--- a/metadata/cache/media-sound/mp3splt-gtk-0.7.0.920
+++ b/metadata/cache/media-sound/mp3splt-gtk-0.7.0.920
@@ -1,4 +1,4 @@
->=x11-libs/gtk+-2.6:2 >=media-libs/libmp3splt-0.7.0.920 audacious? ( <media-sound/audacious-3.0 ) gstreamer? ( media-libs/gst-plugins-base:0.10 ) gnome? ( gnome-base/libgnomeui ) gnome? ( app-text/gnome-doc-utils app-text/rarian ) nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=x11-libs/gtk+-2.6:2 >=media-libs/libmp3splt-0.7.0.920 audacious? ( <media-sound/audacious-3.0 ) gstreamer? ( media-libs/gst-plugins-base:0.10 ) gnome? ( gnome-base/libgnomeui ) gnome? ( app-text/gnome-doc-utils app-text/rarian ) nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=x11-libs/gtk+-2.6:2 >=media-libs/libmp3splt-0.7.0.920 audacious? ( <media-sound/audacious-3.0 ) gstreamer? ( media-libs/gst-plugins-base:0.10 ) gnome? ( gnome-base/libgnomeui )
 0
 http://ioalex.net/testing_downloads/snapshots/920/mp3splt-gtk-0.7.0.920.tar.gz
diff --git a/metadata/cache/media-sound/mp3splt-gtk-0.7.0.930 b/metadata/cache/media-sound/mp3splt-gtk-0.7.0.930
index 002140fec614..a85c574ef7ca 100644
--- a/metadata/cache/media-sound/mp3splt-gtk-0.7.0.930
+++ b/metadata/cache/media-sound/mp3splt-gtk-0.7.0.930
@@ -1,4 +1,4 @@
->=media-libs/libmp3splt-0.7.0.920 gtk3? ( x11-libs/gtk+:3 audacious? ( >=media-sound/audacious-3.0 ) ) !gtk3? ( >=x11-libs/gtk+-2.6:2 audacious? ( <media-sound/audacious-3.0 ) ) gstreamer? ( media-libs/gst-plugins-base:0.10 ) gnome? ( gnome-base/libgnomeui ) gnome? ( app-text/gnome-doc-utils app-text/rarian ) nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=media-libs/libmp3splt-0.7.0.920 gtk3? ( x11-libs/gtk+:3 audacious? ( >=media-sound/audacious-3.0 ) ) !gtk3? ( >=x11-libs/gtk+-2.6:2 audacious? ( <media-sound/audacious-3.0 ) ) gstreamer? ( media-libs/gst-plugins-base:0.10 ) gnome? ( gnome-base/libgnomeui ) gnome? ( app-text/gnome-doc-utils app-text/rarian ) nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=media-libs/libmp3splt-0.7.0.920 gtk3? ( x11-libs/gtk+:3 audacious? ( >=media-sound/audacious-3.0 ) ) !gtk3? ( >=x11-libs/gtk+-2.6:2 audacious? ( <media-sound/audacious-3.0 ) ) gstreamer? ( media-libs/gst-plugins-base:0.10 ) gnome? ( gnome-base/libgnomeui )
 0
 http://ioalex.net/testing_downloads/snapshots/930/mp3splt-gtk-0.7.0.930.tar.gz
diff --git a/metadata/cache/media-sound/mp3splt-gtk-0.7.1 b/metadata/cache/media-sound/mp3splt-gtk-0.7.1
index c384f269a5c2..e42537256942 100644
--- a/metadata/cache/media-sound/mp3splt-gtk-0.7.1
+++ b/metadata/cache/media-sound/mp3splt-gtk-0.7.1
@@ -1,4 +1,4 @@
->=media-libs/libmp3splt-0.7.0.920 gtk3? ( x11-libs/gtk+:3 audacious? ( >=media-sound/audacious-3.0 ) ) !gtk3? ( >=x11-libs/gtk+-2.6:2 audacious? ( <media-sound/audacious-3.0 ) ) gstreamer? ( media-libs/gst-plugins-base:0.10 ) gnome? ( gnome-base/libgnomeui ) gnome? ( app-text/gnome-doc-utils app-text/rarian ) nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=media-libs/libmp3splt-0.7.0.920 gtk3? ( x11-libs/gtk+:3 audacious? ( >=media-sound/audacious-3.0 ) ) !gtk3? ( >=x11-libs/gtk+-2.6:2 audacious? ( <media-sound/audacious-3.0 ) ) gstreamer? ( media-libs/gst-plugins-base:0.10 ) gnome? ( gnome-base/libgnomeui ) gnome? ( app-text/gnome-doc-utils app-text/rarian ) nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=media-libs/libmp3splt-0.7.0.920 gtk3? ( x11-libs/gtk+:3 audacious? ( >=media-sound/audacious-3.0 ) ) !gtk3? ( >=x11-libs/gtk+-2.6:2 audacious? ( <media-sound/audacious-3.0 ) ) gstreamer? ( media-libs/gst-plugins-base:0.10 ) gnome? ( gnome-base/libgnomeui )
 0
 mirror://sourceforge/mp3splt/mp3splt-gtk-0.7.1.tar.gz
diff --git a/metadata/cache/media-sound/mpd-9999 b/metadata/cache/media-sound/mpd-9999
index 76d85bf1bbcd..2e14d5a94290 100644
--- a/metadata/cache/media-sound/mpd-9999
+++ b/metadata/cache/media-sound/mpd-9999
@@ -1,4 +1,4 @@
-!<sys-cluster/mpich2-1.4_rc2 dev-libs/glib:2 aac? ( media-libs/faad2 ) alsa? ( media-sound/alsa-utils ) ao? ( media-libs/libao[alsa?,pulseaudio?] ) audiofile? ( media-libs/audiofile ) bzip2? ( app-arch/bzip2 ) cdio? ( dev-libs/libcdio virtual/cdrtools ) cue? ( media-libs/libcue ) curl? ( net-misc/curl ) ffmpeg? ( virtual/ffmpeg ) flac? ( media-libs/flac[ogg?] ) fluidsynth? ( media-sound/fluidsynth ) network? ( >=media-libs/libshout-2 ) id3tag? ( media-libs/libid3tag ) jack? ( media-sound/jack-audio-connection-kit ) lame? ( network? ( media-sound/lame ) ) libsamplerate? ( media-libs/libsamplerate ) mad? ( media-libs/libmad ) mikmod? ( media-libs/libmikmod:0 ) mms? ( media-libs/libmms ) modplug? ( media-libs/libmodplug ) mpg123? ( >=media-sound/mpg123-1.12.2 ) musepack? ( media-sound/musepack-tools ) ogg? ( media-libs/libogg ) openal? ( media-libs/openal ) pulseaudio? ( media-sound/pulseaudio ) sid? ( media-libs/libsidplay:2 ) sndfile? ( media-libs/libsndfile ) sqlite? ( dev-db/sqlite:3 ) tcpd? ( sys-apps/tcp-wrappers ) twolame? ( media-sound/twolame ) vorbis? ( media-libs/libvorbis ) wavpack? ( media-sound/wavpack ) wildmidi? ( media-sound/wildmidi ) zeroconf? ( net-dns/avahi[dbus] ) zip? ( dev-libs/zziplib ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool !<sys-apps/systemd-29-r4 !=sys-apps/systemd-37-r1 dev-vcs/git
+!<sys-cluster/mpich2-1.4_rc2 dev-libs/glib:2 aac? ( media-libs/faad2 ) alsa? ( media-sound/alsa-utils ) ao? ( media-libs/libao[alsa?,pulseaudio?] ) audiofile? ( media-libs/audiofile ) bzip2? ( app-arch/bzip2 ) cdio? ( dev-libs/libcdio virtual/cdrtools ) cue? ( media-libs/libcue ) curl? ( net-misc/curl ) ffmpeg? ( virtual/ffmpeg ) flac? ( media-libs/flac[ogg?] ) fluidsynth? ( media-sound/fluidsynth ) network? ( >=media-libs/libshout-2 ) id3tag? ( media-libs/libid3tag ) jack? ( media-sound/jack-audio-connection-kit ) lame? ( network? ( media-sound/lame ) ) libsamplerate? ( media-libs/libsamplerate ) mad? ( media-libs/libmad ) mikmod? ( media-libs/libmikmod:0 ) mms? ( media-libs/libmms ) modplug? ( media-libs/libmodplug ) mpg123? ( >=media-sound/mpg123-1.12.2 ) musepack? ( media-sound/musepack-tools ) ogg? ( media-libs/libogg ) openal? ( media-libs/openal ) pulseaudio? ( media-sound/pulseaudio ) sid? ( media-libs/libsidplay:2 ) sndfile? ( media-libs/libsndfile ) sqlite? ( dev-db/sqlite:3 ) tcpd? ( sys-apps/tcp-wrappers ) twolame? ( media-sound/twolame ) vorbis? ( media-libs/libvorbis ) wavpack? ( media-sound/wavpack ) wildmidi? ( media-sound/wildmidi ) zeroconf? ( net-dns/avahi[dbus] ) zip? ( dev-libs/zziplib ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool !<sys-apps/systemd-29-r4 !=sys-apps/systemd-37-r1 dev-vcs/git
 !<sys-cluster/mpich2-1.4_rc2 dev-libs/glib:2 aac? ( media-libs/faad2 ) alsa? ( media-sound/alsa-utils ) ao? ( media-libs/libao[alsa?,pulseaudio?] ) audiofile? ( media-libs/audiofile ) bzip2? ( app-arch/bzip2 ) cdio? ( dev-libs/libcdio virtual/cdrtools ) cue? ( media-libs/libcue ) curl? ( net-misc/curl ) ffmpeg? ( virtual/ffmpeg ) flac? ( media-libs/flac[ogg?] ) fluidsynth? ( media-sound/fluidsynth ) network? ( >=media-libs/libshout-2 ) id3tag? ( media-libs/libid3tag ) jack? ( media-sound/jack-audio-connection-kit ) lame? ( network? ( media-sound/lame ) ) libsamplerate? ( media-libs/libsamplerate ) mad? ( media-libs/libmad ) mikmod? ( media-libs/libmikmod:0 ) mms? ( media-libs/libmms ) modplug? ( media-libs/libmodplug ) mpg123? ( >=media-sound/mpg123-1.12.2 ) musepack? ( media-sound/musepack-tools ) ogg? ( media-libs/libogg ) openal? ( media-libs/openal ) pulseaudio? ( media-sound/pulseaudio ) sid? ( media-libs/libsidplay:2 ) sndfile? ( media-libs/libsndfile ) sqlite? ( dev-db/sqlite:3 ) tcpd? ( sys-apps/tcp-wrappers ) twolame? ( media-sound/twolame ) vorbis? ( media-libs/libvorbis ) wavpack? ( media-sound/wavpack ) wildmidi? ( media-sound/wildmidi ) zeroconf? ( net-dns/avahi[dbus] ) zip? ( dev-libs/zziplib )
 0
 
diff --git a/metadata/cache/media-sound/mpfc-1.3.7-r1 b/metadata/cache/media-sound/mpfc-1.3.7-r1
index d256dfdcb290..d0d202ae9a8e 100644
--- a/metadata/cache/media-sound/mpfc-1.3.7-r1
+++ b/metadata/cache/media-sound/mpfc-1.3.7-r1
@@ -1,4 +1,4 @@
-alsa? ( >=media-libs/alsa-lib-0.9.0 ) gpm? ( >=sys-libs/gpm-1.19.3 ) mad? ( media-libs/libmad ) vorbis? ( media-libs/libvorbis ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+alsa? ( >=media-libs/alsa-lib-0.9.0 ) gpm? ( >=sys-libs/gpm-1.19.3 ) mad? ( media-libs/libmad ) vorbis? ( media-libs/libvorbis ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 alsa? ( >=media-libs/alsa-lib-0.9.0 ) gpm? ( >=sys-libs/gpm-1.19.3 ) mad? ( media-libs/libmad ) vorbis? ( media-libs/libvorbis )
 0
 mirror://sourceforge/mpfc/mpfc-1.3.7.tar.gz
diff --git a/metadata/cache/media-sound/mpg321-0.3.1 b/metadata/cache/media-sound/mpg321-0.3.1
index ddfcd86f7720..a6959b7d491f 100644
--- a/metadata/cache/media-sound/mpg321-0.3.1
+++ b/metadata/cache/media-sound/mpg321-0.3.1
@@ -1,4 +1,4 @@
->=media-libs/libao-1 media-libs/libid3tag media-libs/libmad sys-libs/zlib || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=media-libs/libao-1 media-libs/libid3tag media-libs/libmad sys-libs/zlib || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=media-libs/libao-1 media-libs/libid3tag media-libs/libmad sys-libs/zlib
 0
 mirror://sourceforge/mpg321/mpg321-0.3.1.tar.gz
diff --git a/metadata/cache/media-sound/mt-daapd-0.2.4.2 b/metadata/cache/media-sound/mt-daapd-0.2.4.2
index 851b0a89dc4c..4dcff48c7555 100644
--- a/metadata/cache/media-sound/mt-daapd-0.2.4.2
+++ b/metadata/cache/media-sound/mt-daapd-0.2.4.2
@@ -1,4 +1,4 @@
-media-libs/libid3tag sys-libs/gdbm net-dns/avahi[dbus] vorbis? ( media-libs/libvorbis ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+media-libs/libid3tag sys-libs/gdbm net-dns/avahi[dbus] vorbis? ( media-libs/libvorbis ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 media-libs/libid3tag sys-libs/gdbm net-dns/avahi[dbus] vorbis? ( media-libs/libvorbis )
 0
 mirror://sourceforge/mt-daapd/mt-daapd-0.2.4.2.tar.gz
diff --git a/metadata/cache/media-sound/normalize-0.7.7-r1 b/metadata/cache/media-sound/normalize-0.7.7-r1
index 5a9022b7cab4..8cef9e67e226 100644
--- a/metadata/cache/media-sound/normalize-0.7.7-r1
+++ b/metadata/cache/media-sound/normalize-0.7.7-r1
@@ -1,4 +1,4 @@
-mad? ( media-libs/libmad ) audiofile? ( >=media-libs/audiofile-0.3.1 ) dev-util/pkgconfig nls? ( dev-util/intltool ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+mad? ( media-libs/libmad ) audiofile? ( >=media-libs/audiofile-0.3.1 ) dev-util/pkgconfig nls? ( dev-util/intltool ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 mad? ( media-libs/libmad ) audiofile? ( >=media-libs/audiofile-0.3.1 )
 0
 http://savannah.nongnu.org/download/normalize/normalize-0.7.7.tar.bz2 http://dev.gentoo.org/~radhermit/distfiles/normalize-0.7.7-m4.patch.gz
diff --git a/metadata/cache/media-sound/orpheus-1.6-r2 b/metadata/cache/media-sound/orpheus-1.6-r2
index 604c1c9bd1ab..2a03123ec197 100644
--- a/metadata/cache/media-sound/orpheus-1.6-r2
+++ b/metadata/cache/media-sound/orpheus-1.6-r2
@@ -1,4 +1,4 @@
-sys-libs/ncurses media-libs/libvorbis media-sound/mpg123 media-sound/vorbis-tools[ogg123] || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+sys-libs/ncurses media-libs/libvorbis media-sound/mpg123 media-sound/vorbis-tools[ogg123] || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 sys-libs/ncurses media-libs/libvorbis media-sound/mpg123 media-sound/vorbis-tools[ogg123]
 0
 http://konst.org.ua/download/orpheus-1.6.tar.gz
diff --git a/metadata/cache/media-sound/pms-0.42 b/metadata/cache/media-sound/pms-0.42
index 4a7f36daa0ec..c393bfbff6bf 100644
--- a/metadata/cache/media-sound/pms-0.42
+++ b/metadata/cache/media-sound/pms-0.42
@@ -1,4 +1,4 @@
-dev-util/pkgconfig sys-libs/ncurses dev-libs/glib:2 regex? ( >=dev-libs/boost-1.36 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-util/pkgconfig sys-libs/ncurses dev-libs/glib:2 regex? ( >=dev-libs/boost-1.36 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 sys-libs/ncurses dev-libs/glib:2 regex? ( >=dev-libs/boost-1.36 )
 0
 mirror://sourceforge/pms/pms-0.42.tar.bz2
diff --git a/metadata/cache/media-sound/pms-9999 b/metadata/cache/media-sound/pms-9999
index 58e425b18f1a..02672991f3e1 100644
--- a/metadata/cache/media-sound/pms-9999
+++ b/metadata/cache/media-sound/pms-9999
@@ -1,4 +1,4 @@
-dev-util/pkgconfig sys-libs/ncurses dev-libs/glib:2 regex? ( >=dev-libs/boost-1.36 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
+dev-util/pkgconfig sys-libs/ncurses dev-libs/glib:2 regex? ( >=dev-libs/boost-1.36 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
 sys-libs/ncurses dev-libs/glib:2 regex? ( >=dev-libs/boost-1.36 )
 0
 
diff --git a/metadata/cache/media-sound/pulseaudio-0.9.22 b/metadata/cache/media-sound/pulseaudio-0.9.22
index 402e6c8ba072..3605427a7d3c 100644
--- a/metadata/cache/media-sound/pulseaudio-0.9.22
+++ b/metadata/cache/media-sound/pulseaudio-0.9.22
@@ -1,4 +1,4 @@
-app-admin/eselect-esd X? ( || ( >=x11-libs/libX11-1.4.0 <x11-libs/libX11-1.4.0[xcb] ) <x11-libs/xcb-util-0.3.8 x11-libs/libSM x11-libs/libICE x11-libs/libXtst ) caps? ( sys-libs/libcap ) libsamplerate? ( >=media-libs/libsamplerate-0.1.1-r1 ) alsa? ( >=media-libs/alsa-lib-1.0.19 ) glib? ( >=dev-libs/glib-2.4.0 ) avahi? ( >=net-dns/avahi-0.6.12[dbus] ) jack? ( >=media-sound/jack-audio-connection-kit-0.100 ) tcpd? ( sys-apps/tcp-wrappers ) lirc? ( app-misc/lirc ) dbus? ( >=sys-apps/dbus-1.0.0 ) gnome? ( >=gnome-base/gconf-2.4.0 ) bluetooth? ( >=net-wireless/bluez-4 >=sys-apps/dbus-1.0.0 ) asyncns? ( net-libs/libasyncns ) udev? ( || ( >=sys-fs/udev-171[hwdb] >=sys-fs/udev-143[extras] ) ) realtime? ( sys-auth/rtkit ) >=media-libs/speex-1.2_beta >=media-libs/libsndfile-1.0.20 sys-libs/gdbm >=sys-devel/libtool-2.2.4 doc? ( app-doc/doxygen ) X? ( x11-proto/xproto || ( >=x11-libs/libXtst-1.0.99.2 <x11-proto/xextproto-7.0.99 ) ) dev-libs/libatomic_ops dev-util/pkgconfig system-wide? ( || ( dev-util/unifdef sys-freebsd/freebsd-ubin ) ) dev-util/intltool || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+app-admin/eselect-esd X? ( || ( >=x11-libs/libX11-1.4.0 <x11-libs/libX11-1.4.0[xcb] ) <x11-libs/xcb-util-0.3.8 x11-libs/libSM x11-libs/libICE x11-libs/libXtst ) caps? ( sys-libs/libcap ) libsamplerate? ( >=media-libs/libsamplerate-0.1.1-r1 ) alsa? ( >=media-libs/alsa-lib-1.0.19 ) glib? ( >=dev-libs/glib-2.4.0 ) avahi? ( >=net-dns/avahi-0.6.12[dbus] ) jack? ( >=media-sound/jack-audio-connection-kit-0.100 ) tcpd? ( sys-apps/tcp-wrappers ) lirc? ( app-misc/lirc ) dbus? ( >=sys-apps/dbus-1.0.0 ) gnome? ( >=gnome-base/gconf-2.4.0 ) bluetooth? ( >=net-wireless/bluez-4 >=sys-apps/dbus-1.0.0 ) asyncns? ( net-libs/libasyncns ) udev? ( || ( >=sys-fs/udev-171[hwdb] >=sys-fs/udev-143[extras] ) ) realtime? ( sys-auth/rtkit ) >=media-libs/speex-1.2_beta >=media-libs/libsndfile-1.0.20 sys-libs/gdbm >=sys-devel/libtool-2.2.4 doc? ( app-doc/doxygen ) X? ( x11-proto/xproto || ( >=x11-libs/libXtst-1.0.99.2 <x11-proto/xextproto-7.0.99 ) ) dev-libs/libatomic_ops dev-util/pkgconfig system-wide? ( || ( dev-util/unifdef sys-freebsd/freebsd-ubin ) ) dev-util/intltool || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 app-admin/eselect-esd X? ( || ( >=x11-libs/libX11-1.4.0 <x11-libs/libX11-1.4.0[xcb] ) <x11-libs/xcb-util-0.3.8 x11-libs/libSM x11-libs/libICE x11-libs/libXtst ) caps? ( sys-libs/libcap ) libsamplerate? ( >=media-libs/libsamplerate-0.1.1-r1 ) alsa? ( >=media-libs/alsa-lib-1.0.19 ) glib? ( >=dev-libs/glib-2.4.0 ) avahi? ( >=net-dns/avahi-0.6.12[dbus] ) jack? ( >=media-sound/jack-audio-connection-kit-0.100 ) tcpd? ( sys-apps/tcp-wrappers ) lirc? ( app-misc/lirc ) dbus? ( >=sys-apps/dbus-1.0.0 ) gnome? ( >=gnome-base/gconf-2.4.0 ) bluetooth? ( >=net-wireless/bluez-4 >=sys-apps/dbus-1.0.0 ) asyncns? ( net-libs/libasyncns ) udev? ( || ( >=sys-fs/udev-171[hwdb] >=sys-fs/udev-143[extras] ) ) realtime? ( sys-auth/rtkit ) >=media-libs/speex-1.2_beta >=media-libs/libsndfile-1.0.20 sys-libs/gdbm >=sys-devel/libtool-2.2.4 X? ( gnome-extra/gnome-audio ) system-wide? ( sys-apps/openrc alsa? ( media-sound/alsa-utils ) bluetooth? ( >=net-wireless/bluez-4 ) )
 0
 http://0pointer.de/lennart/projects/pulseaudio/pulseaudio-0.9.22.tar.gz
diff --git a/metadata/cache/media-sound/pulseaudio-0.9.22-r2 b/metadata/cache/media-sound/pulseaudio-0.9.22-r2
index d32b898c42ad..51d87306e35c 100644
--- a/metadata/cache/media-sound/pulseaudio-0.9.22-r2
+++ b/metadata/cache/media-sound/pulseaudio-0.9.22-r2
@@ -1,4 +1,4 @@
-app-admin/eselect-esd X? ( || ( >=x11-libs/libX11-1.4.0 <x11-libs/libX11-1.4.0[xcb] ) >=x11-libs/libxcb-1.6 >=x11-libs/xcb-util-0.3.1 x11-libs/libSM x11-libs/libICE x11-libs/libXtst ) caps? ( sys-libs/libcap ) libsamplerate? ( >=media-libs/libsamplerate-0.1.1-r1 ) alsa? ( >=media-libs/alsa-lib-1.0.19 ) glib? ( >=dev-libs/glib-2.4.0 ) avahi? ( >=net-dns/avahi-0.6.12[dbus] ) jack? ( >=media-sound/jack-audio-connection-kit-0.100 ) tcpd? ( sys-apps/tcp-wrappers ) lirc? ( app-misc/lirc ) dbus? ( >=sys-apps/dbus-1.0.0 ) gnome? ( >=gnome-base/gconf-2.4.0 ) bluetooth? ( >=net-wireless/bluez-4 >=sys-apps/dbus-1.0.0 ) asyncns? ( net-libs/libasyncns ) udev? ( || ( >=sys-fs/udev-171[hwdb] >=sys-fs/udev-143[extras] ) ) realtime? ( sys-auth/rtkit ) >=media-libs/speex-1.2_beta >=media-libs/libsndfile-1.0.20 sys-libs/gdbm >=sys-devel/libtool-2.2.4 doc? ( app-doc/doxygen ) X? ( x11-proto/xproto || ( >=x11-libs/libXtst-1.0.99.2 <x11-proto/xextproto-7.0.99 ) ) dev-libs/libatomic_ops dev-util/pkgconfig system-wide? ( || ( dev-util/unifdef sys-freebsd/freebsd-ubin ) ) dev-util/intltool || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+app-admin/eselect-esd X? ( || ( >=x11-libs/libX11-1.4.0 <x11-libs/libX11-1.4.0[xcb] ) >=x11-libs/libxcb-1.6 >=x11-libs/xcb-util-0.3.1 x11-libs/libSM x11-libs/libICE x11-libs/libXtst ) caps? ( sys-libs/libcap ) libsamplerate? ( >=media-libs/libsamplerate-0.1.1-r1 ) alsa? ( >=media-libs/alsa-lib-1.0.19 ) glib? ( >=dev-libs/glib-2.4.0 ) avahi? ( >=net-dns/avahi-0.6.12[dbus] ) jack? ( >=media-sound/jack-audio-connection-kit-0.100 ) tcpd? ( sys-apps/tcp-wrappers ) lirc? ( app-misc/lirc ) dbus? ( >=sys-apps/dbus-1.0.0 ) gnome? ( >=gnome-base/gconf-2.4.0 ) bluetooth? ( >=net-wireless/bluez-4 >=sys-apps/dbus-1.0.0 ) asyncns? ( net-libs/libasyncns ) udev? ( || ( >=sys-fs/udev-171[hwdb] >=sys-fs/udev-143[extras] ) ) realtime? ( sys-auth/rtkit ) >=media-libs/speex-1.2_beta >=media-libs/libsndfile-1.0.20 sys-libs/gdbm >=sys-devel/libtool-2.2.4 doc? ( app-doc/doxygen ) X? ( x11-proto/xproto || ( >=x11-libs/libXtst-1.0.99.2 <x11-proto/xextproto-7.0.99 ) ) dev-libs/libatomic_ops dev-util/pkgconfig system-wide? ( || ( dev-util/unifdef sys-freebsd/freebsd-ubin ) ) dev-util/intltool || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 app-admin/eselect-esd X? ( || ( >=x11-libs/libX11-1.4.0 <x11-libs/libX11-1.4.0[xcb] ) >=x11-libs/libxcb-1.6 >=x11-libs/xcb-util-0.3.1 x11-libs/libSM x11-libs/libICE x11-libs/libXtst ) caps? ( sys-libs/libcap ) libsamplerate? ( >=media-libs/libsamplerate-0.1.1-r1 ) alsa? ( >=media-libs/alsa-lib-1.0.19 ) glib? ( >=dev-libs/glib-2.4.0 ) avahi? ( >=net-dns/avahi-0.6.12[dbus] ) jack? ( >=media-sound/jack-audio-connection-kit-0.100 ) tcpd? ( sys-apps/tcp-wrappers ) lirc? ( app-misc/lirc ) dbus? ( >=sys-apps/dbus-1.0.0 ) gnome? ( >=gnome-base/gconf-2.4.0 ) bluetooth? ( >=net-wireless/bluez-4 >=sys-apps/dbus-1.0.0 ) asyncns? ( net-libs/libasyncns ) udev? ( || ( >=sys-fs/udev-171[hwdb] >=sys-fs/udev-143[extras] ) ) realtime? ( sys-auth/rtkit ) >=media-libs/speex-1.2_beta >=media-libs/libsndfile-1.0.20 sys-libs/gdbm >=sys-devel/libtool-2.2.4 X? ( gnome-extra/gnome-audio ) system-wide? ( sys-apps/openrc alsa? ( media-sound/alsa-utils ) bluetooth? ( >=net-wireless/bluez-4 ) )
 0
 http://0pointer.de/lennart/projects/pulseaudio/pulseaudio-0.9.22.tar.gz
diff --git a/metadata/cache/media-sound/pulseaudio-1.1-r1 b/metadata/cache/media-sound/pulseaudio-1.1-r1
index 1e684d553baa..9435b932d031 100644
--- a/metadata/cache/media-sound/pulseaudio-1.1-r1
+++ b/metadata/cache/media-sound/pulseaudio-1.1-r1
@@ -1,4 +1,4 @@
-app-admin/eselect-esd X? ( >=x11-libs/libX11-1.4.0 >=x11-libs/libxcb-1.6 >=x11-libs/xcb-util-0.3.1 x11-libs/libSM x11-libs/libICE x11-libs/libXtst ) caps? ( sys-libs/libcap ) libsamplerate? ( >=media-libs/libsamplerate-0.1.1-r1 ) alsa? ( >=media-libs/alsa-lib-1.0.19 ) glib? ( >=dev-libs/glib-2.4.0 ) avahi? ( >=net-dns/avahi-0.6.12[dbus] ) jack? ( >=media-sound/jack-audio-connection-kit-0.117 ) tcpd? ( sys-apps/tcp-wrappers ) lirc? ( app-misc/lirc ) dbus? ( >=sys-apps/dbus-1.0.0 ) gnome? ( >=gnome-base/gconf-2.4.0 ) bluetooth? ( >=net-wireless/bluez-4 >=sys-apps/dbus-1.0.0 ) asyncns? ( net-libs/libasyncns ) udev? ( || ( >=sys-fs/udev-171[hwdb] >=sys-fs/udev-143[extras] ) ) realtime? ( sys-auth/rtkit ) equalizer? ( sci-libs/fftw:3.0 ) orc? ( >=dev-lang/orc-0.4.9 ) ssl? ( dev-libs/openssl ) >=media-libs/speex-1.2_rc1 >=media-libs/libsndfile-1.0.20 gdbm? ( sys-libs/gdbm ) dev-libs/json-c >=sys-devel/libtool-2.2.4 doc? ( app-doc/doxygen ) X? ( x11-proto/xproto >=x11-libs/libXtst-1.0.99.2 ) dev-libs/libatomic_ops dev-util/pkgconfig system-wide? ( || ( dev-util/unifdef sys-freebsd/freebsd-ubin ) ) dev-util/intltool || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+app-admin/eselect-esd X? ( >=x11-libs/libX11-1.4.0 >=x11-libs/libxcb-1.6 >=x11-libs/xcb-util-0.3.1 x11-libs/libSM x11-libs/libICE x11-libs/libXtst ) caps? ( sys-libs/libcap ) libsamplerate? ( >=media-libs/libsamplerate-0.1.1-r1 ) alsa? ( >=media-libs/alsa-lib-1.0.19 ) glib? ( >=dev-libs/glib-2.4.0 ) avahi? ( >=net-dns/avahi-0.6.12[dbus] ) jack? ( >=media-sound/jack-audio-connection-kit-0.117 ) tcpd? ( sys-apps/tcp-wrappers ) lirc? ( app-misc/lirc ) dbus? ( >=sys-apps/dbus-1.0.0 ) gnome? ( >=gnome-base/gconf-2.4.0 ) bluetooth? ( >=net-wireless/bluez-4 >=sys-apps/dbus-1.0.0 ) asyncns? ( net-libs/libasyncns ) udev? ( || ( >=sys-fs/udev-171[hwdb] >=sys-fs/udev-143[extras] ) ) realtime? ( sys-auth/rtkit ) equalizer? ( sci-libs/fftw:3.0 ) orc? ( >=dev-lang/orc-0.4.9 ) ssl? ( dev-libs/openssl ) >=media-libs/speex-1.2_rc1 >=media-libs/libsndfile-1.0.20 gdbm? ( sys-libs/gdbm ) dev-libs/json-c >=sys-devel/libtool-2.2.4 doc? ( app-doc/doxygen ) X? ( x11-proto/xproto >=x11-libs/libXtst-1.0.99.2 ) dev-libs/libatomic_ops dev-util/pkgconfig system-wide? ( || ( dev-util/unifdef sys-freebsd/freebsd-ubin ) ) dev-util/intltool || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 app-admin/eselect-esd X? ( >=x11-libs/libX11-1.4.0 >=x11-libs/libxcb-1.6 >=x11-libs/xcb-util-0.3.1 x11-libs/libSM x11-libs/libICE x11-libs/libXtst ) caps? ( sys-libs/libcap ) libsamplerate? ( >=media-libs/libsamplerate-0.1.1-r1 ) alsa? ( >=media-libs/alsa-lib-1.0.19 ) glib? ( >=dev-libs/glib-2.4.0 ) avahi? ( >=net-dns/avahi-0.6.12[dbus] ) jack? ( >=media-sound/jack-audio-connection-kit-0.117 ) tcpd? ( sys-apps/tcp-wrappers ) lirc? ( app-misc/lirc ) dbus? ( >=sys-apps/dbus-1.0.0 ) gnome? ( >=gnome-base/gconf-2.4.0 ) bluetooth? ( >=net-wireless/bluez-4 >=sys-apps/dbus-1.0.0 ) asyncns? ( net-libs/libasyncns ) udev? ( || ( >=sys-fs/udev-171[hwdb] >=sys-fs/udev-143[extras] ) ) realtime? ( sys-auth/rtkit ) equalizer? ( sci-libs/fftw:3.0 ) orc? ( >=dev-lang/orc-0.4.9 ) ssl? ( dev-libs/openssl ) >=media-libs/speex-1.2_rc1 >=media-libs/libsndfile-1.0.20 gdbm? ( sys-libs/gdbm ) dev-libs/json-c >=sys-devel/libtool-2.2.4 X? ( gnome-extra/gnome-audio ) system-wide? ( sys-apps/openrc alsa? ( media-sound/alsa-utils ) bluetooth? ( >=net-wireless/bluez-4 ) )
 0
 http://freedesktop.org/software/pulseaudio/releases/pulseaudio-1.1.tar.xz
diff --git a/metadata/cache/media-sound/pulseaudio-9999 b/metadata/cache/media-sound/pulseaudio-9999
index 786ffc0dbc07..ccc9945134fb 100644
--- a/metadata/cache/media-sound/pulseaudio-9999
+++ b/metadata/cache/media-sound/pulseaudio-9999
@@ -1,4 +1,4 @@
->=media-libs/libsndfile-1.0.20 X? ( >=x11-libs/libX11-1.4.0 >=x11-libs/libxcb-1.6 >=x11-libs/xcb-util-0.3.1 x11-libs/libSM x11-libs/libICE x11-libs/libXtst ) caps? ( sys-libs/libcap ) libsamplerate? ( >=media-libs/libsamplerate-0.1.1-r1 ) alsa? ( >=media-libs/alsa-lib-1.0.19 ) glib? ( >=dev-libs/glib-2.4.0 ) avahi? ( >=net-dns/avahi-0.6.12[dbus] ) jack? ( >=media-sound/jack-audio-connection-kit-0.117 ) tcpd? ( sys-apps/tcp-wrappers ) lirc? ( app-misc/lirc ) dbus? ( >=sys-apps/dbus-1.0.0 ) gnome? ( >=gnome-base/gconf-2.4.0 ) bluetooth? ( >=net-wireless/bluez-4 >=sys-apps/dbus-1.0.0 ) asyncns? ( net-libs/libasyncns ) udev? ( || ( >=sys-fs/udev-171[hwdb] >=sys-fs/udev-143[extras] ) ) realtime? ( sys-auth/rtkit ) equalizer? ( sci-libs/fftw:3.0 ) orc? ( >=dev-lang/orc-0.4.9 ) ssl? ( dev-libs/openssl ) >=media-libs/speex-1.2_rc1 gdbm? ( sys-libs/gdbm ) dev-libs/json-c >=sys-devel/libtool-2.2.4 doc? ( app-doc/doxygen ) X? ( x11-proto/xproto >=x11-libs/libXtst-1.0.99.2 ) dev-libs/libatomic_ops dev-util/pkgconfig system-wide? ( || ( dev-util/unifdef sys-freebsd/freebsd-ubin ) ) dev-util/intltool || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
+>=media-libs/libsndfile-1.0.20 X? ( >=x11-libs/libX11-1.4.0 >=x11-libs/libxcb-1.6 >=x11-libs/xcb-util-0.3.1 x11-libs/libSM x11-libs/libICE x11-libs/libXtst ) caps? ( sys-libs/libcap ) libsamplerate? ( >=media-libs/libsamplerate-0.1.1-r1 ) alsa? ( >=media-libs/alsa-lib-1.0.19 ) glib? ( >=dev-libs/glib-2.4.0 ) avahi? ( >=net-dns/avahi-0.6.12[dbus] ) jack? ( >=media-sound/jack-audio-connection-kit-0.117 ) tcpd? ( sys-apps/tcp-wrappers ) lirc? ( app-misc/lirc ) dbus? ( >=sys-apps/dbus-1.0.0 ) gnome? ( >=gnome-base/gconf-2.4.0 ) bluetooth? ( >=net-wireless/bluez-4 >=sys-apps/dbus-1.0.0 ) asyncns? ( net-libs/libasyncns ) udev? ( || ( >=sys-fs/udev-171[hwdb] >=sys-fs/udev-143[extras] ) ) realtime? ( sys-auth/rtkit ) equalizer? ( sci-libs/fftw:3.0 ) orc? ( >=dev-lang/orc-0.4.9 ) ssl? ( dev-libs/openssl ) >=media-libs/speex-1.2_rc1 gdbm? ( sys-libs/gdbm ) dev-libs/json-c >=sys-devel/libtool-2.2.4 doc? ( app-doc/doxygen ) X? ( x11-proto/xproto >=x11-libs/libXtst-1.0.99.2 ) dev-libs/libatomic_ops dev-util/pkgconfig system-wide? ( || ( dev-util/unifdef sys-freebsd/freebsd-ubin ) ) dev-util/intltool || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
 >=media-libs/libsndfile-1.0.20 X? ( >=x11-libs/libX11-1.4.0 >=x11-libs/libxcb-1.6 >=x11-libs/xcb-util-0.3.1 x11-libs/libSM x11-libs/libICE x11-libs/libXtst ) caps? ( sys-libs/libcap ) libsamplerate? ( >=media-libs/libsamplerate-0.1.1-r1 ) alsa? ( >=media-libs/alsa-lib-1.0.19 ) glib? ( >=dev-libs/glib-2.4.0 ) avahi? ( >=net-dns/avahi-0.6.12[dbus] ) jack? ( >=media-sound/jack-audio-connection-kit-0.117 ) tcpd? ( sys-apps/tcp-wrappers ) lirc? ( app-misc/lirc ) dbus? ( >=sys-apps/dbus-1.0.0 ) gnome? ( >=gnome-base/gconf-2.4.0 ) bluetooth? ( >=net-wireless/bluez-4 >=sys-apps/dbus-1.0.0 ) asyncns? ( net-libs/libasyncns ) udev? ( || ( >=sys-fs/udev-171[hwdb] >=sys-fs/udev-143[extras] ) ) realtime? ( sys-auth/rtkit ) equalizer? ( sci-libs/fftw:3.0 ) orc? ( >=dev-lang/orc-0.4.9 ) ssl? ( dev-libs/openssl ) >=media-libs/speex-1.2_rc1 gdbm? ( sys-libs/gdbm ) dev-libs/json-c >=sys-devel/libtool-2.2.4 X? ( gnome-extra/gnome-audio ) system-wide? ( sys-apps/openrc alsa? ( media-sound/alsa-utils ) bluetooth? ( >=net-wireless/bluez-4 ) )
 0
 
diff --git a/metadata/cache/media-sound/qmidiarp-0.3.9 b/metadata/cache/media-sound/qmidiarp-0.3.9
index 6b7d36cbf575..1dd1b210c211 100644
--- a/metadata/cache/media-sound/qmidiarp-0.3.9
+++ b/metadata/cache/media-sound/qmidiarp-0.3.9
@@ -1,4 +1,4 @@
-media-libs/alsa-lib media-sound/jack-audio-connection-kit x11-libs/qt-gui:4 dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+media-libs/alsa-lib media-sound/jack-audio-connection-kit x11-libs/qt-gui:4 dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 media-libs/alsa-lib media-sound/jack-audio-connection-kit x11-libs/qt-gui:4
 0
 mirror://sourceforge/qmidiarp/qmidiarp-0.3.9.tar.bz2
diff --git a/metadata/cache/media-sound/rezound-0.12.3_beta-r2 b/metadata/cache/media-sound/rezound-0.12.3_beta-r2
index a7200a99043d..25e3680ad62e 100644
--- a/metadata/cache/media-sound/rezound-0.12.3_beta-r2
+++ b/metadata/cache/media-sound/rezound-0.12.3_beta-r2
@@ -1,4 +1,4 @@
-=sci-libs/fftw-2* >=x11-libs/fox-1.6.19 >=media-libs/audiofile-0.2.3 >=media-libs/ladspa-sdk-1.12 >=media-libs/ladspa-cmt-1.15 alsa? ( >=media-libs/alsa-lib-1.0 ) flac? ( >=media-libs/flac-1.1.2[cxx] ) jack? ( media-sound/jack-audio-connection-kit ) portaudio? ( >=media-libs/portaudio-18 ) soundtouch? ( >=media-libs/libsoundtouch-1.2.1 ) vorbis? ( media-libs/libvorbis media-libs/libogg ) sys-devel/bison dev-util/pkgconfig sys-devel/flex dev-util/reswrap || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+=sci-libs/fftw-2* >=x11-libs/fox-1.6.19 >=media-libs/audiofile-0.2.3 >=media-libs/ladspa-sdk-1.12 >=media-libs/ladspa-cmt-1.15 alsa? ( >=media-libs/alsa-lib-1.0 ) flac? ( >=media-libs/flac-1.1.2[cxx] ) jack? ( media-sound/jack-audio-connection-kit ) portaudio? ( >=media-libs/portaudio-18 ) soundtouch? ( >=media-libs/libsoundtouch-1.2.1 ) vorbis? ( media-libs/libvorbis media-libs/libogg ) sys-devel/bison dev-util/pkgconfig sys-devel/flex dev-util/reswrap || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 =sci-libs/fftw-2* >=x11-libs/fox-1.6.19 >=media-libs/audiofile-0.2.3 >=media-libs/ladspa-sdk-1.12 >=media-libs/ladspa-cmt-1.15 alsa? ( >=media-libs/alsa-lib-1.0 ) flac? ( >=media-libs/flac-1.1.2[cxx] ) jack? ( media-sound/jack-audio-connection-kit ) portaudio? ( >=media-libs/portaudio-18 ) soundtouch? ( >=media-libs/libsoundtouch-1.2.1 ) vorbis? ( media-libs/libvorbis media-libs/libogg )
 0
 mirror://sourceforge/rezound/rezound-0.12.3beta.tar.gz mirror://gentoo/rezound-0.12.3_beta-patches-5.tar.bz2
diff --git a/metadata/cache/media-sound/rosegarden-11.02 b/metadata/cache/media-sound/rosegarden-11.02
index a32d0ce46833..74fa79f73ea2 100644
--- a/metadata/cache/media-sound/rosegarden-11.02
+++ b/metadata/cache/media-sound/rosegarden-11.02
@@ -1,4 +1,4 @@
-x11-libs/qt-gui:4 x11-libs/qt-qt3support:4 media-libs/ladspa-sdk x11-libs/libSM media-sound/jack-audio-connection-kit media-libs/alsa-lib >=media-libs/dssi-1.0.0 media-libs/liblo media-libs/liblrdf =sci-libs/fftw-3* media-libs/libsamplerate[sndfile] lirc? ( app-misc/lirc ) dev-util/pkgconfig x11-misc/makedepend || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+x11-libs/qt-gui:4 x11-libs/qt-qt3support:4 media-libs/ladspa-sdk x11-libs/libSM media-sound/jack-audio-connection-kit media-libs/alsa-lib >=media-libs/dssi-1.0.0 media-libs/liblo media-libs/liblrdf =sci-libs/fftw-3* media-libs/libsamplerate[sndfile] lirc? ( app-misc/lirc ) dev-util/pkgconfig x11-misc/makedepend || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 x11-libs/qt-gui:4 x11-libs/qt-qt3support:4 media-libs/ladspa-sdk x11-libs/libSM media-sound/jack-audio-connection-kit media-libs/alsa-lib >=media-libs/dssi-1.0.0 media-libs/liblo media-libs/liblrdf =sci-libs/fftw-3* media-libs/libsamplerate[sndfile] lirc? ( app-misc/lirc )
 0
 mirror://sourceforge/rosegarden/rosegarden-11.02.tar.bz2
diff --git a/metadata/cache/media-sound/rosegarden-11.11.11 b/metadata/cache/media-sound/rosegarden-11.11.11
index 8c13223e525d..374f0721a1d2 100644
--- a/metadata/cache/media-sound/rosegarden-11.11.11
+++ b/metadata/cache/media-sound/rosegarden-11.11.11
@@ -1,4 +1,4 @@
-x11-libs/qt-gui:4 media-libs/ladspa-sdk x11-libs/libSM media-sound/jack-audio-connection-kit media-libs/alsa-lib >=media-libs/dssi-1.0.0 media-libs/liblo media-libs/liblrdf sci-libs/fftw:3.0 media-libs/libsamplerate[sndfile] lirc? ( app-misc/lirc ) dev-util/pkgconfig x11-misc/makedepend || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+x11-libs/qt-gui:4 media-libs/ladspa-sdk x11-libs/libSM media-sound/jack-audio-connection-kit media-libs/alsa-lib >=media-libs/dssi-1.0.0 media-libs/liblo media-libs/liblrdf sci-libs/fftw:3.0 media-libs/libsamplerate[sndfile] lirc? ( app-misc/lirc ) dev-util/pkgconfig x11-misc/makedepend || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 x11-libs/qt-gui:4 media-libs/ladspa-sdk x11-libs/libSM media-sound/jack-audio-connection-kit media-libs/alsa-lib >=media-libs/dssi-1.0.0 media-libs/liblo media-libs/liblrdf sci-libs/fftw:3.0 media-libs/libsamplerate[sndfile] lirc? ( app-misc/lirc )
 0
 mirror://sourceforge/rosegarden/rosegarden-11.11.11.tar.bz2
diff --git a/metadata/cache/media-sound/sfc-0.018 b/metadata/cache/media-sound/sfc-0.018
index 3dc8ee2db3ff..3bea4596e5e2 100644
--- a/metadata/cache/media-sound/sfc-0.018
+++ b/metadata/cache/media-sound/sfc-0.018
@@ -1,4 +1,4 @@
-media-libs/alsa-lib x11-libs/fltk:1 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+media-libs/alsa-lib x11-libs/fltk:1 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 media-libs/alsa-lib x11-libs/fltk:1
 0
 http://personal.telefonica.terra.es/web/soudfontcombi/sfc-0.018.tar.gz
diff --git a/metadata/cache/media-sound/snd-12.7 b/metadata/cache/media-sound/snd-12.7
index e063386bdd40..65fd3b40b78a 100644
--- a/metadata/cache/media-sound/snd-12.7
+++ b/metadata/cache/media-sound/snd-12.7
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 media-libs/audiofile alsa? ( media-libs/alsa-lib ) fam? ( virtual/fam ) fftw? ( sci-libs/fftw ) gmp? ( dev-libs/gmp dev-libs/mpc dev-libs/mpfr ) gsl? ( sci-libs/gsl ) gtk? ( x11-libs/gtk+:3 x11-libs/pango x11-libs/cairo opengl? ( x11-libs/gtkglext ) ) jack? ( media-sound/jack-audio-connection-kit ) ladspa? ( media-libs/ladspa-sdk ) motif? ( >=x11-libs/openmotif-2.3:0 ) opengl? ( virtual/opengl ) portaudio? ( media-libs/portaudio ) pulseaudio? ( media-sound/pulseaudio ) readline? ( sys-libs/readline ) ruby? ( dev-lang/ruby )
 0
 ftp://ccrma-ftp.stanford.edu/pub/Lisp/snd-12.7.tar.gz
diff --git a/metadata/cache/media-sound/snd-12.8 b/metadata/cache/media-sound/snd-12.8
index 34f5c131ef83..87ec7f4a55e0 100644
--- a/metadata/cache/media-sound/snd-12.8
+++ b/metadata/cache/media-sound/snd-12.8
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 media-libs/audiofile alsa? ( media-libs/alsa-lib ) fam? ( virtual/fam ) fftw? ( sci-libs/fftw ) gmp? ( dev-libs/gmp dev-libs/mpc dev-libs/mpfr ) gsl? ( sci-libs/gsl ) gtk? ( x11-libs/gtk+:3 x11-libs/pango x11-libs/cairo opengl? ( x11-libs/gtkglext ) ) jack? ( media-sound/jack-audio-connection-kit ) ladspa? ( media-libs/ladspa-sdk ) motif? ( >=x11-libs/openmotif-2.3:0 ) opengl? ( virtual/opengl ) portaudio? ( media-libs/portaudio ) pulseaudio? ( media-sound/pulseaudio ) readline? ( sys-libs/readline ) ruby? ( dev-lang/ruby )
 0
 ftp://ccrma-ftp.stanford.edu/pub/Lisp/snd-12.8.tar.gz
diff --git a/metadata/cache/media-sound/sonic-visualiser-1.8 b/metadata/cache/media-sound/sonic-visualiser-1.8
index ca2694dff27b..5e86f2eba5a6 100644
--- a/metadata/cache/media-sound/sonic-visualiser-1.8
+++ b/metadata/cache/media-sound/sonic-visualiser-1.8
@@ -1,4 +1,4 @@
-x11-libs/qt-core:4 x11-libs/qt-gui:4 media-libs/libsndfile media-libs/libsamplerate fftw? ( sci-libs/fftw:3.0 ) app-arch/bzip2 >=media-libs/dssi-0.9.1 media-libs/liblrdf dev-libs/redland media-libs/ladspa-sdk osc? ( media-libs/liblo ) media-libs/speex >=media-libs/vamp-plugin-sdk-2.0 media-libs/rubberband jack? ( media-sound/jack-audio-connection-kit ) mad? ( media-libs/libmad ) id3tag? ( media-libs/libid3tag ) ogg? ( media-libs/libfishsound >=media-libs/liboggz-1.1.0 ) portaudio? ( >=media-libs/portaudio-19_pre20071207 ) pulseaudio? ( media-sound/pulseaudio ) >=dev-util/pkgconfig-0.9 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+x11-libs/qt-core:4 x11-libs/qt-gui:4 media-libs/libsndfile media-libs/libsamplerate fftw? ( sci-libs/fftw:3.0 ) app-arch/bzip2 >=media-libs/dssi-0.9.1 media-libs/liblrdf dev-libs/redland media-libs/ladspa-sdk osc? ( media-libs/liblo ) media-libs/speex >=media-libs/vamp-plugin-sdk-2.0 media-libs/rubberband jack? ( media-sound/jack-audio-connection-kit ) mad? ( media-libs/libmad ) id3tag? ( media-libs/libid3tag ) ogg? ( media-libs/libfishsound >=media-libs/liboggz-1.1.0 ) portaudio? ( >=media-libs/portaudio-19_pre20071207 ) pulseaudio? ( media-sound/pulseaudio ) >=dev-util/pkgconfig-0.9 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 x11-libs/qt-core:4 x11-libs/qt-gui:4 media-libs/libsndfile media-libs/libsamplerate fftw? ( sci-libs/fftw:3.0 ) app-arch/bzip2 >=media-libs/dssi-0.9.1 media-libs/liblrdf dev-libs/redland media-libs/ladspa-sdk osc? ( media-libs/liblo ) media-libs/speex >=media-libs/vamp-plugin-sdk-2.0 media-libs/rubberband jack? ( media-sound/jack-audio-connection-kit ) mad? ( media-libs/libmad ) id3tag? ( media-libs/libid3tag ) ogg? ( media-libs/libfishsound >=media-libs/liboggz-1.1.0 ) portaudio? ( >=media-libs/portaudio-19_pre20071207 ) pulseaudio? ( media-sound/pulseaudio )
 0
 mirror://sourceforge/sv1/sonic-visualiser-1.8.tar.gz
diff --git a/metadata/cache/media-sound/sonic-visualiser-1.9 b/metadata/cache/media-sound/sonic-visualiser-1.9
index 635d58104266..69d9d1e9dac6 100644
--- a/metadata/cache/media-sound/sonic-visualiser-1.9
+++ b/metadata/cache/media-sound/sonic-visualiser-1.9
@@ -1,4 +1,4 @@
-x11-libs/qt-core:4 x11-libs/qt-gui:4 media-libs/libsndfile media-libs/libsamplerate fftw? ( sci-libs/fftw:3.0 ) app-arch/bzip2 >=media-libs/dssi-0.9.1 media-libs/liblrdf dev-libs/redland media-libs/ladspa-sdk osc? ( media-libs/liblo ) media-libs/speex >=media-libs/vamp-plugin-sdk-2.0 media-libs/rubberband jack? ( media-sound/jack-audio-connection-kit ) mad? ( media-libs/libmad ) id3tag? ( media-libs/libid3tag ) ogg? ( media-libs/libfishsound >=media-libs/liboggz-1.1.0 ) portaudio? ( >=media-libs/portaudio-19_pre20071207 ) pulseaudio? ( media-sound/pulseaudio ) >=dev-util/pkgconfig-0.9 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+x11-libs/qt-core:4 x11-libs/qt-gui:4 media-libs/libsndfile media-libs/libsamplerate fftw? ( sci-libs/fftw:3.0 ) app-arch/bzip2 >=media-libs/dssi-0.9.1 media-libs/liblrdf dev-libs/redland media-libs/ladspa-sdk osc? ( media-libs/liblo ) media-libs/speex >=media-libs/vamp-plugin-sdk-2.0 media-libs/rubberband jack? ( media-sound/jack-audio-connection-kit ) mad? ( media-libs/libmad ) id3tag? ( media-libs/libid3tag ) ogg? ( media-libs/libfishsound >=media-libs/liboggz-1.1.0 ) portaudio? ( >=media-libs/portaudio-19_pre20071207 ) pulseaudio? ( media-sound/pulseaudio ) >=dev-util/pkgconfig-0.9 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 x11-libs/qt-core:4 x11-libs/qt-gui:4 media-libs/libsndfile media-libs/libsamplerate fftw? ( sci-libs/fftw:3.0 ) app-arch/bzip2 >=media-libs/dssi-0.9.1 media-libs/liblrdf dev-libs/redland media-libs/ladspa-sdk osc? ( media-libs/liblo ) media-libs/speex >=media-libs/vamp-plugin-sdk-2.0 media-libs/rubberband jack? ( media-sound/jack-audio-connection-kit ) mad? ( media-libs/libmad ) id3tag? ( media-libs/libid3tag ) ogg? ( media-libs/libfishsound >=media-libs/liboggz-1.1.0 ) portaudio? ( >=media-libs/portaudio-19_pre20071207 ) pulseaudio? ( media-sound/pulseaudio )
 0
 http://code.soundsoftware.ac.uk/attachments/download/194/sonic-visualiser-1.9.tar.gz
diff --git a/metadata/cache/media-sound/sooperlooper-1.6.17 b/metadata/cache/media-sound/sooperlooper-1.6.17
index e31cd9670082..acd7b7293c4b 100644
--- a/metadata/cache/media-sound/sooperlooper-1.6.17
+++ b/metadata/cache/media-sound/sooperlooper-1.6.17
@@ -1,4 +1,4 @@
-media-sound/jack-audio-connection-kit x11-libs/wxGTK:2.8 media-libs/liblo dev-libs/libsigc++:1.2 media-libs/libsndfile media-libs/libsamplerate dev-libs/libxml2 media-libs/rubberband sci-libs/fftw:3.0 dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+media-sound/jack-audio-connection-kit x11-libs/wxGTK:2.8 media-libs/liblo dev-libs/libsigc++:1.2 media-libs/libsndfile media-libs/libsamplerate dev-libs/libxml2 media-libs/rubberband sci-libs/fftw:3.0 dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 media-sound/jack-audio-connection-kit x11-libs/wxGTK:2.8 media-libs/liblo dev-libs/libsigc++:1.2 media-libs/libsndfile media-libs/libsamplerate dev-libs/libxml2 media-libs/rubberband sci-libs/fftw:3.0
 0
 http://essej.net/sooperlooper/sooperlooper-1.6.17.tar.gz mirror://gentoo/sooperlooper-1.6.5-m4.tar.bz2
diff --git a/metadata/cache/media-sound/sooperlooper-1.6.18 b/metadata/cache/media-sound/sooperlooper-1.6.18
index 2e0c97d420b3..3f646b8abafc 100644
--- a/metadata/cache/media-sound/sooperlooper-1.6.18
+++ b/metadata/cache/media-sound/sooperlooper-1.6.18
@@ -1,4 +1,4 @@
-media-sound/jack-audio-connection-kit x11-libs/wxGTK:2.8 media-libs/liblo dev-libs/libsigc++:1.2 media-libs/libsndfile media-libs/libsamplerate dev-libs/libxml2 media-libs/rubberband sci-libs/fftw:3.0 dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+media-sound/jack-audio-connection-kit x11-libs/wxGTK:2.8 media-libs/liblo dev-libs/libsigc++:1.2 media-libs/libsndfile media-libs/libsamplerate dev-libs/libxml2 media-libs/rubberband sci-libs/fftw:3.0 dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 media-sound/jack-audio-connection-kit x11-libs/wxGTK:2.8 media-libs/liblo dev-libs/libsigc++:1.2 media-libs/libsndfile media-libs/libsamplerate dev-libs/libxml2 media-libs/rubberband sci-libs/fftw:3.0
 0
 http://essej.net/sooperlooper/sooperlooper-1.6.18.tar.gz mirror://gentoo/sooperlooper-1.6.5-m4.tar.bz2
diff --git a/metadata/cache/media-sound/sweep-0.9.3-r1 b/metadata/cache/media-sound/sweep-0.9.3-r1
index bc69fb2e7cb3..95ca18fd9604 100644
--- a/metadata/cache/media-sound/sweep-0.9.3-r1
+++ b/metadata/cache/media-sound/sweep-0.9.3-r1
@@ -1,4 +1,4 @@
->=media-libs/libsndfile-1.0 >=x11-libs/gtk+-2.4.0:2 >=dev-libs/glib-2.2.0:2 alsa? ( media-libs/alsa-lib ) libsamplerate? ( media-libs/libsamplerate ) speex? ( media-libs/speex ) vorbis? ( media-libs/libogg media-libs/libvorbis ) mp3? ( media-libs/libmad ) ladspa? ( media-libs/ladspa-sdk ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=media-libs/libsndfile-1.0 >=x11-libs/gtk+-2.4.0:2 >=dev-libs/glib-2.2.0:2 alsa? ( media-libs/alsa-lib ) libsamplerate? ( media-libs/libsamplerate ) speex? ( media-libs/speex ) vorbis? ( media-libs/libogg media-libs/libvorbis ) mp3? ( media-libs/libmad ) ladspa? ( media-libs/ladspa-sdk ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=media-libs/libsndfile-1.0 >=x11-libs/gtk+-2.4.0:2 >=dev-libs/glib-2.2.0:2 alsa? ( media-libs/alsa-lib ) libsamplerate? ( media-libs/libsamplerate ) speex? ( media-libs/speex ) vorbis? ( media-libs/libogg media-libs/libvorbis ) mp3? ( media-libs/libmad ) ladspa? ( media-libs/ladspa-sdk )
 0
 mirror://sourceforge/sweep/sweep-0.9.3.tar.gz
diff --git a/metadata/cache/media-sound/tap-reverbed-0 b/metadata/cache/media-sound/tap-reverbed-0
index fc0634492e12..34a46d8d556e 100644
--- a/metadata/cache/media-sound/tap-reverbed-0
+++ b/metadata/cache/media-sound/tap-reverbed-0
@@ -1,4 +1,4 @@
-media-libs/ladspa-sdk media-plugins/tap-plugins x11-libs/gtk+:2 media-sound/jack-audio-connection-kit dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+media-libs/ladspa-sdk media-plugins/tap-plugins x11-libs/gtk+:2 media-sound/jack-audio-connection-kit dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 media-libs/ladspa-sdk media-plugins/tap-plugins x11-libs/gtk+:2 media-sound/jack-audio-connection-kit
 0
 mirror://sourceforge/tap-plugins/tap-reverbed-r0.tar.gz
diff --git a/metadata/cache/media-sound/timidity++-2.13.2-r13 b/metadata/cache/media-sound/timidity++-2.13.2-r13
index 21c8f9fb18e8..22ab72e60de8 100644
--- a/metadata/cache/media-sound/timidity++-2.13.2-r13
+++ b/metadata/cache/media-sound/timidity++-2.13.2-r13
@@ -1,4 +1,4 @@
-ncurses? ( >=sys-libs/ncurses-5 ) emacs? ( virtual/emacs ) gtk? ( x11-libs/gtk+:2 ) tk? ( dev-lang/tk ) nas? ( >=media-libs/nas-1.4 ) alsa? ( media-libs/alsa-lib ) slang? ( sys-libs/slang ) jack? ( media-sound/jack-audio-connection-kit ) vorbis? ( media-libs/libvorbis ) flac? ( media-libs/flac ) speex? ( media-libs/speex ) ao? ( >=media-libs/libao-0.8.5 ) motif? ( >=x11-libs/openmotif-2.3:0 ) X? ( x11-libs/libXaw x11-libs/libXext >=media-libs/libpng-1.4.2 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+ncurses? ( >=sys-libs/ncurses-5 ) emacs? ( virtual/emacs ) gtk? ( x11-libs/gtk+:2 ) tk? ( dev-lang/tk ) nas? ( >=media-libs/nas-1.4 ) alsa? ( media-libs/alsa-lib ) slang? ( sys-libs/slang ) jack? ( media-sound/jack-audio-connection-kit ) vorbis? ( media-libs/libvorbis ) flac? ( media-libs/flac ) speex? ( media-libs/speex ) ao? ( >=media-libs/libao-0.8.5 ) motif? ( >=x11-libs/openmotif-2.3:0 ) X? ( x11-libs/libXaw x11-libs/libXext >=media-libs/libpng-1.4.2 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 ncurses? ( >=sys-libs/ncurses-5 ) emacs? ( virtual/emacs ) gtk? ( x11-libs/gtk+:2 ) tk? ( dev-lang/tk ) nas? ( >=media-libs/nas-1.4 ) alsa? ( media-libs/alsa-lib ) slang? ( sys-libs/slang ) jack? ( media-sound/jack-audio-connection-kit ) vorbis? ( media-libs/libvorbis ) flac? ( media-libs/flac ) speex? ( media-libs/speex ) ao? ( >=media-libs/libao-0.8.5 ) motif? ( >=x11-libs/openmotif-2.3:0 ) X? ( x11-libs/libXaw x11-libs/libXext >=media-libs/libpng-1.4.2 ) alsa? ( media-sound/alsa-utils ) app-admin/eselect-timidity
 0
 mirror://sourceforge/timidity/TiMidity++-2.13.2.tar.bz2 mirror://gentoo/timidity++-2.13.2-patchset-2.tar.bz2
diff --git a/metadata/cache/media-sound/timidity++-2.13.2-r14 b/metadata/cache/media-sound/timidity++-2.13.2-r14
index a1f4e53e66a0..50d979824704 100644
--- a/metadata/cache/media-sound/timidity++-2.13.2-r14
+++ b/metadata/cache/media-sound/timidity++-2.13.2-r14
@@ -1,4 +1,4 @@
-ncurses? ( >=sys-libs/ncurses-5 ) emacs? ( virtual/emacs ) gtk? ( x11-libs/gtk+:2 ) tk? ( dev-lang/tk ) nas? ( >=media-libs/nas-1.4 ) alsa? ( media-libs/alsa-lib ) slang? ( sys-libs/slang ) jack? ( media-sound/jack-audio-connection-kit ) vorbis? ( media-libs/libvorbis ) flac? ( media-libs/flac ) speex? ( media-libs/speex ) ao? ( >=media-libs/libao-0.8.5 ) motif? ( >=x11-libs/openmotif-2.3:0 ) X? ( x11-libs/libXaw x11-libs/libXext >=media-libs/libpng-1.4.2 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+ncurses? ( >=sys-libs/ncurses-5 ) emacs? ( virtual/emacs ) gtk? ( x11-libs/gtk+:2 ) tk? ( dev-lang/tk ) nas? ( >=media-libs/nas-1.4 ) alsa? ( media-libs/alsa-lib ) slang? ( sys-libs/slang ) jack? ( media-sound/jack-audio-connection-kit ) vorbis? ( media-libs/libvorbis ) flac? ( media-libs/flac ) speex? ( media-libs/speex ) ao? ( >=media-libs/libao-0.8.5 ) motif? ( >=x11-libs/openmotif-2.3:0 ) X? ( x11-libs/libXaw x11-libs/libXext >=media-libs/libpng-1.4.2 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 ncurses? ( >=sys-libs/ncurses-5 ) emacs? ( virtual/emacs ) gtk? ( x11-libs/gtk+:2 ) tk? ( dev-lang/tk ) nas? ( >=media-libs/nas-1.4 ) alsa? ( media-libs/alsa-lib ) slang? ( sys-libs/slang ) jack? ( media-sound/jack-audio-connection-kit ) vorbis? ( media-libs/libvorbis ) flac? ( media-libs/flac ) speex? ( media-libs/speex ) ao? ( >=media-libs/libao-0.8.5 ) motif? ( >=x11-libs/openmotif-2.3:0 ) X? ( x11-libs/libXaw x11-libs/libXext >=media-libs/libpng-1.4.2 ) alsa? ( media-sound/alsa-utils ) app-admin/eselect-timidity
 0
 mirror://sourceforge/timidity/TiMidity++-2.13.2.tar.bz2 mirror://gentoo/timidity++-2.13.2-patchset-2.tar.bz2
diff --git a/metadata/cache/media-sound/vimpc-9999 b/metadata/cache/media-sound/vimpc-9999
index 2db695c03c49..be5563ae4741 100644
--- a/metadata/cache/media-sound/vimpc-9999
+++ b/metadata/cache/media-sound/vimpc-9999
@@ -1,4 +1,4 @@
-dev-libs/libpcre[cxx] media-libs/libmpdclient dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/subversion net-misc/rsync
+dev-libs/libpcre[cxx] media-libs/libmpdclient dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/subversion net-misc/rsync
 dev-libs/libpcre[cxx] media-libs/libmpdclient
 0
 
diff --git a/metadata/cache/media-sound/vsound-0.6-r1 b/metadata/cache/media-sound/vsound-0.6-r1
index 7ed8c16e5b83..fcb640b0584f 100644
--- a/metadata/cache/media-sound/vsound-0.6-r1
+++ b/metadata/cache/media-sound/vsound-0.6-r1
@@ -1,4 +1,4 @@
->=media-sound/sox-14.2.0 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=media-sound/sox-14.2.0 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=media-sound/sox-14.2.0
 0
 http://www.vsound.org/vsound-0.6.tar.gz
diff --git a/metadata/cache/media-sound/wavbreaker-0.10 b/metadata/cache/media-sound/wavbreaker-0.10
index 87735e914b99..9dc5e58071b3 100644
--- a/metadata/cache/media-sound/wavbreaker-0.10
+++ b/metadata/cache/media-sound/wavbreaker-0.10
@@ -1,4 +1,4 @@
-dev-libs/libxml2 >=x11-libs/gtk+-2:2 alsa? ( media-libs/alsa-lib ) pulseaudio? ( media-sound/pulseaudio ) nls? ( sys-devel/gettext ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-libs/libxml2 >=x11-libs/gtk+-2:2 alsa? ( media-libs/alsa-lib ) pulseaudio? ( media-sound/pulseaudio ) nls? ( sys-devel/gettext ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-libs/libxml2 >=x11-libs/gtk+-2:2 alsa? ( media-libs/alsa-lib ) pulseaudio? ( media-sound/pulseaudio )
 0
 mirror://sourceforge/wavbreaker/wavbreaker-0.10.tar.gz
diff --git a/metadata/cache/media-sound/wavbreaker-0.11 b/metadata/cache/media-sound/wavbreaker-0.11
index 47ceefe225d9..f178a8a29f6b 100644
--- a/metadata/cache/media-sound/wavbreaker-0.11
+++ b/metadata/cache/media-sound/wavbreaker-0.11
@@ -1,4 +1,4 @@
-dev-libs/libxml2 >=x11-libs/gtk+-2:2 alsa? ( media-libs/alsa-lib ) pulseaudio? ( media-sound/pulseaudio ) nls? ( sys-devel/gettext ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-libs/libxml2 >=x11-libs/gtk+-2:2 alsa? ( media-libs/alsa-lib ) pulseaudio? ( media-sound/pulseaudio ) nls? ( sys-devel/gettext ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-libs/libxml2 >=x11-libs/gtk+-2:2 alsa? ( media-libs/alsa-lib ) pulseaudio? ( media-sound/pulseaudio )
 0
 mirror://sourceforge/wavbreaker/wavbreaker-0.11.tar.gz
diff --git a/metadata/cache/media-sound/wavplay-2.0 b/metadata/cache/media-sound/wavplay-2.0
index f8b9a5ebf733..33236ac8b6e7 100644
--- a/metadata/cache/media-sound/wavplay-2.0
+++ b/metadata/cache/media-sound/wavplay-2.0
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 mirror://sourceforge/wavplay/wavplay-2.0.tar.gz
diff --git a/metadata/cache/media-sound/wildmidi-0.2.3.4-r1 b/metadata/cache/media-sound/wildmidi-0.2.3.4-r1
index 0193a96fde55..d57845094684 100644
--- a/metadata/cache/media-sound/wildmidi-0.2.3.4-r1
+++ b/metadata/cache/media-sound/wildmidi-0.2.3.4-r1
@@ -1,4 +1,4 @@
-alsa? ( media-libs/alsa-lib ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+alsa? ( media-libs/alsa-lib ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 alsa? ( media-libs/alsa-lib ) media-sound/timidity-freepats
 0
 mirror://sourceforge/wildmidi/wildmidi-0.2.3.4.tar.gz
diff --git a/metadata/cache/media-sound/wildmidi-0.2.3.5 b/metadata/cache/media-sound/wildmidi-0.2.3.5
index ffe98cb36fde..58bc357e85e8 100644
--- a/metadata/cache/media-sound/wildmidi-0.2.3.5
+++ b/metadata/cache/media-sound/wildmidi-0.2.3.5
@@ -1,4 +1,4 @@
-alsa? ( media-libs/alsa-lib ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+alsa? ( media-libs/alsa-lib ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 alsa? ( media-libs/alsa-lib ) media-sound/timidity-freepats
 0
 mirror://sourceforge/wildmidi/wildmidi-0.2.3.5.tar.gz
diff --git a/metadata/cache/media-tv/dvbstreamer-1.1-r1 b/metadata/cache/media-tv/dvbstreamer-1.1-r1
index 9f33c0f92bd8..c58241b1cc06 100644
--- a/metadata/cache/media-tv/dvbstreamer-1.1-r1
+++ b/metadata/cache/media-tv/dvbstreamer-1.1-r1
@@ -1,4 +1,4 @@
-dev-db/sqlite:3 sys-libs/readline >=sys-devel/libtool-2.2.6 virtual/linuxtv-dvb-headers || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-db/sqlite:3 sys-libs/readline >=sys-devel/libtool-2.2.6 virtual/linuxtv-dvb-headers || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-db/sqlite:3 sys-libs/readline >=sys-devel/libtool-2.2.6
 0
 mirror://sourceforge/dvbstreamer/dvbstreamer-1.1.tar.bz2
diff --git a/metadata/cache/media-tv/tvtime-1.0.2_p20110131-r3 b/metadata/cache/media-tv/tvtime-1.0.2_p20110131-r3
index 62c44859677b..e112b0640878 100644
--- a/metadata/cache/media-tv/tvtime-1.0.2_p20110131-r3
+++ b/metadata/cache/media-tv/tvtime-1.0.2_p20110131-r3
@@ -1,4 +1,4 @@
-x11-libs/libSM x11-libs/libICE x11-libs/libX11 x11-libs/libXext x11-libs/libXv x11-libs/libXxf86vm xinerama? ( x11-libs/libXinerama ) x11-libs/libXtst x11-libs/libXau x11-libs/libXdmcp >=media-libs/freetype-2 >=sys-libs/zlib-1.1.4 >=media-libs/libpng-1.2 >=dev-libs/libxml2-2.5.11 alsa? ( media-libs/alsa-lib ) nls? ( virtual/libintl ) nls? ( sys-devel/gettext ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+x11-libs/libSM x11-libs/libICE x11-libs/libX11 x11-libs/libXext x11-libs/libXv x11-libs/libXxf86vm xinerama? ( x11-libs/libXinerama ) x11-libs/libXtst x11-libs/libXau x11-libs/libXdmcp >=media-libs/freetype-2 >=sys-libs/zlib-1.1.4 >=media-libs/libpng-1.2 >=dev-libs/libxml2-2.5.11 alsa? ( media-libs/alsa-lib ) nls? ( virtual/libintl ) nls? ( sys-devel/gettext ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 x11-libs/libSM x11-libs/libICE x11-libs/libX11 x11-libs/libXext x11-libs/libXv x11-libs/libXxf86vm xinerama? ( x11-libs/libXinerama ) x11-libs/libXtst x11-libs/libXau x11-libs/libXdmcp >=media-libs/freetype-2 >=sys-libs/zlib-1.1.4 >=media-libs/libpng-1.2 >=dev-libs/libxml2-2.5.11 alsa? ( media-libs/alsa-lib ) nls? ( virtual/libintl )
 0
 http://www.kernellabs.com/hg/~dheitmueller/tvtime/archive/111b28cca42d.tar.bz2 -> tvtime-1.0.2_p20110131.tar.bz2 http://dev.gentoo.org/~a3li/distfiles/tvtime-1.0.2-alsamixer-r1.patch http://dev.gentoo.org/~a3li/distfiles/tvtime-1.0.2-alsa-r1.patch http://dev.gentoo.org/~a3li/distfiles/tvtime-1.0.2-alsa-fixes.patch
diff --git a/metadata/cache/media-tv/xawtv-3.95-r2 b/metadata/cache/media-tv/xawtv-3.95-r2
index 977d71e09036..1f03f5c58320 100644
--- a/metadata/cache/media-tv/xawtv-3.95-r2
+++ b/metadata/cache/media-tv/xawtv-3.95-r2
@@ -1,4 +1,4 @@
->=sys-libs/ncurses-5.1 virtual/jpeg X? ( x11-libs/libFS x11-libs/libXmu x11-libs/libX11 x11-libs/libXaw x11-libs/libXt x11-libs/libXext x11-libs/libXrender xext? ( x11-libs/libXinerama x11-libs/libXxf86dga x11-libs/libXrandr x11-libs/libXxf86vm ) x11-apps/xset xv? ( x11-libs/libXv ) ) motif? ( >=x11-libs/openmotif-2.3:0 app-text/recode ) alsa? ( media-libs/alsa-lib ) aalib? ( media-libs/aalib ) dv? ( media-libs/libdv ) lirc? ( app-misc/lirc ) opengl? ( virtual/opengl ) quicktime? ( media-libs/libquicktime ) zvbi? ( media-libs/zvbi media-libs/libpng ) X? ( x11-apps/xset x11-apps/bdftopcf x11-proto/videoproto xext? ( x11-proto/xineramaproto ) ) X? ( x11-apps/mkfontdir media-fonts/encodings ) >=media-libs/fontconfig-2.4.0 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=sys-libs/ncurses-5.1 virtual/jpeg X? ( x11-libs/libFS x11-libs/libXmu x11-libs/libX11 x11-libs/libXaw x11-libs/libXt x11-libs/libXext x11-libs/libXrender xext? ( x11-libs/libXinerama x11-libs/libXxf86dga x11-libs/libXrandr x11-libs/libXxf86vm ) x11-apps/xset xv? ( x11-libs/libXv ) ) motif? ( >=x11-libs/openmotif-2.3:0 app-text/recode ) alsa? ( media-libs/alsa-lib ) aalib? ( media-libs/aalib ) dv? ( media-libs/libdv ) lirc? ( app-misc/lirc ) opengl? ( virtual/opengl ) quicktime? ( media-libs/libquicktime ) zvbi? ( media-libs/zvbi media-libs/libpng ) X? ( x11-apps/xset x11-apps/bdftopcf x11-proto/videoproto xext? ( x11-proto/xineramaproto ) ) X? ( x11-apps/mkfontdir media-fonts/encodings ) >=media-libs/fontconfig-2.4.0 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=sys-libs/ncurses-5.1 virtual/jpeg X? ( x11-libs/libFS x11-libs/libXmu x11-libs/libX11 x11-libs/libXaw x11-libs/libXt x11-libs/libXext x11-libs/libXrender xext? ( x11-libs/libXinerama x11-libs/libXxf86dga x11-libs/libXrandr x11-libs/libXxf86vm ) x11-apps/xset xv? ( x11-libs/libXv ) ) motif? ( >=x11-libs/openmotif-2.3:0 app-text/recode ) alsa? ( media-libs/alsa-lib ) aalib? ( media-libs/aalib ) dv? ( media-libs/libdv ) lirc? ( app-misc/lirc ) opengl? ( virtual/opengl ) quicktime? ( media-libs/libquicktime ) zvbi? ( media-libs/zvbi media-libs/libpng )
 0
 http://dl.bytesex.org/releases/xawtv/xawtv-3.95.tar.gz X? ( http://dl.bytesex.org/releases/tv-fonts/tv-fonts-1.1.tar.bz2 ) mirror://gentoo/xawtv-patches-4.tar.bz2
diff --git a/metadata/cache/media-tv/xbmc-10.1 b/metadata/cache/media-tv/xbmc-10.1
index d6e657b4b11e..ace86c6da4bc 100644
--- a/metadata/cache/media-tv/xbmc-10.1
+++ b/metadata/cache/media-tv/xbmc-10.1
@@ -1,4 +1,4 @@
-virtual/opengl app-arch/bzip2 app-arch/unzip app-arch/zip app-i18n/enca dev-libs/boost dev-libs/fribidi dev-libs/libcdio[-minimal] dev-libs/libpcre[cxx] >=dev-libs/lzo-2.04 >=dev-python/pysqlite-2 media-libs/alsa-lib media-libs/faad2 media-libs/flac media-libs/fontconfig media-libs/freetype >=media-libs/glew-1.5.6 media-libs/jasper media-libs/jbigkit virtual/jpeg >=media-libs/libass-0.9.7 css? ( media-libs/libdvdcss ) media-libs/libmad media-libs/libmms media-libs/libmodplug media-libs/libmpeg2 media-libs/libogg media-libs/libpng media-libs/libsamplerate media-libs/libsdl[audio,opengl,video,X] alsa? ( media-libs/libsdl[alsa] ) media-libs/libvorbis media-libs/sdl-gfx >=media-libs/sdl-image-1.2.10[gif,jpeg,png] media-libs/sdl-mixer media-libs/sdl-sound media-libs/tiff pulseaudio? ( media-sound/pulseaudio ) media-sound/wavpack >=virtual/ffmpeg-0.6 rtmp? ( media-video/rtmpdump ) avahi? ( net-dns/avahi ) webserver? ( net-libs/libmicrohttpd ) net-misc/curl || ( >=net-fs/samba-3.4.6[smbclient] <net-fs/samba-3.3 ) sys-apps/dbus sys-libs/zlib virtual/mysql x11-apps/xdpyinfo x11-apps/mesa-progs vaapi? ( x11-libs/libva ) vdpau? ( || ( x11-libs/libvdpau >=x11-drivers/nvidia-drivers-180.51 ) virtual/ffmpeg[vdpau] ) x11-libs/libXinerama xrandr? ( x11-libs/libXrandr ) x11-libs/libXrender dev-util/gperf x11-proto/xineramaproto dev-util/cmake x86? ( dev-lang/nasm ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+virtual/opengl app-arch/bzip2 app-arch/unzip app-arch/zip app-i18n/enca dev-libs/boost dev-libs/fribidi dev-libs/libcdio[-minimal] dev-libs/libpcre[cxx] >=dev-libs/lzo-2.04 >=dev-python/pysqlite-2 media-libs/alsa-lib media-libs/faad2 media-libs/flac media-libs/fontconfig media-libs/freetype >=media-libs/glew-1.5.6 media-libs/jasper media-libs/jbigkit virtual/jpeg >=media-libs/libass-0.9.7 css? ( media-libs/libdvdcss ) media-libs/libmad media-libs/libmms media-libs/libmodplug media-libs/libmpeg2 media-libs/libogg media-libs/libpng media-libs/libsamplerate media-libs/libsdl[audio,opengl,video,X] alsa? ( media-libs/libsdl[alsa] ) media-libs/libvorbis media-libs/sdl-gfx >=media-libs/sdl-image-1.2.10[gif,jpeg,png] media-libs/sdl-mixer media-libs/sdl-sound media-libs/tiff pulseaudio? ( media-sound/pulseaudio ) media-sound/wavpack >=virtual/ffmpeg-0.6 rtmp? ( media-video/rtmpdump ) avahi? ( net-dns/avahi ) webserver? ( net-libs/libmicrohttpd ) net-misc/curl || ( >=net-fs/samba-3.4.6[smbclient] <net-fs/samba-3.3 ) sys-apps/dbus sys-libs/zlib virtual/mysql x11-apps/xdpyinfo x11-apps/mesa-progs vaapi? ( x11-libs/libva ) vdpau? ( || ( x11-libs/libvdpau >=x11-drivers/nvidia-drivers-180.51 ) virtual/ffmpeg[vdpau] ) x11-libs/libXinerama xrandr? ( x11-libs/libXrandr ) x11-libs/libXrender dev-util/gperf x11-proto/xineramaproto dev-util/cmake x86? ( dev-lang/nasm ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 virtual/opengl app-arch/bzip2 app-arch/unzip app-arch/zip app-i18n/enca dev-libs/boost dev-libs/fribidi dev-libs/libcdio[-minimal] dev-libs/libpcre[cxx] >=dev-libs/lzo-2.04 >=dev-python/pysqlite-2 media-libs/alsa-lib media-libs/faad2 media-libs/flac media-libs/fontconfig media-libs/freetype >=media-libs/glew-1.5.6 media-libs/jasper media-libs/jbigkit virtual/jpeg >=media-libs/libass-0.9.7 css? ( media-libs/libdvdcss ) media-libs/libmad media-libs/libmms media-libs/libmodplug media-libs/libmpeg2 media-libs/libogg media-libs/libpng media-libs/libsamplerate media-libs/libsdl[audio,opengl,video,X] alsa? ( media-libs/libsdl[alsa] ) media-libs/libvorbis media-libs/sdl-gfx >=media-libs/sdl-image-1.2.10[gif,jpeg,png] media-libs/sdl-mixer media-libs/sdl-sound media-libs/tiff pulseaudio? ( media-sound/pulseaudio ) media-sound/wavpack >=virtual/ffmpeg-0.6 rtmp? ( media-video/rtmpdump ) avahi? ( net-dns/avahi ) webserver? ( net-libs/libmicrohttpd ) net-misc/curl || ( >=net-fs/samba-3.4.6[smbclient] <net-fs/samba-3.3 ) sys-apps/dbus sys-libs/zlib virtual/mysql x11-apps/xdpyinfo x11-apps/mesa-progs vaapi? ( x11-libs/libva ) vdpau? ( || ( x11-libs/libvdpau >=x11-drivers/nvidia-drivers-180.51 ) virtual/ffmpeg[vdpau] ) x11-libs/libXinerama xrandr? ( x11-libs/libXrandr ) x11-libs/libXrender udev? ( sys-fs/udisks sys-power/upower )
 0
 http://mirrors.xbmc.org/releases/source/xbmc-10.1.tar.gz
diff --git a/metadata/cache/media-tv/xbmc-11.0_rc2 b/metadata/cache/media-tv/xbmc-11.0_rc2
index b761a2449b18..fca36dc0e135 100644
--- a/metadata/cache/media-tv/xbmc-11.0_rc2
+++ b/metadata/cache/media-tv/xbmc-11.0_rc2
@@ -1,4 +1,4 @@
-virtual/opengl app-arch/bzip2 app-arch/unzip app-arch/zip app-i18n/enca airplay? ( app-pda/libplist ) >=dev-lang/python-2.4 dev-libs/boost dev-libs/fribidi dev-libs/libcdio[-minimal] dev-libs/libpcre[cxx] >=dev-libs/lzo-2.04 dev-libs/yajl >=dev-python/pysqlite-2 dev-python/simplejson media-libs/alsa-lib media-libs/flac media-libs/fontconfig media-libs/freetype >=media-libs/glew-1.5.6 media-libs/jasper media-libs/jbigkit virtual/jpeg >=media-libs/libass-0.9.7 bluray? ( media-libs/libbluray ) css? ( media-libs/libdvdcss ) media-libs/libmad media-libs/libmodplug media-libs/libmpeg2 media-libs/libogg media-libs/libpng projectm? ( media-libs/libprojectm ) media-libs/libsamplerate media-libs/libsdl[audio,opengl,video,X] alsa? ( media-libs/libsdl[alsa] ) media-libs/libvorbis media-libs/sdl-gfx >=media-libs/sdl-image-1.2.10[gif,jpeg,png] media-libs/sdl-mixer media-libs/sdl-sound media-libs/tiff pulseaudio? ( media-sound/pulseaudio ) media-sound/wavpack >=virtual/ffmpeg-0.6[encode] rtmp? ( media-video/rtmpdump ) avahi? ( net-dns/avahi ) webserver? ( net-libs/libmicrohttpd ) net-misc/curl samba? ( >=net-fs/samba-3.4.6[smbclient] ) bluetooth? ( net-wireless/bluez ) sys-apps/dbus sys-libs/zlib mysql? ( virtual/mysql ) x11-apps/xdpyinfo x11-apps/mesa-progs vaapi? ( x11-libs/libva ) vdpau? ( || ( x11-libs/libvdpau >=x11-drivers/nvidia-drivers-180.51 ) virtual/ffmpeg[vdpau] ) x11-libs/libXinerama xrandr? ( x11-libs/libXrandr ) x11-libs/libXrender dev-util/gperf x11-proto/xineramaproto dev-util/cmake x86? ( dev-lang/nasm ) || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+virtual/opengl app-arch/bzip2 app-arch/unzip app-arch/zip app-i18n/enca airplay? ( app-pda/libplist ) >=dev-lang/python-2.4 dev-libs/boost dev-libs/fribidi dev-libs/libcdio[-minimal] dev-libs/libpcre[cxx] >=dev-libs/lzo-2.04 dev-libs/yajl >=dev-python/pysqlite-2 dev-python/simplejson media-libs/alsa-lib media-libs/flac media-libs/fontconfig media-libs/freetype >=media-libs/glew-1.5.6 media-libs/jasper media-libs/jbigkit virtual/jpeg >=media-libs/libass-0.9.7 bluray? ( media-libs/libbluray ) css? ( media-libs/libdvdcss ) media-libs/libmad media-libs/libmodplug media-libs/libmpeg2 media-libs/libogg media-libs/libpng projectm? ( media-libs/libprojectm ) media-libs/libsamplerate media-libs/libsdl[audio,opengl,video,X] alsa? ( media-libs/libsdl[alsa] ) media-libs/libvorbis media-libs/sdl-gfx >=media-libs/sdl-image-1.2.10[gif,jpeg,png] media-libs/sdl-mixer media-libs/sdl-sound media-libs/tiff pulseaudio? ( media-sound/pulseaudio ) media-sound/wavpack >=virtual/ffmpeg-0.6[encode] rtmp? ( media-video/rtmpdump ) avahi? ( net-dns/avahi ) webserver? ( net-libs/libmicrohttpd ) net-misc/curl samba? ( >=net-fs/samba-3.4.6[smbclient] ) bluetooth? ( net-wireless/bluez ) sys-apps/dbus sys-libs/zlib mysql? ( virtual/mysql ) x11-apps/xdpyinfo x11-apps/mesa-progs vaapi? ( x11-libs/libva ) vdpau? ( || ( x11-libs/libvdpau >=x11-drivers/nvidia-drivers-180.51 ) virtual/ffmpeg[vdpau] ) x11-libs/libXinerama xrandr? ( x11-libs/libXrandr ) x11-libs/libXrender dev-util/gperf x11-proto/xineramaproto dev-util/cmake x86? ( dev-lang/nasm ) || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 virtual/opengl app-arch/bzip2 app-arch/unzip app-arch/zip app-i18n/enca airplay? ( app-pda/libplist ) >=dev-lang/python-2.4 dev-libs/boost dev-libs/fribidi dev-libs/libcdio[-minimal] dev-libs/libpcre[cxx] >=dev-libs/lzo-2.04 dev-libs/yajl >=dev-python/pysqlite-2 dev-python/simplejson media-libs/alsa-lib media-libs/flac media-libs/fontconfig media-libs/freetype >=media-libs/glew-1.5.6 media-libs/jasper media-libs/jbigkit virtual/jpeg >=media-libs/libass-0.9.7 bluray? ( media-libs/libbluray ) css? ( media-libs/libdvdcss ) media-libs/libmad media-libs/libmodplug media-libs/libmpeg2 media-libs/libogg media-libs/libpng projectm? ( media-libs/libprojectm ) media-libs/libsamplerate media-libs/libsdl[audio,opengl,video,X] alsa? ( media-libs/libsdl[alsa] ) media-libs/libvorbis media-libs/sdl-gfx >=media-libs/sdl-image-1.2.10[gif,jpeg,png] media-libs/sdl-mixer media-libs/sdl-sound media-libs/tiff pulseaudio? ( media-sound/pulseaudio ) media-sound/wavpack >=virtual/ffmpeg-0.6[encode] rtmp? ( media-video/rtmpdump ) avahi? ( net-dns/avahi ) webserver? ( net-libs/libmicrohttpd ) net-misc/curl samba? ( >=net-fs/samba-3.4.6[smbclient] ) bluetooth? ( net-wireless/bluez ) sys-apps/dbus sys-libs/zlib mysql? ( virtual/mysql ) x11-apps/xdpyinfo x11-apps/mesa-progs vaapi? ( x11-libs/libva ) vdpau? ( || ( x11-libs/libvdpau >=x11-drivers/nvidia-drivers-180.51 ) virtual/ffmpeg[vdpau] ) x11-libs/libXinerama xrandr? ( x11-libs/libXrandr ) x11-libs/libXrender udev? ( sys-fs/udisks sys-power/upower ) || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
 0
 http://mirrors.xbmc.org/releases/source/xbmc-11.0-Eden_rc2.tar.gz
diff --git a/metadata/cache/media-tv/xbmc-9999 b/metadata/cache/media-tv/xbmc-9999
index 92c6754e429f..d88014fc1502 100644
--- a/metadata/cache/media-tv/xbmc-9999
+++ b/metadata/cache/media-tv/xbmc-9999
@@ -1,4 +1,4 @@
-virtual/opengl app-arch/bzip2 app-arch/unzip app-arch/zip app-i18n/enca airplay? ( app-pda/libplist ) >=dev-lang/python-2.4 dev-libs/boost dev-libs/fribidi dev-libs/libcdio[-minimal] dev-libs/libpcre[cxx] >=dev-libs/lzo-2.04 dev-libs/yajl >=dev-python/pysqlite-2 dev-python/simplejson media-libs/alsa-lib media-libs/flac media-libs/fontconfig media-libs/freetype >=media-libs/glew-1.5.6 media-libs/jasper media-libs/jbigkit virtual/jpeg >=media-libs/libass-0.9.7 bluray? ( media-libs/libbluray ) css? ( media-libs/libdvdcss ) media-libs/libmad media-libs/libmodplug media-libs/libmpeg2 media-libs/libogg media-libs/libpng projectm? ( media-libs/libprojectm ) media-libs/libsamplerate media-libs/libsdl[audio,opengl,video,X] alsa? ( media-libs/libsdl[alsa] ) media-libs/libvorbis media-libs/sdl-gfx >=media-libs/sdl-image-1.2.10[gif,jpeg,png] media-libs/sdl-mixer media-libs/sdl-sound media-libs/tiff pulseaudio? ( media-sound/pulseaudio ) media-sound/wavpack >=virtual/ffmpeg-0.6[encode] rtmp? ( media-video/rtmpdump ) avahi? ( net-dns/avahi ) webserver? ( net-libs/libmicrohttpd ) net-misc/curl samba? ( >=net-fs/samba-3.4.6[smbclient] ) bluetooth? ( net-wireless/bluez ) sys-apps/dbus sys-libs/zlib mysql? ( virtual/mysql ) x11-apps/xdpyinfo x11-apps/mesa-progs vaapi? ( x11-libs/libva ) vdpau? ( || ( x11-libs/libvdpau >=x11-drivers/nvidia-drivers-180.51 ) virtual/ffmpeg[vdpau] ) x11-libs/libXinerama xrandr? ( x11-libs/libXrandr ) x11-libs/libXrender dev-util/gperf x11-proto/xineramaproto dev-util/cmake x86? ( dev-lang/nasm ) || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) dev-vcs/git || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+virtual/opengl app-arch/bzip2 app-arch/unzip app-arch/zip app-i18n/enca airplay? ( app-pda/libplist ) >=dev-lang/python-2.4 dev-libs/boost dev-libs/fribidi dev-libs/libcdio[-minimal] dev-libs/libpcre[cxx] >=dev-libs/lzo-2.04 dev-libs/yajl >=dev-python/pysqlite-2 dev-python/simplejson media-libs/alsa-lib media-libs/flac media-libs/fontconfig media-libs/freetype >=media-libs/glew-1.5.6 media-libs/jasper media-libs/jbigkit virtual/jpeg >=media-libs/libass-0.9.7 bluray? ( media-libs/libbluray ) css? ( media-libs/libdvdcss ) media-libs/libmad media-libs/libmodplug media-libs/libmpeg2 media-libs/libogg media-libs/libpng projectm? ( media-libs/libprojectm ) media-libs/libsamplerate media-libs/libsdl[audio,opengl,video,X] alsa? ( media-libs/libsdl[alsa] ) media-libs/libvorbis media-libs/sdl-gfx >=media-libs/sdl-image-1.2.10[gif,jpeg,png] media-libs/sdl-mixer media-libs/sdl-sound media-libs/tiff pulseaudio? ( media-sound/pulseaudio ) media-sound/wavpack >=virtual/ffmpeg-0.6[encode] rtmp? ( media-video/rtmpdump ) avahi? ( net-dns/avahi ) webserver? ( net-libs/libmicrohttpd ) net-misc/curl samba? ( >=net-fs/samba-3.4.6[smbclient] ) bluetooth? ( net-wireless/bluez ) sys-apps/dbus sys-libs/zlib mysql? ( virtual/mysql ) x11-apps/xdpyinfo x11-apps/mesa-progs vaapi? ( x11-libs/libva ) vdpau? ( || ( x11-libs/libvdpau >=x11-drivers/nvidia-drivers-180.51 ) virtual/ffmpeg[vdpau] ) x11-libs/libXinerama xrandr? ( x11-libs/libXrandr ) x11-libs/libXrender dev-util/gperf x11-proto/xineramaproto dev-util/cmake x86? ( dev-lang/nasm ) || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) dev-vcs/git || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 virtual/opengl app-arch/bzip2 app-arch/unzip app-arch/zip app-i18n/enca airplay? ( app-pda/libplist ) >=dev-lang/python-2.4 dev-libs/boost dev-libs/fribidi dev-libs/libcdio[-minimal] dev-libs/libpcre[cxx] >=dev-libs/lzo-2.04 dev-libs/yajl >=dev-python/pysqlite-2 dev-python/simplejson media-libs/alsa-lib media-libs/flac media-libs/fontconfig media-libs/freetype >=media-libs/glew-1.5.6 media-libs/jasper media-libs/jbigkit virtual/jpeg >=media-libs/libass-0.9.7 bluray? ( media-libs/libbluray ) css? ( media-libs/libdvdcss ) media-libs/libmad media-libs/libmodplug media-libs/libmpeg2 media-libs/libogg media-libs/libpng projectm? ( media-libs/libprojectm ) media-libs/libsamplerate media-libs/libsdl[audio,opengl,video,X] alsa? ( media-libs/libsdl[alsa] ) media-libs/libvorbis media-libs/sdl-gfx >=media-libs/sdl-image-1.2.10[gif,jpeg,png] media-libs/sdl-mixer media-libs/sdl-sound media-libs/tiff pulseaudio? ( media-sound/pulseaudio ) media-sound/wavpack >=virtual/ffmpeg-0.6[encode] rtmp? ( media-video/rtmpdump ) avahi? ( net-dns/avahi ) webserver? ( net-libs/libmicrohttpd ) net-misc/curl samba? ( >=net-fs/samba-3.4.6[smbclient] ) bluetooth? ( net-wireless/bluez ) sys-apps/dbus sys-libs/zlib mysql? ( virtual/mysql ) x11-apps/xdpyinfo x11-apps/mesa-progs vaapi? ( x11-libs/libva ) vdpau? ( || ( x11-libs/libvdpau >=x11-drivers/nvidia-drivers-180.51 ) virtual/ffmpeg[vdpau] ) x11-libs/libXinerama xrandr? ( x11-libs/libXrandr ) x11-libs/libXrender udev? ( sys-fs/udisks sys-power/upower ) || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
 0
 
diff --git a/metadata/cache/media-video/aegisub-2.1.9 b/metadata/cache/media-video/aegisub-2.1.9
index 3ddec694a3aa..7dc71d9c6981 100644
--- a/metadata/cache/media-video/aegisub-2.1.9
+++ b/metadata/cache/media-video/aegisub-2.1.9
@@ -1,4 +1,4 @@
-x11-libs/wxGTK:2.8[X,opengl,debug?] virtual/opengl virtual/glu >=media-libs/libass-0.9.11[fontconfig] virtual/libiconv >=media-libs/fontconfig-2.4.2 media-libs/freetype:2 alsa? ( media-libs/alsa-lib ) portaudio? ( =media-libs/portaudio-19* ) pulseaudio? ( media-sound/pulseaudio ) openal? ( media-libs/openal ) lua? ( >=dev-lang/lua-5.1.1 ) spell? ( >=app-text/hunspell-1.2 ) ffmpeg? ( >=media-libs/ffmpegsource-2.17 ) dev-util/intltool dev-util/pkgconfig media-gfx/imagemagick || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+x11-libs/wxGTK:2.8[X,opengl,debug?] virtual/opengl virtual/glu >=media-libs/libass-0.9.11[fontconfig] virtual/libiconv >=media-libs/fontconfig-2.4.2 media-libs/freetype:2 alsa? ( media-libs/alsa-lib ) portaudio? ( =media-libs/portaudio-19* ) pulseaudio? ( media-sound/pulseaudio ) openal? ( media-libs/openal ) lua? ( >=dev-lang/lua-5.1.1 ) spell? ( >=app-text/hunspell-1.2 ) ffmpeg? ( >=media-libs/ffmpegsource-2.17 ) dev-util/intltool dev-util/pkgconfig media-gfx/imagemagick || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 x11-libs/wxGTK:2.8[X,opengl,debug?] virtual/opengl virtual/glu >=media-libs/libass-0.9.11[fontconfig] virtual/libiconv >=media-libs/fontconfig-2.4.2 media-libs/freetype:2 alsa? ( media-libs/alsa-lib ) portaudio? ( =media-libs/portaudio-19* ) pulseaudio? ( media-sound/pulseaudio ) openal? ( media-libs/openal ) lua? ( >=dev-lang/lua-5.1.1 ) spell? ( >=app-text/hunspell-1.2 ) ffmpeg? ( >=media-libs/ffmpegsource-2.17 )
 0
 http://rion-overlay.googlecode.com/files/aegisub-2.1.9.tar.xz
diff --git a/metadata/cache/media-video/aegisub-2.1.9999 b/metadata/cache/media-video/aegisub-2.1.9999
index 374ee3a61c33..4040ea3b3dd1 100644
--- a/metadata/cache/media-video/aegisub-2.1.9999
+++ b/metadata/cache/media-video/aegisub-2.1.9999
@@ -1,4 +1,4 @@
-x11-libs/wxGTK:2.8[X,opengl,debug?] virtual/opengl virtual/glu >=media-libs/libass-0.9.11[fontconfig] virtual/libiconv >=media-libs/fontconfig-2.4.2 media-libs/freetype:2 alsa? ( media-libs/alsa-lib ) portaudio? ( =media-libs/portaudio-19* ) pulseaudio? ( media-sound/pulseaudio ) openal? ( media-libs/openal ) lua? ( >=dev-lang/lua-5.1.1 ) spell? ( >=app-text/hunspell-1.2 ) ffmpeg? ( >=media-libs/ffmpegsource-2.17 ) dev-util/intltool dev-util/pkgconfig media-gfx/imagemagick || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/subversion net-misc/rsync
+x11-libs/wxGTK:2.8[X,opengl,debug?] virtual/opengl virtual/glu >=media-libs/libass-0.9.11[fontconfig] virtual/libiconv >=media-libs/fontconfig-2.4.2 media-libs/freetype:2 alsa? ( media-libs/alsa-lib ) portaudio? ( =media-libs/portaudio-19* ) pulseaudio? ( media-sound/pulseaudio ) openal? ( media-libs/openal ) lua? ( >=dev-lang/lua-5.1.1 ) spell? ( >=app-text/hunspell-1.2 ) ffmpeg? ( >=media-libs/ffmpegsource-2.17 ) dev-util/intltool dev-util/pkgconfig media-gfx/imagemagick || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/subversion net-misc/rsync
 x11-libs/wxGTK:2.8[X,opengl,debug?] virtual/opengl virtual/glu >=media-libs/libass-0.9.11[fontconfig] virtual/libiconv >=media-libs/fontconfig-2.4.2 media-libs/freetype:2 alsa? ( media-libs/alsa-lib ) portaudio? ( =media-libs/portaudio-19* ) pulseaudio? ( media-sound/pulseaudio ) openal? ( media-libs/openal ) lua? ( >=dev-lang/lua-5.1.1 ) spell? ( >=app-text/hunspell-1.2 ) ffmpeg? ( >=media-libs/ffmpegsource-2.17 )
 0
 
diff --git a/metadata/cache/media-video/aravis-9999 b/metadata/cache/media-video/aravis-9999
index e8aa205901cc..de90879f20d8 100644
--- a/metadata/cache/media-video/aravis-9999
+++ b/metadata/cache/media-video/aravis-9999
@@ -1,4 +1,4 @@
->=dev-libs/glib-2.22 dev-libs/libxml2 X? ( >=x11-libs/gtk+-2.12:2 media-libs/gstreamer media-libs/gst-plugins-base media-libs/gst-plugins-base media-plugins/gst-plugins-xvideo ) gstreamer? ( media-libs/gstreamer media-libs/gst-plugins-base ) dev-util/pkgconfig dev-libs/gobject-introspection dev-util/gtk-doc dev-util/intltool dev-vcs/git || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-libs/glib-2.22 dev-libs/libxml2 X? ( >=x11-libs/gtk+-2.12:2 media-libs/gstreamer media-libs/gst-plugins-base media-libs/gst-plugins-base media-plugins/gst-plugins-xvideo ) gstreamer? ( media-libs/gstreamer media-libs/gst-plugins-base ) dev-util/pkgconfig dev-libs/gobject-introspection dev-util/gtk-doc dev-util/intltool dev-vcs/git || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=dev-libs/glib-2.22 dev-libs/libxml2 X? ( >=x11-libs/gtk+-2.12:2 media-libs/gstreamer media-libs/gst-plugins-base media-libs/gst-plugins-base media-plugins/gst-plugins-xvideo ) gstreamer? ( media-libs/gstreamer media-libs/gst-plugins-base )
 0
 
diff --git a/metadata/cache/media-video/cinelerra-20101104 b/metadata/cache/media-video/cinelerra-20101104
index 55463b48613f..af5cd88306cd 100644
--- a/metadata/cache/media-video/cinelerra-20101104
+++ b/metadata/cache/media-video/cinelerra-20101104
@@ -1,4 +1,4 @@
->=media-libs/libpng-1.4.0 >=media-libs/libdv-1.0.0 media-libs/faad2 media-libs/faac media-libs/a52dec media-libs/libsndfile media-libs/tiff virtual/ffmpeg media-sound/lame >=sci-libs/fftw-3.0.1 media-libs/x264 media-video/mjpegtools >=media-libs/freetype-2.1.10 >=media-libs/openexr-1.2.2 >=media-libs/libvorbis-1.2.3 >=media-libs/libogg-1.1.4 >=media-libs/libtheora-1.1.1 x11-libs/libX11 x11-libs/libXv x11-libs/libXxf86vm x11-libs/libXext x11-libs/libXvMC x11-libs/libXft virtual/jpeg alsa? ( media-libs/alsa-lib ) ieee1394? ( media-libs/libiec61883 >=sys-libs/libraw1394-1.2.0 >=sys-libs/libavc1394-0.5.0 ) opengl? ( virtual/opengl ) app-arch/xz-utils dev-util/pkgconfig mmx? ( dev-lang/nasm ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=media-libs/libpng-1.4.0 >=media-libs/libdv-1.0.0 media-libs/faad2 media-libs/faac media-libs/a52dec media-libs/libsndfile media-libs/tiff virtual/ffmpeg media-sound/lame >=sci-libs/fftw-3.0.1 media-libs/x264 media-video/mjpegtools >=media-libs/freetype-2.1.10 >=media-libs/openexr-1.2.2 >=media-libs/libvorbis-1.2.3 >=media-libs/libogg-1.1.4 >=media-libs/libtheora-1.1.1 x11-libs/libX11 x11-libs/libXv x11-libs/libXxf86vm x11-libs/libXext x11-libs/libXvMC x11-libs/libXft virtual/jpeg alsa? ( media-libs/alsa-lib ) ieee1394? ( media-libs/libiec61883 >=sys-libs/libraw1394-1.2.0 >=sys-libs/libavc1394-0.5.0 ) opengl? ( virtual/opengl ) app-arch/xz-utils dev-util/pkgconfig mmx? ( dev-lang/nasm ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=media-libs/libpng-1.4.0 >=media-libs/libdv-1.0.0 media-libs/faad2 media-libs/faac media-libs/a52dec media-libs/libsndfile media-libs/tiff virtual/ffmpeg media-sound/lame >=sci-libs/fftw-3.0.1 media-libs/x264 media-video/mjpegtools >=media-libs/freetype-2.1.10 >=media-libs/openexr-1.2.2 >=media-libs/libvorbis-1.2.3 >=media-libs/libogg-1.1.4 >=media-libs/libtheora-1.1.1 x11-libs/libX11 x11-libs/libXv x11-libs/libXxf86vm x11-libs/libXext x11-libs/libXvMC x11-libs/libXft virtual/jpeg alsa? ( media-libs/alsa-lib ) ieee1394? ( media-libs/libiec61883 >=sys-libs/libraw1394-1.2.0 >=sys-libs/libavc1394-0.5.0 ) opengl? ( virtual/opengl )
 0
 mirror://gentoo/cinelerra-20101104.tar.xz
diff --git a/metadata/cache/media-video/cinelerra-20111223 b/metadata/cache/media-video/cinelerra-20111223
index 90cd29438beb..b6bb0c10660b 100644
--- a/metadata/cache/media-video/cinelerra-20111223
+++ b/metadata/cache/media-video/cinelerra-20111223
@@ -1,4 +1,4 @@
-media-libs/a52dec media-libs/faac media-libs/faad2 >=media-libs/freetype-2 media-libs/libdv >=media-libs/libogg-1.2 >=media-libs/libpng-1.2:0 media-libs/libsndfile >=media-libs/libtheora-1.1 >=media-libs/libvorbis-1.3 >=media-libs/openexr-1.5 media-libs/tiff:0 media-libs/x264 media-sound/lame >=media-video/mjpegtools-2 >=sci-libs/fftw-3 x11-libs/libX11 x11-libs/libXext x11-libs/libXft x11-libs/libXv x11-libs/libXvMC x11-libs/libXxf86vm virtual/ffmpeg virtual/jpeg alsa? ( media-libs/alsa-lib ) ieee1394? ( media-libs/libiec61883 >=sys-libs/libraw1394-1.2.0 >=sys-libs/libavc1394-0.5.0 ) opengl? ( virtual/opengl ) app-arch/xz-utils dev-util/pkgconfig mmx? ( dev-lang/nasm ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+media-libs/a52dec media-libs/faac media-libs/faad2 >=media-libs/freetype-2 media-libs/libdv >=media-libs/libogg-1.2 >=media-libs/libpng-1.2:0 media-libs/libsndfile >=media-libs/libtheora-1.1 >=media-libs/libvorbis-1.3 >=media-libs/openexr-1.5 media-libs/tiff:0 media-libs/x264 media-sound/lame >=media-video/mjpegtools-2 >=sci-libs/fftw-3 x11-libs/libX11 x11-libs/libXext x11-libs/libXft x11-libs/libXv x11-libs/libXvMC x11-libs/libXxf86vm virtual/ffmpeg virtual/jpeg alsa? ( media-libs/alsa-lib ) ieee1394? ( media-libs/libiec61883 >=sys-libs/libraw1394-1.2.0 >=sys-libs/libavc1394-0.5.0 ) opengl? ( virtual/opengl ) app-arch/xz-utils dev-util/pkgconfig mmx? ( dev-lang/nasm ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 media-libs/a52dec media-libs/faac media-libs/faad2 >=media-libs/freetype-2 media-libs/libdv >=media-libs/libogg-1.2 >=media-libs/libpng-1.2:0 media-libs/libsndfile >=media-libs/libtheora-1.1 >=media-libs/libvorbis-1.3 >=media-libs/openexr-1.5 media-libs/tiff:0 media-libs/x264 media-sound/lame >=media-video/mjpegtools-2 >=sci-libs/fftw-3 x11-libs/libX11 x11-libs/libXext x11-libs/libXft x11-libs/libXv x11-libs/libXvMC x11-libs/libXxf86vm virtual/ffmpeg virtual/jpeg alsa? ( media-libs/alsa-lib ) ieee1394? ( media-libs/libiec61883 >=sys-libs/libraw1394-1.2.0 >=sys-libs/libavc1394-0.5.0 ) opengl? ( virtual/opengl )
 0
 http://dev.gentoo.org/~ssuominen/cinelerra-20111223.tar.xz
diff --git a/metadata/cache/media-video/dirac-1.0.2 b/metadata/cache/media-video/dirac-1.0.2
index 7719cdedb37f..7a009077ddf5 100644
--- a/metadata/cache/media-video/dirac-1.0.2
+++ b/metadata/cache/media-video/dirac-1.0.2
@@ -1,4 +1,4 @@
-doc? ( app-doc/doxygen virtual/latex-base media-gfx/graphviz app-text/dvipdfm ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+doc? ( app-doc/doxygen virtual/latex-base media-gfx/graphviz app-text/dvipdfm ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 mirror://sourceforge/dirac/dirac-1.0.2.tar.gz
diff --git a/metadata/cache/media-video/em8300-libraries-0.17.4 b/metadata/cache/media-video/em8300-libraries-0.17.4
index 99fc2ae5d107..1242fc9e932c 100644
--- a/metadata/cache/media-video/em8300-libraries-0.17.4
+++ b/metadata/cache/media-video/em8300-libraries-0.17.4
@@ -1,4 +1,4 @@
-gtk? ( x11-libs/gtk+:2 ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+gtk? ( x11-libs/gtk+:2 ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 gtk? ( x11-libs/gtk+:2 ) ~media-video/em8300-modules-0.17.4
 0
 mirror://sourceforge/dxr3/em8300-0.17.4.tar.gz
diff --git a/metadata/cache/media-video/em8300-libraries-0.18.0 b/metadata/cache/media-video/em8300-libraries-0.18.0
index fcc7cd01bf65..acc0d7bad43b 100644
--- a/metadata/cache/media-video/em8300-libraries-0.18.0
+++ b/metadata/cache/media-video/em8300-libraries-0.18.0
@@ -1,4 +1,4 @@
-gtk? ( x11-libs/gtk+:2 ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+gtk? ( x11-libs/gtk+:2 ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 gtk? ( x11-libs/gtk+:2 ) modules? ( ~media-video/em8300-modules-0.18.0 )
 0
 mirror://sourceforge/dxr3/em8300-0.18.0.tar.gz mirror://gentoo/em8300-gtk-2.0.m4.tbz2
diff --git a/metadata/cache/media-video/em8300-libraries-0.18.0_p20120124 b/metadata/cache/media-video/em8300-libraries-0.18.0_p20120124
index 99658dbe2806..ab5233fd1d3a 100644
--- a/metadata/cache/media-video/em8300-libraries-0.18.0_p20120124
+++ b/metadata/cache/media-video/em8300-libraries-0.18.0_p20120124
@@ -1,4 +1,4 @@
-gtk? ( x11-libs/gtk+:2 ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+gtk? ( x11-libs/gtk+:2 ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 gtk? ( x11-libs/gtk+:2 ) modules? ( ~media-video/em8300-modules-0.18.0_p20120124 )
 0
 http://vdr.websitec.de/download/em8300-0.18.0_p20120124.tar.gz mirror://gentoo/em8300-gtk-2.0.m4.tbz2
diff --git a/metadata/cache/media-video/guvcview-1.5.0 b/metadata/cache/media-video/guvcview-1.5.0
index 19241977947d..3f6444a3b08e 100644
--- a/metadata/cache/media-video/guvcview-1.5.0
+++ b/metadata/cache/media-video/guvcview-1.5.0
@@ -1,4 +1,4 @@
->=dev-libs/glib-2.10:2 virtual/ffmpeg >=media-libs/libsdl-1.2.10 >=media-libs/libpng-1.4 media-libs/libv4l >=media-libs/portaudio-19_pre sys-fs/udev >=x11-libs/gtk+-2.14:2 pulseaudio? ( >=media-sound/pulseaudio-0.9.15 ) dev-util/pkgconfig sys-devel/gettext || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-libs/glib-2.10:2 virtual/ffmpeg >=media-libs/libsdl-1.2.10 >=media-libs/libpng-1.4 media-libs/libv4l >=media-libs/portaudio-19_pre sys-fs/udev >=x11-libs/gtk+-2.14:2 pulseaudio? ( >=media-sound/pulseaudio-0.9.15 ) dev-util/pkgconfig sys-devel/gettext || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=dev-libs/glib-2.10:2 virtual/ffmpeg >=media-libs/libsdl-1.2.10 >=media-libs/libpng-1.4 media-libs/libv4l >=media-libs/portaudio-19_pre sys-fs/udev >=x11-libs/gtk+-2.14:2 pulseaudio? ( >=media-sound/pulseaudio-0.9.15 )
 0
 mirror://berlios/guvcview/guvcview-src-1.5.0.tar.gz
diff --git a/metadata/cache/media-video/guvcview-1.5.1 b/metadata/cache/media-video/guvcview-1.5.1
index a0005fd5910f..2f82562df802 100644
--- a/metadata/cache/media-video/guvcview-1.5.1
+++ b/metadata/cache/media-video/guvcview-1.5.1
@@ -1,4 +1,4 @@
->=dev-libs/glib-2.10:2 virtual/ffmpeg >=media-libs/libsdl-1.2.10 >=media-libs/libpng-1.4 media-libs/libv4l >=media-libs/portaudio-19_pre sys-fs/udev x11-libs/gtk+:3 pulseaudio? ( >=media-sound/pulseaudio-0.9.15 ) dev-util/pkgconfig sys-devel/gettext || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-libs/glib-2.10:2 virtual/ffmpeg >=media-libs/libsdl-1.2.10 >=media-libs/libpng-1.4 media-libs/libv4l >=media-libs/portaudio-19_pre sys-fs/udev x11-libs/gtk+:3 pulseaudio? ( >=media-sound/pulseaudio-0.9.15 ) dev-util/pkgconfig sys-devel/gettext || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=dev-libs/glib-2.10:2 virtual/ffmpeg >=media-libs/libsdl-1.2.10 >=media-libs/libpng-1.4 media-libs/libv4l >=media-libs/portaudio-19_pre sys-fs/udev x11-libs/gtk+:3 pulseaudio? ( >=media-sound/pulseaudio-0.9.15 )
 0
 mirror://sourceforge/guvcview/guvcview-src-1.5.1.tar.gz
diff --git a/metadata/cache/media-video/guvcview-1.5.2 b/metadata/cache/media-video/guvcview-1.5.2
index 44ba34445eb5..456da0969442 100644
--- a/metadata/cache/media-video/guvcview-1.5.2
+++ b/metadata/cache/media-video/guvcview-1.5.2
@@ -1,4 +1,4 @@
->=dev-libs/glib-2.10:2 virtual/ffmpeg >=media-libs/libsdl-1.2.10 >=media-libs/libpng-1.4 media-libs/libv4l >=media-libs/portaudio-19_pre sys-fs/udev x11-libs/gtk+:3 pulseaudio? ( >=media-sound/pulseaudio-0.9.15 ) dev-util/pkgconfig sys-devel/gettext || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-libs/glib-2.10:2 virtual/ffmpeg >=media-libs/libsdl-1.2.10 >=media-libs/libpng-1.4 media-libs/libv4l >=media-libs/portaudio-19_pre sys-fs/udev x11-libs/gtk+:3 pulseaudio? ( >=media-sound/pulseaudio-0.9.15 ) dev-util/pkgconfig sys-devel/gettext || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=dev-libs/glib-2.10:2 virtual/ffmpeg >=media-libs/libsdl-1.2.10 >=media-libs/libpng-1.4 media-libs/libv4l >=media-libs/portaudio-19_pre sys-fs/udev x11-libs/gtk+:3 pulseaudio? ( >=media-sound/pulseaudio-0.9.15 )
 0
 mirror://sourceforge/guvcview/guvcview-src-1.5.2.tar.gz
diff --git a/metadata/cache/media-video/guvcview-1.5.3 b/metadata/cache/media-video/guvcview-1.5.3
index 08530712da48..e3fe97e23cf3 100644
--- a/metadata/cache/media-video/guvcview-1.5.3
+++ b/metadata/cache/media-video/guvcview-1.5.3
@@ -1,4 +1,4 @@
->=dev-libs/glib-2.10:2 virtual/ffmpeg >=media-libs/libsdl-1.2.10 >=media-libs/libpng-1.4 media-libs/libv4l >=media-libs/portaudio-19_pre sys-fs/udev x11-libs/gtk+:3 pulseaudio? ( >=media-sound/pulseaudio-0.9.15 ) dev-util/pkgconfig sys-devel/gettext || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-libs/glib-2.10:2 virtual/ffmpeg >=media-libs/libsdl-1.2.10 >=media-libs/libpng-1.4 media-libs/libv4l >=media-libs/portaudio-19_pre sys-fs/udev x11-libs/gtk+:3 pulseaudio? ( >=media-sound/pulseaudio-0.9.15 ) dev-util/pkgconfig sys-devel/gettext || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=dev-libs/glib-2.10:2 virtual/ffmpeg >=media-libs/libsdl-1.2.10 >=media-libs/libpng-1.4 media-libs/libv4l >=media-libs/portaudio-19_pre sys-fs/udev x11-libs/gtk+:3 pulseaudio? ( >=media-sound/pulseaudio-0.9.15 )
 0
 mirror://sourceforge/guvcview/guvcview-src-1.5.3.tar.gz
diff --git a/metadata/cache/media-video/gxine-0.5.906-r1 b/metadata/cache/media-video/gxine-0.5.906-r1
index 79682bd501c2..1c6a8db14b49 100644
--- a/metadata/cache/media-video/gxine-0.5.906-r1
+++ b/metadata/cache/media-video/gxine-0.5.906-r1
@@ -1,4 +1,4 @@
->=media-libs/xine-lib-1.1.17 >=x11-libs/gtk+-2.8:2 >=dev-libs/glib-2.10:2 >=x11-libs/pango-1.12 >=dev-lang/spidermonkey-1.8.2.15 x11-libs/libX11 x11-libs/libXext x11-libs/libXrender gnome? ( >=dev-libs/dbus-glib-0.88 ) lirc? ( app-misc/lirc ) nls? ( virtual/libintl ) nsplugin? ( dev-libs/nspr x11-libs/libXaw x11-libs/libXt ) udev? ( || ( >=sys-fs/udev-171-r1[gudev] <sys-fs/udev-171-r1[extras] ) ) xcb? ( x11-libs/libxcb ) xinerama? ( x11-libs/libXinerama ) dev-util/pkgconfig nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+>=media-libs/xine-lib-1.1.17 >=x11-libs/gtk+-2.8:2 >=dev-libs/glib-2.10:2 >=x11-libs/pango-1.12 >=dev-lang/spidermonkey-1.8.2.15 x11-libs/libX11 x11-libs/libXext x11-libs/libXrender gnome? ( >=dev-libs/dbus-glib-0.88 ) lirc? ( app-misc/lirc ) nls? ( virtual/libintl ) nsplugin? ( dev-libs/nspr x11-libs/libXaw x11-libs/libXt ) udev? ( || ( >=sys-fs/udev-171-r1[gudev] <sys-fs/udev-171-r1[extras] ) ) xcb? ( x11-libs/libxcb ) xinerama? ( x11-libs/libXinerama ) dev-util/pkgconfig nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 >=media-libs/xine-lib-1.1.17 >=x11-libs/gtk+-2.8:2 >=dev-libs/glib-2.10:2 >=x11-libs/pango-1.12 >=dev-lang/spidermonkey-1.8.2.15 x11-libs/libX11 x11-libs/libXext x11-libs/libXrender gnome? ( >=dev-libs/dbus-glib-0.88 ) lirc? ( app-misc/lirc ) nls? ( virtual/libintl ) nsplugin? ( dev-libs/nspr x11-libs/libXaw x11-libs/libXt ) udev? ( || ( >=sys-fs/udev-171-r1[gudev] <sys-fs/udev-171-r1[extras] ) ) xcb? ( x11-libs/libxcb ) xinerama? ( x11-libs/libXinerama )
 0
 mirror://sourceforge/xine/gxine-0.5.906.tar.xz
diff --git a/metadata/cache/media-video/gxine-0.5.907 b/metadata/cache/media-video/gxine-0.5.907
index 8187ee074338..caedc8eb595f 100644
--- a/metadata/cache/media-video/gxine-0.5.907
+++ b/metadata/cache/media-video/gxine-0.5.907
@@ -1,4 +1,4 @@
->=media-libs/xine-lib-1.1.20 x11-libs/gtk+:2 >=dev-libs/glib-2 >=dev-lang/spidermonkey-1.8.2.15 x11-libs/libX11 x11-libs/libXext x11-libs/libXrender gnome-screensaver? ( >=dev-libs/dbus-glib-0.90 ) lirc? ( app-misc/lirc ) nls? ( virtual/libintl ) nsplugin? ( dev-libs/nspr x11-libs/libXaw x11-libs/libXt ) udev? ( || ( >=sys-fs/udev-171-r1[gudev] <sys-fs/udev-171-r1[extras] ) ) xcb? ( x11-libs/libxcb ) xinerama? ( x11-libs/libXinerama ) dev-util/pkgconfig nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+>=media-libs/xine-lib-1.1.20 x11-libs/gtk+:2 >=dev-libs/glib-2 >=dev-lang/spidermonkey-1.8.2.15 x11-libs/libX11 x11-libs/libXext x11-libs/libXrender gnome-screensaver? ( >=dev-libs/dbus-glib-0.90 ) lirc? ( app-misc/lirc ) nls? ( virtual/libintl ) nsplugin? ( dev-libs/nspr x11-libs/libXaw x11-libs/libXt ) udev? ( || ( >=sys-fs/udev-171-r1[gudev] <sys-fs/udev-171-r1[extras] ) ) xcb? ( x11-libs/libxcb ) xinerama? ( x11-libs/libXinerama ) dev-util/pkgconfig nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 >=media-libs/xine-lib-1.1.20 x11-libs/gtk+:2 >=dev-libs/glib-2 >=dev-lang/spidermonkey-1.8.2.15 x11-libs/libX11 x11-libs/libXext x11-libs/libXrender gnome-screensaver? ( >=dev-libs/dbus-glib-0.90 ) lirc? ( app-misc/lirc ) nls? ( virtual/libintl ) nsplugin? ( dev-libs/nspr x11-libs/libXaw x11-libs/libXt ) udev? ( || ( >=sys-fs/udev-171-r1[gudev] <sys-fs/udev-171-r1[extras] ) ) xcb? ( x11-libs/libxcb ) xinerama? ( x11-libs/libXinerama ) gnome-screensaver? ( gnome-extra/gnome-screensaver )
 0
 mirror://sourceforge/xine/gxine-0.5.907.tar.xz
diff --git a/metadata/cache/media-video/imagination-3.0 b/metadata/cache/media-video/imagination-3.0
index 5377bcf9e689..86e3ed9a474b 100644
--- a/metadata/cache/media-video/imagination-3.0
+++ b/metadata/cache/media-video/imagination-3.0
@@ -1,4 +1,4 @@
-x11-libs/gtk+:2 media-sound/sox || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+x11-libs/gtk+:2 media-sound/sox || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 x11-libs/gtk+:2 media-sound/sox virtual/ffmpeg
 0
 mirror://sourceforge/imagination/imagination/3.0/imagination-3.0.tar.gz
diff --git a/metadata/cache/media-video/imagination-3.0-r1 b/metadata/cache/media-video/imagination-3.0-r1
index 5377bcf9e689..86e3ed9a474b 100644
--- a/metadata/cache/media-video/imagination-3.0-r1
+++ b/metadata/cache/media-video/imagination-3.0-r1
@@ -1,4 +1,4 @@
-x11-libs/gtk+:2 media-sound/sox || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+x11-libs/gtk+:2 media-sound/sox || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 x11-libs/gtk+:2 media-sound/sox virtual/ffmpeg
 0
 mirror://sourceforge/imagination/imagination/3.0/imagination-3.0.tar.gz
diff --git a/metadata/cache/media-video/istanbul-0.2.2 b/metadata/cache/media-video/istanbul-0.2.2
index 47539e5eff13..c090e83827cb 100644
--- a/metadata/cache/media-video/istanbul-0.2.2
+++ b/metadata/cache/media-video/istanbul-0.2.2
@@ -1,4 +1,4 @@
->=media-libs/gst-plugins-base-0.10.8 >=dev-python/pygtk-2.6 >=gnome-base/gconf-2.0 >=dev-python/gst-python-0.10.0 =media-plugins/gst-plugins-ogg-0.10* =media-plugins/gst-plugins-theora-0.10* >=media-libs/libtheora-1.0_alpha6[encode] =media-plugins/gst-plugins-gconf-0.10* dev-python/python-xlib >=dev-python/egg-python-2.11.3 >=dev-python/gnome-vfs-python-2 >=dev-python/gconf-python-2 >=dev-util/intltool-0.35.0 dev-util/pkgconfig >=sys-apps/sed-4 =dev-lang/python-2* || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=media-libs/gst-plugins-base-0.10.8 >=dev-python/pygtk-2.6 >=gnome-base/gconf-2.0 >=dev-python/gst-python-0.10.0 =media-plugins/gst-plugins-ogg-0.10* =media-plugins/gst-plugins-theora-0.10* >=media-libs/libtheora-1.0_alpha6[encode] =media-plugins/gst-plugins-gconf-0.10* dev-python/python-xlib >=dev-python/egg-python-2.11.3 >=dev-python/gnome-vfs-python-2 >=dev-python/gconf-python-2 >=dev-util/intltool-0.35.0 dev-util/pkgconfig >=sys-apps/sed-4 =dev-lang/python-2* || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=media-libs/gst-plugins-base-0.10.8 >=dev-python/pygtk-2.6 >=gnome-base/gconf-2.0 >=dev-python/gst-python-0.10.0 =media-plugins/gst-plugins-ogg-0.10* =media-plugins/gst-plugins-theora-0.10* >=media-libs/libtheora-1.0_alpha6[encode] =media-plugins/gst-plugins-gconf-0.10* dev-python/python-xlib >=dev-python/egg-python-2.11.3 >=dev-python/gnome-vfs-python-2 >=dev-python/gconf-python-2 =dev-lang/python-2*
 0
 http://zaheer.merali.org/istanbul-0.2.2.tar.bz2
diff --git a/metadata/cache/media-video/lives-1.4.6 b/metadata/cache/media-video/lives-1.4.6
index 6999169aa680..e2201514e8e2 100644
--- a/metadata/cache/media-video/lives-1.4.6
+++ b/metadata/cache/media-video/lives-1.4.6
@@ -1,4 +1,4 @@
-dev-util/pkgconfig nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-util/pkgconfig nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 media-video/mplayer || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] ) dev-lang/perl >=dev-libs/glib-2.14 >=x11-libs/gtk+-2.16:2 media-libs/libsdl media-libs/libv4l virtual/ffmpeg virtual/jpeg media-sound/sox virtual/cdrtools || ( dev-lang/python:2.7 dev-lang/python:2.6 ) media-plugins/frei0r-plugins media-sound/jack-audio-connection-kit >=media-video/mjpegtools-1.6.2 sys-libs/libavc1394 libvisual? ( media-libs/libvisual ) matroska? ( media-video/mkvtoolnix ) ogg? ( media-sound/ogmtools ) theora? ( media-libs/libtheora )
 0
 http://www.xs4all.nl/~salsaman/lives/current/LiVES-1.4.6.tar.bz2
diff --git a/metadata/cache/media-video/lsdvd-0.16-r2 b/metadata/cache/media-video/lsdvd-0.16-r2
index f46fa1a68c56..b6e8a4447682 100644
--- a/metadata/cache/media-video/lsdvd-0.16-r2
+++ b/metadata/cache/media-video/lsdvd-0.16-r2
@@ -1,4 +1,4 @@
-media-libs/libdvdread || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+media-libs/libdvdread || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 media-libs/libdvdread
 0
 mirror://gentoo/lsdvd-0.16.tar.gz
diff --git a/metadata/cache/media-video/mjpegtools-2.0.0-r1 b/metadata/cache/media-video/mjpegtools-2.0.0-r1
index 16cc3b3a9195..e9e69c2a6924 100644
--- a/metadata/cache/media-video/mjpegtools-2.0.0-r1
+++ b/metadata/cache/media-video/mjpegtools-2.0.0-r1
@@ -1,4 +1,4 @@
-virtual/jpeg quicktime? ( media-libs/libquicktime ) dv? ( >=media-libs/libdv-0.99 ) png? ( media-libs/libpng ) dga? ( x11-libs/libXxf86dga ) gtk? ( x11-libs/gtk+:2 ) sdl? ( >=media-libs/libsdl-1.2.7-r3 x11-libs/libX11 x11-libs/libXt sdlgfx? ( media-libs/sdl-gfx ) ) mmx? ( dev-lang/nasm ) >=sys-apps/sed-4 sys-apps/gawk dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+virtual/jpeg quicktime? ( media-libs/libquicktime ) dv? ( >=media-libs/libdv-0.99 ) png? ( media-libs/libpng ) dga? ( x11-libs/libXxf86dga ) gtk? ( x11-libs/gtk+:2 ) sdl? ( >=media-libs/libsdl-1.2.7-r3 x11-libs/libX11 x11-libs/libXt sdlgfx? ( media-libs/sdl-gfx ) ) mmx? ( dev-lang/nasm ) >=sys-apps/sed-4 sys-apps/gawk dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 virtual/jpeg quicktime? ( media-libs/libquicktime ) dv? ( >=media-libs/libdv-0.99 ) png? ( media-libs/libpng ) dga? ( x11-libs/libXxf86dga ) gtk? ( x11-libs/gtk+:2 ) sdl? ( >=media-libs/libsdl-1.2.7-r3 x11-libs/libX11 x11-libs/libXt sdlgfx? ( media-libs/sdl-gfx ) )
 1
 mirror://sourceforge/mjpeg/mjpegtools-2.0.0.tar.gz
diff --git a/metadata/cache/media-video/mkvtoolnix-4.9.1 b/metadata/cache/media-video/mkvtoolnix-4.9.1
index 6659792020b1..dd4c8be057cf 100644
--- a/metadata/cache/media-video/mkvtoolnix-4.9.1
+++ b/metadata/cache/media-video/mkvtoolnix-4.9.1
@@ -1,4 +1,4 @@
->=dev-libs/libebml-1.2.0 >=media-libs/libmatroska-1.1.0 >=dev-libs/boost-1.36.0 dev-libs/expat media-libs/flac media-libs/libogg media-libs/libvorbis sys-apps/file sys-libs/zlib bzip2? ( app-arch/bzip2 ) lzo? ( dev-libs/lzo ) wxwidgets? ( x11-libs/wxGTK:2.8[X] ) dev-ruby/rake || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-libs/libebml-1.2.0 >=media-libs/libmatroska-1.1.0 >=dev-libs/boost-1.36.0 dev-libs/expat media-libs/flac media-libs/libogg media-libs/libvorbis sys-apps/file sys-libs/zlib bzip2? ( app-arch/bzip2 ) lzo? ( dev-libs/lzo ) wxwidgets? ( x11-libs/wxGTK:2.8[X] ) dev-ruby/rake || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=dev-libs/libebml-1.2.0 >=media-libs/libmatroska-1.1.0 >=dev-libs/boost-1.36.0 dev-libs/expat media-libs/flac media-libs/libogg media-libs/libvorbis sys-apps/file sys-libs/zlib bzip2? ( app-arch/bzip2 ) lzo? ( dev-libs/lzo ) wxwidgets? ( x11-libs/wxGTK:2.8[X] )
 0
 http://www.bunkus.org/videotools/mkvtoolnix/sources/mkvtoolnix-4.9.1.tar.bz2
diff --git a/metadata/cache/media-video/mkvtoolnix-5.0.1 b/metadata/cache/media-video/mkvtoolnix-5.0.1
index 32ba462331be..90935c2ee529 100644
--- a/metadata/cache/media-video/mkvtoolnix-5.0.1
+++ b/metadata/cache/media-video/mkvtoolnix-5.0.1
@@ -1,4 +1,4 @@
->=dev-libs/libebml-1.2.2 >=media-libs/libmatroska-1.3.0 >=dev-libs/boost-1.36.0 dev-libs/expat media-libs/flac media-libs/libogg media-libs/libvorbis sys-apps/file sys-libs/zlib bzip2? ( app-arch/bzip2 ) lzo? ( dev-libs/lzo ) wxwidgets? ( x11-libs/wxGTK:2.8[X] ) dev-ruby/rake || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-libs/libebml-1.2.2 >=media-libs/libmatroska-1.3.0 >=dev-libs/boost-1.36.0 dev-libs/expat media-libs/flac media-libs/libogg media-libs/libvorbis sys-apps/file sys-libs/zlib bzip2? ( app-arch/bzip2 ) lzo? ( dev-libs/lzo ) wxwidgets? ( x11-libs/wxGTK:2.8[X] ) dev-ruby/rake || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=dev-libs/libebml-1.2.2 >=media-libs/libmatroska-1.3.0 >=dev-libs/boost-1.36.0 dev-libs/expat media-libs/flac media-libs/libogg media-libs/libvorbis sys-apps/file sys-libs/zlib bzip2? ( app-arch/bzip2 ) lzo? ( dev-libs/lzo ) wxwidgets? ( x11-libs/wxGTK:2.8[X] )
 0
 http://www.bunkus.org/videotools/mkvtoolnix/sources/mkvtoolnix-5.0.1.tar.bz2
diff --git a/metadata/cache/media-video/noad-0.7.2-r2 b/metadata/cache/media-video/noad-0.7.2-r2
index fa486ff2992a..23feb4035860 100644
--- a/metadata/cache/media-video/noad-0.7.2-r2
+++ b/metadata/cache/media-video/noad-0.7.2-r2
@@ -1,4 +1,4 @@
-media-libs/libmpeg2 ffmpeg? ( >=virtual/ffmpeg-0.4.8 ) imagemagick? ( >=media-gfx/imagemagick-6.2.4.2-r1 ) !media-plugins/vdr-markad || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+media-libs/libmpeg2 ffmpeg? ( >=virtual/ffmpeg-0.4.8 ) imagemagick? ( >=media-gfx/imagemagick-6.2.4.2-r1 ) !media-plugins/vdr-markad || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 media-libs/libmpeg2 ffmpeg? ( >=virtual/ffmpeg-0.4.8 ) imagemagick? ( >=media-gfx/imagemagick-6.2.4.2-r1 ) !media-plugins/vdr-markad
 0
 http://noad.heliohost.org/noad-0.7.2.tar.bz2
diff --git a/metadata/cache/media-video/noad-0.7.3 b/metadata/cache/media-video/noad-0.7.3
index 35dd9a53eeee..0d77d3026200 100644
--- a/metadata/cache/media-video/noad-0.7.3
+++ b/metadata/cache/media-video/noad-0.7.3
@@ -1,4 +1,4 @@
-media-libs/libmpeg2 ffmpeg? ( >=virtual/ffmpeg-0.4.8 ) imagemagick? ( >=media-gfx/imagemagick-6.2.4.2-r1 ) !media-plugins/vdr-markad || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+media-libs/libmpeg2 ffmpeg? ( >=virtual/ffmpeg-0.4.8 ) imagemagick? ( >=media-gfx/imagemagick-6.2.4.2-r1 ) !media-plugins/vdr-markad || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 media-libs/libmpeg2 ffmpeg? ( >=virtual/ffmpeg-0.4.8 ) imagemagick? ( >=media-gfx/imagemagick-6.2.4.2-r1 ) !media-plugins/vdr-markad
 0
 http://noad.heliohost.org/noad-0.7.3.tar.bz2
diff --git a/metadata/cache/media-video/ogmrip-0.13.6 b/metadata/cache/media-video/ogmrip-0.13.6
index ecad736689e0..fa12c7945cf3 100644
--- a/metadata/cache/media-video/ogmrip-0.13.6
+++ b/metadata/cache/media-video/ogmrip-0.13.6
@@ -1,4 +1,4 @@
->=dev-libs/glib-2.16:2 >=app-i18n/enca-1.9 dev-libs/libxml2 media-libs/libdvdread >=media-video/mplayer-1.0_rc2[dvd,encode,xvid?,dts?,x264?] aac? ( >=media-libs/faac-1.24 ) gtk? ( >=x11-libs/gtk+-2.12:2 gnome-base/libglade gnome-base/gconf dbus? ( dev-libs/dbus-glib ) libnotify? ( >=x11-libs/libnotify-0.4.3 ) media-video/mplayer[jpeg] ) matroska? ( media-video/mkvtoolnix ) mp3? ( media-sound/lame ) mp4? ( >=media-video/gpac-0.4.2 ) ogm? ( media-sound/ogmtools ) spell? ( >=app-text/enchant-1.1.0 ) srt? ( || ( ( >=app-text/tesseract-2 media-libs/tiff ) >=app-text/gocr-0.39 >=app-text/ocrad-0.15 ) media-libs/libpng ) theora? ( media-libs/libtheora ) vorbis? ( media-sound/vorbis-tools ) nls? ( sys-devel/gettext dev-util/intltool ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+>=dev-libs/glib-2.16:2 >=app-i18n/enca-1.9 dev-libs/libxml2 media-libs/libdvdread >=media-video/mplayer-1.0_rc2[dvd,encode,xvid?,dts?,x264?] aac? ( >=media-libs/faac-1.24 ) gtk? ( >=x11-libs/gtk+-2.12:2 gnome-base/libglade gnome-base/gconf dbus? ( dev-libs/dbus-glib ) libnotify? ( >=x11-libs/libnotify-0.4.3 ) media-video/mplayer[jpeg] ) matroska? ( media-video/mkvtoolnix ) mp3? ( media-sound/lame ) mp4? ( >=media-video/gpac-0.4.2 ) ogm? ( media-sound/ogmtools ) spell? ( >=app-text/enchant-1.1.0 ) srt? ( || ( ( >=app-text/tesseract-2 media-libs/tiff ) >=app-text/gocr-0.39 >=app-text/ocrad-0.15 ) media-libs/libpng ) theora? ( media-libs/libtheora ) vorbis? ( media-sound/vorbis-tools ) nls? ( sys-devel/gettext dev-util/intltool ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 >=dev-libs/glib-2.16:2 >=app-i18n/enca-1.9 dev-libs/libxml2 media-libs/libdvdread >=media-video/mplayer-1.0_rc2[dvd,encode,xvid?,dts?,x264?] aac? ( >=media-libs/faac-1.24 ) gtk? ( >=x11-libs/gtk+-2.12:2 gnome-base/libglade gnome-base/gconf dbus? ( dev-libs/dbus-glib ) libnotify? ( >=x11-libs/libnotify-0.4.3 ) media-video/mplayer[jpeg] ) matroska? ( media-video/mkvtoolnix ) mp3? ( media-sound/lame ) mp4? ( >=media-video/gpac-0.4.2 ) ogm? ( media-sound/ogmtools ) spell? ( >=app-text/enchant-1.1.0 ) srt? ( || ( ( >=app-text/tesseract-2 media-libs/tiff ) >=app-text/gocr-0.39 >=app-text/ocrad-0.15 ) media-libs/libpng ) theora? ( media-libs/libtheora ) vorbis? ( media-sound/vorbis-tools ) gnome-base/gvfs
 0
 mirror://sourceforge/ogmrip/ogmrip-0.13.6.tar.gz
diff --git a/metadata/cache/media-video/ogmrip-0.13.7 b/metadata/cache/media-video/ogmrip-0.13.7
index f3990475dc67..47fee3bd9c4e 100644
--- a/metadata/cache/media-video/ogmrip-0.13.7
+++ b/metadata/cache/media-video/ogmrip-0.13.7
@@ -1,4 +1,4 @@
->=dev-libs/glib-2.16:2 >=app-i18n/enca-1.9 dev-libs/libxml2 media-libs/libdvdread >=media-video/mplayer-1.0_rc2[dvd,encode,xvid?,dts?,x264?] aac? ( >=media-libs/faac-1.24 ) gtk? ( >=x11-libs/gtk+-2.12:2 gnome-base/libglade gnome-base/gconf dbus? ( dev-libs/dbus-glib ) libnotify? ( >=x11-libs/libnotify-0.4.3 ) media-video/mplayer[jpeg] ) matroska? ( media-video/mkvtoolnix ) mp3? ( media-sound/lame ) mp4? ( >=media-video/gpac-0.4.2 ) ogm? ( media-sound/ogmtools ) spell? ( >=app-text/enchant-1.1.0 ) srt? ( || ( ( >=app-text/tesseract-2 media-libs/tiff ) >=app-text/gocr-0.39 >=app-text/ocrad-0.15 ) media-libs/libpng ) theora? ( media-libs/libtheora ) vorbis? ( media-sound/vorbis-tools ) nls? ( sys-devel/gettext dev-util/intltool ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
+>=dev-libs/glib-2.16:2 >=app-i18n/enca-1.9 dev-libs/libxml2 media-libs/libdvdread >=media-video/mplayer-1.0_rc2[dvd,encode,xvid?,dts?,x264?] aac? ( >=media-libs/faac-1.24 ) gtk? ( >=x11-libs/gtk+-2.12:2 gnome-base/libglade gnome-base/gconf dbus? ( dev-libs/dbus-glib ) libnotify? ( >=x11-libs/libnotify-0.4.3 ) media-video/mplayer[jpeg] ) matroska? ( media-video/mkvtoolnix ) mp3? ( media-sound/lame ) mp4? ( >=media-video/gpac-0.4.2 ) ogm? ( media-sound/ogmtools ) spell? ( >=app-text/enchant-1.1.0 ) srt? ( || ( ( >=app-text/tesseract-2 media-libs/tiff ) >=app-text/gocr-0.39 >=app-text/ocrad-0.15 ) media-libs/libpng ) theora? ( media-libs/libtheora ) vorbis? ( media-sound/vorbis-tools ) nls? ( sys-devel/gettext dev-util/intltool ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
 >=dev-libs/glib-2.16:2 >=app-i18n/enca-1.9 dev-libs/libxml2 media-libs/libdvdread >=media-video/mplayer-1.0_rc2[dvd,encode,xvid?,dts?,x264?] aac? ( >=media-libs/faac-1.24 ) gtk? ( >=x11-libs/gtk+-2.12:2 gnome-base/libglade gnome-base/gconf dbus? ( dev-libs/dbus-glib ) libnotify? ( >=x11-libs/libnotify-0.4.3 ) media-video/mplayer[jpeg] ) matroska? ( media-video/mkvtoolnix ) mp3? ( media-sound/lame ) mp4? ( >=media-video/gpac-0.4.2 ) ogm? ( media-sound/ogmtools ) spell? ( >=app-text/enchant-1.1.0 ) srt? ( || ( ( >=app-text/tesseract-2 media-libs/tiff ) >=app-text/gocr-0.39 >=app-text/ocrad-0.15 ) media-libs/libpng ) theora? ( media-libs/libtheora ) vorbis? ( media-sound/vorbis-tools ) gnome-base/gvfs
 0
 mirror://sourceforge/ogmrip/ogmrip-0.13.7.tar.gz
diff --git a/metadata/cache/media-video/parole-0.2.0.6 b/metadata/cache/media-video/parole-0.2.0.6
index c4f2e6246a56..0971cc969fd5 100644
--- a/metadata/cache/media-video/parole-0.2.0.6
+++ b/metadata/cache/media-video/parole-0.2.0.6
@@ -1,4 +1,4 @@
->=x11-libs/gtk+-2.16:2 >=dev-libs/glib-2.16:2 >=xfce-base/libxfce4util-4.8 >=xfce-base/libxfcegui4-4.8 >=dev-libs/dbus-glib-0.88 >=media-libs/gstreamer-0.10.11:0.10 >=media-libs/gst-plugins-base-0.10.11:0.10 libnotify? ( >=x11-libs/libnotify-0.4.5 ) taglib? ( >=media-libs/taglib-1.4 ) dev-util/intltool dev-util/pkgconfig x11-proto/xproto >=sys-apps/sed-4 >=dev-util/xfce4-dev-tools-4.9.1 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=x11-libs/gtk+-2.16:2 >=dev-libs/glib-2.16:2 >=xfce-base/libxfce4util-4.8 >=xfce-base/libxfcegui4-4.8 >=dev-libs/dbus-glib-0.88 >=media-libs/gstreamer-0.10.11:0.10 >=media-libs/gst-plugins-base-0.10.11:0.10 libnotify? ( >=x11-libs/libnotify-0.4.5 ) taglib? ( >=media-libs/taglib-1.4 ) dev-util/intltool dev-util/pkgconfig x11-proto/xproto >=sys-apps/sed-4 >=dev-util/xfce4-dev-tools-4.9.1 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=x11-libs/gtk+-2.16:2 >=dev-libs/glib-2.16:2 >=xfce-base/libxfce4util-4.8 >=xfce-base/libxfcegui4-4.8 >=dev-libs/dbus-glib-0.88 >=media-libs/gstreamer-0.10.11:0.10 >=media-libs/gst-plugins-base-0.10.11:0.10 libnotify? ( >=x11-libs/libnotify-0.4.5 ) taglib? ( >=media-libs/taglib-1.4 ) media-plugins/gst-plugins-meta:0.10
 0
 mirror://xfce/src/apps/parole/0.2/parole-0.2.0.6.tar.bz2
diff --git a/metadata/cache/media-video/recordmydesktop-0.3.8.1-r4 b/metadata/cache/media-video/recordmydesktop-0.3.8.1-r4
index d5c85729d10b..085c8a403e47 100644
--- a/metadata/cache/media-video/recordmydesktop-0.3.8.1-r4
+++ b/metadata/cache/media-video/recordmydesktop-0.3.8.1-r4
@@ -1,4 +1,4 @@
-sys-libs/zlib x11-libs/libXext x11-libs/libXfixes x11-libs/libXdamage media-libs/libvorbis media-libs/libogg media-libs/libtheora[encode] x11-libs/libICE x11-libs/libSM alsa? ( media-libs/alsa-lib ) jack? ( media-sound/jack-audio-connection-kit ) x11-proto/xextproto || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+sys-libs/zlib x11-libs/libXext x11-libs/libXfixes x11-libs/libXdamage media-libs/libvorbis media-libs/libogg media-libs/libtheora[encode] x11-libs/libICE x11-libs/libSM alsa? ( media-libs/alsa-lib ) jack? ( media-sound/jack-audio-connection-kit ) x11-proto/xextproto || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 sys-libs/zlib x11-libs/libXext x11-libs/libXfixes x11-libs/libXdamage media-libs/libvorbis media-libs/libogg media-libs/libtheora[encode] x11-libs/libICE x11-libs/libSM alsa? ( media-libs/alsa-lib ) jack? ( media-sound/jack-audio-connection-kit )
 0
 mirror://sourceforge/recordmydesktop/recordmydesktop-0.3.8.1.tar.gz
diff --git a/metadata/cache/media-video/snappy-9999 b/metadata/cache/media-video/snappy-9999
index 174164abf202..4fa2a0bd9cd0 100644
--- a/metadata/cache/media-video/snappy-9999
+++ b/metadata/cache/media-video/snappy-9999
@@ -1,4 +1,4 @@
->=dev-libs/glib-2.26:2 >=media-libs/clutter-1.2.0:1.0 >=media-libs/clutter-gst-1.0.0:1.0 x11-libs/libXtst >=media-libs/gstreamer-0.10.30:0.10 >=media-libs/gst-plugins-base-0.10.30:0.10 >=media-plugins/gst-plugins-meta-0.10-r2:0.10 !!net-misc/spice-gtk || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
+>=dev-libs/glib-2.26:2 >=media-libs/clutter-1.2.0:1.0 >=media-libs/clutter-gst-1.0.0:1.0 x11-libs/libXtst >=media-libs/gstreamer-0.10.30:0.10 >=media-libs/gst-plugins-base-0.10.30:0.10 >=media-plugins/gst-plugins-meta-0.10-r2:0.10 !!net-misc/spice-gtk || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
 >=dev-libs/glib-2.26:2 >=media-libs/clutter-1.2.0:1.0 >=media-libs/clutter-gst-1.0.0:1.0 x11-libs/libXtst >=media-libs/gstreamer-0.10.30:0.10 >=media-libs/gst-plugins-base-0.10.30:0.10 >=media-plugins/gst-plugins-meta-0.10-r2:0.10 !!net-misc/spice-gtk
 0
 
diff --git a/metadata/cache/media-video/totem-2.32.0-r2 b/metadata/cache/media-video/totem-2.32.0-r2
index 4650dd5cd5a6..508a33473b31 100644
--- a/metadata/cache/media-video/totem-2.32.0-r2
+++ b/metadata/cache/media-video/totem-2.32.0-r2
@@ -1,4 +1,4 @@
->=dev-libs/glib-2.25.11:2 >=x11-libs/gtk+-2.21.8:2 >=gnome-base/gconf-2:2 >=dev-libs/totem-pl-parser-2.30.2 >=x11-themes/gnome-icon-theme-2.16 x11-libs/cairo >=dev-libs/libxml2-2.6:2 >=dev-libs/dbus-glib-0.82 >=media-libs/gstreamer-0.10.30:0.10 >=media-libs/gst-plugins-good-0.10:0.10 >=media-libs/gst-plugins-base-0.10.30:0.10 >=media-plugins/gst-plugins-gconf-0.10:0.10 >=media-plugins/gst-plugins-taglib-0.10:0.10 >=media-plugins/gst-plugins-gio-0.10:0.10 >=media-plugins/gst-plugins-pango-0.10:0.10 >=media-plugins/gst-plugins-x-0.10:0.10 >=media-plugins/gst-plugins-meta-0.10-r2:0.10 dev-libs/libunique:1 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXtst >=x11-libs/libXrandr-1.1.1 >=x11-libs/libXxf86vm-1.0.1 bluetooth? ( net-wireless/bluez ) iplayer? ( dev-python/pygobject:2 dev-python/pygtk:2 dev-python/httplib2 dev-python/feedparser dev-python/beautifulsoup ) lirc? ( app-misc/lirc ) nautilus? ( >=gnome-base/nautilus-2.10 ) nsplugin? ( media-plugins/gst-plugins-soup:0.10 ) python? ( >=dev-python/pygtk-2.12:2 dev-python/pyxdg dev-python/gst-python:0.10 dev-python/dbus-python dev-python/gconf-python:2 ) tracker? ( >=app-misc/tracker-0.8.1 ) upnp? ( media-video/coherence ) youtube? ( <dev-libs/libgdata-0.9 >=dev-libs/libgdata-0.4 net-libs/libsoup:2.4 media-plugins/gst-plugins-soup:0.10 >=dev-libs/totem-pl-parser-2.32.4[quvi] >=dev-python/pygtk-2.12:2 dev-python/pyxdg dev-python/gst-python:0.10 dev-python/dbus-python dev-python/gconf-python:2 ) x11-proto/xproto x11-proto/xextproto x11-proto/xf86vidmodeproto app-text/scrollkeeper >=app-text/gnome-doc-utils-0.20.3 >=dev-util/intltool-0.40 >=dev-util/pkgconfig-0.20 app-text/docbook-xml-dtd:4.5 gnome-base/gnome-common dev-util/gtk-doc-am doc? ( >=dev-util/gtk-doc-1.11 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 python? ( =dev-lang/python-2* ) python? ( =dev-lang/python-2*[threads] )
+>=dev-libs/glib-2.25.11:2 >=x11-libs/gtk+-2.21.8:2 >=gnome-base/gconf-2:2 >=dev-libs/totem-pl-parser-2.30.2 >=x11-themes/gnome-icon-theme-2.16 x11-libs/cairo >=dev-libs/libxml2-2.6:2 >=dev-libs/dbus-glib-0.82 >=media-libs/gstreamer-0.10.30:0.10 >=media-libs/gst-plugins-good-0.10:0.10 >=media-libs/gst-plugins-base-0.10.30:0.10 >=media-plugins/gst-plugins-gconf-0.10:0.10 >=media-plugins/gst-plugins-taglib-0.10:0.10 >=media-plugins/gst-plugins-gio-0.10:0.10 >=media-plugins/gst-plugins-pango-0.10:0.10 >=media-plugins/gst-plugins-x-0.10:0.10 >=media-plugins/gst-plugins-meta-0.10-r2:0.10 dev-libs/libunique:1 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXtst >=x11-libs/libXrandr-1.1.1 >=x11-libs/libXxf86vm-1.0.1 bluetooth? ( net-wireless/bluez ) iplayer? ( dev-python/pygobject:2 dev-python/pygtk:2 dev-python/httplib2 dev-python/feedparser dev-python/beautifulsoup ) lirc? ( app-misc/lirc ) nautilus? ( >=gnome-base/nautilus-2.10 ) nsplugin? ( media-plugins/gst-plugins-soup:0.10 ) python? ( >=dev-python/pygtk-2.12:2 dev-python/pyxdg dev-python/gst-python:0.10 dev-python/dbus-python dev-python/gconf-python:2 ) tracker? ( >=app-misc/tracker-0.8.1 ) upnp? ( media-video/coherence ) youtube? ( <dev-libs/libgdata-0.9 >=dev-libs/libgdata-0.4 net-libs/libsoup:2.4 media-plugins/gst-plugins-soup:0.10 >=dev-libs/totem-pl-parser-2.32.4[quvi] >=dev-python/pygtk-2.12:2 dev-python/pyxdg dev-python/gst-python:0.10 dev-python/dbus-python dev-python/gconf-python:2 ) x11-proto/xproto x11-proto/xextproto x11-proto/xf86vidmodeproto app-text/scrollkeeper >=app-text/gnome-doc-utils-0.20.3 >=dev-util/intltool-0.40 >=dev-util/pkgconfig-0.20 app-text/docbook-xml-dtd:4.5 gnome-base/gnome-common dev-util/gtk-doc-am doc? ( >=dev-util/gtk-doc-1.11 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 python? ( =dev-lang/python-2* ) python? ( =dev-lang/python-2*[threads] )
 >=dev-libs/glib-2.25.11:2 >=x11-libs/gtk+-2.21.8:2 >=gnome-base/gconf-2:2 >=dev-libs/totem-pl-parser-2.30.2 >=x11-themes/gnome-icon-theme-2.16 x11-libs/cairo >=dev-libs/libxml2-2.6:2 >=dev-libs/dbus-glib-0.82 >=media-libs/gstreamer-0.10.30:0.10 >=media-libs/gst-plugins-good-0.10:0.10 >=media-libs/gst-plugins-base-0.10.30:0.10 >=media-plugins/gst-plugins-gconf-0.10:0.10 >=media-plugins/gst-plugins-taglib-0.10:0.10 >=media-plugins/gst-plugins-gio-0.10:0.10 >=media-plugins/gst-plugins-pango-0.10:0.10 >=media-plugins/gst-plugins-x-0.10:0.10 >=media-plugins/gst-plugins-meta-0.10-r2:0.10 dev-libs/libunique:1 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXtst >=x11-libs/libXrandr-1.1.1 >=x11-libs/libXxf86vm-1.0.1 bluetooth? ( net-wireless/bluez ) iplayer? ( dev-python/pygobject:2 dev-python/pygtk:2 dev-python/httplib2 dev-python/feedparser dev-python/beautifulsoup ) lirc? ( app-misc/lirc ) nautilus? ( >=gnome-base/nautilus-2.10 ) nsplugin? ( media-plugins/gst-plugins-soup:0.10 ) python? ( >=dev-python/pygtk-2.12:2 dev-python/pyxdg dev-python/gst-python:0.10 dev-python/dbus-python dev-python/gconf-python:2 ) tracker? ( >=app-misc/tracker-0.8.1 ) upnp? ( media-video/coherence ) youtube? ( <dev-libs/libgdata-0.9 >=dev-libs/libgdata-0.4 net-libs/libsoup:2.4 media-plugins/gst-plugins-soup:0.10 >=dev-libs/totem-pl-parser-2.32.4[quvi] >=dev-python/pygtk-2.12:2 dev-python/pyxdg dev-python/gst-python:0.10 dev-python/dbus-python dev-python/gconf-python:2 ) python? ( =dev-lang/python-2* ) python? ( =dev-lang/python-2*[threads] )
 0
 mirror://gnome/sources/totem/2.32/totem-2.32.0.tar.bz2 http://dev.gentoo.org/~pacho/gnome/totem-2.32.0-patches.tar.bz2
diff --git a/metadata/cache/media-video/vlc-1.1.13 b/metadata/cache/media-video/vlc-1.1.13
index d2bb749078dc..6b16e94e6654 100644
--- a/metadata/cache/media-video/vlc-1.1.13
+++ b/metadata/cache/media-video/vlc-1.1.13
@@ -1,4 +1,4 @@
-|| ( >=sys-libs/zlib-1.2.5.1-r2[minizip] <sys-libs/zlib-1.2.5.1-r1 ) >=media-libs/libdvbpsi-0.1.6 a52? ( >=media-libs/a52dec-0.7.4-r3 ) aalib? ( media-libs/aalib x11-libs/libX11 ) aac? ( >=media-libs/faad2-2.6.1 ) alsa? ( >=media-libs/alsa-lib-1.0.23 ) avahi? ( >=net-dns/avahi-0.6[dbus] ) bidi? ( >=dev-libs/fribidi-0.10.4 ) cdda? ( cddb? ( >=media-libs/libcddb-1.2.0 ) ) dbus? ( >=sys-apps/dbus-1.0.2 ) dc1394? ( >=sys-libs/libraw1394-2.0.1 >=media-libs/libdc1394-2.0.2 ) dirac? ( >=media-video/dirac-0.10.0 ) directfb? ( dev-libs/DirectFB sys-libs/zlib ) dts? ( media-libs/libdca ) dvd? ( media-libs/libdvdread >=media-libs/libdvdnav-0.1.9 ) elibc_glibc? ( >=sys-libs/glibc-2.8 ) ffmpeg? ( virtual/ffmpeg ) flac? ( media-libs/libogg >=media-libs/flac-1.1.2 ) fluidsynth? ( media-sound/fluidsynth ) fontconfig? ( media-libs/fontconfig ) gcrypt? ( >=dev-libs/libgcrypt-1.2.0 ) ggi? ( media-libs/libggi ) gme? ( media-libs/game-music-emu ) gnome? ( gnome-base/gnome-vfs ) gnutls? ( >=net-libs/gnutls-1.7.4 >=dev-libs/libgcrypt-1.2.0 ) id3tag? ( media-libs/libid3tag sys-libs/zlib ) ieee1394? ( >=sys-libs/libraw1394-2.0.1 >=sys-libs/libavc1394-0.5.3 ) jack? ( >=media-sound/jack-audio-connection-kit-0.99.0-r1 ) kate? ( >=media-libs/libkate-0.1.1 ) libass? ( >=media-libs/libass-0.9.6 media-libs/fontconfig ) libcaca? ( >=media-libs/libcaca-0.99_beta14 ) libnotify? ( x11-libs/libnotify x11-libs/gtk+:2 ) libproxy? ( net-libs/libproxy ) libtiger? ( media-libs/libtiger ) lirc? ( app-misc/lirc ) live? ( >=media-plugins/live-2008.07.06 ) lua? ( >=dev-lang/lua-5.1 ) matroska? ( >=dev-libs/libebml-0.7.6 >=media-libs/libmatroska-0.8.0 ) modplug? ( >=media-libs/libmodplug-0.8.8.1 ) mp3? ( media-libs/libmad ) mpeg? ( >=media-libs/libmpeg2-0.3.2 ) mtp? ( >=media-libs/libmtp-1.0.0 ) musepack? ( >=media-sound/musepack-tools-444 ) ncurses? ( sys-libs/ncurses ) nsplugin? ( >=net-libs/xulrunner-1.9.2 x11-libs/libXpm x11-libs/libXt x11-libs/libxcb x11-libs/xcb-util ) ogg? ( media-libs/libogg ) opengl? ( virtual/opengl || ( >=x11-libs/libX11-1.3.99.901 <x11-libs/libX11-1.3.99.901[xcb] ) ) png? ( media-libs/libpng sys-libs/zlib ) projectm? ( media-libs/libprojectm ) pulseaudio? ( >=media-sound/pulseaudio-0.9.22 ) qt4? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 x11-libs/libX11 ) remoteosd? ( >=dev-libs/libgcrypt-1.2.0 ) samba? ( || ( >=net-fs/samba-3.4.6[smbclient] <net-fs/samba-3.4 ) ) schroedinger? ( >=media-libs/schroedinger-1.0.10 ) sdl? ( >=media-libs/libsdl-1.2.8 x11-libs/libX11 sdl-image? ( media-libs/sdl-image sys-libs/zlib ) ) shout? ( media-libs/libshout ) skins? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 x11-libs/libXext x11-libs/libX11 media-libs/freetype media-fonts/dejavu ) speex? ( media-libs/speex ) sqlite? ( >=dev-db/sqlite-3.6.0:3 ) svg? ( >=gnome-base/librsvg-2.9.0 ) svga? ( media-libs/svgalib ) taglib? ( >=media-libs/taglib-1.5 sys-libs/zlib ) theora? ( >=media-libs/libtheora-1.0_beta3 ) truetype? ( media-libs/freetype virtual/ttf-fonts !fontconfig? ( media-fonts/dejavu ) ) twolame? ( media-sound/twolame ) udev? ( >=sys-fs/udev-142 ) upnp? ( net-libs/libupnp ) v4l? ( libv4l2? ( media-libs/libv4l ) libv4l? ( media-libs/libv4l ) ) vaapi? ( x11-libs/libva virtual/ffmpeg ) vcdx? ( >=dev-libs/libcdio-0.78.2 >=media-video/vcdimager-0.7.22 ) vorbis? ( media-libs/libvorbis ) win32codecs? ( media-libs/win32codecs ) X? ( x11-libs/libX11 ) x264? ( >=media-libs/x264-0.0.20090923 ) xcb? ( x11-libs/libxcb x11-libs/xcb-util ) xml? ( dev-libs/libxml2 ) xosd? ( x11-libs/xosd x11-libs/libX11 ) zvbi? ( >=media-libs/zvbi-0.2.25 ) !!<=media-video/vlc-1.0.99999 alsa? ( >=media-sound/alsa-headers-1.0.23 ) dvb? ( sys-kernel/linux-headers ) kde? ( >=kde-base/kdelibs-4 ) v4l? ( >=sys-kernel/linux-headers-2.6.25 ) xcb? ( x11-proto/xproto ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+|| ( >=sys-libs/zlib-1.2.5.1-r2[minizip] <sys-libs/zlib-1.2.5.1-r1 ) >=media-libs/libdvbpsi-0.1.6 a52? ( >=media-libs/a52dec-0.7.4-r3 ) aalib? ( media-libs/aalib x11-libs/libX11 ) aac? ( >=media-libs/faad2-2.6.1 ) alsa? ( >=media-libs/alsa-lib-1.0.23 ) avahi? ( >=net-dns/avahi-0.6[dbus] ) bidi? ( >=dev-libs/fribidi-0.10.4 ) cdda? ( cddb? ( >=media-libs/libcddb-1.2.0 ) ) dbus? ( >=sys-apps/dbus-1.0.2 ) dc1394? ( >=sys-libs/libraw1394-2.0.1 >=media-libs/libdc1394-2.0.2 ) dirac? ( >=media-video/dirac-0.10.0 ) directfb? ( dev-libs/DirectFB sys-libs/zlib ) dts? ( media-libs/libdca ) dvd? ( media-libs/libdvdread >=media-libs/libdvdnav-0.1.9 ) elibc_glibc? ( >=sys-libs/glibc-2.8 ) ffmpeg? ( virtual/ffmpeg ) flac? ( media-libs/libogg >=media-libs/flac-1.1.2 ) fluidsynth? ( media-sound/fluidsynth ) fontconfig? ( media-libs/fontconfig ) gcrypt? ( >=dev-libs/libgcrypt-1.2.0 ) ggi? ( media-libs/libggi ) gme? ( media-libs/game-music-emu ) gnome? ( gnome-base/gnome-vfs ) gnutls? ( >=net-libs/gnutls-1.7.4 >=dev-libs/libgcrypt-1.2.0 ) id3tag? ( media-libs/libid3tag sys-libs/zlib ) ieee1394? ( >=sys-libs/libraw1394-2.0.1 >=sys-libs/libavc1394-0.5.3 ) jack? ( >=media-sound/jack-audio-connection-kit-0.99.0-r1 ) kate? ( >=media-libs/libkate-0.1.1 ) libass? ( >=media-libs/libass-0.9.6 media-libs/fontconfig ) libcaca? ( >=media-libs/libcaca-0.99_beta14 ) libnotify? ( x11-libs/libnotify x11-libs/gtk+:2 ) libproxy? ( net-libs/libproxy ) libtiger? ( media-libs/libtiger ) lirc? ( app-misc/lirc ) live? ( >=media-plugins/live-2008.07.06 ) lua? ( >=dev-lang/lua-5.1 ) matroska? ( >=dev-libs/libebml-0.7.6 >=media-libs/libmatroska-0.8.0 ) modplug? ( >=media-libs/libmodplug-0.8.8.1 ) mp3? ( media-libs/libmad ) mpeg? ( >=media-libs/libmpeg2-0.3.2 ) mtp? ( >=media-libs/libmtp-1.0.0 ) musepack? ( >=media-sound/musepack-tools-444 ) ncurses? ( sys-libs/ncurses ) nsplugin? ( >=net-libs/xulrunner-1.9.2 x11-libs/libXpm x11-libs/libXt x11-libs/libxcb x11-libs/xcb-util ) ogg? ( media-libs/libogg ) opengl? ( virtual/opengl || ( >=x11-libs/libX11-1.3.99.901 <x11-libs/libX11-1.3.99.901[xcb] ) ) png? ( media-libs/libpng sys-libs/zlib ) projectm? ( media-libs/libprojectm ) pulseaudio? ( >=media-sound/pulseaudio-0.9.22 ) qt4? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 x11-libs/libX11 ) remoteosd? ( >=dev-libs/libgcrypt-1.2.0 ) samba? ( || ( >=net-fs/samba-3.4.6[smbclient] <net-fs/samba-3.4 ) ) schroedinger? ( >=media-libs/schroedinger-1.0.10 ) sdl? ( >=media-libs/libsdl-1.2.8 x11-libs/libX11 sdl-image? ( media-libs/sdl-image sys-libs/zlib ) ) shout? ( media-libs/libshout ) skins? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 x11-libs/libXext x11-libs/libX11 media-libs/freetype media-fonts/dejavu ) speex? ( media-libs/speex ) sqlite? ( >=dev-db/sqlite-3.6.0:3 ) svg? ( >=gnome-base/librsvg-2.9.0 ) svga? ( media-libs/svgalib ) taglib? ( >=media-libs/taglib-1.5 sys-libs/zlib ) theora? ( >=media-libs/libtheora-1.0_beta3 ) truetype? ( media-libs/freetype virtual/ttf-fonts !fontconfig? ( media-fonts/dejavu ) ) twolame? ( media-sound/twolame ) udev? ( >=sys-fs/udev-142 ) upnp? ( net-libs/libupnp ) v4l? ( libv4l2? ( media-libs/libv4l ) libv4l? ( media-libs/libv4l ) ) vaapi? ( x11-libs/libva virtual/ffmpeg ) vcdx? ( >=dev-libs/libcdio-0.78.2 >=media-video/vcdimager-0.7.22 ) vorbis? ( media-libs/libvorbis ) win32codecs? ( media-libs/win32codecs ) X? ( x11-libs/libX11 ) x264? ( >=media-libs/x264-0.0.20090923 ) xcb? ( x11-libs/libxcb x11-libs/xcb-util ) xml? ( dev-libs/libxml2 ) xosd? ( x11-libs/xosd x11-libs/libX11 ) zvbi? ( >=media-libs/zvbi-0.2.25 ) !!<=media-video/vlc-1.0.99999 alsa? ( >=media-sound/alsa-headers-1.0.23 ) dvb? ( sys-kernel/linux-headers ) kde? ( >=kde-base/kdelibs-4 ) v4l? ( >=sys-kernel/linux-headers-2.6.25 ) xcb? ( x11-proto/xproto ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 || ( >=sys-libs/zlib-1.2.5.1-r2[minizip] <sys-libs/zlib-1.2.5.1-r1 ) >=media-libs/libdvbpsi-0.1.6 a52? ( >=media-libs/a52dec-0.7.4-r3 ) aalib? ( media-libs/aalib x11-libs/libX11 ) aac? ( >=media-libs/faad2-2.6.1 ) alsa? ( >=media-libs/alsa-lib-1.0.23 ) avahi? ( >=net-dns/avahi-0.6[dbus] ) bidi? ( >=dev-libs/fribidi-0.10.4 ) cdda? ( cddb? ( >=media-libs/libcddb-1.2.0 ) ) dbus? ( >=sys-apps/dbus-1.0.2 ) dc1394? ( >=sys-libs/libraw1394-2.0.1 >=media-libs/libdc1394-2.0.2 ) dirac? ( >=media-video/dirac-0.10.0 ) directfb? ( dev-libs/DirectFB sys-libs/zlib ) dts? ( media-libs/libdca ) dvd? ( media-libs/libdvdread >=media-libs/libdvdnav-0.1.9 ) elibc_glibc? ( >=sys-libs/glibc-2.8 ) ffmpeg? ( virtual/ffmpeg ) flac? ( media-libs/libogg >=media-libs/flac-1.1.2 ) fluidsynth? ( media-sound/fluidsynth ) fontconfig? ( media-libs/fontconfig ) gcrypt? ( >=dev-libs/libgcrypt-1.2.0 ) ggi? ( media-libs/libggi ) gme? ( media-libs/game-music-emu ) gnome? ( gnome-base/gnome-vfs ) gnutls? ( >=net-libs/gnutls-1.7.4 >=dev-libs/libgcrypt-1.2.0 ) id3tag? ( media-libs/libid3tag sys-libs/zlib ) ieee1394? ( >=sys-libs/libraw1394-2.0.1 >=sys-libs/libavc1394-0.5.3 ) jack? ( >=media-sound/jack-audio-connection-kit-0.99.0-r1 ) kate? ( >=media-libs/libkate-0.1.1 ) libass? ( >=media-libs/libass-0.9.6 media-libs/fontconfig ) libcaca? ( >=media-libs/libcaca-0.99_beta14 ) libnotify? ( x11-libs/libnotify x11-libs/gtk+:2 ) libproxy? ( net-libs/libproxy ) libtiger? ( media-libs/libtiger ) lirc? ( app-misc/lirc ) live? ( >=media-plugins/live-2008.07.06 ) lua? ( >=dev-lang/lua-5.1 ) matroska? ( >=dev-libs/libebml-0.7.6 >=media-libs/libmatroska-0.8.0 ) modplug? ( >=media-libs/libmodplug-0.8.8.1 ) mp3? ( media-libs/libmad ) mpeg? ( >=media-libs/libmpeg2-0.3.2 ) mtp? ( >=media-libs/libmtp-1.0.0 ) musepack? ( >=media-sound/musepack-tools-444 ) ncurses? ( sys-libs/ncurses ) nsplugin? ( >=net-libs/xulrunner-1.9.2 x11-libs/libXpm x11-libs/libXt x11-libs/libxcb x11-libs/xcb-util ) ogg? ( media-libs/libogg ) opengl? ( virtual/opengl || ( >=x11-libs/libX11-1.3.99.901 <x11-libs/libX11-1.3.99.901[xcb] ) ) png? ( media-libs/libpng sys-libs/zlib ) projectm? ( media-libs/libprojectm ) pulseaudio? ( >=media-sound/pulseaudio-0.9.22 ) qt4? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 x11-libs/libX11 ) remoteosd? ( >=dev-libs/libgcrypt-1.2.0 ) samba? ( || ( >=net-fs/samba-3.4.6[smbclient] <net-fs/samba-3.4 ) ) schroedinger? ( >=media-libs/schroedinger-1.0.10 ) sdl? ( >=media-libs/libsdl-1.2.8 x11-libs/libX11 sdl-image? ( media-libs/sdl-image sys-libs/zlib ) ) shout? ( media-libs/libshout ) skins? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 x11-libs/libXext x11-libs/libX11 media-libs/freetype media-fonts/dejavu ) speex? ( media-libs/speex ) sqlite? ( >=dev-db/sqlite-3.6.0:3 ) svg? ( >=gnome-base/librsvg-2.9.0 ) svga? ( media-libs/svgalib ) taglib? ( >=media-libs/taglib-1.5 sys-libs/zlib ) theora? ( >=media-libs/libtheora-1.0_beta3 ) truetype? ( media-libs/freetype virtual/ttf-fonts !fontconfig? ( media-fonts/dejavu ) ) twolame? ( media-sound/twolame ) udev? ( >=sys-fs/udev-142 ) upnp? ( net-libs/libupnp ) v4l? ( libv4l2? ( media-libs/libv4l ) libv4l? ( media-libs/libv4l ) ) vaapi? ( x11-libs/libva virtual/ffmpeg ) vcdx? ( >=dev-libs/libcdio-0.78.2 >=media-video/vcdimager-0.7.22 ) vorbis? ( media-libs/libvorbis ) win32codecs? ( media-libs/win32codecs ) X? ( x11-libs/libX11 ) x264? ( >=media-libs/x264-0.0.20090923 ) xcb? ( x11-libs/libxcb x11-libs/xcb-util ) xml? ( dev-libs/libxml2 ) xosd? ( x11-libs/xosd x11-libs/libX11 ) zvbi? ( >=media-libs/zvbi-0.2.25 )
 0
 http://download.videolan.org/pub/videolan/vlc/1.1.13/vlc-1.1.13.tar.bz2 mirror://gentoo/vlc-patches-105.tar.bz2
diff --git a/metadata/cache/media-video/vlc-2.0.0 b/metadata/cache/media-video/vlc-2.0.0
index d0590ac47953..788ca0bed515 100644
--- a/metadata/cache/media-video/vlc-2.0.0
+++ b/metadata/cache/media-video/vlc-2.0.0
@@ -1,4 +1,4 @@
->=sys-libs/zlib-1.2.5.1-r2[minizip] a52? ( >=media-libs/a52dec-0.7.4-r3 ) aalib? ( media-libs/aalib ) aac? ( >=media-libs/faad2-2.6.1 ) alsa? ( >=media-libs/alsa-lib-1.0.23 ) avahi? ( >=net-dns/avahi-0.6[dbus] ) avcodec? ( virtual/ffmpeg ) avformat? ( virtual/ffmpeg ) bidi? ( >=dev-libs/fribidi-0.10.4 ) bluray? ( >=media-libs/libbluray-0.2.1 ) cddb? ( >=media-libs/libcddb-1.2.0 ) dbus? ( >=sys-apps/dbus-1.0.2 ) dc1394? ( >=sys-libs/libraw1394-2.0.1 >=media-libs/libdc1394-2.0.2 ) dirac? ( >=media-video/dirac-0.10.0 ) directfb? ( dev-libs/DirectFB sys-libs/zlib ) dts? ( media-libs/libdca ) dvbpsi? ( >=media-libs/libdvbpsi-0.1.6 ) dvd? ( media-libs/libdvdread >=media-libs/libdvdnav-0.1.9 ) egl? ( virtual/opengl ) elibc_glibc? ( >=sys-libs/glibc-2.8 ) flac? ( media-libs/libogg >=media-libs/flac-1.1.2 ) fluidsynth? ( media-sound/fluidsynth ) fontconfig? ( media-libs/fontconfig ) gcrypt? ( >=dev-libs/libgcrypt-1.2.0 ) gme? ( media-libs/game-music-emu ) gnome? ( gnome-base/gnome-vfs ) gnutls? ( >=net-libs/gnutls-2.0.0 ) ieee1394? ( >=sys-libs/libraw1394-2.0.1 >=sys-libs/libavc1394-0.5.3 ) ios-vout? ( virtual/opengl ) jack? ( >=media-sound/jack-audio-connection-kit-0.99.0-r1 ) kate? ( >=media-libs/libkate-0.1.1 ) libass? ( >=media-libs/libass-0.9.8 media-libs/fontconfig ) libcaca? ( >=media-libs/libcaca-0.99_beta14 ) libnotify? ( x11-libs/libnotify x11-libs/gtk+:2 ) libproxy? ( net-libs/libproxy ) libsamplerate? ( media-libs/libsamplerate ) libtar? ( >=dev-libs/libtar-1.2.11-r3 ) libtiger? ( media-libs/libtiger ) linsys? ( >=media-libs/zvbi-0.2.28 ) lirc? ( app-misc/lirc ) live? ( >=media-plugins/live-2011.12.23 ) lua? ( >=dev-lang/lua-5.1 ) macosx-vout? ( virtual/opengl ) matroska? ( >=dev-libs/libebml-1.0.0 >=media-libs/libmatroska-1.0.0 ) modplug? ( >=media-libs/libmodplug-0.8.8.1 ) mp3? ( media-libs/libmad ) mpeg? ( >=media-libs/libmpeg2-0.3.2 ) mtp? ( >=media-libs/libmtp-1.0.0 ) musepack? ( >=media-sound/musepack-tools-444 ) ncurses? ( sys-libs/ncurses[unicode] ) ogg? ( media-libs/libogg ) opengl? ( virtual/opengl >=x11-libs/libX11-1.3.99.901 ) png? ( media-libs/libpng sys-libs/zlib ) portaudio? ( >=media-libs/portaudio-19_pre ) postproc? ( virtual/ffmpeg ) projectm? ( media-libs/libprojectm ) pulseaudio? ( >=media-sound/pulseaudio-0.9.22 ) qt4? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 ) samba? ( >=net-fs/samba-3.4.6[smbclient] ) schroedinger? ( >=media-libs/schroedinger-1.0.10 ) sdl? ( >=media-libs/libsdl-1.2.8 sdl-image? ( media-libs/sdl-image sys-libs/zlib ) ) shout? ( media-libs/libshout ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext x11-libs/libXpm ) speex? ( media-libs/speex ) sqlite? ( >=dev-db/sqlite-3.6.0:3 ) svg? ( >=gnome-base/librsvg-2.9.0 ) swscale? ( virtual/ffmpeg ) taglib? ( >=media-libs/taglib-1.5 sys-libs/zlib ) theora? ( >=media-libs/libtheora-1.0_beta3 ) truetype? ( media-libs/freetype virtual/ttf-fonts !fontconfig? ( media-fonts/dejavu ) ) twolame? ( media-sound/twolame ) udev? ( >=sys-fs/udev-142 ) upnp? ( net-libs/libupnp ) v4l? ( media-libs/libv4l ) vaapi? ( x11-libs/libva ) vcdx? ( >=dev-libs/libcdio-0.78.2 >=media-video/vcdimager-0.7.22 ) vorbis? ( media-libs/libvorbis ) win32codecs? ( media-libs/win32codecs ) X? ( x11-libs/libX11 ) x264? ( >=media-libs/x264-0.0.20090923 ) xcb? ( >=x11-libs/libxcb-1.6 >=x11-libs/xcb-util-0.3.4 ) xml? ( dev-libs/libxml2 ) xosd? ( x11-libs/xosd ) zvbi? ( >=media-libs/zvbi-0.2.25 ) alsa? ( >=media-sound/alsa-headers-1.0.23 ) fbosd? ( sys-kernel/linux-headers ) kde? ( >=kde-base/kdelibs-4 ) xcb? ( x11-proto/xproto ) app-arch/xz-utils dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=sys-libs/zlib-1.2.5.1-r2[minizip] a52? ( >=media-libs/a52dec-0.7.4-r3 ) aalib? ( media-libs/aalib ) aac? ( >=media-libs/faad2-2.6.1 ) alsa? ( >=media-libs/alsa-lib-1.0.23 ) avahi? ( >=net-dns/avahi-0.6[dbus] ) avcodec? ( virtual/ffmpeg ) avformat? ( virtual/ffmpeg ) bidi? ( >=dev-libs/fribidi-0.10.4 ) bluray? ( >=media-libs/libbluray-0.2.1 ) cddb? ( >=media-libs/libcddb-1.2.0 ) dbus? ( >=sys-apps/dbus-1.0.2 ) dc1394? ( >=sys-libs/libraw1394-2.0.1 >=media-libs/libdc1394-2.0.2 ) dirac? ( >=media-video/dirac-0.10.0 ) directfb? ( dev-libs/DirectFB sys-libs/zlib ) dts? ( media-libs/libdca ) dvbpsi? ( >=media-libs/libdvbpsi-0.1.6 ) dvd? ( media-libs/libdvdread >=media-libs/libdvdnav-0.1.9 ) egl? ( virtual/opengl ) elibc_glibc? ( >=sys-libs/glibc-2.8 ) flac? ( media-libs/libogg >=media-libs/flac-1.1.2 ) fluidsynth? ( media-sound/fluidsynth ) fontconfig? ( media-libs/fontconfig ) gcrypt? ( >=dev-libs/libgcrypt-1.2.0 ) gme? ( media-libs/game-music-emu ) gnome? ( gnome-base/gnome-vfs ) gnutls? ( >=net-libs/gnutls-2.0.0 ) ieee1394? ( >=sys-libs/libraw1394-2.0.1 >=sys-libs/libavc1394-0.5.3 ) ios-vout? ( virtual/opengl ) jack? ( >=media-sound/jack-audio-connection-kit-0.99.0-r1 ) kate? ( >=media-libs/libkate-0.1.1 ) libass? ( >=media-libs/libass-0.9.8 media-libs/fontconfig ) libcaca? ( >=media-libs/libcaca-0.99_beta14 ) libnotify? ( x11-libs/libnotify x11-libs/gtk+:2 ) libproxy? ( net-libs/libproxy ) libsamplerate? ( media-libs/libsamplerate ) libtar? ( >=dev-libs/libtar-1.2.11-r3 ) libtiger? ( media-libs/libtiger ) linsys? ( >=media-libs/zvbi-0.2.28 ) lirc? ( app-misc/lirc ) live? ( >=media-plugins/live-2011.12.23 ) lua? ( >=dev-lang/lua-5.1 ) macosx-vout? ( virtual/opengl ) matroska? ( >=dev-libs/libebml-1.0.0 >=media-libs/libmatroska-1.0.0 ) modplug? ( >=media-libs/libmodplug-0.8.8.1 ) mp3? ( media-libs/libmad ) mpeg? ( >=media-libs/libmpeg2-0.3.2 ) mtp? ( >=media-libs/libmtp-1.0.0 ) musepack? ( >=media-sound/musepack-tools-444 ) ncurses? ( sys-libs/ncurses[unicode] ) ogg? ( media-libs/libogg ) opengl? ( virtual/opengl >=x11-libs/libX11-1.3.99.901 ) png? ( media-libs/libpng sys-libs/zlib ) portaudio? ( >=media-libs/portaudio-19_pre ) postproc? ( virtual/ffmpeg ) projectm? ( media-libs/libprojectm ) pulseaudio? ( >=media-sound/pulseaudio-0.9.22 ) qt4? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 ) samba? ( >=net-fs/samba-3.4.6[smbclient] ) schroedinger? ( >=media-libs/schroedinger-1.0.10 ) sdl? ( >=media-libs/libsdl-1.2.8 sdl-image? ( media-libs/sdl-image sys-libs/zlib ) ) shout? ( media-libs/libshout ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext x11-libs/libXpm ) speex? ( media-libs/speex ) sqlite? ( >=dev-db/sqlite-3.6.0:3 ) svg? ( >=gnome-base/librsvg-2.9.0 ) swscale? ( virtual/ffmpeg ) taglib? ( >=media-libs/taglib-1.5 sys-libs/zlib ) theora? ( >=media-libs/libtheora-1.0_beta3 ) truetype? ( media-libs/freetype virtual/ttf-fonts !fontconfig? ( media-fonts/dejavu ) ) twolame? ( media-sound/twolame ) udev? ( >=sys-fs/udev-142 ) upnp? ( net-libs/libupnp ) v4l? ( media-libs/libv4l ) vaapi? ( x11-libs/libva ) vcdx? ( >=dev-libs/libcdio-0.78.2 >=media-video/vcdimager-0.7.22 ) vorbis? ( media-libs/libvorbis ) win32codecs? ( media-libs/win32codecs ) X? ( x11-libs/libX11 ) x264? ( >=media-libs/x264-0.0.20090923 ) xcb? ( >=x11-libs/libxcb-1.6 >=x11-libs/xcb-util-0.3.4 ) xml? ( dev-libs/libxml2 ) xosd? ( x11-libs/xosd ) zvbi? ( >=media-libs/zvbi-0.2.25 ) alsa? ( >=media-sound/alsa-headers-1.0.23 ) fbosd? ( sys-kernel/linux-headers ) kde? ( >=kde-base/kdelibs-4 ) xcb? ( x11-proto/xproto ) app-arch/xz-utils dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=sys-libs/zlib-1.2.5.1-r2[minizip] a52? ( >=media-libs/a52dec-0.7.4-r3 ) aalib? ( media-libs/aalib ) aac? ( >=media-libs/faad2-2.6.1 ) alsa? ( >=media-libs/alsa-lib-1.0.23 ) avahi? ( >=net-dns/avahi-0.6[dbus] ) avcodec? ( virtual/ffmpeg ) avformat? ( virtual/ffmpeg ) bidi? ( >=dev-libs/fribidi-0.10.4 ) bluray? ( >=media-libs/libbluray-0.2.1 ) cddb? ( >=media-libs/libcddb-1.2.0 ) dbus? ( >=sys-apps/dbus-1.0.2 ) dc1394? ( >=sys-libs/libraw1394-2.0.1 >=media-libs/libdc1394-2.0.2 ) dirac? ( >=media-video/dirac-0.10.0 ) directfb? ( dev-libs/DirectFB sys-libs/zlib ) dts? ( media-libs/libdca ) dvbpsi? ( >=media-libs/libdvbpsi-0.1.6 ) dvd? ( media-libs/libdvdread >=media-libs/libdvdnav-0.1.9 ) egl? ( virtual/opengl ) elibc_glibc? ( >=sys-libs/glibc-2.8 ) flac? ( media-libs/libogg >=media-libs/flac-1.1.2 ) fluidsynth? ( media-sound/fluidsynth ) fontconfig? ( media-libs/fontconfig ) gcrypt? ( >=dev-libs/libgcrypt-1.2.0 ) gme? ( media-libs/game-music-emu ) gnome? ( gnome-base/gnome-vfs ) gnutls? ( >=net-libs/gnutls-2.0.0 ) ieee1394? ( >=sys-libs/libraw1394-2.0.1 >=sys-libs/libavc1394-0.5.3 ) ios-vout? ( virtual/opengl ) jack? ( >=media-sound/jack-audio-connection-kit-0.99.0-r1 ) kate? ( >=media-libs/libkate-0.1.1 ) libass? ( >=media-libs/libass-0.9.8 media-libs/fontconfig ) libcaca? ( >=media-libs/libcaca-0.99_beta14 ) libnotify? ( x11-libs/libnotify x11-libs/gtk+:2 ) libproxy? ( net-libs/libproxy ) libsamplerate? ( media-libs/libsamplerate ) libtar? ( >=dev-libs/libtar-1.2.11-r3 ) libtiger? ( media-libs/libtiger ) linsys? ( >=media-libs/zvbi-0.2.28 ) lirc? ( app-misc/lirc ) live? ( >=media-plugins/live-2011.12.23 ) lua? ( >=dev-lang/lua-5.1 ) macosx-vout? ( virtual/opengl ) matroska? ( >=dev-libs/libebml-1.0.0 >=media-libs/libmatroska-1.0.0 ) modplug? ( >=media-libs/libmodplug-0.8.8.1 ) mp3? ( media-libs/libmad ) mpeg? ( >=media-libs/libmpeg2-0.3.2 ) mtp? ( >=media-libs/libmtp-1.0.0 ) musepack? ( >=media-sound/musepack-tools-444 ) ncurses? ( sys-libs/ncurses[unicode] ) ogg? ( media-libs/libogg ) opengl? ( virtual/opengl >=x11-libs/libX11-1.3.99.901 ) png? ( media-libs/libpng sys-libs/zlib ) portaudio? ( >=media-libs/portaudio-19_pre ) postproc? ( virtual/ffmpeg ) projectm? ( media-libs/libprojectm ) pulseaudio? ( >=media-sound/pulseaudio-0.9.22 ) qt4? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 ) samba? ( >=net-fs/samba-3.4.6[smbclient] ) schroedinger? ( >=media-libs/schroedinger-1.0.10 ) sdl? ( >=media-libs/libsdl-1.2.8 sdl-image? ( media-libs/sdl-image sys-libs/zlib ) ) shout? ( media-libs/libshout ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext x11-libs/libXpm ) speex? ( media-libs/speex ) sqlite? ( >=dev-db/sqlite-3.6.0:3 ) svg? ( >=gnome-base/librsvg-2.9.0 ) swscale? ( virtual/ffmpeg ) taglib? ( >=media-libs/taglib-1.5 sys-libs/zlib ) theora? ( >=media-libs/libtheora-1.0_beta3 ) truetype? ( media-libs/freetype virtual/ttf-fonts !fontconfig? ( media-fonts/dejavu ) ) twolame? ( media-sound/twolame ) udev? ( >=sys-fs/udev-142 ) upnp? ( net-libs/libupnp ) v4l? ( media-libs/libv4l ) vaapi? ( x11-libs/libva ) vcdx? ( >=dev-libs/libcdio-0.78.2 >=media-video/vcdimager-0.7.22 ) vorbis? ( media-libs/libvorbis ) win32codecs? ( media-libs/win32codecs ) X? ( x11-libs/libX11 ) x264? ( >=media-libs/x264-0.0.20090923 ) xcb? ( >=x11-libs/libxcb-1.6 >=x11-libs/xcb-util-0.3.4 ) xml? ( dev-libs/libxml2 ) xosd? ( x11-libs/xosd ) zvbi? ( >=media-libs/zvbi-0.2.25 )
 0
 http://download.videolan.org/pub/videolan/vlc/2.0.0/vlc-2.0.0.tar.xz mirror://gentoo/vlc-patches-101.tar.bz2
diff --git a/metadata/cache/media-video/vlc-2.0.1 b/metadata/cache/media-video/vlc-2.0.1
index 5ab23c02bbc6..8d7584f6ab83 100644
--- a/metadata/cache/media-video/vlc-2.0.1
+++ b/metadata/cache/media-video/vlc-2.0.1
@@ -1,7 +1,7 @@
-|| ( >=sys-libs/zlib-1.2.5.1-r2[minizip] <sys-libs/zlib-1.2.5.1-r1 ) a52? ( >=media-libs/a52dec-0.7.4-r3 ) aalib? ( media-libs/aalib ) aac? ( >=media-libs/faad2-2.6.1 ) alsa? ( >=media-libs/alsa-lib-1.0.23 ) avahi? ( >=net-dns/avahi-0.6[dbus] ) avcodec? ( virtual/ffmpeg ) avformat? ( virtual/ffmpeg ) bidi? ( >=dev-libs/fribidi-0.10.4 ) bluray? ( >=media-libs/libbluray-0.2.1 ) cddb? ( >=media-libs/libcddb-1.2.0 ) dbus? ( >=sys-apps/dbus-1.0.2 ) dc1394? ( >=sys-libs/libraw1394-2.0.1 >=media-libs/libdc1394-2.0.2 ) dirac? ( >=media-video/dirac-0.10.0 ) directfb? ( dev-libs/DirectFB sys-libs/zlib ) dts? ( media-libs/libdca ) dvbpsi? ( >=media-libs/libdvbpsi-0.1.6 ) dvd? ( media-libs/libdvdread >=media-libs/libdvdnav-0.1.9 ) egl? ( virtual/opengl ) elibc_glibc? ( >=sys-libs/glibc-2.8 ) flac? ( media-libs/libogg >=media-libs/flac-1.1.2 ) fluidsynth? ( media-sound/fluidsynth ) fontconfig? ( media-libs/fontconfig ) gcrypt? ( >=dev-libs/libgcrypt-1.2.0 ) gme? ( media-libs/game-music-emu ) gnome? ( gnome-base/gnome-vfs ) gnutls? ( >=net-libs/gnutls-2.0.0 ) ieee1394? ( >=sys-libs/libraw1394-2.0.1 >=sys-libs/libavc1394-0.5.3 ) ios-vout? ( virtual/opengl ) jack? ( >=media-sound/jack-audio-connection-kit-0.99.0-r1 ) kate? ( >=media-libs/libkate-0.1.1 ) libass? ( >=media-libs/libass-0.9.8 media-libs/fontconfig ) libcaca? ( >=media-libs/libcaca-0.99_beta14 ) libnotify? ( x11-libs/libnotify x11-libs/gtk+:2 ) libproxy? ( net-libs/libproxy ) libsamplerate? ( media-libs/libsamplerate ) libtar? ( >=dev-libs/libtar-1.2.11-r3 ) libtiger? ( media-libs/libtiger ) linsys? ( >=media-libs/zvbi-0.2.28 ) lirc? ( app-misc/lirc ) live? ( >=media-plugins/live-2011.12.23 ) lua? ( >=dev-lang/lua-5.1 ) macosx-vout? ( virtual/opengl ) matroska? ( >=dev-libs/libebml-1.0.0 >=media-libs/libmatroska-1.0.0 ) modplug? ( >=media-libs/libmodplug-0.8.8.1 ) mp3? ( media-libs/libmad ) mpeg? ( >=media-libs/libmpeg2-0.3.2 ) mtp? ( >=media-libs/libmtp-1.0.0 ) musepack? ( >=media-sound/musepack-tools-444 ) ncurses? ( sys-libs/ncurses[unicode] ) ogg? ( media-libs/libogg ) opengl? ( virtual/opengl >=x11-libs/libX11-1.3.99.901 ) png? ( media-libs/libpng sys-libs/zlib ) portaudio? ( >=media-libs/portaudio-19_pre ) postproc? ( virtual/ffmpeg ) projectm? ( media-libs/libprojectm ) pulseaudio? ( >=media-sound/pulseaudio-0.9.22 ) qt4? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 ) samba? ( >=net-fs/samba-3.4.6[smbclient] ) schroedinger? ( >=media-libs/schroedinger-1.0.10 ) sdl? ( >=media-libs/libsdl-1.2.8 sdl-image? ( media-libs/sdl-image sys-libs/zlib ) ) shout? ( media-libs/libshout ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext x11-libs/libXpm ) speex? ( media-libs/speex ) sqlite? ( >=dev-db/sqlite-3.6.0:3 ) svg? ( >=gnome-base/librsvg-2.9.0 ) swscale? ( virtual/ffmpeg ) taglib? ( >=media-libs/taglib-1.5 sys-libs/zlib ) theora? ( >=media-libs/libtheora-1.0_beta3 ) truetype? ( media-libs/freetype virtual/ttf-fonts !fontconfig? ( media-fonts/dejavu ) ) twolame? ( media-sound/twolame ) udev? ( >=sys-fs/udev-142 ) upnp? ( net-libs/libupnp ) v4l? ( media-libs/libv4l ) vaapi? ( x11-libs/libva ) vcdx? ( >=dev-libs/libcdio-0.78.2 >=media-video/vcdimager-0.7.22 ) vorbis? ( media-libs/libvorbis ) win32codecs? ( media-libs/win32codecs ) X? ( x11-libs/libX11 ) x264? ( >=media-libs/x264-0.0.20090923 ) xcb? ( >=x11-libs/libxcb-1.6 >=x11-libs/xcb-util-0.3.4 ) xml? ( dev-libs/libxml2 ) xosd? ( x11-libs/xosd ) zvbi? ( >=media-libs/zvbi-0.2.25 ) alsa? ( >=media-sound/alsa-headers-1.0.23 ) fbosd? ( sys-kernel/linux-headers ) kde? ( >=kde-base/kdelibs-4 ) xcb? ( x11-proto/xproto ) app-arch/xz-utils dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+|| ( >=sys-libs/zlib-1.2.5.1-r2[minizip] <sys-libs/zlib-1.2.5.1-r1 ) a52? ( >=media-libs/a52dec-0.7.4-r3 ) aalib? ( media-libs/aalib ) aac? ( >=media-libs/faad2-2.6.1 ) alsa? ( >=media-libs/alsa-lib-1.0.23 ) avahi? ( >=net-dns/avahi-0.6[dbus] ) avcodec? ( virtual/ffmpeg ) avformat? ( virtual/ffmpeg ) bidi? ( >=dev-libs/fribidi-0.10.4 ) bluray? ( >=media-libs/libbluray-0.2.1 ) cddb? ( >=media-libs/libcddb-1.2.0 ) dbus? ( >=sys-apps/dbus-1.0.2 ) dc1394? ( >=sys-libs/libraw1394-2.0.1 >=media-libs/libdc1394-2.0.2 ) dirac? ( >=media-video/dirac-0.10.0 ) directfb? ( dev-libs/DirectFB sys-libs/zlib ) dts? ( media-libs/libdca ) dvbpsi? ( >=media-libs/libdvbpsi-0.1.6 ) dvd? ( media-libs/libdvdread >=media-libs/libdvdnav-0.1.9 ) egl? ( virtual/opengl ) elibc_glibc? ( >=sys-libs/glibc-2.8 ) flac? ( media-libs/libogg >=media-libs/flac-1.1.2 ) fluidsynth? ( media-sound/fluidsynth ) fontconfig? ( media-libs/fontconfig ) gcrypt? ( >=dev-libs/libgcrypt-1.2.0 ) gme? ( media-libs/game-music-emu ) gnome? ( gnome-base/gnome-vfs ) gnutls? ( >=net-libs/gnutls-2.0.0 ) ieee1394? ( >=sys-libs/libraw1394-2.0.1 >=sys-libs/libavc1394-0.5.3 ) ios-vout? ( virtual/opengl ) jack? ( >=media-sound/jack-audio-connection-kit-0.99.0-r1 ) kate? ( >=media-libs/libkate-0.1.1 ) libass? ( >=media-libs/libass-0.9.8 media-libs/fontconfig ) libcaca? ( >=media-libs/libcaca-0.99_beta14 ) libnotify? ( x11-libs/libnotify x11-libs/gtk+:2 ) libproxy? ( net-libs/libproxy ) libsamplerate? ( media-libs/libsamplerate ) libtar? ( >=dev-libs/libtar-1.2.11-r3 ) libtiger? ( media-libs/libtiger ) linsys? ( >=media-libs/zvbi-0.2.28 ) lirc? ( app-misc/lirc ) live? ( >=media-plugins/live-2011.12.23 ) lua? ( >=dev-lang/lua-5.1 ) macosx-vout? ( virtual/opengl ) matroska? ( >=dev-libs/libebml-1.0.0 >=media-libs/libmatroska-1.0.0 ) modplug? ( >=media-libs/libmodplug-0.8.8.1 ) mp3? ( media-libs/libmad ) mpeg? ( >=media-libs/libmpeg2-0.3.2 ) mtp? ( >=media-libs/libmtp-1.0.0 ) musepack? ( >=media-sound/musepack-tools-444 ) ncurses? ( sys-libs/ncurses[unicode] ) ogg? ( media-libs/libogg ) opengl? ( virtual/opengl >=x11-libs/libX11-1.3.99.901 ) png? ( media-libs/libpng sys-libs/zlib ) portaudio? ( >=media-libs/portaudio-19_pre ) postproc? ( virtual/ffmpeg ) projectm? ( media-libs/libprojectm ) pulseaudio? ( >=media-sound/pulseaudio-0.9.22 ) qt4? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 ) samba? ( >=net-fs/samba-3.4.6[smbclient] ) schroedinger? ( >=media-libs/schroedinger-1.0.10 ) sdl? ( >=media-libs/libsdl-1.2.8 sdl-image? ( media-libs/sdl-image sys-libs/zlib ) ) shout? ( media-libs/libshout ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext x11-libs/libXpm ) speex? ( media-libs/speex ) sqlite? ( >=dev-db/sqlite-3.6.0:3 ) svg? ( >=gnome-base/librsvg-2.9.0 ) swscale? ( virtual/ffmpeg ) taglib? ( >=media-libs/taglib-1.5 sys-libs/zlib ) theora? ( >=media-libs/libtheora-1.0_beta3 ) truetype? ( media-libs/freetype virtual/ttf-fonts !fontconfig? ( media-fonts/dejavu ) ) twolame? ( media-sound/twolame ) udev? ( >=sys-fs/udev-142 ) upnp? ( net-libs/libupnp ) v4l? ( media-libs/libv4l ) vaapi? ( x11-libs/libva ) vcdx? ( >=dev-libs/libcdio-0.78.2 >=media-video/vcdimager-0.7.22 ) vorbis? ( media-libs/libvorbis ) win32codecs? ( media-libs/win32codecs ) X? ( x11-libs/libX11 ) x264? ( >=media-libs/x264-0.0.20090923 ) xcb? ( >=x11-libs/libxcb-1.6 >=x11-libs/xcb-util-0.3.4 ) xml? ( dev-libs/libxml2 ) xosd? ( x11-libs/xosd ) zvbi? ( >=media-libs/zvbi-0.2.25 ) alsa? ( >=media-sound/alsa-headers-1.0.23 ) fbosd? ( sys-kernel/linux-headers ) kde? ( >=kde-base/kdelibs-4 ) xcb? ( x11-proto/xproto ) app-arch/xz-utils dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 || ( >=sys-libs/zlib-1.2.5.1-r2[minizip] <sys-libs/zlib-1.2.5.1-r1 ) a52? ( >=media-libs/a52dec-0.7.4-r3 ) aalib? ( media-libs/aalib ) aac? ( >=media-libs/faad2-2.6.1 ) alsa? ( >=media-libs/alsa-lib-1.0.23 ) avahi? ( >=net-dns/avahi-0.6[dbus] ) avcodec? ( virtual/ffmpeg ) avformat? ( virtual/ffmpeg ) bidi? ( >=dev-libs/fribidi-0.10.4 ) bluray? ( >=media-libs/libbluray-0.2.1 ) cddb? ( >=media-libs/libcddb-1.2.0 ) dbus? ( >=sys-apps/dbus-1.0.2 ) dc1394? ( >=sys-libs/libraw1394-2.0.1 >=media-libs/libdc1394-2.0.2 ) dirac? ( >=media-video/dirac-0.10.0 ) directfb? ( dev-libs/DirectFB sys-libs/zlib ) dts? ( media-libs/libdca ) dvbpsi? ( >=media-libs/libdvbpsi-0.1.6 ) dvd? ( media-libs/libdvdread >=media-libs/libdvdnav-0.1.9 ) egl? ( virtual/opengl ) elibc_glibc? ( >=sys-libs/glibc-2.8 ) flac? ( media-libs/libogg >=media-libs/flac-1.1.2 ) fluidsynth? ( media-sound/fluidsynth ) fontconfig? ( media-libs/fontconfig ) gcrypt? ( >=dev-libs/libgcrypt-1.2.0 ) gme? ( media-libs/game-music-emu ) gnome? ( gnome-base/gnome-vfs ) gnutls? ( >=net-libs/gnutls-2.0.0 ) ieee1394? ( >=sys-libs/libraw1394-2.0.1 >=sys-libs/libavc1394-0.5.3 ) ios-vout? ( virtual/opengl ) jack? ( >=media-sound/jack-audio-connection-kit-0.99.0-r1 ) kate? ( >=media-libs/libkate-0.1.1 ) libass? ( >=media-libs/libass-0.9.8 media-libs/fontconfig ) libcaca? ( >=media-libs/libcaca-0.99_beta14 ) libnotify? ( x11-libs/libnotify x11-libs/gtk+:2 ) libproxy? ( net-libs/libproxy ) libsamplerate? ( media-libs/libsamplerate ) libtar? ( >=dev-libs/libtar-1.2.11-r3 ) libtiger? ( media-libs/libtiger ) linsys? ( >=media-libs/zvbi-0.2.28 ) lirc? ( app-misc/lirc ) live? ( >=media-plugins/live-2011.12.23 ) lua? ( >=dev-lang/lua-5.1 ) macosx-vout? ( virtual/opengl ) matroska? ( >=dev-libs/libebml-1.0.0 >=media-libs/libmatroska-1.0.0 ) modplug? ( >=media-libs/libmodplug-0.8.8.1 ) mp3? ( media-libs/libmad ) mpeg? ( >=media-libs/libmpeg2-0.3.2 ) mtp? ( >=media-libs/libmtp-1.0.0 ) musepack? ( >=media-sound/musepack-tools-444 ) ncurses? ( sys-libs/ncurses[unicode] ) ogg? ( media-libs/libogg ) opengl? ( virtual/opengl >=x11-libs/libX11-1.3.99.901 ) png? ( media-libs/libpng sys-libs/zlib ) portaudio? ( >=media-libs/portaudio-19_pre ) postproc? ( virtual/ffmpeg ) projectm? ( media-libs/libprojectm ) pulseaudio? ( >=media-sound/pulseaudio-0.9.22 ) qt4? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 ) samba? ( >=net-fs/samba-3.4.6[smbclient] ) schroedinger? ( >=media-libs/schroedinger-1.0.10 ) sdl? ( >=media-libs/libsdl-1.2.8 sdl-image? ( media-libs/sdl-image sys-libs/zlib ) ) shout? ( media-libs/libshout ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext x11-libs/libXpm ) speex? ( media-libs/speex ) sqlite? ( >=dev-db/sqlite-3.6.0:3 ) svg? ( >=gnome-base/librsvg-2.9.0 ) swscale? ( virtual/ffmpeg ) taglib? ( >=media-libs/taglib-1.5 sys-libs/zlib ) theora? ( >=media-libs/libtheora-1.0_beta3 ) truetype? ( media-libs/freetype virtual/ttf-fonts !fontconfig? ( media-fonts/dejavu ) ) twolame? ( media-sound/twolame ) udev? ( >=sys-fs/udev-142 ) upnp? ( net-libs/libupnp ) v4l? ( media-libs/libv4l ) vaapi? ( x11-libs/libva ) vcdx? ( >=dev-libs/libcdio-0.78.2 >=media-video/vcdimager-0.7.22 ) vorbis? ( media-libs/libvorbis ) win32codecs? ( media-libs/win32codecs ) X? ( x11-libs/libX11 ) x264? ( >=media-libs/x264-0.0.20090923 ) xcb? ( >=x11-libs/libxcb-1.6 >=x11-libs/xcb-util-0.3.4 ) xml? ( dev-libs/libxml2 ) xosd? ( x11-libs/xosd ) zvbi? ( >=media-libs/zvbi-0.2.25 )
 0
-http://download.videolan.org/pub/videolan/vlc/2.0.1/vlc-2.0.1.tar.xz mirror://gentoo/vlc-patches-106.tar.bz2
+http://download.videolan.org/pub/videolan/vlc/2.0.1/vlc-2.0.1.tar.xz mirror://gentoo/vlc-patches-107.tar.bz2
 
 http://www.videolan.org/vlc/
 LGPL-2.1 GPL-2
diff --git a/metadata/cache/media-video/vlc-2.0.9999 b/metadata/cache/media-video/vlc-2.0.9999
index e607a712fde9..6545a53503e3 100644
--- a/metadata/cache/media-video/vlc-2.0.9999
+++ b/metadata/cache/media-video/vlc-2.0.9999
@@ -1,4 +1,4 @@
->=sys-libs/zlib-1.2.5.1-r2[minizip] a52? ( >=media-libs/a52dec-0.7.4-r3 ) aalib? ( media-libs/aalib ) aac? ( >=media-libs/faad2-2.6.1 ) alsa? ( >=media-libs/alsa-lib-1.0.23 ) avahi? ( >=net-dns/avahi-0.6[dbus] ) avcodec? ( virtual/ffmpeg ) avformat? ( virtual/ffmpeg ) bidi? ( >=dev-libs/fribidi-0.10.4 ) bluray? ( >=media-libs/libbluray-0.2.1 ) cddb? ( >=media-libs/libcddb-1.2.0 ) dbus? ( >=sys-apps/dbus-1.0.2 ) dc1394? ( >=sys-libs/libraw1394-2.0.1 >=media-libs/libdc1394-2.0.2 ) dirac? ( >=media-video/dirac-0.10.0 ) directfb? ( dev-libs/DirectFB sys-libs/zlib ) dts? ( media-libs/libdca ) dvbpsi? ( >=media-libs/libdvbpsi-0.1.6 ) dvd? ( media-libs/libdvdread >=media-libs/libdvdnav-0.1.9 ) egl? ( virtual/opengl ) elibc_glibc? ( >=sys-libs/glibc-2.8 ) flac? ( media-libs/libogg >=media-libs/flac-1.1.2 ) fluidsynth? ( media-sound/fluidsynth ) fontconfig? ( media-libs/fontconfig ) gcrypt? ( >=dev-libs/libgcrypt-1.2.0 ) gme? ( media-libs/game-music-emu ) gnome? ( gnome-base/gnome-vfs ) gnutls? ( >=net-libs/gnutls-2.0.0 ) ieee1394? ( >=sys-libs/libraw1394-2.0.1 >=sys-libs/libavc1394-0.5.3 ) ios-vout? ( virtual/opengl ) jack? ( >=media-sound/jack-audio-connection-kit-0.99.0-r1 ) kate? ( >=media-libs/libkate-0.1.1 ) libass? ( >=media-libs/libass-0.9.8 media-libs/fontconfig ) libcaca? ( >=media-libs/libcaca-0.99_beta14 ) libnotify? ( x11-libs/libnotify x11-libs/gtk+:2 ) libproxy? ( net-libs/libproxy ) libsamplerate? ( media-libs/libsamplerate ) libtar? ( >=dev-libs/libtar-1.2.11-r3 ) libtiger? ( media-libs/libtiger ) linsys? ( >=media-libs/zvbi-0.2.28 ) lirc? ( app-misc/lirc ) live? ( >=media-plugins/live-2011.12.23 ) lua? ( >=dev-lang/lua-5.1 ) macosx-vout? ( virtual/opengl ) matroska? ( >=dev-libs/libebml-1.0.0 >=media-libs/libmatroska-1.0.0 ) modplug? ( >=media-libs/libmodplug-0.8.8.1 ) mp3? ( media-libs/libmad ) mpeg? ( >=media-libs/libmpeg2-0.3.2 ) mtp? ( >=media-libs/libmtp-1.0.0 ) musepack? ( >=media-sound/musepack-tools-444 ) ncurses? ( sys-libs/ncurses[unicode] ) ogg? ( media-libs/libogg ) opengl? ( virtual/opengl >=x11-libs/libX11-1.3.99.901 ) png? ( media-libs/libpng sys-libs/zlib ) portaudio? ( >=media-libs/portaudio-19_pre ) postproc? ( virtual/ffmpeg ) projectm? ( media-libs/libprojectm ) pulseaudio? ( >=media-sound/pulseaudio-0.9.22 ) qt4? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 ) samba? ( >=net-fs/samba-3.4.6[smbclient] ) schroedinger? ( >=media-libs/schroedinger-1.0.10 ) sdl? ( >=media-libs/libsdl-1.2.8 sdl-image? ( media-libs/sdl-image sys-libs/zlib ) ) shout? ( media-libs/libshout ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext x11-libs/libXpm ) speex? ( media-libs/speex ) sqlite? ( >=dev-db/sqlite-3.6.0:3 ) svg? ( >=gnome-base/librsvg-2.9.0 ) swscale? ( virtual/ffmpeg ) taglib? ( >=media-libs/taglib-1.5 sys-libs/zlib ) theora? ( >=media-libs/libtheora-1.0_beta3 ) truetype? ( media-libs/freetype virtual/ttf-fonts !fontconfig? ( media-fonts/dejavu ) ) twolame? ( media-sound/twolame ) udev? ( >=sys-fs/udev-142 ) upnp? ( net-libs/libupnp ) v4l? ( media-libs/libv4l ) vaapi? ( x11-libs/libva ) vcdx? ( >=dev-libs/libcdio-0.78.2 >=media-video/vcdimager-0.7.22 ) vorbis? ( media-libs/libvorbis ) win32codecs? ( media-libs/win32codecs ) X? ( x11-libs/libX11 ) x264? ( >=media-libs/x264-0.0.20090923 ) xcb? ( >=x11-libs/libxcb-1.6 >=x11-libs/xcb-util-0.3.4 ) xml? ( dev-libs/libxml2 ) xosd? ( x11-libs/xosd ) zvbi? ( >=media-libs/zvbi-0.2.25 ) alsa? ( >=media-sound/alsa-headers-1.0.23 ) fbosd? ( sys-kernel/linux-headers ) kde? ( >=kde-base/kdelibs-4 ) xcb? ( x11-proto/xproto ) app-arch/xz-utils dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
+>=sys-libs/zlib-1.2.5.1-r2[minizip] a52? ( >=media-libs/a52dec-0.7.4-r3 ) aalib? ( media-libs/aalib ) aac? ( >=media-libs/faad2-2.6.1 ) alsa? ( >=media-libs/alsa-lib-1.0.23 ) avahi? ( >=net-dns/avahi-0.6[dbus] ) avcodec? ( virtual/ffmpeg ) avformat? ( virtual/ffmpeg ) bidi? ( >=dev-libs/fribidi-0.10.4 ) bluray? ( >=media-libs/libbluray-0.2.1 ) cddb? ( >=media-libs/libcddb-1.2.0 ) dbus? ( >=sys-apps/dbus-1.0.2 ) dc1394? ( >=sys-libs/libraw1394-2.0.1 >=media-libs/libdc1394-2.0.2 ) dirac? ( >=media-video/dirac-0.10.0 ) directfb? ( dev-libs/DirectFB sys-libs/zlib ) dts? ( media-libs/libdca ) dvbpsi? ( >=media-libs/libdvbpsi-0.1.6 ) dvd? ( media-libs/libdvdread >=media-libs/libdvdnav-0.1.9 ) egl? ( virtual/opengl ) elibc_glibc? ( >=sys-libs/glibc-2.8 ) flac? ( media-libs/libogg >=media-libs/flac-1.1.2 ) fluidsynth? ( media-sound/fluidsynth ) fontconfig? ( media-libs/fontconfig ) gcrypt? ( >=dev-libs/libgcrypt-1.2.0 ) gme? ( media-libs/game-music-emu ) gnome? ( gnome-base/gnome-vfs ) gnutls? ( >=net-libs/gnutls-2.0.0 ) ieee1394? ( >=sys-libs/libraw1394-2.0.1 >=sys-libs/libavc1394-0.5.3 ) ios-vout? ( virtual/opengl ) jack? ( >=media-sound/jack-audio-connection-kit-0.99.0-r1 ) kate? ( >=media-libs/libkate-0.1.1 ) libass? ( >=media-libs/libass-0.9.8 media-libs/fontconfig ) libcaca? ( >=media-libs/libcaca-0.99_beta14 ) libnotify? ( x11-libs/libnotify x11-libs/gtk+:2 ) libproxy? ( net-libs/libproxy ) libsamplerate? ( media-libs/libsamplerate ) libtar? ( >=dev-libs/libtar-1.2.11-r3 ) libtiger? ( media-libs/libtiger ) linsys? ( >=media-libs/zvbi-0.2.28 ) lirc? ( app-misc/lirc ) live? ( >=media-plugins/live-2011.12.23 ) lua? ( >=dev-lang/lua-5.1 ) macosx-vout? ( virtual/opengl ) matroska? ( >=dev-libs/libebml-1.0.0 >=media-libs/libmatroska-1.0.0 ) modplug? ( >=media-libs/libmodplug-0.8.8.1 ) mp3? ( media-libs/libmad ) mpeg? ( >=media-libs/libmpeg2-0.3.2 ) mtp? ( >=media-libs/libmtp-1.0.0 ) musepack? ( >=media-sound/musepack-tools-444 ) ncurses? ( sys-libs/ncurses[unicode] ) ogg? ( media-libs/libogg ) opengl? ( virtual/opengl >=x11-libs/libX11-1.3.99.901 ) png? ( media-libs/libpng sys-libs/zlib ) portaudio? ( >=media-libs/portaudio-19_pre ) postproc? ( virtual/ffmpeg ) projectm? ( media-libs/libprojectm ) pulseaudio? ( >=media-sound/pulseaudio-0.9.22 ) qt4? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 ) samba? ( >=net-fs/samba-3.4.6[smbclient] ) schroedinger? ( >=media-libs/schroedinger-1.0.10 ) sdl? ( >=media-libs/libsdl-1.2.8 sdl-image? ( media-libs/sdl-image sys-libs/zlib ) ) shout? ( media-libs/libshout ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext x11-libs/libXpm ) speex? ( media-libs/speex ) sqlite? ( >=dev-db/sqlite-3.6.0:3 ) svg? ( >=gnome-base/librsvg-2.9.0 ) swscale? ( virtual/ffmpeg ) taglib? ( >=media-libs/taglib-1.5 sys-libs/zlib ) theora? ( >=media-libs/libtheora-1.0_beta3 ) truetype? ( media-libs/freetype virtual/ttf-fonts !fontconfig? ( media-fonts/dejavu ) ) twolame? ( media-sound/twolame ) udev? ( >=sys-fs/udev-142 ) upnp? ( net-libs/libupnp ) v4l? ( media-libs/libv4l ) vaapi? ( x11-libs/libva ) vcdx? ( >=dev-libs/libcdio-0.78.2 >=media-video/vcdimager-0.7.22 ) vorbis? ( media-libs/libvorbis ) win32codecs? ( media-libs/win32codecs ) X? ( x11-libs/libX11 ) x264? ( >=media-libs/x264-0.0.20090923 ) xcb? ( >=x11-libs/libxcb-1.6 >=x11-libs/xcb-util-0.3.4 ) xml? ( dev-libs/libxml2 ) xosd? ( x11-libs/xosd ) zvbi? ( >=media-libs/zvbi-0.2.25 ) alsa? ( >=media-sound/alsa-headers-1.0.23 ) fbosd? ( sys-kernel/linux-headers ) kde? ( >=kde-base/kdelibs-4 ) xcb? ( x11-proto/xproto ) app-arch/xz-utils dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
 >=sys-libs/zlib-1.2.5.1-r2[minizip] a52? ( >=media-libs/a52dec-0.7.4-r3 ) aalib? ( media-libs/aalib ) aac? ( >=media-libs/faad2-2.6.1 ) alsa? ( >=media-libs/alsa-lib-1.0.23 ) avahi? ( >=net-dns/avahi-0.6[dbus] ) avcodec? ( virtual/ffmpeg ) avformat? ( virtual/ffmpeg ) bidi? ( >=dev-libs/fribidi-0.10.4 ) bluray? ( >=media-libs/libbluray-0.2.1 ) cddb? ( >=media-libs/libcddb-1.2.0 ) dbus? ( >=sys-apps/dbus-1.0.2 ) dc1394? ( >=sys-libs/libraw1394-2.0.1 >=media-libs/libdc1394-2.0.2 ) dirac? ( >=media-video/dirac-0.10.0 ) directfb? ( dev-libs/DirectFB sys-libs/zlib ) dts? ( media-libs/libdca ) dvbpsi? ( >=media-libs/libdvbpsi-0.1.6 ) dvd? ( media-libs/libdvdread >=media-libs/libdvdnav-0.1.9 ) egl? ( virtual/opengl ) elibc_glibc? ( >=sys-libs/glibc-2.8 ) flac? ( media-libs/libogg >=media-libs/flac-1.1.2 ) fluidsynth? ( media-sound/fluidsynth ) fontconfig? ( media-libs/fontconfig ) gcrypt? ( >=dev-libs/libgcrypt-1.2.0 ) gme? ( media-libs/game-music-emu ) gnome? ( gnome-base/gnome-vfs ) gnutls? ( >=net-libs/gnutls-2.0.0 ) ieee1394? ( >=sys-libs/libraw1394-2.0.1 >=sys-libs/libavc1394-0.5.3 ) ios-vout? ( virtual/opengl ) jack? ( >=media-sound/jack-audio-connection-kit-0.99.0-r1 ) kate? ( >=media-libs/libkate-0.1.1 ) libass? ( >=media-libs/libass-0.9.8 media-libs/fontconfig ) libcaca? ( >=media-libs/libcaca-0.99_beta14 ) libnotify? ( x11-libs/libnotify x11-libs/gtk+:2 ) libproxy? ( net-libs/libproxy ) libsamplerate? ( media-libs/libsamplerate ) libtar? ( >=dev-libs/libtar-1.2.11-r3 ) libtiger? ( media-libs/libtiger ) linsys? ( >=media-libs/zvbi-0.2.28 ) lirc? ( app-misc/lirc ) live? ( >=media-plugins/live-2011.12.23 ) lua? ( >=dev-lang/lua-5.1 ) macosx-vout? ( virtual/opengl ) matroska? ( >=dev-libs/libebml-1.0.0 >=media-libs/libmatroska-1.0.0 ) modplug? ( >=media-libs/libmodplug-0.8.8.1 ) mp3? ( media-libs/libmad ) mpeg? ( >=media-libs/libmpeg2-0.3.2 ) mtp? ( >=media-libs/libmtp-1.0.0 ) musepack? ( >=media-sound/musepack-tools-444 ) ncurses? ( sys-libs/ncurses[unicode] ) ogg? ( media-libs/libogg ) opengl? ( virtual/opengl >=x11-libs/libX11-1.3.99.901 ) png? ( media-libs/libpng sys-libs/zlib ) portaudio? ( >=media-libs/portaudio-19_pre ) postproc? ( virtual/ffmpeg ) projectm? ( media-libs/libprojectm ) pulseaudio? ( >=media-sound/pulseaudio-0.9.22 ) qt4? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 ) samba? ( >=net-fs/samba-3.4.6[smbclient] ) schroedinger? ( >=media-libs/schroedinger-1.0.10 ) sdl? ( >=media-libs/libsdl-1.2.8 sdl-image? ( media-libs/sdl-image sys-libs/zlib ) ) shout? ( media-libs/libshout ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext x11-libs/libXpm ) speex? ( media-libs/speex ) sqlite? ( >=dev-db/sqlite-3.6.0:3 ) svg? ( >=gnome-base/librsvg-2.9.0 ) swscale? ( virtual/ffmpeg ) taglib? ( >=media-libs/taglib-1.5 sys-libs/zlib ) theora? ( >=media-libs/libtheora-1.0_beta3 ) truetype? ( media-libs/freetype virtual/ttf-fonts !fontconfig? ( media-fonts/dejavu ) ) twolame? ( media-sound/twolame ) udev? ( >=sys-fs/udev-142 ) upnp? ( net-libs/libupnp ) v4l? ( media-libs/libv4l ) vaapi? ( x11-libs/libva ) vcdx? ( >=dev-libs/libcdio-0.78.2 >=media-video/vcdimager-0.7.22 ) vorbis? ( media-libs/libvorbis ) win32codecs? ( media-libs/win32codecs ) X? ( x11-libs/libX11 ) x264? ( >=media-libs/x264-0.0.20090923 ) xcb? ( >=x11-libs/libxcb-1.6 >=x11-libs/xcb-util-0.3.4 ) xml? ( dev-libs/libxml2 ) xosd? ( x11-libs/xosd ) zvbi? ( >=media-libs/zvbi-0.2.25 )
 0
 mirror://gentoo/vlc-patches-101.tar.bz2
diff --git a/metadata/cache/media-video/vlc-9999 b/metadata/cache/media-video/vlc-9999
index dd09ab0c837b..77795d780815 100644
--- a/metadata/cache/media-video/vlc-9999
+++ b/metadata/cache/media-video/vlc-9999
@@ -1,4 +1,4 @@
->=sys-libs/zlib-1.2.5.1-r2[minizip] a52? ( >=media-libs/a52dec-0.7.4-r3 ) aalib? ( media-libs/aalib ) aac? ( >=media-libs/faad2-2.6.1 ) alsa? ( >=media-libs/alsa-lib-1.0.23 ) avahi? ( >=net-dns/avahi-0.6[dbus] ) avcodec? ( virtual/ffmpeg ) avformat? ( virtual/ffmpeg ) bidi? ( >=dev-libs/fribidi-0.10.4 ) bluray? ( >=media-libs/libbluray-0.2.1 ) cddb? ( >=media-libs/libcddb-1.2.0 ) dbus? ( >=sys-apps/dbus-1.0.2 ) dc1394? ( >=sys-libs/libraw1394-2.0.1 >=media-libs/libdc1394-2.0.2 ) dirac? ( >=media-video/dirac-0.10.0 ) directfb? ( dev-libs/DirectFB sys-libs/zlib ) dts? ( media-libs/libdca ) dvbpsi? ( >=media-libs/libdvbpsi-0.1.6 ) dvd? ( media-libs/libdvdread >=media-libs/libdvdnav-0.1.9 ) egl? ( virtual/opengl ) elibc_glibc? ( >=sys-libs/glibc-2.8 ) flac? ( media-libs/libogg >=media-libs/flac-1.1.2 ) fluidsynth? ( >=media-sound/fluidsynth-1.1.0 ) fontconfig? ( media-libs/fontconfig ) gcrypt? ( >=dev-libs/libgcrypt-1.2.0 ) gme? ( media-libs/game-music-emu ) gnome? ( gnome-base/gnome-vfs ) gnutls? ( >=net-libs/gnutls-2.0.0 ) ieee1394? ( >=sys-libs/libraw1394-2.0.1 >=sys-libs/libavc1394-0.5.3 ) ios-vout? ( virtual/opengl ) jack? ( >=media-sound/jack-audio-connection-kit-0.99.0-r1 ) kate? ( >=media-libs/libkate-0.1.1 ) libass? ( >=media-libs/libass-0.9.8 media-libs/fontconfig ) libcaca? ( >=media-libs/libcaca-0.99_beta14 ) libnotify? ( x11-libs/libnotify x11-libs/gtk+:2 ) libproxy? ( net-libs/libproxy ) libsamplerate? ( media-libs/libsamplerate ) libtar? ( >=dev-libs/libtar-1.2.11-r3 ) libtiger? ( media-libs/libtiger ) linsys? ( >=media-libs/zvbi-0.2.28 ) lirc? ( app-misc/lirc ) live? ( >=media-plugins/live-2011.12.23 ) lua? ( >=dev-lang/lua-5.1 ) macosx-vout? ( virtual/opengl ) matroska? ( >=dev-libs/libebml-1.0.0 >=media-libs/libmatroska-1.0.0 ) modplug? ( >=media-libs/libmodplug-0.8.8.1 ) mp3? ( media-libs/libmad ) mpeg? ( >=media-libs/libmpeg2-0.3.2 ) mtp? ( >=media-libs/libmtp-1.0.0 ) musepack? ( >=media-sound/musepack-tools-444 ) ncurses? ( sys-libs/ncurses[unicode] ) ogg? ( media-libs/libogg ) opengl? ( virtual/opengl >=x11-libs/libX11-1.3.99.901 ) png? ( media-libs/libpng sys-libs/zlib ) postproc? ( virtual/ffmpeg ) projectm? ( media-libs/libprojectm ) pulseaudio? ( >=media-sound/pulseaudio-0.9.22 ) qt4? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 ) samba? ( >=net-fs/samba-3.4.6[smbclient] ) schroedinger? ( >=media-libs/schroedinger-1.0.10 ) sdl? ( >=media-libs/libsdl-1.2.8 sdl-image? ( media-libs/sdl-image sys-libs/zlib ) ) shout? ( media-libs/libshout ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext x11-libs/libXpm ) speex? ( media-libs/speex ) sqlite? ( >=dev-db/sqlite-3.6.0:3 ) svg? ( >=gnome-base/librsvg-2.9.0 ) swscale? ( virtual/ffmpeg ) taglib? ( >=media-libs/taglib-1.5 sys-libs/zlib ) theora? ( >=media-libs/libtheora-1.0_beta3 ) truetype? ( media-libs/freetype virtual/ttf-fonts !fontconfig? ( media-fonts/dejavu ) ) twolame? ( media-sound/twolame ) udev? ( >=sys-fs/udev-142 ) upnp? ( net-libs/libupnp ) v4l? ( media-libs/libv4l ) vaapi? ( x11-libs/libva ) vcdx? ( >=dev-libs/libcdio-0.78.2 >=media-video/vcdimager-0.7.22 ) vorbis? ( media-libs/libvorbis ) win32codecs? ( media-libs/win32codecs ) X? ( x11-libs/libX11 ) x264? ( >=media-libs/x264-0.0.20090923 ) xcb? ( >=x11-libs/libxcb-1.6 >=x11-libs/xcb-util-0.3.4 ) xml? ( dev-libs/libxml2 ) xosd? ( x11-libs/xosd ) zvbi? ( >=media-libs/zvbi-0.2.25 ) alsa? ( >=media-sound/alsa-headers-1.0.23 ) fbosd? ( sys-kernel/linux-headers ) kde? ( >=kde-base/kdelibs-4 ) xcb? ( x11-proto/xproto ) app-arch/xz-utils dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
+>=sys-libs/zlib-1.2.5.1-r2[minizip] a52? ( >=media-libs/a52dec-0.7.4-r3 ) aalib? ( media-libs/aalib ) aac? ( >=media-libs/faad2-2.6.1 ) alsa? ( >=media-libs/alsa-lib-1.0.23 ) avahi? ( >=net-dns/avahi-0.6[dbus] ) avcodec? ( virtual/ffmpeg ) avformat? ( virtual/ffmpeg ) bidi? ( >=dev-libs/fribidi-0.10.4 ) bluray? ( >=media-libs/libbluray-0.2.1 ) cddb? ( >=media-libs/libcddb-1.2.0 ) dbus? ( >=sys-apps/dbus-1.0.2 ) dc1394? ( >=sys-libs/libraw1394-2.0.1 >=media-libs/libdc1394-2.0.2 ) dirac? ( >=media-video/dirac-0.10.0 ) directfb? ( dev-libs/DirectFB sys-libs/zlib ) dts? ( media-libs/libdca ) dvbpsi? ( >=media-libs/libdvbpsi-0.1.6 ) dvd? ( media-libs/libdvdread >=media-libs/libdvdnav-0.1.9 ) egl? ( virtual/opengl ) elibc_glibc? ( >=sys-libs/glibc-2.8 ) flac? ( media-libs/libogg >=media-libs/flac-1.1.2 ) fluidsynth? ( >=media-sound/fluidsynth-1.1.0 ) fontconfig? ( media-libs/fontconfig ) gcrypt? ( >=dev-libs/libgcrypt-1.2.0 ) gme? ( media-libs/game-music-emu ) gnome? ( gnome-base/gnome-vfs ) gnutls? ( >=net-libs/gnutls-2.0.0 ) ieee1394? ( >=sys-libs/libraw1394-2.0.1 >=sys-libs/libavc1394-0.5.3 ) ios-vout? ( virtual/opengl ) jack? ( >=media-sound/jack-audio-connection-kit-0.99.0-r1 ) kate? ( >=media-libs/libkate-0.1.1 ) libass? ( >=media-libs/libass-0.9.8 media-libs/fontconfig ) libcaca? ( >=media-libs/libcaca-0.99_beta14 ) libnotify? ( x11-libs/libnotify x11-libs/gtk+:2 ) libproxy? ( net-libs/libproxy ) libsamplerate? ( media-libs/libsamplerate ) libtar? ( >=dev-libs/libtar-1.2.11-r3 ) libtiger? ( media-libs/libtiger ) linsys? ( >=media-libs/zvbi-0.2.28 ) lirc? ( app-misc/lirc ) live? ( >=media-plugins/live-2011.12.23 ) lua? ( >=dev-lang/lua-5.1 ) macosx-vout? ( virtual/opengl ) matroska? ( >=dev-libs/libebml-1.0.0 >=media-libs/libmatroska-1.0.0 ) modplug? ( >=media-libs/libmodplug-0.8.8.1 ) mp3? ( media-libs/libmad ) mpeg? ( >=media-libs/libmpeg2-0.3.2 ) mtp? ( >=media-libs/libmtp-1.0.0 ) musepack? ( >=media-sound/musepack-tools-444 ) ncurses? ( sys-libs/ncurses[unicode] ) ogg? ( media-libs/libogg ) opengl? ( virtual/opengl >=x11-libs/libX11-1.3.99.901 ) png? ( media-libs/libpng sys-libs/zlib ) postproc? ( virtual/ffmpeg ) projectm? ( media-libs/libprojectm ) pulseaudio? ( >=media-sound/pulseaudio-0.9.22 ) qt4? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 ) samba? ( >=net-fs/samba-3.4.6[smbclient] ) schroedinger? ( >=media-libs/schroedinger-1.0.10 ) sdl? ( >=media-libs/libsdl-1.2.8 sdl-image? ( media-libs/sdl-image sys-libs/zlib ) ) shout? ( media-libs/libshout ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext x11-libs/libXpm ) speex? ( media-libs/speex ) sqlite? ( >=dev-db/sqlite-3.6.0:3 ) svg? ( >=gnome-base/librsvg-2.9.0 ) swscale? ( virtual/ffmpeg ) taglib? ( >=media-libs/taglib-1.5 sys-libs/zlib ) theora? ( >=media-libs/libtheora-1.0_beta3 ) truetype? ( media-libs/freetype virtual/ttf-fonts !fontconfig? ( media-fonts/dejavu ) ) twolame? ( media-sound/twolame ) udev? ( >=sys-fs/udev-142 ) upnp? ( net-libs/libupnp ) v4l? ( media-libs/libv4l ) vaapi? ( x11-libs/libva ) vcdx? ( >=dev-libs/libcdio-0.78.2 >=media-video/vcdimager-0.7.22 ) vorbis? ( media-libs/libvorbis ) win32codecs? ( media-libs/win32codecs ) X? ( x11-libs/libX11 ) x264? ( >=media-libs/x264-0.0.20090923 ) xcb? ( >=x11-libs/libxcb-1.6 >=x11-libs/xcb-util-0.3.4 ) xml? ( dev-libs/libxml2 ) xosd? ( x11-libs/xosd ) zvbi? ( >=media-libs/zvbi-0.2.25 ) alsa? ( >=media-sound/alsa-headers-1.0.23 ) fbosd? ( sys-kernel/linux-headers ) kde? ( >=kde-base/kdelibs-4 ) xcb? ( x11-proto/xproto ) app-arch/xz-utils dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
 >=sys-libs/zlib-1.2.5.1-r2[minizip] a52? ( >=media-libs/a52dec-0.7.4-r3 ) aalib? ( media-libs/aalib ) aac? ( >=media-libs/faad2-2.6.1 ) alsa? ( >=media-libs/alsa-lib-1.0.23 ) avahi? ( >=net-dns/avahi-0.6[dbus] ) avcodec? ( virtual/ffmpeg ) avformat? ( virtual/ffmpeg ) bidi? ( >=dev-libs/fribidi-0.10.4 ) bluray? ( >=media-libs/libbluray-0.2.1 ) cddb? ( >=media-libs/libcddb-1.2.0 ) dbus? ( >=sys-apps/dbus-1.0.2 ) dc1394? ( >=sys-libs/libraw1394-2.0.1 >=media-libs/libdc1394-2.0.2 ) dirac? ( >=media-video/dirac-0.10.0 ) directfb? ( dev-libs/DirectFB sys-libs/zlib ) dts? ( media-libs/libdca ) dvbpsi? ( >=media-libs/libdvbpsi-0.1.6 ) dvd? ( media-libs/libdvdread >=media-libs/libdvdnav-0.1.9 ) egl? ( virtual/opengl ) elibc_glibc? ( >=sys-libs/glibc-2.8 ) flac? ( media-libs/libogg >=media-libs/flac-1.1.2 ) fluidsynth? ( >=media-sound/fluidsynth-1.1.0 ) fontconfig? ( media-libs/fontconfig ) gcrypt? ( >=dev-libs/libgcrypt-1.2.0 ) gme? ( media-libs/game-music-emu ) gnome? ( gnome-base/gnome-vfs ) gnutls? ( >=net-libs/gnutls-2.0.0 ) ieee1394? ( >=sys-libs/libraw1394-2.0.1 >=sys-libs/libavc1394-0.5.3 ) ios-vout? ( virtual/opengl ) jack? ( >=media-sound/jack-audio-connection-kit-0.99.0-r1 ) kate? ( >=media-libs/libkate-0.1.1 ) libass? ( >=media-libs/libass-0.9.8 media-libs/fontconfig ) libcaca? ( >=media-libs/libcaca-0.99_beta14 ) libnotify? ( x11-libs/libnotify x11-libs/gtk+:2 ) libproxy? ( net-libs/libproxy ) libsamplerate? ( media-libs/libsamplerate ) libtar? ( >=dev-libs/libtar-1.2.11-r3 ) libtiger? ( media-libs/libtiger ) linsys? ( >=media-libs/zvbi-0.2.28 ) lirc? ( app-misc/lirc ) live? ( >=media-plugins/live-2011.12.23 ) lua? ( >=dev-lang/lua-5.1 ) macosx-vout? ( virtual/opengl ) matroska? ( >=dev-libs/libebml-1.0.0 >=media-libs/libmatroska-1.0.0 ) modplug? ( >=media-libs/libmodplug-0.8.8.1 ) mp3? ( media-libs/libmad ) mpeg? ( >=media-libs/libmpeg2-0.3.2 ) mtp? ( >=media-libs/libmtp-1.0.0 ) musepack? ( >=media-sound/musepack-tools-444 ) ncurses? ( sys-libs/ncurses[unicode] ) ogg? ( media-libs/libogg ) opengl? ( virtual/opengl >=x11-libs/libX11-1.3.99.901 ) png? ( media-libs/libpng sys-libs/zlib ) postproc? ( virtual/ffmpeg ) projectm? ( media-libs/libprojectm ) pulseaudio? ( >=media-sound/pulseaudio-0.9.22 ) qt4? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 ) samba? ( >=net-fs/samba-3.4.6[smbclient] ) schroedinger? ( >=media-libs/schroedinger-1.0.10 ) sdl? ( >=media-libs/libsdl-1.2.8 sdl-image? ( media-libs/sdl-image sys-libs/zlib ) ) shout? ( media-libs/libshout ) sid? ( media-libs/libsidplay:2 ) skins? ( x11-libs/libXext x11-libs/libXpm ) speex? ( media-libs/speex ) sqlite? ( >=dev-db/sqlite-3.6.0:3 ) svg? ( >=gnome-base/librsvg-2.9.0 ) swscale? ( virtual/ffmpeg ) taglib? ( >=media-libs/taglib-1.5 sys-libs/zlib ) theora? ( >=media-libs/libtheora-1.0_beta3 ) truetype? ( media-libs/freetype virtual/ttf-fonts !fontconfig? ( media-fonts/dejavu ) ) twolame? ( media-sound/twolame ) udev? ( >=sys-fs/udev-142 ) upnp? ( net-libs/libupnp ) v4l? ( media-libs/libv4l ) vaapi? ( x11-libs/libva ) vcdx? ( >=dev-libs/libcdio-0.78.2 >=media-video/vcdimager-0.7.22 ) vorbis? ( media-libs/libvorbis ) win32codecs? ( media-libs/win32codecs ) X? ( x11-libs/libX11 ) x264? ( >=media-libs/x264-0.0.20090923 ) xcb? ( >=x11-libs/libxcb-1.6 >=x11-libs/xcb-util-0.3.4 ) xml? ( dev-libs/libxml2 ) xosd? ( x11-libs/xosd ) zvbi? ( >=media-libs/zvbi-0.2.25 )
 0
 mirror://gentoo/vlc-patches-101.tar.bz2
diff --git a/metadata/cache/media-video/xvattr-1.3-r2 b/metadata/cache/media-video/xvattr-1.3-r2
index a7aff3944e85..42ff157311d4 100644
--- a/metadata/cache/media-video/xvattr-1.3-r2
+++ b/metadata/cache/media-video/xvattr-1.3-r2
@@ -1,4 +1,4 @@
-x11-libs/libX11 x11-libs/libXv x11-libs/libXext gtk? ( x11-libs/gtk+:2 ) x11-libs/libXt dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+x11-libs/libX11 x11-libs/libXv x11-libs/libXext gtk? ( x11-libs/gtk+:2 ) x11-libs/libXt dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 x11-libs/libX11 x11-libs/libXv x11-libs/libXext gtk? ( x11-libs/gtk+:2 )
 0
 http://www.dtek.chalmers.se/groups/dvd/dist/xvattr-1.3.tar.gz
diff --git a/metadata/cache/net-analyzer/argus-3.0.3.8 b/metadata/cache/net-analyzer/argus-3.0.3.8
index 3425b84e8642..fc44da0a3a51 100644
--- a/metadata/cache/net-analyzer/argus-3.0.3.8
+++ b/metadata/cache/net-analyzer/argus-3.0.3.8
@@ -1,4 +1,4 @@
-net-libs/libpcap tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) >=sys-devel/bison-1.28 >=sys-devel/flex-2.4.6 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+net-libs/libpcap tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) >=sys-devel/bison-1.28 >=sys-devel/flex-2.4.6 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 net-libs/libpcap tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
 0
 http://qosient.com/argus/dev/argus-3.0.3.8.tar.gz
diff --git a/metadata/cache/net-analyzer/argus-3.0.4 b/metadata/cache/net-analyzer/argus-3.0.4
index 74d3496bfa8f..642123c55f58 100644
--- a/metadata/cache/net-analyzer/argus-3.0.4
+++ b/metadata/cache/net-analyzer/argus-3.0.4
@@ -1,4 +1,4 @@
-net-libs/libpcap tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) >=sys-devel/bison-1.28 >=sys-devel/flex-2.4.6 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+net-libs/libpcap tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) >=sys-devel/bison-1.28 >=sys-devel/flex-2.4.6 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 net-libs/libpcap tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
 0
 http://qosient.com/argus/src/argus-3.0.4.tar.gz
diff --git a/metadata/cache/net-analyzer/argus-3.0.5.10 b/metadata/cache/net-analyzer/argus-3.0.5.10
index d8c7accce676..6679fa488c9a 100644
--- a/metadata/cache/net-analyzer/argus-3.0.5.10
+++ b/metadata/cache/net-analyzer/argus-3.0.5.10
@@ -1,4 +1,4 @@
-net-libs/libpcap tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) >=sys-devel/bison-1.28 >=sys-devel/flex-2.4.6 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+net-libs/libpcap tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) >=sys-devel/bison-1.28 >=sys-devel/flex-2.4.6 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 net-libs/libpcap tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
 0
 http://qosient.com/argus/dev/argus-3.0.5.10.tar.gz
diff --git a/metadata/cache/net-analyzer/argus-3.0.5.11 b/metadata/cache/net-analyzer/argus-3.0.5.11
index 6149cae268f4..9ea1e29e1e4e 100644
--- a/metadata/cache/net-analyzer/argus-3.0.5.11
+++ b/metadata/cache/net-analyzer/argus-3.0.5.11
@@ -1,4 +1,4 @@
-net-libs/libpcap tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) >=sys-devel/bison-1.28 >=sys-devel/flex-2.4.6 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+net-libs/libpcap tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) >=sys-devel/bison-1.28 >=sys-devel/flex-2.4.6 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 net-libs/libpcap tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
 0
 http://qosient.com/argus/dev/argus-3.0.5.11.tar.gz
diff --git a/metadata/cache/net-analyzer/argus-clients-3.0.4.1-r1 b/metadata/cache/net-analyzer/argus-clients-3.0.4.1-r1
index 31ca3eed610f..7f445e3554da 100644
--- a/metadata/cache/net-analyzer/argus-clients-3.0.4.1-r1
+++ b/metadata/cache/net-analyzer/argus-clients-3.0.4.1-r1
@@ -1,4 +1,4 @@
-net-libs/libpcap net-analyzer/rrdtool[perl] geoip? ( dev-libs/geoip ) mysql? ( virtual/mysql ) sys-libs/ncurses >=sys-devel/bison-1.28 >=sys-devel/flex-2.4.6 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+net-libs/libpcap net-analyzer/rrdtool[perl] geoip? ( dev-libs/geoip ) mysql? ( virtual/mysql ) sys-libs/ncurses >=sys-devel/bison-1.28 >=sys-devel/flex-2.4.6 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 net-libs/libpcap net-analyzer/rrdtool[perl] geoip? ( dev-libs/geoip ) mysql? ( virtual/mysql ) sys-libs/ncurses >=net-analyzer/argus-3.0.2
 0
 http://qosient.com/argus/src/argus-clients-3.0.4.1.tar.gz
diff --git a/metadata/cache/net-analyzer/argus-clients-3.0.4.1-r2 b/metadata/cache/net-analyzer/argus-clients-3.0.4.1-r2
index 15a3093ddde9..5cde252b9758 100644
--- a/metadata/cache/net-analyzer/argus-clients-3.0.4.1-r2
+++ b/metadata/cache/net-analyzer/argus-clients-3.0.4.1-r2
@@ -1,4 +1,4 @@
-net-libs/libpcap net-analyzer/rrdtool[perl] geoip? ( dev-libs/geoip ) mysql? ( virtual/mysql ) sys-libs/ncurses >=sys-devel/bison-1.28 >=sys-devel/flex-2.4.6 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+net-libs/libpcap net-analyzer/rrdtool[perl] geoip? ( dev-libs/geoip ) mysql? ( virtual/mysql ) sys-libs/ncurses >=sys-devel/bison-1.28 >=sys-devel/flex-2.4.6 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 net-libs/libpcap net-analyzer/rrdtool[perl] geoip? ( dev-libs/geoip ) mysql? ( virtual/mysql ) sys-libs/ncurses >=net-analyzer/argus-3.0.2
 0
 http://qosient.com/argus/src/argus-clients-3.0.4.1.tar.gz
diff --git a/metadata/cache/net-analyzer/argus-clients-3.0.5.34 b/metadata/cache/net-analyzer/argus-clients-3.0.5.34
index 9e22f2d4a119..2071f70b7f49 100644
--- a/metadata/cache/net-analyzer/argus-clients-3.0.5.34
+++ b/metadata/cache/net-analyzer/argus-clients-3.0.5.34
@@ -1,4 +1,4 @@
-net-libs/libpcap net-analyzer/rrdtool[perl] geoip? ( dev-libs/geoip ) mysql? ( virtual/mysql ) sys-libs/ncurses >=sys-devel/bison-1.28 >=sys-devel/flex-2.4.6 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+net-libs/libpcap net-analyzer/rrdtool[perl] geoip? ( dev-libs/geoip ) mysql? ( virtual/mysql ) sys-libs/ncurses >=sys-devel/bison-1.28 >=sys-devel/flex-2.4.6 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 net-libs/libpcap net-analyzer/rrdtool[perl] geoip? ( dev-libs/geoip ) mysql? ( virtual/mysql ) sys-libs/ncurses >=net-analyzer/argus-3.0.2
 0
 http://qosient.com/argus/dev/argus-clients-3.0.5.34.tar.gz
diff --git a/metadata/cache/net-analyzer/argus-clients-3.0.5.35 b/metadata/cache/net-analyzer/argus-clients-3.0.5.35
index c1f8018041a3..b45b0765bd69 100644
--- a/metadata/cache/net-analyzer/argus-clients-3.0.5.35
+++ b/metadata/cache/net-analyzer/argus-clients-3.0.5.35
@@ -1,4 +1,4 @@
-net-libs/libpcap net-analyzer/rrdtool[perl] geoip? ( dev-libs/geoip ) mysql? ( virtual/mysql ) sys-libs/ncurses >=sys-devel/bison-1.28 >=sys-devel/flex-2.4.6 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+net-libs/libpcap net-analyzer/rrdtool[perl] geoip? ( dev-libs/geoip ) mysql? ( virtual/mysql ) sys-libs/ncurses >=sys-devel/bison-1.28 >=sys-devel/flex-2.4.6 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 net-libs/libpcap net-analyzer/rrdtool[perl] geoip? ( dev-libs/geoip ) mysql? ( virtual/mysql ) sys-libs/ncurses >=net-analyzer/argus-3.0.2
 0
 http://qosient.com/argus/dev/argus-clients-3.0.5.35.tar.gz
diff --git a/metadata/cache/net-analyzer/barnyard-0.2.0-r3 b/metadata/cache/net-analyzer/barnyard-0.2.0-r3
index 20a4992e2d4d..3374bbfa93ba 100644
--- a/metadata/cache/net-analyzer/barnyard-0.2.0-r3
+++ b/metadata/cache/net-analyzer/barnyard-0.2.0-r3
@@ -1,4 +1,4 @@
-net-libs/libpcap postgres? ( dev-db/postgresql-server ) mysql? ( virtual/mysql ) sguil? ( dev-lang/tcl ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+net-libs/libpcap postgres? ( dev-db/postgresql-server ) mysql? ( virtual/mysql ) sguil? ( dev-lang/tcl ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 net-libs/libpcap postgres? ( dev-db/postgresql-server ) mysql? ( virtual/mysql ) sguil? ( dev-lang/tcl ) net-analyzer/snort
 0
 mirror://sourceforge/barnyard/barnyard-0.2.0.tar.gz mirror://gentoo/barnyard-0.2.0-patches.tar.bz2
diff --git a/metadata/cache/net-analyzer/bigeye-0.3-r3 b/metadata/cache/net-analyzer/bigeye-0.3-r3
index 77d9fc557cec..cc64c353b2f9 100644
--- a/metadata/cache/net-analyzer/bigeye-0.3-r3
+++ b/metadata/cache/net-analyzer/bigeye-0.3-r3
@@ -6,7 +6,7 @@ http://violating.us/projects/bigeye/download/bigeye-0.3.tgz mirror://gentoo/bige
 http://violating.us/projects/bigeye/
 GPL-2
 network utility dump and simple honeypot utility
-~amd64 ~ppc ~x86
+~amd64 ~ppc x86
 eutils multilib toolchain-funcs user
 
 
diff --git a/metadata/cache/net-analyzer/bwping-1.2 b/metadata/cache/net-analyzer/bwping-1.2
index 3ff8287440a0..27e300edb834 100644
--- a/metadata/cache/net-analyzer/bwping-1.2
+++ b/metadata/cache/net-analyzer/bwping-1.2
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 mirror://sourceforge/bwping/1.2/bwping-1.2.tar.gz
diff --git a/metadata/cache/net-analyzer/bwping-1.4 b/metadata/cache/net-analyzer/bwping-1.4
index 0b1e7dfff4a2..1d9083ae62c9 100644
--- a/metadata/cache/net-analyzer/bwping-1.4
+++ b/metadata/cache/net-analyzer/bwping-1.4
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 mirror://sourceforge/bwping/1.4/bwping-1.4.tar.gz
diff --git a/metadata/cache/net-analyzer/cacti-spine-0.8.7g b/metadata/cache/net-analyzer/cacti-spine-0.8.7g
index eaf1f3c35143..c6e41bc21df4 100644
--- a/metadata/cache/net-analyzer/cacti-spine-0.8.7g
+++ b/metadata/cache/net-analyzer/cacti-spine-0.8.7g
@@ -1,4 +1,4 @@
-net-analyzer/net-snmp dev-libs/openssl virtual/mysql || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+net-analyzer/net-snmp dev-libs/openssl virtual/mysql || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 net-analyzer/net-snmp dev-libs/openssl virtual/mysql >net-analyzer/cacti-0.8.7
 0
 http://www.cacti.net/downloads/spine/cacti-spine-0.8.7g.tar.gz http://www.cacti.net/downloads/spine/patches/0.8.7g/unified_issues.patch
diff --git a/metadata/cache/net-analyzer/cacti-spine-0.8.7h b/metadata/cache/net-analyzer/cacti-spine-0.8.7h
index 9b14f26f226d..23eb3f72899e 100644
--- a/metadata/cache/net-analyzer/cacti-spine-0.8.7h
+++ b/metadata/cache/net-analyzer/cacti-spine-0.8.7h
@@ -1,4 +1,4 @@
-net-analyzer/net-snmp dev-libs/openssl virtual/mysql || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+net-analyzer/net-snmp dev-libs/openssl virtual/mysql || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 net-analyzer/net-snmp dev-libs/openssl virtual/mysql >net-analyzer/cacti-0.8.7
 0
 http://www.cacti.net/downloads/spine/cacti-spine-0.8.7h.tar.gz
diff --git a/metadata/cache/net-analyzer/cacti-spine-0.8.7i b/metadata/cache/net-analyzer/cacti-spine-0.8.7i
index 7346042bf2da..0994ce6cc8e9 100644
--- a/metadata/cache/net-analyzer/cacti-spine-0.8.7i
+++ b/metadata/cache/net-analyzer/cacti-spine-0.8.7i
@@ -1,4 +1,4 @@
-net-analyzer/net-snmp dev-libs/openssl virtual/mysql || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+net-analyzer/net-snmp dev-libs/openssl virtual/mysql || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 net-analyzer/net-snmp dev-libs/openssl virtual/mysql >net-analyzer/cacti-0.8.7
 0
 http://www.cacti.net/downloads/spine/cacti-spine-0.8.7i.tar.gz
diff --git a/metadata/cache/net-analyzer/dsniff-2.4_beta1-r5 b/metadata/cache/net-analyzer/dsniff-2.4_beta1-r5
index c2d0f62e91d3..fee2affe4492 100644
--- a/metadata/cache/net-analyzer/dsniff-2.4_beta1-r5
+++ b/metadata/cache/net-analyzer/dsniff-2.4_beta1-r5
@@ -1,4 +1,4 @@
-net-libs/libpcap >=net-libs/libnet-1.1.2.1-r1 >=net-libs/libnids-1.21 >=dev-libs/openssl-0.9.6e >=sys-libs/db-4.2.52_p4 X? ( x11-libs/libXmu ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+net-libs/libpcap >=net-libs/libnet-1.1.2.1-r1 >=net-libs/libnids-1.21 >=dev-libs/openssl-0.9.6e >=sys-libs/db-4.2.52_p4 X? ( x11-libs/libXmu ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 net-libs/libpcap >=net-libs/libnet-1.1.2.1-r1 >=net-libs/libnids-1.21 >=dev-libs/openssl-0.9.6e >=sys-libs/db-4.2.52_p4 X? ( x11-libs/libXmu )
 0
 http://monkey.org/~dugsong/dsniff/beta/dsniff-2.4b1.tar.gz mirror://debian/pool/main/d/dsniff/dsniff_2.4b1+debian-18.diff.gz
diff --git a/metadata/cache/net-analyzer/echoping-6.0.2-r1 b/metadata/cache/net-analyzer/echoping-6.0.2-r1
index 2fd4c5cb5395..3a79563a3625 100644
--- a/metadata/cache/net-analyzer/echoping-6.0.2-r1
+++ b/metadata/cache/net-analyzer/echoping-6.0.2-r1
@@ -1,4 +1,4 @@
-gnutls? ( >=net-libs/gnutls-1.0.17 ) ssl? ( >=dev-libs/openssl-0.9.7d ) idn? ( net-dns/libidn ) postgres? ( dev-db/postgresql-base ) ldap? ( net-nds/openldap ) >=sys-devel/libtool-2 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+gnutls? ( >=net-libs/gnutls-1.0.17 ) ssl? ( >=dev-libs/openssl-0.9.7d ) idn? ( net-dns/libidn ) postgres? ( dev-db/postgresql-base ) ldap? ( net-nds/openldap ) >=sys-devel/libtool-2 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 gnutls? ( >=net-libs/gnutls-1.0.17 ) ssl? ( >=dev-libs/openssl-0.9.7d ) idn? ( net-dns/libidn ) postgres? ( dev-db/postgresql-base ) ldap? ( net-nds/openldap )
 0
 mirror://sourceforge/echoping/echoping-6.0.2.tar.gz
diff --git a/metadata/cache/net-analyzer/ettercap-0.7.3-r4 b/metadata/cache/net-analyzer/ettercap-0.7.3-r4
index fef0726fc52c..251e570c21bd 100644
--- a/metadata/cache/net-analyzer/ettercap-0.7.3-r4
+++ b/metadata/cache/net-analyzer/ettercap-0.7.3-r4
@@ -1,4 +1,4 @@
->=net-libs/libnet-1.1.2.1-r1 net-libs/libpcap sys-devel/libtool ncurses? ( sys-libs/ncurses ) ssl? ( dev-libs/openssl ) gtk? ( >=x11-libs/gtk+-2.2.2:2 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=net-libs/libnet-1.1.2.1-r1 net-libs/libpcap sys-devel/libtool ncurses? ( sys-libs/ncurses ) ssl? ( dev-libs/openssl ) gtk? ( >=x11-libs/gtk+-2.2.2:2 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=net-libs/libnet-1.1.2.1-r1 net-libs/libpcap sys-devel/libtool ncurses? ( sys-libs/ncurses ) ssl? ( dev-libs/openssl ) gtk? ( >=x11-libs/gtk+-2.2.2:2 )
 0
 mirror://sourceforge/ettercap/ettercap-NG-0.7.3.tar.gz
diff --git a/metadata/cache/net-analyzer/ettercap-0.7.4 b/metadata/cache/net-analyzer/ettercap-0.7.4
index b7983621dd7d..847d2b04e2bd 100644
--- a/metadata/cache/net-analyzer/ettercap-0.7.4
+++ b/metadata/cache/net-analyzer/ettercap-0.7.4
@@ -1,4 +1,4 @@
->=net-libs/libnet-1.1.2.1-r1 net-libs/libpcap sys-devel/libtool sys-libs/zlib gtk? ( >=dev-libs/glib-2.2.2:2 >=x11-libs/gtk+-2.2.2:2 ) ncurses? ( sys-libs/ncurses ) pcre? ( dev-libs/libpcre ) ssl? ( dev-libs/openssl ) dev-util/pkgconfig sys-devel/flex virtual/yacc || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=net-libs/libnet-1.1.2.1-r1 net-libs/libpcap sys-devel/libtool sys-libs/zlib gtk? ( >=dev-libs/glib-2.2.2:2 >=x11-libs/gtk+-2.2.2:2 ) ncurses? ( sys-libs/ncurses ) pcre? ( dev-libs/libpcre ) ssl? ( dev-libs/openssl ) dev-util/pkgconfig sys-devel/flex virtual/yacc || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=net-libs/libnet-1.1.2.1-r1 net-libs/libpcap sys-devel/libtool sys-libs/zlib gtk? ( >=dev-libs/glib-2.2.2:2 >=x11-libs/gtk+-2.2.2:2 ) ncurses? ( sys-libs/ncurses ) pcre? ( dev-libs/libpcre ) ssl? ( dev-libs/openssl )
 0
 mirror://sourceforge/ettercap/ettercap-0.7.4.tar.gz
diff --git a/metadata/cache/net-analyzer/ettercap-0.7.4.1 b/metadata/cache/net-analyzer/ettercap-0.7.4.1
index 3d4230571fdc..c0db823c1458 100644
--- a/metadata/cache/net-analyzer/ettercap-0.7.4.1
+++ b/metadata/cache/net-analyzer/ettercap-0.7.4.1
@@ -1,4 +1,4 @@
->=net-libs/libnet-1.1.2.1-r1 net-libs/libpcap sys-devel/libtool sys-libs/zlib gtk? ( >=dev-libs/glib-2.2.2:2 >=x11-libs/gtk+-2.2.2:2 ) ncurses? ( sys-libs/ncurses ) pcre? ( dev-libs/libpcre ) ssl? ( dev-libs/openssl ) dev-util/pkgconfig sys-devel/flex virtual/yacc || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=net-libs/libnet-1.1.2.1-r1 net-libs/libpcap sys-devel/libtool sys-libs/zlib gtk? ( >=dev-libs/glib-2.2.2:2 >=x11-libs/gtk+-2.2.2:2 ) ncurses? ( sys-libs/ncurses ) pcre? ( dev-libs/libpcre ) ssl? ( dev-libs/openssl ) dev-util/pkgconfig sys-devel/flex virtual/yacc || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=net-libs/libnet-1.1.2.1-r1 net-libs/libpcap sys-devel/libtool sys-libs/zlib gtk? ( >=dev-libs/glib-2.2.2:2 >=x11-libs/gtk+-2.2.2:2 ) ncurses? ( sys-libs/ncurses ) pcre? ( dev-libs/libpcre ) ssl? ( dev-libs/openssl )
 0
 mirror://sourceforge/ettercap/ettercap-0.7.4.1.tar.gz
diff --git a/metadata/cache/net-analyzer/fe3d-0.11.2 b/metadata/cache/net-analyzer/fe3d-0.11.2
index 7bbfd67c5392..86e112bd8982 100644
--- a/metadata/cache/net-analyzer/fe3d-0.11.2
+++ b/metadata/cache/net-analyzer/fe3d-0.11.2
@@ -1,4 +1,4 @@
-x11-libs/wxGTK:2.8 >=dev-libs/xerces-c-2.7 net-analyzer/nmap || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+x11-libs/wxGTK:2.8 >=dev-libs/xerces-c-2.7 net-analyzer/nmap || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 x11-libs/wxGTK:2.8 >=dev-libs/xerces-c-2.7 net-analyzer/nmap
 0
 mirror://sourceforge/fe3d/fe3d_0.11.2-src.tar.bz2
diff --git a/metadata/cache/net-analyzer/flowgrind-0.5.8 b/metadata/cache/net-analyzer/flowgrind-0.5.8
index 508a894bed5e..ec8260298701 100644
--- a/metadata/cache/net-analyzer/flowgrind-0.5.8
+++ b/metadata/cache/net-analyzer/flowgrind-0.5.8
@@ -1,4 +1,4 @@
-dev-libs/xmlrpc-c[abyss,curl] gsl? ( sci-libs/gsl ) pcap? ( net-libs/libpcap ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-libs/xmlrpc-c[abyss,curl] gsl? ( sci-libs/gsl ) pcap? ( net-libs/libpcap ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-libs/xmlrpc-c[abyss,curl] gsl? ( sci-libs/gsl ) pcap? ( net-libs/libpcap )
 0
 https://launchpad.net/flowgrind/trunk/flowgrind-0.5.8/+download/flowgrind-0.5.8.tar.bz2
diff --git a/metadata/cache/net-analyzer/fping-2.4_beta2_p161-r1 b/metadata/cache/net-analyzer/fping-2.4_beta2_p161-r1
index 65cf77a8e1e1..f4a6ee2b7a2b 100644
--- a/metadata/cache/net-analyzer/fping-2.4_beta2_p161-r1
+++ b/metadata/cache/net-analyzer/fping-2.4_beta2_p161-r1
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 mirror://debian/pool/main/f/fping/fping_2.4b2-to-ipv6.orig.tar.gz mirror://debian/pool/main/f/fping/fping_2.4b2-to-ipv6-16.1.diff.gz
diff --git a/metadata/cache/net-analyzer/ipcad-3.7 b/metadata/cache/net-analyzer/ipcad-3.7
index 68229584b61d..8a40420ad97b 100644
--- a/metadata/cache/net-analyzer/ipcad-3.7
+++ b/metadata/cache/net-analyzer/ipcad-3.7
@@ -1,4 +1,4 @@
-net-libs/libpcap net-firewall/iptables || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+net-libs/libpcap net-firewall/iptables || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 net-libs/libpcap net-firewall/iptables
 0
 mirror://sourceforge/ipcad/ipcad-3.7.tar.gz mirror://gentoo/ipcad-3.7-20060828-cvs.patch.bz2
diff --git a/metadata/cache/net-analyzer/ipcad-3.7.3 b/metadata/cache/net-analyzer/ipcad-3.7.3
index ef91cce48328..fdf3ac6842c5 100644
--- a/metadata/cache/net-analyzer/ipcad-3.7.3
+++ b/metadata/cache/net-analyzer/ipcad-3.7.3
@@ -1,4 +1,4 @@
-net-libs/libpcap net-firewall/iptables || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+net-libs/libpcap net-firewall/iptables || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 net-libs/libpcap net-firewall/iptables
 0
 mirror://sourceforge/ipcad/ipcad-3.7.3.tar.gz
diff --git a/metadata/cache/net-analyzer/iptraf-ng-1.0.2 b/metadata/cache/net-analyzer/iptraf-ng-1.0.2
index 38ff39c69ee7..175db83b4d18 100644
--- a/metadata/cache/net-analyzer/iptraf-ng-1.0.2
+++ b/metadata/cache/net-analyzer/iptraf-ng-1.0.2
@@ -1,4 +1,4 @@
-sys-libs/ncurses || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+sys-libs/ncurses || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 !net-analyzer/iptraf sys-libs/ncurses
 0
 https://fedorahosted.org/releases/i/p/iptraf-ng/iptraf-ng-1.0.2.tar.gz
diff --git a/metadata/cache/net-analyzer/iptraf-ng-1.1.1.20120321 b/metadata/cache/net-analyzer/iptraf-ng-1.1.1.20120321
new file mode 100644
index 000000000000..7c3c8016de10
--- /dev/null
+++ b/metadata/cache/net-analyzer/iptraf-ng-1.1.1.20120321
@@ -0,0 +1,22 @@
+>=sys-libs/ncurses-5.7-r7 !net-analyzer/iptraf
+>=sys-libs/ncurses-5.7-r7
+0
+http://dev.gentoo.org/~jer/iptraf-ng-1.1.1.20120321.tar.xz
+
+http://fedorahosted.org/iptraf-ng/
+GPL-2
+A console-based network monitoring utility
+~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+
+
+
+
+
+4
+
+install prepare
+
+
+
+
+
diff --git a/metadata/cache/net-analyzer/labrea-2.5-r1 b/metadata/cache/net-analyzer/labrea-2.5-r1
index c74f7880eec2..f976c8576bd4 100644
--- a/metadata/cache/net-analyzer/labrea-2.5-r1
+++ b/metadata/cache/net-analyzer/labrea-2.5-r1
@@ -1,4 +1,4 @@
-net-libs/libpcap >=dev-libs/libdnet-1.7 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+net-libs/libpcap >=dev-libs/libdnet-1.7 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 net-libs/libpcap >=dev-libs/libdnet-1.7
 0
 mirror://sourceforge/labrea/labrea-2.5-stable-1.tar.gz
diff --git a/metadata/cache/net-analyzer/mbrowse-0.4.3 b/metadata/cache/net-analyzer/mbrowse-0.4.3
index b08c7d71bf3f..08408e22856e 100644
--- a/metadata/cache/net-analyzer/mbrowse-0.4.3
+++ b/metadata/cache/net-analyzer/mbrowse-0.4.3
@@ -1,4 +1,4 @@
-dev-libs/glib net-analyzer/net-snmp x11-libs/gdk-pixbuf x11-libs/gtk+:2 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-libs/glib net-analyzer/net-snmp x11-libs/gdk-pixbuf x11-libs/gtk+:2 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-libs/glib net-analyzer/net-snmp x11-libs/gdk-pixbuf x11-libs/gtk+:2
 0
 mirror://sourceforge/mbrowse/files/mbrowse-0.4.3.tar.gz
diff --git a/metadata/cache/net-analyzer/mrtg-2.16.4-r1 b/metadata/cache/net-analyzer/mrtg-2.16.4-r1
index 724a54b8b2be..f125985ca150 100644
--- a/metadata/cache/net-analyzer/mrtg-2.16.4-r1
+++ b/metadata/cache/net-analyzer/mrtg-2.16.4-r1
@@ -1,4 +1,4 @@
-dev-lang/perl dev-perl/SNMP_Session >=dev-perl/Socket6-0.20 >=media-libs/gd-1.8.4 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-lang/perl dev-perl/SNMP_Session >=dev-perl/Socket6-0.20 >=media-libs/gd-1.8.4 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-lang/perl dev-perl/SNMP_Session >=dev-perl/Socket6-0.20 >=media-libs/gd-1.8.4
 0
 http://oss.oetiker.ch/mrtg/pub/mrtg-2.16.4.tar.gz
diff --git a/metadata/cache/net-analyzer/mtr-0.81 b/metadata/cache/net-analyzer/mtr-0.81
index 41fcbf80b65c..fc978efc6c44 100644
--- a/metadata/cache/net-analyzer/mtr-0.81
+++ b/metadata/cache/net-analyzer/mtr-0.81
@@ -1,4 +1,4 @@
-sys-libs/ncurses gtk? ( x11-libs/gtk+:2 ) gtk? ( dev-util/pkgconfig ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+sys-libs/ncurses gtk? ( x11-libs/gtk+:2 ) gtk? ( dev-util/pkgconfig ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 sys-libs/ncurses gtk? ( x11-libs/gtk+:2 )
 0
 ftp://ftp.bitwizard.nl/mtr/mtr-0.81.tar.gz mirror://gentoo/gtk-2.0-for-mtr.m4.bz2
diff --git a/metadata/cache/net-analyzer/mtr-0.82 b/metadata/cache/net-analyzer/mtr-0.82
index 72bb9b4fe03e..7f5fe32d1946 100644
--- a/metadata/cache/net-analyzer/mtr-0.82
+++ b/metadata/cache/net-analyzer/mtr-0.82
@@ -1,4 +1,4 @@
-sys-libs/ncurses gtk? ( x11-libs/gtk+:2 ) gtk? ( dev-util/pkgconfig ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+sys-libs/ncurses gtk? ( x11-libs/gtk+:2 ) gtk? ( dev-util/pkgconfig ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 sys-libs/ncurses gtk? ( x11-libs/gtk+:2 )
 0
 ftp://ftp.bitwizard.nl/mtr/mtr-0.82.tar.gz mirror://gentoo/gtk-2.0-for-mtr.m4.bz2
diff --git a/metadata/cache/net-analyzer/nagios-check_dnssec-0.1_p28 b/metadata/cache/net-analyzer/nagios-check_dnssec-0.1_p28
index 3a5e232a87e5..d392263ce334 100644
--- a/metadata/cache/net-analyzer/nagios-check_dnssec-0.1_p28
+++ b/metadata/cache/net-analyzer/nagios-check_dnssec-0.1_p28
@@ -1,4 +1,4 @@
-net-analyzer/nagios-plugins net-libs/ldns || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+net-analyzer/nagios-plugins net-libs/ldns || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 net-analyzer/nagios-plugins net-libs/ldns
 0
 mirror://gentoo/check_dnssec-0.1_p28.tar.bz2
diff --git a/metadata/cache/net-analyzer/nagios-check_fail2ban-3 b/metadata/cache/net-analyzer/nagios-check_fail2ban-3
index d18ae4dbc21c..cd1789aef369 100644
--- a/metadata/cache/net-analyzer/nagios-check_fail2ban-3
+++ b/metadata/cache/net-analyzer/nagios-check_fail2ban-3
@@ -1,4 +1,4 @@
->=net-analyzer/nagios-plugins-1.4.13-r1 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=net-analyzer/nagios-plugins-1.4.13-r1 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=net-analyzer/nagios-plugins-1.4.13-r1
 0
 http://nodeload.github.com/hollow/check_fail2ban/tarball/v3 -> nagios-check_fail2ban-3.tar.gz
diff --git a/metadata/cache/net-analyzer/nagios-check_mysql_health-2.1.5 b/metadata/cache/net-analyzer/nagios-check_mysql_health-2.1.5
index 2f7026a86792..dcb191d7b22d 100644
--- a/metadata/cache/net-analyzer/nagios-check_mysql_health-2.1.5
+++ b/metadata/cache/net-analyzer/nagios-check_mysql_health-2.1.5
@@ -1,4 +1,4 @@
->=net-analyzer/nagios-plugins-1.4.13-r1 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=net-analyzer/nagios-plugins-1.4.13-r1 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=net-analyzer/nagios-plugins-1.4.13-r1 virtual/mysql
 0
 http://labs.consol.de/wp-content/uploads/2010/12/check_mysql_health-2.1.5.tar.gz
diff --git a/metadata/cache/net-analyzer/nagios-check_mysql_health-2.1.7 b/metadata/cache/net-analyzer/nagios-check_mysql_health-2.1.7
index d16573340b29..de9025081456 100644
--- a/metadata/cache/net-analyzer/nagios-check_mysql_health-2.1.7
+++ b/metadata/cache/net-analyzer/nagios-check_mysql_health-2.1.7
@@ -1,4 +1,4 @@
->=net-analyzer/nagios-plugins-1.4.13-r1 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=net-analyzer/nagios-plugins-1.4.13-r1 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=net-analyzer/nagios-plugins-1.4.13-r1 virtual/mysql
 0
 http://labs.consol.de/wp-content/uploads/2011/08/check_mysql_health-2.1.7.tar.gz
diff --git a/metadata/cache/net-analyzer/nagios-plugins-1.4.14 b/metadata/cache/net-analyzer/nagios-plugins-1.4.14
index 7e7359ed753e..867b24ec8bee 100644
--- a/metadata/cache/net-analyzer/nagios-plugins-1.4.14
+++ b/metadata/cache/net-analyzer/nagios-plugins-1.4.14
@@ -1,4 +1,4 @@
-ldap? ( >=net-nds/openldap-2.0.25 ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-base ) ssl? ( >=dev-libs/openssl-0.9.6g ) radius? ( >=net-dialup/radiusclient-0.3.2 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+ldap? ( >=net-nds/openldap-2.0.25 ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-base ) ssl? ( >=dev-libs/openssl-0.9.6g ) radius? ( >=net-dialup/radiusclient-0.3.2 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 ldap? ( >=net-nds/openldap-2.0.25 ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-base ) ssl? ( >=dev-libs/openssl-0.9.6g ) radius? ( >=net-dialup/radiusclient-0.3.2 ) >=dev-lang/perl-5.6.1-r7 samba? ( >=net-fs/samba-2.2.5-r1 ) snmp? ( >=dev-perl/Net-SNMP-4.0.1-r1 >=net-analyzer/net-snmp-5.0.6 ) mysql? ( dev-perl/DBI dev-perl/DBD-mysql ) nagios-dns? ( >=net-dns/bind-tools-9.2.2_rc1 ) nagios-ntp? ( >=net-misc/ntp-4.1.1a ) nagios-ping? ( >=net-analyzer/fping-2.4_beta2-r1 ) nagios-ssh? ( >=net-misc/openssh-3.5_p1 ) ups? ( >=sys-power/nut-1.4 ) !sparc? ( nagios-game? ( >=games-util/qstat-2.6 ) )
 0
 mirror://sourceforge/nagiosplug/nagios-plugins-1.4.14.tar.gz
diff --git a/metadata/cache/net-analyzer/nagios-plugins-1.4.14-r2 b/metadata/cache/net-analyzer/nagios-plugins-1.4.14-r2
index 8d0fdba9ec44..7f49f8e1fa2c 100644
--- a/metadata/cache/net-analyzer/nagios-plugins-1.4.14-r2
+++ b/metadata/cache/net-analyzer/nagios-plugins-1.4.14-r2
@@ -1,4 +1,4 @@
-ldap? ( >=net-nds/openldap-2.0.25 ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-base ) ssl? ( >=dev-libs/openssl-0.9.6g ) radius? ( >=net-dialup/radiusclient-0.3.2 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+ldap? ( >=net-nds/openldap-2.0.25 ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-base ) ssl? ( >=dev-libs/openssl-0.9.6g ) radius? ( >=net-dialup/radiusclient-0.3.2 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 ldap? ( >=net-nds/openldap-2.0.25 ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-base ) ssl? ( >=dev-libs/openssl-0.9.6g ) radius? ( >=net-dialup/radiusclient-0.3.2 ) >=dev-lang/perl-5.6.1-r7 samba? ( >=net-fs/samba-2.2.5-r1 ) snmp? ( >=dev-perl/Net-SNMP-4.0.1-r1 >=net-analyzer/net-snmp-5.0.6 ) mysql? ( dev-perl/DBI dev-perl/DBD-mysql ) nagios-dns? ( >=net-dns/bind-tools-9.2.2_rc1 ) nagios-ntp? ( >=net-misc/ntp-4.1.1a ) nagios-ping? ( >=net-analyzer/fping-2.4_beta2-r1 ) nagios-ssh? ( >=net-misc/openssh-3.5_p1 ) ups? ( >=sys-power/nut-1.4 ) !sparc? ( nagios-game? ( >=games-util/qstat-2.6 ) ) jabber? ( >=dev-perl/Net-Jabber-2.0 )
 0
 mirror://sourceforge/nagiosplug/nagios-plugins-1.4.14.tar.gz
diff --git a/metadata/cache/net-analyzer/nagios-plugins-1.4.15 b/metadata/cache/net-analyzer/nagios-plugins-1.4.15
index 5f7313a6206f..151d8663476a 100644
--- a/metadata/cache/net-analyzer/nagios-plugins-1.4.15
+++ b/metadata/cache/net-analyzer/nagios-plugins-1.4.15
@@ -1,4 +1,4 @@
-ldap? ( >=net-nds/openldap-2.0.25 ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-base ) ssl? ( >=dev-libs/openssl-0.9.6g ) radius? ( >=net-dialup/radiusclient-0.3.2 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+ldap? ( >=net-nds/openldap-2.0.25 ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-base ) ssl? ( >=dev-libs/openssl-0.9.6g ) radius? ( >=net-dialup/radiusclient-0.3.2 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 ldap? ( >=net-nds/openldap-2.0.25 ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-base ) ssl? ( >=dev-libs/openssl-0.9.6g ) radius? ( >=net-dialup/radiusclient-0.3.2 ) >=dev-lang/perl-5.6.1-r7 samba? ( >=net-fs/samba-2.2.5-r1 ) snmp? ( >=dev-perl/Net-SNMP-4.0.1-r1 >=net-analyzer/net-snmp-5.0.6 ) mysql? ( dev-perl/DBI dev-perl/DBD-mysql ) nagios-dns? ( >=net-dns/bind-tools-9.2.2_rc1 ) nagios-ntp? ( >=net-misc/ntp-4.1.1a ) nagios-ping? ( >=net-analyzer/fping-2.4_beta2-r1 ) nagios-ssh? ( >=net-misc/openssh-3.5_p1 ) ups? ( >=sys-power/nut-1.4 ) !sparc? ( nagios-game? ( >=games-util/qstat-2.6 ) ) jabber? ( >=dev-perl/Net-Jabber-2.0 )
 0
 mirror://sourceforge/nagiosplug/nagios-plugins-1.4.15.tar.gz
diff --git a/metadata/cache/net-analyzer/nast-0.2.0-r1 b/metadata/cache/net-analyzer/nast-0.2.0-r1
index f34377213be3..f3ebc8f6d9f2 100644
--- a/metadata/cache/net-analyzer/nast-0.2.0-r1
+++ b/metadata/cache/net-analyzer/nast-0.2.0-r1
@@ -1,4 +1,4 @@
->=net-libs/libnet-1.1.1 net-libs/libpcap ncurses? ( >=sys-libs/ncurses-5.4 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=net-libs/libnet-1.1.1 net-libs/libpcap ncurses? ( >=sys-libs/ncurses-5.4 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=net-libs/libnet-1.1.1 net-libs/libpcap ncurses? ( >=sys-libs/ncurses-5.4 )
 0
 mirror://berlios/nast/nast-0.2.0.tar.gz
diff --git a/metadata/cache/net-analyzer/nb-0.8.3 b/metadata/cache/net-analyzer/nb-0.8.3
index 331de573020f..a676a3b8abdf 100644
--- a/metadata/cache/net-analyzer/nb-0.8.3
+++ b/metadata/cache/net-analyzer/nb-0.8.3
@@ -1,4 +1,4 @@
-dev-lang/perl dev-util/pkgconfig sys-apps/texinfo || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-lang/perl dev-util/pkgconfig sys-apps/texinfo || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 !sys-boot/netboot !www-apps/nanoblogger
 0
 mirror://sourceforge/nodebrain/nodebrain-0.8.3.tar.gz
diff --git a/metadata/cache/net-analyzer/nepenthes-0.2.2 b/metadata/cache/net-analyzer/nepenthes-0.2.2
index b48ebc93f4bd..4ff581551c38 100644
--- a/metadata/cache/net-analyzer/nepenthes-0.2.2
+++ b/metadata/cache/net-analyzer/nepenthes-0.2.2
@@ -1,4 +1,4 @@
-net-misc/curl sys-apps/file dev-libs/libpcre net-libs/adns || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+net-misc/curl sys-apps/file dev-libs/libpcre net-libs/adns || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 mirror://sourceforge/nepenthes/nepenthes-0.2.2.tar.bz2 mirror://gentoo/nepenthes-0.2.2-gcc44.patch.bz2
diff --git a/metadata/cache/net-analyzer/nessus-core-2.2.9-r1 b/metadata/cache/net-analyzer/nessus-core-2.2.9-r1
index e139548fa154..eef4d734202f 100644
--- a/metadata/cache/net-analyzer/nessus-core-2.2.9-r1
+++ b/metadata/cache/net-analyzer/nessus-core-2.2.9-r1
@@ -1,4 +1,4 @@
-~net-analyzer/nessus-libraries-2.2.9 ~net-analyzer/libnasl-2.2.9 tcpd? ( sys-apps/tcp-wrappers ) gtk? ( x11-libs/gtk+:2 ) prelude? ( dev-libs/libprelude ) !net-analyzer/nessus-client dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+~net-analyzer/nessus-libraries-2.2.9 ~net-analyzer/libnasl-2.2.9 tcpd? ( sys-apps/tcp-wrappers ) gtk? ( x11-libs/gtk+:2 ) prelude? ( dev-libs/libprelude ) !net-analyzer/nessus-client dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 ~net-analyzer/nessus-libraries-2.2.9 ~net-analyzer/libnasl-2.2.9 tcpd? ( sys-apps/tcp-wrappers ) gtk? ( x11-libs/gtk+:2 ) prelude? ( dev-libs/libprelude ) !net-analyzer/nessus-client
 0
 ftp://ftp.nessus.org/pub/nessus/nessus-2.2.9/src/nessus-core-2.2.9.tar.gz
diff --git a/metadata/cache/net-analyzer/net-snmp-5.4.2.1-r4 b/metadata/cache/net-analyzer/net-snmp-5.4.2.1-r4
index c23e4a12829a..89cfd767ed71 100644
--- a/metadata/cache/net-analyzer/net-snmp-5.4.2.1-r4
+++ b/metadata/cache/net-analyzer/net-snmp-5.4.2.1-r4
@@ -1,4 +1,4 @@
-ssl? ( >=dev-libs/openssl-0.9.6d ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) rpm? ( app-arch/rpm dev-libs/popt app-arch/bzip2 >=sys-libs/zlib-1.1.4 ) bzip2? ( app-arch/bzip2 ) zlib? ( >=sys-libs/zlib-1.1.4 ) elf? ( dev-libs/elfutils ) lm_sensors? ( kernel_linux? ( sys-apps/lm_sensors ) ) python? ( dev-python/setuptools ) >=sys-devel/autoconf-2.61-r2 >=sys-apps/sed-4 doc? ( app-doc/doxygen ) >=sys-apps/sed-4 dev-lang/perl[-build] python? ( =dev-lang/python-2* ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+ssl? ( >=dev-libs/openssl-0.9.6d ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) rpm? ( app-arch/rpm dev-libs/popt app-arch/bzip2 >=sys-libs/zlib-1.1.4 ) bzip2? ( app-arch/bzip2 ) zlib? ( >=sys-libs/zlib-1.1.4 ) elf? ( dev-libs/elfutils ) lm_sensors? ( kernel_linux? ( sys-apps/lm_sensors ) ) python? ( dev-python/setuptools ) >=sys-devel/autoconf-2.61-r2 >=sys-apps/sed-4 doc? ( app-doc/doxygen ) >=sys-apps/sed-4 dev-lang/perl[-build] python? ( =dev-lang/python-2* ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 ssl? ( >=dev-libs/openssl-0.9.6d ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) rpm? ( app-arch/rpm dev-libs/popt app-arch/bzip2 >=sys-libs/zlib-1.1.4 ) bzip2? ( app-arch/bzip2 ) zlib? ( >=sys-libs/zlib-1.1.4 ) elf? ( dev-libs/elfutils ) lm_sensors? ( kernel_linux? ( sys-apps/lm_sensors ) ) python? ( dev-python/setuptools ) perl? ( X? ( dev-perl/perl-tk ) !minimal? ( dev-perl/TermReadKey ) ) selinux? ( sec-policy/selinux-snmpd ) dev-lang/perl[-build] python? ( =dev-lang/python-2* )
 0
 mirror://sourceforge/net-snmp/net-snmp-5.4.2.1.tar.gz
diff --git a/metadata/cache/net-analyzer/net-snmp-5.4.3 b/metadata/cache/net-analyzer/net-snmp-5.4.3
index 2b9eab336943..c30c4775edcd 100644
--- a/metadata/cache/net-analyzer/net-snmp-5.4.3
+++ b/metadata/cache/net-analyzer/net-snmp-5.4.3
@@ -1,4 +1,4 @@
-ssl? ( >=dev-libs/openssl-0.9.6d ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) rpm? ( app-arch/rpm dev-libs/popt app-arch/bzip2 >=sys-libs/zlib-1.1.4 ) bzip2? ( app-arch/bzip2 ) zlib? ( >=sys-libs/zlib-1.1.4 ) elf? ( dev-libs/elfutils ) lm_sensors? ( kernel_linux? ( sys-apps/lm_sensors ) ) python? ( dev-python/setuptools ) >=sys-devel/autoconf-2.61-r2 >=sys-apps/sed-4 doc? ( app-doc/doxygen ) >=sys-apps/sed-4 dev-lang/perl[-build] python? ( =dev-lang/python-2* ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+ssl? ( >=dev-libs/openssl-0.9.6d ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) rpm? ( app-arch/rpm dev-libs/popt app-arch/bzip2 >=sys-libs/zlib-1.1.4 ) bzip2? ( app-arch/bzip2 ) zlib? ( >=sys-libs/zlib-1.1.4 ) elf? ( dev-libs/elfutils ) lm_sensors? ( kernel_linux? ( sys-apps/lm_sensors ) ) python? ( dev-python/setuptools ) >=sys-devel/autoconf-2.61-r2 >=sys-apps/sed-4 doc? ( app-doc/doxygen ) >=sys-apps/sed-4 dev-lang/perl[-build] python? ( =dev-lang/python-2* ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 ssl? ( >=dev-libs/openssl-0.9.6d ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) rpm? ( app-arch/rpm dev-libs/popt app-arch/bzip2 >=sys-libs/zlib-1.1.4 ) bzip2? ( app-arch/bzip2 ) zlib? ( >=sys-libs/zlib-1.1.4 ) elf? ( dev-libs/elfutils ) lm_sensors? ( kernel_linux? ( sys-apps/lm_sensors ) ) python? ( dev-python/setuptools ) perl? ( X? ( dev-perl/perl-tk ) !minimal? ( dev-perl/TermReadKey ) ) selinux? ( sec-policy/selinux-snmpd ) dev-lang/perl[-build] python? ( =dev-lang/python-2* )
 0
 mirror://sourceforge/net-snmp/net-snmp-5.4.3.tar.gz
diff --git a/metadata/cache/net-analyzer/netdiscover-0.3_beta6-r2 b/metadata/cache/net-analyzer/netdiscover-0.3_beta6-r2
index 29cbc6cb6be8..ff9d50eee1ec 100644
--- a/metadata/cache/net-analyzer/netdiscover-0.3_beta6-r2
+++ b/metadata/cache/net-analyzer/netdiscover-0.3_beta6-r2
@@ -1,4 +1,4 @@
->=net-libs/libnet-1.1.2.1-r1 >=net-libs/libpcap-0.8.3-r1 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=net-libs/libnet-1.1.2.1-r1 >=net-libs/libpcap-0.8.3-r1 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=net-libs/libnet-1.1.2.1-r1 >=net-libs/libpcap-0.8.3-r1
 0
 http://nixgeneration.com/~jaime/netdiscover/releases/netdiscover-0.3-beta6.tar.gz mirror://gentoo/netdiscover-0.3-beta6-oui-db-update-20091010.patch.bz2
diff --git a/metadata/cache/net-analyzer/netdiscover-0.3_beta6-r3 b/metadata/cache/net-analyzer/netdiscover-0.3_beta6-r3
index 29cbc6cb6be8..ff9d50eee1ec 100644
--- a/metadata/cache/net-analyzer/netdiscover-0.3_beta6-r3
+++ b/metadata/cache/net-analyzer/netdiscover-0.3_beta6-r3
@@ -1,4 +1,4 @@
->=net-libs/libnet-1.1.2.1-r1 >=net-libs/libpcap-0.8.3-r1 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=net-libs/libnet-1.1.2.1-r1 >=net-libs/libpcap-0.8.3-r1 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=net-libs/libnet-1.1.2.1-r1 >=net-libs/libpcap-0.8.3-r1
 0
 http://nixgeneration.com/~jaime/netdiscover/releases/netdiscover-0.3-beta6.tar.gz mirror://gentoo/netdiscover-0.3-beta6-oui-db-update-20091010.patch.bz2
diff --git a/metadata/cache/net-analyzer/nfdump-1.6.1-r2 b/metadata/cache/net-analyzer/nfdump-1.6.1-r2
index 4f9f11e6176a..83e5f42d9293 100644
--- a/metadata/cache/net-analyzer/nfdump-1.6.1-r2
+++ b/metadata/cache/net-analyzer/nfdump-1.6.1-r2
@@ -1,4 +1,4 @@
-ftconv? ( sys-libs/zlib net-analyzer/flow-tools ) nfprofile? ( net-analyzer/rrdtool ) sys-devel/flex || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+ftconv? ( sys-libs/zlib net-analyzer/flow-tools ) nfprofile? ( net-analyzer/rrdtool ) sys-devel/flex || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 ftconv? ( sys-libs/zlib net-analyzer/flow-tools ) nfprofile? ( net-analyzer/rrdtool ) dev-lang/perl
 0
 mirror://sourceforge/nfdump/nfdump-1.6.1.tar.gz
diff --git a/metadata/cache/net-analyzer/nfdump-1.6.5 b/metadata/cache/net-analyzer/nfdump-1.6.5
index 1d21b14ce863..2ff0f671ad3b 100644
--- a/metadata/cache/net-analyzer/nfdump-1.6.5
+++ b/metadata/cache/net-analyzer/nfdump-1.6.5
@@ -1,4 +1,4 @@
-ftconv? ( sys-libs/zlib net-analyzer/flow-tools ) nfprofile? ( net-analyzer/rrdtool ) sys-devel/flex || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+ftconv? ( sys-libs/zlib net-analyzer/flow-tools ) nfprofile? ( net-analyzer/rrdtool ) sys-devel/flex || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 ftconv? ( sys-libs/zlib net-analyzer/flow-tools ) nfprofile? ( net-analyzer/rrdtool ) dev-lang/perl
 0
 mirror://sourceforge/nfdump/nfdump-1.6.5.tar.gz
diff --git a/metadata/cache/net-analyzer/ngrep-1.45-r3 b/metadata/cache/net-analyzer/ngrep-1.45-r3
index 3628ec96e551..a2bab03247b8 100644
--- a/metadata/cache/net-analyzer/ngrep-1.45-r3
+++ b/metadata/cache/net-analyzer/ngrep-1.45-r3
@@ -1,4 +1,4 @@
-net-libs/libpcap pcre? ( dev-libs/libpcre ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+net-libs/libpcap pcre? ( dev-libs/libpcre ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 net-libs/libpcap pcre? ( dev-libs/libpcre )
 0
 mirror://sourceforge/ngrep/ngrep-1.45.tar.bz2
diff --git a/metadata/cache/net-analyzer/ntop-4.0.1 b/metadata/cache/net-analyzer/ntop-4.0.1
index dcdb2920da01..bcaa46c950b1 100644
--- a/metadata/cache/net-analyzer/ntop-4.0.1
+++ b/metadata/cache/net-analyzer/ntop-4.0.1
@@ -1,4 +1,4 @@
-sys-apps/gawk dev-lang/perl sys-libs/gdbm dev-libs/libevent net-libs/libpcap media-libs/gd media-libs/libpng net-analyzer/rrdtool ssl? ( dev-libs/openssl ) sys-libs/zlib >=dev-libs/geoip-1.4.5 >=dev-lang/lua-5.1.4 >=sys-devel/libtool-1.4 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+sys-apps/gawk dev-lang/perl sys-libs/gdbm dev-libs/libevent net-libs/libpcap media-libs/gd media-libs/libpng net-analyzer/rrdtool ssl? ( dev-libs/openssl ) sys-libs/zlib >=dev-libs/geoip-1.4.5 >=dev-lang/lua-5.1.4 >=sys-devel/libtool-1.4 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 sys-apps/gawk dev-lang/perl sys-libs/gdbm dev-libs/libevent net-libs/libpcap media-libs/gd media-libs/libpng net-analyzer/rrdtool ssl? ( dev-libs/openssl ) sys-libs/zlib >=dev-libs/geoip-1.4.5 >=dev-lang/lua-5.1.4 media-fonts/corefonts media-gfx/graphviz net-misc/wget app-arch/gzip
 0
 mirror://sourceforge/ntop/ntop-4.0.1.tar.gz
diff --git a/metadata/cache/net-analyzer/ntop-4.0.3 b/metadata/cache/net-analyzer/ntop-4.0.3
index 51fa382dd4ff..e6fb07b50c11 100644
--- a/metadata/cache/net-analyzer/ntop-4.0.3
+++ b/metadata/cache/net-analyzer/ntop-4.0.3
@@ -1,4 +1,4 @@
-sys-apps/gawk dev-lang/perl sys-libs/gdbm dev-libs/libevent net-libs/libpcap media-libs/gd media-libs/libpng net-analyzer/rrdtool ssl? ( dev-libs/openssl ) sys-libs/zlib >=dev-libs/geoip-1.4.5 >=dev-lang/lua-5.1.4 >=sys-devel/libtool-1.4 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+sys-apps/gawk dev-lang/perl sys-libs/gdbm dev-libs/libevent net-libs/libpcap media-libs/gd media-libs/libpng net-analyzer/rrdtool ssl? ( dev-libs/openssl ) sys-libs/zlib >=dev-libs/geoip-1.4.5 >=dev-lang/lua-5.1.4 >=sys-devel/libtool-1.4 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 sys-apps/gawk dev-lang/perl sys-libs/gdbm dev-libs/libevent net-libs/libpcap media-libs/gd media-libs/libpng net-analyzer/rrdtool ssl? ( dev-libs/openssl ) sys-libs/zlib >=dev-libs/geoip-1.4.5 >=dev-lang/lua-5.1.4 media-fonts/corefonts media-gfx/graphviz net-misc/wget app-arch/gzip
 0
 mirror://sourceforge/ntop/ntop-4.0.3.tgz
diff --git a/metadata/cache/net-analyzer/ntop-4.1.0 b/metadata/cache/net-analyzer/ntop-4.1.0
index f699f50386a9..f080ebb0cfbb 100644
--- a/metadata/cache/net-analyzer/ntop-4.1.0
+++ b/metadata/cache/net-analyzer/ntop-4.1.0
@@ -1,4 +1,4 @@
-sys-apps/gawk dev-lang/perl sys-libs/gdbm dev-libs/libevent net-libs/libpcap media-libs/gd media-libs/libpng net-analyzer/rrdtool ssl? ( dev-libs/openssl ) sys-libs/zlib dev-libs/geoip dev-lang/lua snmp? ( net-analyzer/net-snmp[ipv6] ) >=sys-devel/libtool-1.5.26 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+sys-apps/gawk dev-lang/perl sys-libs/gdbm dev-libs/libevent net-libs/libpcap media-libs/gd media-libs/libpng net-analyzer/rrdtool ssl? ( dev-libs/openssl ) sys-libs/zlib dev-libs/geoip dev-lang/lua snmp? ( net-analyzer/net-snmp[ipv6] ) >=sys-devel/libtool-1.5.26 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 sys-apps/gawk dev-lang/perl sys-libs/gdbm dev-libs/libevent net-libs/libpcap media-libs/gd media-libs/libpng net-analyzer/rrdtool ssl? ( dev-libs/openssl ) sys-libs/zlib dev-libs/geoip dev-lang/lua snmp? ( net-analyzer/net-snmp[ipv6] ) media-fonts/corefonts media-gfx/graphviz net-misc/wget app-arch/gzip !arm? ( dev-libs/gdome2 ) dev-libs/glib:2
 0
 mirror://sourceforge/ntop/ntop/Stable/ntop-4.1.0.tar.gz
diff --git a/metadata/cache/net-analyzer/postal-0.72 b/metadata/cache/net-analyzer/postal-0.72
index ab84a617cb7f..72c72f8cbfc4 100644
--- a/metadata/cache/net-analyzer/postal-0.72
+++ b/metadata/cache/net-analyzer/postal-0.72
@@ -1,4 +1,4 @@
-ssl? ( !gnutls? ( >=dev-libs/openssl-0.9.8g ) gnutls? ( >=net-libs/gnutls-2.2.2 ) ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+ssl? ( !gnutls? ( >=dev-libs/openssl-0.9.8g ) gnutls? ( >=net-libs/gnutls-2.2.2 ) ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 ssl? ( !gnutls? ( >=dev-libs/openssl-0.9.8g ) gnutls? ( >=net-libs/gnutls-2.2.2 ) )
 0
 http://www.coker.com.au/postal/postal-0.72.tgz
diff --git a/metadata/cache/net-analyzer/rain-1.2.9_beta1 b/metadata/cache/net-analyzer/rain-1.2.9_beta1
index b90bafa4d884..c21df182a4d3 100644
--- a/metadata/cache/net-analyzer/rain-1.2.9_beta1
+++ b/metadata/cache/net-analyzer/rain-1.2.9_beta1
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 mirror://ubuntu/pool/universe/r/rain/rain_1.2.9beta1.orig.tar.gz mirror://ubuntu/pool/universe/r/rain/rain_1.2.9beta1-1.diff.gz
diff --git a/metadata/cache/net-analyzer/rrdtool-1.4.5-r1 b/metadata/cache/net-analyzer/rrdtool-1.4.5-r1
index 35bc3e04ec0c..1bbfc1f941bb 100644
--- a/metadata/cache/net-analyzer/rrdtool-1.4.5-r1
+++ b/metadata/cache/net-analyzer/rrdtool-1.4.5-r1
@@ -1,4 +1,4 @@
->=media-libs/libpng-1.2.10 >=dev-libs/libxml2-2.6.31 >=x11-libs/cairo-1.4.6[svg] >=dev-libs/glib-2.12.12 >=x11-libs/pango-1.17 lua? ( dev-lang/lua ) perl? ( dev-lang/perl ) ruby? ( >=dev-lang/ruby-1.8.6_p287-r13 ) tcl? ( dev-lang/tcl ) dev-util/pkgconfig sys-apps/gawk python? ( =dev-lang/python-2* ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=media-libs/libpng-1.2.10 >=dev-libs/libxml2-2.6.31 >=x11-libs/cairo-1.4.6[svg] >=dev-libs/glib-2.12.12 >=x11-libs/pango-1.17 lua? ( dev-lang/lua ) perl? ( dev-lang/perl ) ruby? ( >=dev-lang/ruby-1.8.6_p287-r13 ) tcl? ( dev-lang/tcl ) dev-util/pkgconfig sys-apps/gawk python? ( =dev-lang/python-2* ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=media-libs/libpng-1.2.10 >=dev-libs/libxml2-2.6.31 >=x11-libs/cairo-1.4.6[svg] >=dev-libs/glib-2.12.12 >=x11-libs/pango-1.17 lua? ( dev-lang/lua ) perl? ( dev-lang/perl ) ruby? ( >=dev-lang/ruby-1.8.6_p287-r13 ) tcl? ( dev-lang/tcl ) python? ( =dev-lang/python-2* )
 0
 http://oss.oetiker.ch/rrdtool/pub/rrdtool-1.4.5.tar.gz
diff --git a/metadata/cache/net-analyzer/rrdtool-1.4.5-r2 b/metadata/cache/net-analyzer/rrdtool-1.4.5-r2
index cd93972237e6..b3728200e69e 100644
--- a/metadata/cache/net-analyzer/rrdtool-1.4.5-r2
+++ b/metadata/cache/net-analyzer/rrdtool-1.4.5-r2
@@ -1,4 +1,4 @@
->=media-libs/libpng-1.2.10 >=dev-libs/libxml2-2.6.31 >=x11-libs/cairo-1.4.6[svg] >=dev-libs/glib-2.12.12 >=x11-libs/pango-1.17 lua? ( dev-lang/lua ) perl? ( dev-lang/perl ) ruby? ( >=dev-lang/ruby-1.8.6_p287-r13 ) tcl? ( dev-lang/tcl ) dev-util/pkgconfig sys-apps/gawk python? ( =dev-lang/python-2* ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=media-libs/libpng-1.2.10 >=dev-libs/libxml2-2.6.31 >=x11-libs/cairo-1.4.6[svg] >=dev-libs/glib-2.12.12 >=x11-libs/pango-1.17 lua? ( dev-lang/lua ) perl? ( dev-lang/perl ) ruby? ( >=dev-lang/ruby-1.8.6_p287-r13 ) tcl? ( dev-lang/tcl ) dev-util/pkgconfig sys-apps/gawk python? ( =dev-lang/python-2* ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=media-libs/libpng-1.2.10 >=dev-libs/libxml2-2.6.31 >=x11-libs/cairo-1.4.6[svg] >=dev-libs/glib-2.12.12 >=x11-libs/pango-1.17 lua? ( dev-lang/lua ) perl? ( dev-lang/perl ) ruby? ( >=dev-lang/ruby-1.8.6_p287-r13 ) tcl? ( dev-lang/tcl ) python? ( =dev-lang/python-2* )
 0
 http://oss.oetiker.ch/rrdtool/pub/rrdtool-1.4.5.tar.gz
diff --git a/metadata/cache/net-analyzer/sflowtool-3.20 b/metadata/cache/net-analyzer/sflowtool-3.20
index b794c7f63f99..105da442b04e 100644
--- a/metadata/cache/net-analyzer/sflowtool-3.20
+++ b/metadata/cache/net-analyzer/sflowtool-3.20
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 http://www.inmon.com/bin/sflowtool-3.20.tar.gz
diff --git a/metadata/cache/net-analyzer/sflowtool-3.22 b/metadata/cache/net-analyzer/sflowtool-3.22
index 4d6a7d650d70..8a9be81dac9a 100644
--- a/metadata/cache/net-analyzer/sflowtool-3.22
+++ b/metadata/cache/net-analyzer/sflowtool-3.22
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 http://www.inmon.com/bin/sflowtool-3.22.tar.gz
diff --git a/metadata/cache/net-analyzer/sflowtool-3.23 b/metadata/cache/net-analyzer/sflowtool-3.23
index 9fbc1de8cc53..ddb6d912d964 100644
--- a/metadata/cache/net-analyzer/sflowtool-3.23
+++ b/metadata/cache/net-analyzer/sflowtool-3.23
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 http://www.inmon.com/bin/sflowtool-3.23.tar.gz
diff --git a/metadata/cache/net-analyzer/sflowtool-3.24 b/metadata/cache/net-analyzer/sflowtool-3.24
index 50d03540dcbc..313c82cd5cc7 100644
--- a/metadata/cache/net-analyzer/sflowtool-3.24
+++ b/metadata/cache/net-analyzer/sflowtool-3.24
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 http://www.inmon.com/bin/sflowtool-3.24.tar.gz
diff --git a/metadata/cache/net-analyzer/slurm-0.3.3-r1 b/metadata/cache/net-analyzer/slurm-0.3.3-r1
index a92da7745061..d10b2640b279 100644
--- a/metadata/cache/net-analyzer/slurm-0.3.3-r1
+++ b/metadata/cache/net-analyzer/slurm-0.3.3-r1
@@ -1,4 +1,4 @@
-sys-libs/ncurses || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+sys-libs/ncurses || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 http://www.wormulon.net/files/code/slurm/slurm-0.3.3.tar.gz
diff --git a/metadata/cache/net-analyzer/snort-2.9.0.5 b/metadata/cache/net-analyzer/snort-2.9.0.5
index 2aa48c096f0e..b6903f601edc 100644
--- a/metadata/cache/net-analyzer/snort-2.9.0.5
+++ b/metadata/cache/net-analyzer/snort-2.9.0.5
@@ -1,4 +1,4 @@
->=net-libs/libpcap-1.0.0 >=net-libs/daq-0.5 >=dev-libs/libpcre-6.0 dev-libs/libdnet postgres? ( dev-db/postgresql-base ) mysql? ( virtual/mysql ) odbc? ( dev-db/unixODBC ) prelude? ( >=dev-libs/libprelude-0.9.0 ) zlib? ( sys-libs/zlib ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=net-libs/libpcap-1.0.0 >=net-libs/daq-0.5 >=dev-libs/libpcre-6.0 dev-libs/libdnet postgres? ( dev-db/postgresql-base ) mysql? ( virtual/mysql ) odbc? ( dev-db/unixODBC ) prelude? ( >=dev-libs/libprelude-0.9.0 ) zlib? ( sys-libs/zlib ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=net-libs/libpcap-1.0.0 >=net-libs/daq-0.5 >=dev-libs/libpcre-6.0 dev-libs/libdnet postgres? ( dev-db/postgresql-base ) mysql? ( virtual/mysql ) odbc? ( dev-db/unixODBC ) prelude? ( >=dev-libs/libprelude-0.9.0 ) zlib? ( sys-libs/zlib ) selinux? ( sec-policy/selinux-snort )
 0
 http://www.snort.org/dl/snort-current/snort-2.9.0.5.tar.gz
diff --git a/metadata/cache/net-analyzer/snort-2.9.1 b/metadata/cache/net-analyzer/snort-2.9.1
index 29c7f63d6a49..78b71627d55b 100644
--- a/metadata/cache/net-analyzer/snort-2.9.1
+++ b/metadata/cache/net-analyzer/snort-2.9.1
@@ -1,4 +1,4 @@
->=net-libs/libpcap-1.0.0 >=net-libs/daq-0.6 >=dev-libs/libpcre-6.0 dev-libs/libdnet postgres? ( dev-db/postgresql-base ) mysql? ( virtual/mysql ) odbc? ( dev-db/unixODBC ) zlib? ( sys-libs/zlib ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=net-libs/libpcap-1.0.0 >=net-libs/daq-0.6 >=dev-libs/libpcre-6.0 dev-libs/libdnet postgres? ( dev-db/postgresql-base ) mysql? ( virtual/mysql ) odbc? ( dev-db/unixODBC ) zlib? ( sys-libs/zlib ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=net-libs/libpcap-1.0.0 >=net-libs/daq-0.6 >=dev-libs/libpcre-6.0 dev-libs/libdnet postgres? ( dev-db/postgresql-base ) mysql? ( virtual/mysql ) odbc? ( dev-db/unixODBC ) zlib? ( sys-libs/zlib ) selinux? ( sec-policy/selinux-snort )
 0
 http://www.snort.org/dl/snort-current/snort-2.9.1.tar.gz
diff --git a/metadata/cache/net-analyzer/snort-2.9.2.1 b/metadata/cache/net-analyzer/snort-2.9.2.1
index 57611b4e7265..1d7e75da41cb 100644
--- a/metadata/cache/net-analyzer/snort-2.9.2.1
+++ b/metadata/cache/net-analyzer/snort-2.9.2.1
@@ -1,4 +1,4 @@
->=net-libs/libpcap-1.0.0 >=net-libs/daq-0.6 >=dev-libs/libpcre-6.0 dev-libs/libdnet postgres? ( dev-db/postgresql-base ) mysql? ( virtual/mysql ) odbc? ( dev-db/unixODBC ) zlib? ( sys-libs/zlib ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=net-libs/libpcap-1.0.0 >=net-libs/daq-0.6 >=dev-libs/libpcre-6.0 dev-libs/libdnet postgres? ( dev-db/postgresql-base ) mysql? ( virtual/mysql ) odbc? ( dev-db/unixODBC ) zlib? ( sys-libs/zlib ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=net-libs/libpcap-1.0.0 >=net-libs/daq-0.6 >=dev-libs/libpcre-6.0 dev-libs/libdnet postgres? ( dev-db/postgresql-base ) mysql? ( virtual/mysql ) odbc? ( dev-db/unixODBC ) zlib? ( sys-libs/zlib ) selinux? ( sec-policy/selinux-snort )
 0
 http://www.snort.org/dl/snort-current/snort-2.9.2.1.tar.gz
diff --git a/metadata/cache/net-analyzer/ssldump-0.9-r1 b/metadata/cache/net-analyzer/ssldump-0.9-r1
index 0667fb151587..308f7a106cc5 100644
--- a/metadata/cache/net-analyzer/ssldump-0.9-r1
+++ b/metadata/cache/net-analyzer/ssldump-0.9-r1
@@ -1,4 +1,4 @@
-net-libs/libpcap ssl? ( >=dev-libs/openssl-1 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+net-libs/libpcap ssl? ( >=dev-libs/openssl-1 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 net-libs/libpcap ssl? ( >=dev-libs/openssl-1 )
 0
 http://www.rtfm.com/ssldump/ssldump-0.9b3.tar.gz
diff --git a/metadata/cache/net-analyzer/sslsniff-0.6 b/metadata/cache/net-analyzer/sslsniff-0.6
index 01b3169b3e9a..98d27dc75767 100644
--- a/metadata/cache/net-analyzer/sslsniff-0.6
+++ b/metadata/cache/net-analyzer/sslsniff-0.6
@@ -1,4 +1,4 @@
-dev-libs/boost dev-libs/log4cpp dev-libs/openssl || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-libs/boost dev-libs/log4cpp dev-libs/openssl || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-libs/boost dev-libs/log4cpp dev-libs/openssl
 0
 http://thoughtcrime.org/software/sslsniff/sslsniff-0.6.tar.gz
diff --git a/metadata/cache/net-analyzer/sslsniff-0.8 b/metadata/cache/net-analyzer/sslsniff-0.8
index 5fc47f4a6066..046d26f6a413 100644
--- a/metadata/cache/net-analyzer/sslsniff-0.8
+++ b/metadata/cache/net-analyzer/sslsniff-0.8
@@ -1,4 +1,4 @@
-dev-libs/boost dev-libs/log4cpp dev-libs/openssl || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-libs/boost dev-libs/log4cpp dev-libs/openssl || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-libs/boost dev-libs/log4cpp dev-libs/openssl
 0
 http://thoughtcrime.org/software/sslsniff/sslsniff-0.8.tar.gz
diff --git a/metadata/cache/net-analyzer/synscan-5.01 b/metadata/cache/net-analyzer/synscan-5.01
index 98e3a803f1cf..b793361d3b5b 100644
--- a/metadata/cache/net-analyzer/synscan-5.01
+++ b/metadata/cache/net-analyzer/synscan-5.01
@@ -1,4 +1,4 @@
-net-libs/libpcap || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+net-libs/libpcap || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 net-libs/libpcap
 0
 http://www.digit-labs.org/files/tools/synscan/releases/synscan-5.01.tar.gz
diff --git a/metadata/cache/net-analyzer/tcptrack-1.4.2 b/metadata/cache/net-analyzer/tcptrack-1.4.2
index 700fc84ef5a6..d191c07db07c 100644
--- a/metadata/cache/net-analyzer/tcptrack-1.4.2
+++ b/metadata/cache/net-analyzer/tcptrack-1.4.2
@@ -1,4 +1,4 @@
-net-libs/libpcap sys-libs/ncurses || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+net-libs/libpcap sys-libs/ncurses || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 net-libs/libpcap sys-libs/ncurses
 0
 http://www.rhythm.cx/~steve/devel/tcptrack/release/1.4.2/source/tcptrack-1.4.2.tar.gz
diff --git a/metadata/cache/net-analyzer/thc-ipv6-1.8 b/metadata/cache/net-analyzer/thc-ipv6-1.8
new file mode 100644
index 000000000000..fb4224308fc5
--- /dev/null
+++ b/metadata/cache/net-analyzer/thc-ipv6-1.8
@@ -0,0 +1,22 @@
+net-libs/libpcap dev-libs/openssl
+net-libs/libpcap dev-libs/openssl
+0
+http://freeworld.thc.org/releases/thc-ipv6-1.8.tar.gz
+
+http://freeworld.thc.org/thc-ipv6/
+GPL-3
+complete tool set to attack the inherent protocol weaknesses of IPV6 and ICMP6
+~amd64 ~x86
+eutils multilib toolchain-funcs user
+
+
+
+
+4
+
+install prepare
+
+
+
+
+
diff --git a/metadata/cache/net-analyzer/thrulay-0.9 b/metadata/cache/net-analyzer/thrulay-0.9
index 6a86765e1399..02ee5e680935 100644
--- a/metadata/cache/net-analyzer/thrulay-0.9
+++ b/metadata/cache/net-analyzer/thrulay-0.9
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 http://www.internet2.edu/~shalunov/thrulay/thrulay-0.9.tar.gz mirror://sourceforge/thrulay/thrulay-0.9.tar.gz
diff --git a/metadata/cache/net-analyzer/upnpscan-0.4-r2 b/metadata/cache/net-analyzer/upnpscan-0.4-r2
index 25955431083d..5d9bf4ea8dc1 100644
--- a/metadata/cache/net-analyzer/upnpscan-0.4-r2
+++ b/metadata/cache/net-analyzer/upnpscan-0.4-r2
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 http://www.cqure.net/tools/upnpscan-v0.4-src.tgz
diff --git a/metadata/cache/net-analyzer/wireshark-1.4.9 b/metadata/cache/net-analyzer/wireshark-1.4.9
index bba140bb2eb8..da93f3674754 100644
--- a/metadata/cache/net-analyzer/wireshark-1.4.9
+++ b/metadata/cache/net-analyzer/wireshark-1.4.9
@@ -1,4 +1,4 @@
->=dev-libs/glib-2.14:2 zlib? ( sys-libs/zlib !=sys-libs/zlib-1.2.4 ) smi? ( net-libs/libsmi ) gtk? ( >=x11-libs/gtk+-2.4.0:2 x11-libs/pango dev-libs/atk x11-misc/xdg-utils ) ssl? ( net-libs/gnutls ) gcrypt? ( dev-libs/libgcrypt ) pcap? ( net-libs/libpcap ) caps? ( sys-libs/libcap ) kerberos? ( virtual/krb5 ) portaudio? ( media-libs/portaudio ) ares? ( >=net-dns/c-ares-1.5 ) !ares? ( adns? ( net-libs/adns ) ) geoip? ( dev-libs/geoip ) lua? ( >=dev-lang/lua-5.1 ) selinux? ( sec-policy/selinux-wireshark ) doc? ( dev-libs/libxslt app-text/docbook-xml-dtd:4.2 dev-libs/libxml2 app-doc/doxygen doc-pdf? ( dev-java/fop ) ) >=dev-util/pkgconfig-0.15.0 dev-lang/perl sys-devel/bison sys-apps/sed sys-devel/flex python? ( =dev-lang/python-2* ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-libs/glib-2.14:2 zlib? ( sys-libs/zlib !=sys-libs/zlib-1.2.4 ) smi? ( net-libs/libsmi ) gtk? ( >=x11-libs/gtk+-2.4.0:2 x11-libs/pango dev-libs/atk x11-misc/xdg-utils ) ssl? ( net-libs/gnutls ) gcrypt? ( dev-libs/libgcrypt ) pcap? ( net-libs/libpcap ) caps? ( sys-libs/libcap ) kerberos? ( virtual/krb5 ) portaudio? ( media-libs/portaudio ) ares? ( >=net-dns/c-ares-1.5 ) !ares? ( adns? ( net-libs/adns ) ) geoip? ( dev-libs/geoip ) lua? ( >=dev-lang/lua-5.1 ) selinux? ( sec-policy/selinux-wireshark ) doc? ( dev-libs/libxslt app-text/docbook-xml-dtd:4.2 dev-libs/libxml2 app-doc/doxygen doc-pdf? ( dev-java/fop ) ) >=dev-util/pkgconfig-0.15.0 dev-lang/perl sys-devel/bison sys-apps/sed sys-devel/flex python? ( =dev-lang/python-2* ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=dev-libs/glib-2.14:2 zlib? ( sys-libs/zlib !=sys-libs/zlib-1.2.4 ) smi? ( net-libs/libsmi ) gtk? ( >=x11-libs/gtk+-2.4.0:2 x11-libs/pango dev-libs/atk x11-misc/xdg-utils ) ssl? ( net-libs/gnutls ) gcrypt? ( dev-libs/libgcrypt ) pcap? ( net-libs/libpcap ) caps? ( sys-libs/libcap ) kerberos? ( virtual/krb5 ) portaudio? ( media-libs/portaudio ) ares? ( >=net-dns/c-ares-1.5 ) !ares? ( adns? ( net-libs/adns ) ) geoip? ( dev-libs/geoip ) lua? ( >=dev-lang/lua-5.1 ) selinux? ( sec-policy/selinux-wireshark ) python? ( =dev-lang/python-2* )
 0
 http://www.wireshark.org/download/src/all-versions/wireshark-1.4.9.tar.bz2
diff --git a/metadata/cache/net-analyzer/zabbix-1.8.10-r1 b/metadata/cache/net-analyzer/zabbix-1.8.10-r1
index 1b6d1b639159..23a02f45ad4f 100644
--- a/metadata/cache/net-analyzer/zabbix-1.8.10-r1
+++ b/metadata/cache/net-analyzer/zabbix-1.8.10-r1
@@ -1,4 +1,4 @@
-snmp? ( net-analyzer/net-snmp ) ldap? ( net-nds/openldap =dev-libs/cyrus-sasl-2* net-libs/gnutls ) mysql? ( virtual/mysql ) sqlite3? ( =dev-db/sqlite-3* ) postgres? ( dev-db/postgresql-base ) oracle? ( dev-db/oracle-instantclient-basic ) jabber? ( dev-libs/iksemel ) curl? ( net-misc/curl ) openipmi? ( sys-libs/openipmi ) ssh? ( net-libs/libssh2 ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+snmp? ( net-analyzer/net-snmp ) ldap? ( net-nds/openldap =dev-libs/cyrus-sasl-2* net-libs/gnutls ) mysql? ( virtual/mysql ) sqlite3? ( =dev-db/sqlite-3* ) postgres? ( dev-db/postgresql-base ) oracle? ( dev-db/oracle-instantclient-basic ) jabber? ( dev-libs/iksemel ) curl? ( net-misc/curl ) openipmi? ( sys-libs/openipmi ) ssh? ( net-libs/libssh2 ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 snmp? ( net-analyzer/net-snmp ) ldap? ( net-nds/openldap =dev-libs/cyrus-sasl-2* net-libs/gnutls ) mysql? ( virtual/mysql ) sqlite3? ( =dev-db/sqlite-3* ) postgres? ( dev-db/postgresql-base ) oracle? ( dev-db/oracle-instantclient-basic ) jabber? ( dev-libs/iksemel ) curl? ( net-misc/curl ) openipmi? ( sys-libs/openipmi ) ssh? ( net-libs/libssh2 ) proxy? ( net-analyzer/fping ) server? ( net-analyzer/fping app-admin/webapp-config ) frontend? ( dev-lang/php[bcmath,ctype,sockets,gd,truetype,xml,session] media-libs/gd[png] app-admin/webapp-config )
 0
 http://prdownloads.sourceforge.net/zabbix/zabbix-1.8.10.tar.gz
diff --git a/metadata/cache/net-analyzer/zabbix-1.8.10-r2 b/metadata/cache/net-analyzer/zabbix-1.8.10-r2
index 0a6629c5863c..1e229b22075a 100644
--- a/metadata/cache/net-analyzer/zabbix-1.8.10-r2
+++ b/metadata/cache/net-analyzer/zabbix-1.8.10-r2
@@ -1,4 +1,4 @@
-snmp? ( net-analyzer/net-snmp ) ldap? ( net-nds/openldap =dev-libs/cyrus-sasl-2* net-libs/gnutls ) mysql? ( virtual/mysql ) sqlite? ( =dev-db/sqlite-3* ) postgres? ( dev-db/postgresql-base ) oracle? ( dev-db/oracle-instantclient-basic ) jabber? ( dev-libs/iksemel ) curl? ( net-misc/curl ) openipmi? ( sys-libs/openipmi ) ssh? ( net-libs/libssh2 ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+snmp? ( net-analyzer/net-snmp ) ldap? ( net-nds/openldap =dev-libs/cyrus-sasl-2* net-libs/gnutls ) mysql? ( virtual/mysql ) sqlite? ( =dev-db/sqlite-3* ) postgres? ( dev-db/postgresql-base ) oracle? ( dev-db/oracle-instantclient-basic ) jabber? ( dev-libs/iksemel ) curl? ( net-misc/curl ) openipmi? ( sys-libs/openipmi ) ssh? ( net-libs/libssh2 ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 snmp? ( net-analyzer/net-snmp ) ldap? ( net-nds/openldap =dev-libs/cyrus-sasl-2* net-libs/gnutls ) mysql? ( virtual/mysql ) sqlite? ( =dev-db/sqlite-3* ) postgres? ( dev-db/postgresql-base ) oracle? ( dev-db/oracle-instantclient-basic ) jabber? ( dev-libs/iksemel ) curl? ( net-misc/curl ) openipmi? ( sys-libs/openipmi ) ssh? ( net-libs/libssh2 ) proxy? ( net-analyzer/fping ) server? ( net-analyzer/fping app-admin/webapp-config ) frontend? ( dev-lang/php[bcmath,ctype,sockets,gd,truetype,xml,session] media-libs/gd[png] app-admin/webapp-config )
 0
 http://prdownloads.sourceforge.net/zabbix/zabbix-1.8.10.tar.gz
diff --git a/metadata/cache/net-analyzer/zabbix-1.8.11 b/metadata/cache/net-analyzer/zabbix-1.8.11
index e93282a186f7..b2b43aaa6cba 100644
--- a/metadata/cache/net-analyzer/zabbix-1.8.11
+++ b/metadata/cache/net-analyzer/zabbix-1.8.11
@@ -1,4 +1,4 @@
-snmp? ( net-analyzer/net-snmp ) ldap? ( net-nds/openldap =dev-libs/cyrus-sasl-2* net-libs/gnutls ) mysql? ( virtual/mysql ) sqlite? ( =dev-db/sqlite-3* ) postgres? ( dev-db/postgresql-base ) oracle? ( dev-db/oracle-instantclient-basic ) jabber? ( dev-libs/iksemel ) curl? ( net-misc/curl ) openipmi? ( sys-libs/openipmi ) ssh? ( net-libs/libssh2 ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+snmp? ( net-analyzer/net-snmp ) ldap? ( net-nds/openldap =dev-libs/cyrus-sasl-2* net-libs/gnutls ) mysql? ( virtual/mysql ) sqlite? ( =dev-db/sqlite-3* ) postgres? ( dev-db/postgresql-base ) oracle? ( dev-db/oracle-instantclient-basic ) jabber? ( dev-libs/iksemel ) curl? ( net-misc/curl ) openipmi? ( sys-libs/openipmi ) ssh? ( net-libs/libssh2 ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 snmp? ( net-analyzer/net-snmp ) ldap? ( net-nds/openldap =dev-libs/cyrus-sasl-2* net-libs/gnutls ) mysql? ( virtual/mysql ) sqlite? ( =dev-db/sqlite-3* ) postgres? ( dev-db/postgresql-base ) oracle? ( dev-db/oracle-instantclient-basic ) jabber? ( dev-libs/iksemel ) curl? ( net-misc/curl ) openipmi? ( sys-libs/openipmi ) ssh? ( net-libs/libssh2 ) proxy? ( net-analyzer/fping ) server? ( net-analyzer/fping app-admin/webapp-config ) frontend? ( dev-lang/php[bcmath,ctype,sockets,gd,truetype,xml,session] media-libs/gd[png] app-admin/webapp-config )
 0
 http://prdownloads.sourceforge.net/zabbix/zabbix-1.8.11.tar.gz
diff --git a/metadata/cache/net-dialup/freeradius-2.1.10 b/metadata/cache/net-dialup/freeradius-2.1.10
index 0ef5c01c686b..43f2a14bb2dd 100644
--- a/metadata/cache/net-dialup/freeradius-2.1.10
+++ b/metadata/cache/net-dialup/freeradius-2.1.10
@@ -1,4 +1,4 @@
-!net-dialup/cistronradius !net-dialup/gnuradius >=sys-libs/db-3.2 sys-libs/gdbm sys-libs/readline net-libs/libpcap dev-lang/perl snmp? ( net-analyzer/net-snmp ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-server ) !bindist? ( firebird? ( dev-db/firebird ) ) pam? ( sys-libs/pam ) ssl? ( dev-libs/openssl ) ldap? ( net-nds/openldap ) kerberos? ( virtual/krb5 ) frxp? ( dev-lang/python ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+!net-dialup/cistronradius !net-dialup/gnuradius >=sys-libs/db-3.2 sys-libs/gdbm sys-libs/readline net-libs/libpcap dev-lang/perl snmp? ( net-analyzer/net-snmp ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-server ) !bindist? ( firebird? ( dev-db/firebird ) ) pam? ( sys-libs/pam ) ssl? ( dev-libs/openssl ) ldap? ( net-nds/openldap ) kerberos? ( virtual/krb5 ) frxp? ( dev-lang/python ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 !net-dialup/cistronradius !net-dialup/gnuradius >=sys-libs/db-3.2 sys-libs/gdbm sys-libs/readline net-libs/libpcap dev-lang/perl snmp? ( net-analyzer/net-snmp ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-server ) !bindist? ( firebird? ( dev-db/firebird ) ) pam? ( sys-libs/pam ) ssl? ( dev-libs/openssl ) ldap? ( net-nds/openldap ) kerberos? ( virtual/krb5 ) frxp? ( dev-lang/python )
 0
 ftp://ftp.freeradius.org/pub/radius/freeradius-server-2.1.10.tar.gz
diff --git a/metadata/cache/net-dialup/freeradius-2.1.11 b/metadata/cache/net-dialup/freeradius-2.1.11
index 99767567b234..fa8575ab4172 100644
--- a/metadata/cache/net-dialup/freeradius-2.1.11
+++ b/metadata/cache/net-dialup/freeradius-2.1.11
@@ -1,4 +1,4 @@
-!net-dialup/cistronradius !net-dialup/gnuradius >=sys-libs/db-3.2 sys-libs/gdbm sys-libs/readline net-libs/libpcap dev-lang/perl snmp? ( net-analyzer/net-snmp ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-server ) !bindist? ( firebird? ( dev-db/firebird ) ) pam? ( sys-libs/pam ) ssl? ( dev-libs/openssl ) ldap? ( net-nds/openldap ) kerberos? ( virtual/krb5 ) frxp? ( dev-lang/python ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+!net-dialup/cistronradius !net-dialup/gnuradius >=sys-libs/db-3.2 sys-libs/gdbm sys-libs/readline net-libs/libpcap dev-lang/perl snmp? ( net-analyzer/net-snmp ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-server ) !bindist? ( firebird? ( dev-db/firebird ) ) pam? ( sys-libs/pam ) ssl? ( dev-libs/openssl ) ldap? ( net-nds/openldap ) kerberos? ( virtual/krb5 ) frxp? ( dev-lang/python ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 !net-dialup/cistronradius !net-dialup/gnuradius >=sys-libs/db-3.2 sys-libs/gdbm sys-libs/readline net-libs/libpcap dev-lang/perl snmp? ( net-analyzer/net-snmp ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-server ) !bindist? ( firebird? ( dev-db/firebird ) ) pam? ( sys-libs/pam ) ssl? ( dev-libs/openssl ) ldap? ( net-nds/openldap ) kerberos? ( virtual/krb5 ) frxp? ( dev-lang/python )
 0
 ftp://ftp.freeradius.org/pub/radius/freeradius-server-2.1.11.tar.gz
diff --git a/metadata/cache/net-dialup/freeradius-2.1.12 b/metadata/cache/net-dialup/freeradius-2.1.12
index 2b4b601ae2d2..af4a6b79aef7 100644
--- a/metadata/cache/net-dialup/freeradius-2.1.12
+++ b/metadata/cache/net-dialup/freeradius-2.1.12
@@ -1,4 +1,4 @@
-!net-dialup/cistronradius !net-dialup/gnuradius >=sys-libs/db-3.2 sys-libs/gdbm sys-libs/readline net-libs/libpcap dev-lang/perl snmp? ( net-analyzer/net-snmp ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-server ) !bindist? ( firebird? ( dev-db/firebird ) ) pam? ( sys-libs/pam ) ssl? ( dev-libs/openssl ) ldap? ( net-nds/openldap ) kerberos? ( virtual/krb5 ) frxp? ( dev-lang/python ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+!net-dialup/cistronradius !net-dialup/gnuradius >=sys-libs/db-3.2 sys-libs/gdbm sys-libs/readline net-libs/libpcap dev-lang/perl snmp? ( net-analyzer/net-snmp ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-server ) !bindist? ( firebird? ( dev-db/firebird ) ) pam? ( sys-libs/pam ) ssl? ( dev-libs/openssl ) ldap? ( net-nds/openldap ) kerberos? ( virtual/krb5 ) frxp? ( dev-lang/python ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 !net-dialup/cistronradius !net-dialup/gnuradius >=sys-libs/db-3.2 sys-libs/gdbm sys-libs/readline net-libs/libpcap dev-lang/perl snmp? ( net-analyzer/net-snmp ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-server ) !bindist? ( firebird? ( dev-db/firebird ) ) pam? ( sys-libs/pam ) ssl? ( dev-libs/openssl ) ldap? ( net-nds/openldap ) kerberos? ( virtual/krb5 ) frxp? ( dev-lang/python )
 0
 ftp://ftp.freeradius.org/pub/radius/freeradius-server-2.1.12.tar.gz
diff --git a/metadata/cache/net-dialup/freeradius-2.1.3-r1 b/metadata/cache/net-dialup/freeradius-2.1.3-r1
index 0b7ddae45d2c..6207b45e8f42 100644
--- a/metadata/cache/net-dialup/freeradius-2.1.3-r1
+++ b/metadata/cache/net-dialup/freeradius-2.1.3-r1
@@ -1,4 +1,4 @@
-!net-dialup/cistronradius !net-dialup/gnuradius >=sys-libs/db-3.2 sys-libs/gdbm sys-libs/readline net-libs/libpcap dev-lang/perl snmp? ( net-analyzer/net-snmp ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-server ) !bindist? ( firebird? ( dev-db/firebird ) ) pam? ( sys-libs/pam ) ssl? ( dev-libs/openssl ) ldap? ( net-nds/openldap ) kerberos? ( virtual/krb5 ) frxp? ( dev-lang/python ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+!net-dialup/cistronradius !net-dialup/gnuradius >=sys-libs/db-3.2 sys-libs/gdbm sys-libs/readline net-libs/libpcap dev-lang/perl snmp? ( net-analyzer/net-snmp ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-server ) !bindist? ( firebird? ( dev-db/firebird ) ) pam? ( sys-libs/pam ) ssl? ( dev-libs/openssl ) ldap? ( net-nds/openldap ) kerberos? ( virtual/krb5 ) frxp? ( dev-lang/python ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 !net-dialup/cistronradius !net-dialup/gnuradius >=sys-libs/db-3.2 sys-libs/gdbm sys-libs/readline net-libs/libpcap dev-lang/perl snmp? ( net-analyzer/net-snmp ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-server ) !bindist? ( firebird? ( dev-db/firebird ) ) pam? ( sys-libs/pam ) ssl? ( dev-libs/openssl ) ldap? ( net-nds/openldap ) kerberos? ( virtual/krb5 ) frxp? ( dev-lang/python )
 0
 ftp://ftp.freeradius.org/pub/radius/freeradius-server-2.1.3.tar.gz
diff --git a/metadata/cache/net-dialup/freeradius-2.1.6 b/metadata/cache/net-dialup/freeradius-2.1.6
index a6d706906a02..ae2435f5107e 100644
--- a/metadata/cache/net-dialup/freeradius-2.1.6
+++ b/metadata/cache/net-dialup/freeradius-2.1.6
@@ -1,4 +1,4 @@
-!net-dialup/cistronradius !net-dialup/gnuradius >=sys-libs/db-3.2 sys-libs/gdbm sys-libs/readline net-libs/libpcap dev-lang/perl snmp? ( net-analyzer/net-snmp ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-server ) !bindist? ( firebird? ( dev-db/firebird ) ) pam? ( sys-libs/pam ) ssl? ( dev-libs/openssl ) ldap? ( net-nds/openldap ) kerberos? ( virtual/krb5 ) frxp? ( dev-lang/python ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+!net-dialup/cistronradius !net-dialup/gnuradius >=sys-libs/db-3.2 sys-libs/gdbm sys-libs/readline net-libs/libpcap dev-lang/perl snmp? ( net-analyzer/net-snmp ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-server ) !bindist? ( firebird? ( dev-db/firebird ) ) pam? ( sys-libs/pam ) ssl? ( dev-libs/openssl ) ldap? ( net-nds/openldap ) kerberos? ( virtual/krb5 ) frxp? ( dev-lang/python ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 !net-dialup/cistronradius !net-dialup/gnuradius >=sys-libs/db-3.2 sys-libs/gdbm sys-libs/readline net-libs/libpcap dev-lang/perl snmp? ( net-analyzer/net-snmp ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-server ) !bindist? ( firebird? ( dev-db/firebird ) ) pam? ( sys-libs/pam ) ssl? ( dev-libs/openssl ) ldap? ( net-nds/openldap ) kerberos? ( virtual/krb5 ) frxp? ( dev-lang/python )
 0
 ftp://ftp.freeradius.org/pub/radius/freeradius-server-2.1.6.tar.gz
diff --git a/metadata/cache/net-dialup/freeradius-2.1.7 b/metadata/cache/net-dialup/freeradius-2.1.7
index 02a7f2ca54f3..54ed0a5bdc2a 100644
--- a/metadata/cache/net-dialup/freeradius-2.1.7
+++ b/metadata/cache/net-dialup/freeradius-2.1.7
@@ -1,4 +1,4 @@
-!net-dialup/cistronradius !net-dialup/gnuradius >=sys-libs/db-3.2 sys-libs/gdbm sys-libs/readline net-libs/libpcap dev-lang/perl snmp? ( net-analyzer/net-snmp ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-server ) !bindist? ( firebird? ( dev-db/firebird ) ) pam? ( sys-libs/pam ) ssl? ( dev-libs/openssl ) ldap? ( net-nds/openldap ) kerberos? ( virtual/krb5 ) frxp? ( dev-lang/python ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+!net-dialup/cistronradius !net-dialup/gnuradius >=sys-libs/db-3.2 sys-libs/gdbm sys-libs/readline net-libs/libpcap dev-lang/perl snmp? ( net-analyzer/net-snmp ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-server ) !bindist? ( firebird? ( dev-db/firebird ) ) pam? ( sys-libs/pam ) ssl? ( dev-libs/openssl ) ldap? ( net-nds/openldap ) kerberos? ( virtual/krb5 ) frxp? ( dev-lang/python ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 !net-dialup/cistronradius !net-dialup/gnuradius >=sys-libs/db-3.2 sys-libs/gdbm sys-libs/readline net-libs/libpcap dev-lang/perl snmp? ( net-analyzer/net-snmp ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-server ) !bindist? ( firebird? ( dev-db/firebird ) ) pam? ( sys-libs/pam ) ssl? ( dev-libs/openssl ) ldap? ( net-nds/openldap ) kerberos? ( virtual/krb5 ) frxp? ( dev-lang/python )
 0
 ftp://ftp.freeradius.org/pub/radius/freeradius-server-2.1.7.tar.gz
diff --git a/metadata/cache/net-dialup/lrzsz-0.12.20-r3 b/metadata/cache/net-dialup/lrzsz-0.12.20-r3
index 41563a2ec45a..7eaf29a3f848 100644
--- a/metadata/cache/net-dialup/lrzsz-0.12.20-r3
+++ b/metadata/cache/net-dialup/lrzsz-0.12.20-r3
@@ -1,4 +1,4 @@
-nls? ( virtual/libintl ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+nls? ( virtual/libintl ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 nls? ( virtual/libintl )
 0
 http://www.ohse.de/uwe/releases/lrzsz-0.12.20.tar.gz
diff --git a/metadata/cache/net-dialup/mwavem-2.0-r1 b/metadata/cache/net-dialup/mwavem-2.0-r1
index 289ff4397859..3f4c8650ca82 100644
--- a/metadata/cache/net-dialup/mwavem-2.0-r1
+++ b/metadata/cache/net-dialup/mwavem-2.0-r1
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 ftp://www-126.ibm.com/pub/acpmodem/2.0/mwavem-2.0.tar.gz
diff --git a/metadata/cache/net-dialup/pptpd-1.3.4-r1 b/metadata/cache/net-dialup/pptpd-1.3.4-r1
index c9ad95663404..bc67f85a87e2 100644
--- a/metadata/cache/net-dialup/pptpd-1.3.4-r1
+++ b/metadata/cache/net-dialup/pptpd-1.3.4-r1
@@ -1,4 +1,4 @@
-net-dialup/ppp tcpd? ( sys-apps/tcp-wrappers ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+net-dialup/ppp tcpd? ( sys-apps/tcp-wrappers ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 net-dialup/ppp tcpd? ( sys-apps/tcp-wrappers )
 0
 mirror://sourceforge/poptop/pptpd-1.3.4.tar.gz
diff --git a/metadata/cache/net-dns/avahi-0.6.30-r1 b/metadata/cache/net-dns/avahi-0.6.30-r1
index 0bc543397a8a..e7844d203cc0 100644
--- a/metadata/cache/net-dns/avahi-0.6.30-r1
+++ b/metadata/cache/net-dns/avahi-0.6.30-r1
@@ -1,4 +1,4 @@
->=dev-libs/libdaemon-0.14 dev-libs/expat dev-libs/glib:2 gdbm? ( sys-libs/gdbm ) qt4? ( x11-libs/qt-core:4 ) gtk? ( >=x11-libs/gtk+-2.14.0:2 ) gtk3? ( x11-libs/gtk+:3 ) dbus? ( >=sys-apps/dbus-0.30 python? ( dev-python/dbus-python ) ) mono? ( >=dev-lang/mono-1.1.10 gtk? ( >=dev-dotnet/gtk-sharp-2 ) ) howl-compat? ( >=sys-apps/dbus-0.30 ) introspection? ( >=dev-libs/gobject-introspection-0.9.5 ) mdnsresponder-compat? ( >=sys-apps/dbus-0.30 ) python? ( gtk? ( >=dev-python/pygtk-2 ) ) bookmarks? ( dev-python/twisted dev-python/twisted-web ) kernel_linux? ( sys-libs/libcap ) >=dev-util/intltool-0.40.5 >=dev-util/pkgconfig-0.9.0 doc? ( app-doc/doxygen mono? ( >=virtual/monodoc-1.1.8 ) ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( =dev-lang/python-2* ) python? ( =dev-lang/python-2*[gdbm] )
+>=dev-libs/libdaemon-0.14 dev-libs/expat dev-libs/glib:2 gdbm? ( sys-libs/gdbm ) qt4? ( x11-libs/qt-core:4 ) gtk? ( >=x11-libs/gtk+-2.14.0:2 ) gtk3? ( x11-libs/gtk+:3 ) dbus? ( >=sys-apps/dbus-0.30 python? ( dev-python/dbus-python ) ) mono? ( >=dev-lang/mono-1.1.10 gtk? ( >=dev-dotnet/gtk-sharp-2 ) ) howl-compat? ( >=sys-apps/dbus-0.30 ) introspection? ( >=dev-libs/gobject-introspection-0.9.5 ) mdnsresponder-compat? ( >=sys-apps/dbus-0.30 ) python? ( gtk? ( >=dev-python/pygtk-2 ) ) bookmarks? ( dev-python/twisted dev-python/twisted-web ) kernel_linux? ( sys-libs/libcap ) >=dev-util/intltool-0.40.5 >=dev-util/pkgconfig-0.9.0 doc? ( app-doc/doxygen mono? ( >=virtual/monodoc-1.1.8 ) ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( =dev-lang/python-2* ) python? ( =dev-lang/python-2*[gdbm] )
 >=dev-libs/libdaemon-0.14 dev-libs/expat dev-libs/glib:2 gdbm? ( sys-libs/gdbm ) qt4? ( x11-libs/qt-core:4 ) gtk? ( >=x11-libs/gtk+-2.14.0:2 ) gtk3? ( x11-libs/gtk+:3 ) dbus? ( >=sys-apps/dbus-0.30 python? ( dev-python/dbus-python ) ) mono? ( >=dev-lang/mono-1.1.10 gtk? ( >=dev-dotnet/gtk-sharp-2 ) ) howl-compat? ( >=sys-apps/dbus-0.30 ) introspection? ( >=dev-libs/gobject-introspection-0.9.5 ) mdnsresponder-compat? ( >=sys-apps/dbus-0.30 ) python? ( gtk? ( >=dev-python/pygtk-2 ) ) bookmarks? ( dev-python/twisted dev-python/twisted-web ) kernel_linux? ( sys-libs/libcap ) howl-compat? ( !net-misc/howl ) mdnsresponder-compat? ( !net-misc/mDNSResponder ) python? ( =dev-lang/python-2* ) python? ( =dev-lang/python-2*[gdbm] )
 0
 http://avahi.org/download/avahi-0.6.30.tar.gz
diff --git a/metadata/cache/net-dns/avahi-0.6.30-r3 b/metadata/cache/net-dns/avahi-0.6.30-r3
index a6dd5d360612..ccfaa32dc3cb 100644
--- a/metadata/cache/net-dns/avahi-0.6.30-r3
+++ b/metadata/cache/net-dns/avahi-0.6.30-r3
@@ -1,4 +1,4 @@
->=dev-libs/libdaemon-0.14 dev-libs/expat dev-libs/glib:2 gdbm? ( sys-libs/gdbm ) qt4? ( x11-libs/qt-core:4 ) gtk? ( >=x11-libs/gtk+-2.14.0:2 ) gtk3? ( x11-libs/gtk+:3 ) dbus? ( >=sys-apps/dbus-0.30 python? ( dev-python/dbus-python ) ) mono? ( >=dev-lang/mono-1.1.10 gtk? ( >=dev-dotnet/gtk-sharp-2 ) ) howl-compat? ( >=sys-apps/dbus-0.30 ) introspection? ( >=dev-libs/gobject-introspection-0.9.5 ) mdnsresponder-compat? ( >=sys-apps/dbus-0.30 ) python? ( gtk? ( >=dev-python/pygtk-2 ) ) bookmarks? ( dev-python/twisted dev-python/twisted-web ) kernel_linux? ( sys-libs/libcap ) >=dev-util/intltool-0.40.5 >=dev-util/pkgconfig-0.9.0 doc? ( app-doc/doxygen mono? ( >=virtual/monodoc-1.1.8 ) ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( =dev-lang/python-2* ) python? ( =dev-lang/python-2*[gdbm] )
+>=dev-libs/libdaemon-0.14 dev-libs/expat dev-libs/glib:2 gdbm? ( sys-libs/gdbm ) qt4? ( x11-libs/qt-core:4 ) gtk? ( >=x11-libs/gtk+-2.14.0:2 ) gtk3? ( x11-libs/gtk+:3 ) dbus? ( >=sys-apps/dbus-0.30 python? ( dev-python/dbus-python ) ) mono? ( >=dev-lang/mono-1.1.10 gtk? ( >=dev-dotnet/gtk-sharp-2 ) ) howl-compat? ( >=sys-apps/dbus-0.30 ) introspection? ( >=dev-libs/gobject-introspection-0.9.5 ) mdnsresponder-compat? ( >=sys-apps/dbus-0.30 ) python? ( gtk? ( >=dev-python/pygtk-2 ) ) bookmarks? ( dev-python/twisted dev-python/twisted-web ) kernel_linux? ( sys-libs/libcap ) >=dev-util/intltool-0.40.5 >=dev-util/pkgconfig-0.9.0 doc? ( app-doc/doxygen mono? ( >=virtual/monodoc-1.1.8 ) ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( =dev-lang/python-2* ) python? ( =dev-lang/python-2*[gdbm] )
 >=dev-libs/libdaemon-0.14 dev-libs/expat dev-libs/glib:2 gdbm? ( sys-libs/gdbm ) qt4? ( x11-libs/qt-core:4 ) gtk? ( >=x11-libs/gtk+-2.14.0:2 ) gtk3? ( x11-libs/gtk+:3 ) dbus? ( >=sys-apps/dbus-0.30 python? ( dev-python/dbus-python ) ) mono? ( >=dev-lang/mono-1.1.10 gtk? ( >=dev-dotnet/gtk-sharp-2 ) ) howl-compat? ( >=sys-apps/dbus-0.30 ) introspection? ( >=dev-libs/gobject-introspection-0.9.5 ) mdnsresponder-compat? ( >=sys-apps/dbus-0.30 ) python? ( gtk? ( >=dev-python/pygtk-2 ) ) bookmarks? ( dev-python/twisted dev-python/twisted-web ) kernel_linux? ( sys-libs/libcap ) howl-compat? ( !net-misc/howl ) mdnsresponder-compat? ( !net-misc/mDNSResponder ) python? ( =dev-lang/python-2* ) python? ( =dev-lang/python-2*[gdbm] )
 0
 http://avahi.org/download/avahi-0.6.30.tar.gz
diff --git a/metadata/cache/net-dns/bind-9.7.4_p1 b/metadata/cache/net-dns/bind-9.7.4_p1
index 22f50ff309e7..075f9e6497f3 100644
--- a/metadata/cache/net-dns/bind-9.7.4_p1
+++ b/metadata/cache/net-dns/bind-9.7.4_p1
@@ -1,4 +1,4 @@
-ssl? ( >=dev-libs/openssl-0.9.6g ) mysql? ( >=virtual/mysql-4.0 ) odbc? ( >=dev-db/unixODBC-2.2.6 ) ldap? ( net-nds/openldap ) idn? ( net-dns/idnkit ) postgres? ( dev-db/postgresql-base ) threads? ( >=sys-libs/libcap-2.1.0 ) xml? ( dev-libs/libxml2 ) geoip? ( >=dev-libs/geoip-1.4.6 ) gssapi? ( virtual/krb5 ) sdb-ldap? ( net-nds/openldap ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+ssl? ( >=dev-libs/openssl-0.9.6g ) mysql? ( >=virtual/mysql-4.0 ) odbc? ( >=dev-db/unixODBC-2.2.6 ) ldap? ( net-nds/openldap ) idn? ( net-dns/idnkit ) postgres? ( dev-db/postgresql-base ) threads? ( >=sys-libs/libcap-2.1.0 ) xml? ( dev-libs/libxml2 ) geoip? ( >=dev-libs/geoip-1.4.6 ) gssapi? ( virtual/krb5 ) sdb-ldap? ( net-nds/openldap ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 ssl? ( >=dev-libs/openssl-0.9.6g ) mysql? ( >=virtual/mysql-4.0 ) odbc? ( >=dev-db/unixODBC-2.2.6 ) ldap? ( net-nds/openldap ) idn? ( net-dns/idnkit ) postgres? ( dev-db/postgresql-base ) threads? ( >=sys-libs/libcap-2.1.0 ) xml? ( dev-libs/libxml2 ) geoip? ( >=dev-libs/geoip-1.4.6 ) gssapi? ( virtual/krb5 ) sdb-ldap? ( net-nds/openldap ) selinux? ( sec-policy/selinux-bind ) resolvconf? ( net-dns/openresolv ) sys-process/psmisc
 0
 ftp://ftp.isc.org/isc/bind9/9.7.4-P1/bind-9.7.4-P1.tar.gz doc? ( mirror://gentoo/dyndns-samples.tbz2 ) geoip? ( http://bind-geoip.googlecode.com//files/bind-geoip-1.3-readme.txt http://bind-geoip.googlecode.com//files/bind-geoip-1.3-9.7.2-P2.patch ) sdb-ldap? ( http://ftp.disconnected-by-peer.at/pub/bind-sdb-ldap-1.1.0-fc14.patch.bz2 )
diff --git a/metadata/cache/net-dns/bind-9.8.1_p1 b/metadata/cache/net-dns/bind-9.8.1_p1
index b4e596cf1597..f3f82a5a1579 100644
--- a/metadata/cache/net-dns/bind-9.8.1_p1
+++ b/metadata/cache/net-dns/bind-9.8.1_p1
@@ -1,4 +1,4 @@
-ssl? ( >=dev-libs/openssl-0.9.6g ) mysql? ( >=virtual/mysql-4.0 ) odbc? ( >=dev-db/unixODBC-2.2.6 ) ldap? ( net-nds/openldap ) idn? ( net-dns/idnkit ) postgres? ( dev-db/postgresql-base ) caps? ( >=sys-libs/libcap-2.1.0 ) xml? ( dev-libs/libxml2 ) geoip? ( >=dev-libs/geoip-1.4.6 ) gssapi? ( virtual/krb5 ) sdb-ldap? ( net-nds/openldap ) gost? ( >=dev-libs/openssl-1.0.0 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+ssl? ( >=dev-libs/openssl-0.9.6g ) mysql? ( >=virtual/mysql-4.0 ) odbc? ( >=dev-db/unixODBC-2.2.6 ) ldap? ( net-nds/openldap ) idn? ( net-dns/idnkit ) postgres? ( dev-db/postgresql-base ) caps? ( >=sys-libs/libcap-2.1.0 ) xml? ( dev-libs/libxml2 ) geoip? ( >=dev-libs/geoip-1.4.6 ) gssapi? ( virtual/krb5 ) sdb-ldap? ( net-nds/openldap ) gost? ( >=dev-libs/openssl-1.0.0 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 ssl? ( >=dev-libs/openssl-0.9.6g ) mysql? ( >=virtual/mysql-4.0 ) odbc? ( >=dev-db/unixODBC-2.2.6 ) ldap? ( net-nds/openldap ) idn? ( net-dns/idnkit ) postgres? ( dev-db/postgresql-base ) caps? ( >=sys-libs/libcap-2.1.0 ) xml? ( dev-libs/libxml2 ) geoip? ( >=dev-libs/geoip-1.4.6 ) gssapi? ( virtual/krb5 ) sdb-ldap? ( net-nds/openldap ) gost? ( >=dev-libs/openssl-1.0.0 ) selinux? ( sec-policy/selinux-bind ) || ( sys-process/psmisc sys-process/fuser-bsd )
 0
 ftp://ftp.isc.org/isc/bind9/9.8.1-P1/bind-9.8.1-P1.tar.gz doc? ( mirror://gentoo/dyndns-samples.tbz2 ) geoip? ( http://bind-geoip.googlecode.com//files/bind-geoip-1.3-readme.txt http://bind-geoip.googlecode.com//files/bind-9.8.0-P1-geoip-1.3.patch ) sdb-ldap? ( http://ftp.disconnected-by-peer.at/pub/bind-sdb-ldap-1.1.0-fc14.patch.bz2 )
diff --git a/metadata/cache/net-dns/bind-9.9.0 b/metadata/cache/net-dns/bind-9.9.0
index e85fa2b9cb9b..68244dd76795 100644
--- a/metadata/cache/net-dns/bind-9.9.0
+++ b/metadata/cache/net-dns/bind-9.9.0
@@ -1,4 +1,4 @@
-ssl? ( >=dev-libs/openssl-0.9.6g ) mysql? ( >=virtual/mysql-4.0 ) odbc? ( >=dev-db/unixODBC-2.2.6 ) ldap? ( net-nds/openldap ) idn? ( net-dns/idnkit ) postgres? ( dev-db/postgresql-base ) caps? ( >=sys-libs/libcap-2.1.0 ) xml? ( dev-libs/libxml2 ) geoip? ( >=dev-libs/geoip-1.4.6 ) gssapi? ( virtual/krb5 ) sdb-ldap? ( net-nds/openldap ) gost? ( >=dev-libs/openssl-1.0.0 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+ssl? ( >=dev-libs/openssl-0.9.6g ) mysql? ( >=virtual/mysql-4.0 ) odbc? ( >=dev-db/unixODBC-2.2.6 ) ldap? ( net-nds/openldap ) idn? ( net-dns/idnkit ) postgres? ( dev-db/postgresql-base ) caps? ( >=sys-libs/libcap-2.1.0 ) xml? ( dev-libs/libxml2 ) geoip? ( >=dev-libs/geoip-1.4.6 ) gssapi? ( virtual/krb5 ) sdb-ldap? ( net-nds/openldap ) gost? ( >=dev-libs/openssl-1.0.0 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 ssl? ( >=dev-libs/openssl-0.9.6g ) mysql? ( >=virtual/mysql-4.0 ) odbc? ( >=dev-db/unixODBC-2.2.6 ) ldap? ( net-nds/openldap ) idn? ( net-dns/idnkit ) postgres? ( dev-db/postgresql-base ) caps? ( >=sys-libs/libcap-2.1.0 ) xml? ( dev-libs/libxml2 ) geoip? ( >=dev-libs/geoip-1.4.6 ) gssapi? ( virtual/krb5 ) sdb-ldap? ( net-nds/openldap ) gost? ( >=dev-libs/openssl-1.0.0 ) selinux? ( sec-policy/selinux-bind ) || ( sys-process/psmisc sys-process/fuser-bsd )
 0
 ftp://ftp.isc.org/isc/bind9/9.9.0/bind-9.9.0.tar.gz doc? ( mirror://gentoo/dyndns-samples.tbz2 ) geoip? ( http://bind-geoip.googlecode.com//files/bind-geoip-1.3-readme.txt http://bind-geoip.googlecode.com//files/bind-9.9.0-geoip-1.3.patch ) sdb-ldap? ( http://ftp.disconnected-by-peer.at/pub/bind-sdb-ldap-1.1.0-fc14.patch.bz2 )
diff --git a/metadata/cache/net-dns/bind-tools-9.7.3 b/metadata/cache/net-dns/bind-tools-9.7.3
index 8651df19f6fc..aef4f64f31e8 100644
--- a/metadata/cache/net-dns/bind-tools-9.7.3
+++ b/metadata/cache/net-dns/bind-tools-9.7.3
@@ -1,4 +1,4 @@
-ssl? ( dev-libs/openssl ) xml? ( dev-libs/libxml2 ) idn? ( || ( sys-libs/glibc dev-libs/libiconv ) net-dns/idnkit ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+ssl? ( dev-libs/openssl ) xml? ( dev-libs/libxml2 ) idn? ( || ( sys-libs/glibc dev-libs/libiconv ) net-dns/idnkit ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 ssl? ( dev-libs/openssl ) xml? ( dev-libs/libxml2 ) idn? ( || ( sys-libs/glibc dev-libs/libiconv ) net-dns/idnkit )
 0
 ftp://ftp.isc.org/isc/bind9/9.7.3/bind-9.7.3.tar.gz
diff --git a/metadata/cache/net-dns/bind-tools-9.8.1 b/metadata/cache/net-dns/bind-tools-9.8.1
index b292f27997db..bdab8147988f 100644
--- a/metadata/cache/net-dns/bind-tools-9.8.1
+++ b/metadata/cache/net-dns/bind-tools-9.8.1
@@ -1,4 +1,4 @@
-ssl? ( dev-libs/openssl ) xml? ( dev-libs/libxml2 ) idn? ( net-dns/idnkit ) gssapi? ( virtual/krb5 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+ssl? ( dev-libs/openssl ) xml? ( dev-libs/libxml2 ) idn? ( net-dns/idnkit ) gssapi? ( virtual/krb5 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 ssl? ( dev-libs/openssl ) xml? ( dev-libs/libxml2 ) idn? ( net-dns/idnkit ) gssapi? ( virtual/krb5 )
 0
 ftp://ftp.isc.org/isc/bind9/9.8.1/bind-9.8.1.tar.gz
diff --git a/metadata/cache/net-dns/bind-tools-9.9.0 b/metadata/cache/net-dns/bind-tools-9.9.0
index a2d0d4609f60..0ad82530c882 100644
--- a/metadata/cache/net-dns/bind-tools-9.9.0
+++ b/metadata/cache/net-dns/bind-tools-9.9.0
@@ -1,4 +1,4 @@
-ssl? ( dev-libs/openssl ) xml? ( dev-libs/libxml2 ) idn? ( net-dns/idnkit ) gssapi? ( virtual/krb5 ) readline? ( sys-libs/readline ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+ssl? ( dev-libs/openssl ) xml? ( dev-libs/libxml2 ) idn? ( net-dns/idnkit ) gssapi? ( virtual/krb5 ) readline? ( sys-libs/readline ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 ssl? ( dev-libs/openssl ) xml? ( dev-libs/libxml2 ) idn? ( net-dns/idnkit ) gssapi? ( virtual/krb5 ) readline? ( sys-libs/readline )
 0
 ftp://ftp.isc.org/isc/bind9/9.9.0/bind-9.9.0.tar.gz
diff --git a/metadata/cache/net-dns/hesinfo-3.1.0 b/metadata/cache/net-dns/hesinfo-3.1.0
index a9e958b9c871..6e238dd66092 100644
--- a/metadata/cache/net-dns/hesinfo-3.1.0
+++ b/metadata/cache/net-dns/hesinfo-3.1.0
@@ -1,4 +1,4 @@
->=net-dns/hesiod-3.1.0 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=net-dns/hesiod-3.1.0 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=net-dns/hesiod-3.1.0
 0
 ftp://athena-dist.mit.edu/pub/ATHENA/hesiod/hesinfo-3.1.0.tar.gz
diff --git a/metadata/cache/net-dns/hesiod-3.1.0 b/metadata/cache/net-dns/hesiod-3.1.0
index 7fa065d41c86..bb27c78a092a 100644
--- a/metadata/cache/net-dns/hesiod-3.1.0
+++ b/metadata/cache/net-dns/hesiod-3.1.0
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 ftp://athena-dist.mit.edu/pub/ATHENA/hesiod/hesiod-3.1.0.tar.gz mirror://gentoo/hesiod-3.1.0-patches.tgz
diff --git a/metadata/cache/net-dns/idnkit-1.0-r2 b/metadata/cache/net-dns/idnkit-1.0-r2
index 707c2743b8e9..16343768074f 100644
--- a/metadata/cache/net-dns/idnkit-1.0-r2
+++ b/metadata/cache/net-dns/idnkit-1.0-r2
@@ -1,4 +1,4 @@
-virtual/libiconv || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+virtual/libiconv || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 
 0
 http://www.nic.ad.jp/ja/idn/idnkit/download/sources/idnkit-1.0-src.tar.gz
diff --git a/metadata/cache/net-dns/knot-1.0.0 b/metadata/cache/net-dns/knot-1.0.0
index a8b93df7fca3..89c5528721a3 100644
--- a/metadata/cache/net-dns/knot-1.0.0
+++ b/metadata/cache/net-dns/knot-1.0.0
@@ -1,4 +1,4 @@
-dev-libs/openssl dev-libs/userspace-rcu dev-util/pkgconfig sys-devel/flex virtual/yacc || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-libs/openssl dev-libs/userspace-rcu dev-util/pkgconfig sys-devel/flex virtual/yacc || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-libs/openssl dev-libs/userspace-rcu
 0
 http://public.nic.cz/files/knot-dns/knot-1.0.0.tar.gz
diff --git a/metadata/cache/net-dns/ldns-utils-1.6.11 b/metadata/cache/net-dns/ldns-utils-1.6.11
index 2c352ca4834f..e0ac985a8c9b 100644
--- a/metadata/cache/net-dns/ldns-utils-1.6.11
+++ b/metadata/cache/net-dns/ldns-utils-1.6.11
@@ -1,4 +1,4 @@
->=net-libs/ldns-1.6.11[gost?,ssl?] examples? ( net-libs/libpcap ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=net-libs/ldns-1.6.11[gost?,ssl?] examples? ( net-libs/libpcap ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=net-libs/ldns-1.6.11[gost?,ssl?] examples? ( net-libs/libpcap )
 0
 http://www.nlnetlabs.nl/downloads/ldns/ldns-1.6.11.tar.gz
diff --git a/metadata/cache/net-dns/ldns-utils-1.6.12 b/metadata/cache/net-dns/ldns-utils-1.6.12
index 390d5b077492..7ecc670c7b4e 100644
--- a/metadata/cache/net-dns/ldns-utils-1.6.12
+++ b/metadata/cache/net-dns/ldns-utils-1.6.12
@@ -1,4 +1,4 @@
->=net-libs/ldns-1.6.12[gost?,ssl?] examples? ( net-libs/libpcap ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=net-libs/ldns-1.6.12[gost?,ssl?] examples? ( net-libs/libpcap ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=net-libs/ldns-1.6.12[gost?,ssl?] examples? ( net-libs/libpcap )
 0
 http://www.nlnetlabs.nl/downloads/ldns/ldns-1.6.12.tar.gz
diff --git a/metadata/cache/net-dns/mydns-1.2.8.27 b/metadata/cache/net-dns/mydns-1.2.8.27
index 82406a780d5f..6dde9c6f9e71 100644
--- a/metadata/cache/net-dns/mydns-1.2.8.27
+++ b/metadata/cache/net-dns/mydns-1.2.8.27
@@ -1,4 +1,4 @@
-mysql? ( virtual/mysql ) nls? ( virtual/libintl ) postgres? ( dev-db/postgresql-base ) ssl? ( dev-libs/openssl ) zlib? ( sys-libs/zlib ) virtual/libiconv nls? ( sys-devel/gettext ) sys-devel/bison || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+mysql? ( virtual/mysql ) nls? ( virtual/libintl ) postgres? ( dev-db/postgresql-base ) ssl? ( dev-libs/openssl ) zlib? ( sys-libs/zlib ) virtual/libiconv nls? ( sys-devel/gettext ) sys-devel/bison || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 mysql? ( virtual/mysql ) nls? ( virtual/libintl ) postgres? ( dev-db/postgresql-base ) ssl? ( dev-libs/openssl ) zlib? ( sys-libs/zlib ) virtual/libiconv
 0
 mirror://sourceforge/mydns-ng/mydns-1.2.8.27.tar.gz
diff --git a/metadata/cache/net-dns/mydns-1.2.8.31 b/metadata/cache/net-dns/mydns-1.2.8.31
index baefdccf6ab7..04d5ff570df7 100644
--- a/metadata/cache/net-dns/mydns-1.2.8.31
+++ b/metadata/cache/net-dns/mydns-1.2.8.31
@@ -1,4 +1,4 @@
-mysql? ( virtual/mysql ) nls? ( virtual/libintl ) postgres? ( dev-db/postgresql-base ) ssl? ( dev-libs/openssl ) virtual/libiconv nls? ( >=sys-devel/gettext-0.12 ) sys-devel/bison || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+mysql? ( virtual/mysql ) nls? ( virtual/libintl ) postgres? ( dev-db/postgresql-base ) ssl? ( dev-libs/openssl ) virtual/libiconv nls? ( >=sys-devel/gettext-0.12 ) sys-devel/bison || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 mysql? ( virtual/mysql ) nls? ( virtual/libintl ) postgres? ( dev-db/postgresql-base ) ssl? ( dev-libs/openssl ) virtual/libiconv
 0
 mirror://sourceforge/mydns-ng/mydns-1.2.8.31.tar.gz
diff --git a/metadata/cache/net-dns/opendnssec-1.3.6 b/metadata/cache/net-dns/opendnssec-1.3.6
index 14bf5ad98847..8ba571101105 100644
--- a/metadata/cache/net-dns/opendnssec-1.3.6
+++ b/metadata/cache/net-dns/opendnssec-1.3.6
@@ -1,4 +1,4 @@
-dev-lang/perl dev-libs/libxml2 dev-libs/libxslt >=net-libs/ldns-1.6.12 auditor? ( dev-lang/ruby[ssl] >=dev-ruby/dnsruby-1.53 ) curl? ( net-misc/curl ) mysql? ( virtual/mysql dev-perl/DBD-mysql ) opensc? ( dev-libs/opensc ) softhsm? ( dev-libs/softhsm ) sqlite? ( dev-db/sqlite:3 dev-perl/DBD-SQLite ) doc? ( app-doc/doxygen ) test? ( app-text/trang ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-lang/perl dev-libs/libxml2 dev-libs/libxslt >=net-libs/ldns-1.6.12 auditor? ( dev-lang/ruby[ssl] >=dev-ruby/dnsruby-1.53 ) curl? ( net-misc/curl ) mysql? ( virtual/mysql dev-perl/DBD-mysql ) opensc? ( dev-libs/opensc ) softhsm? ( dev-libs/softhsm ) sqlite? ( dev-db/sqlite:3 dev-perl/DBD-SQLite ) doc? ( app-doc/doxygen ) test? ( app-text/trang ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-lang/perl dev-libs/libxml2 dev-libs/libxslt >=net-libs/ldns-1.6.12 auditor? ( dev-lang/ruby[ssl] >=dev-ruby/dnsruby-1.53 ) curl? ( net-misc/curl ) mysql? ( virtual/mysql dev-perl/DBD-mysql ) opensc? ( dev-libs/opensc ) softhsm? ( dev-libs/softhsm ) sqlite? ( dev-db/sqlite:3 dev-perl/DBD-SQLite )
 0
 http://www.opendnssec.org/files/source/opendnssec-1.3.6.tar.gz
diff --git a/metadata/cache/net-dns/opendnssec-1.3.7 b/metadata/cache/net-dns/opendnssec-1.3.7
index 1198fa122169..49cea5dcc034 100644
--- a/metadata/cache/net-dns/opendnssec-1.3.7
+++ b/metadata/cache/net-dns/opendnssec-1.3.7
@@ -1,4 +1,4 @@
-dev-lang/perl dev-libs/libxml2 dev-libs/libxslt >=net-libs/ldns-1.6.12 auditor? ( dev-lang/ruby[ssl] >=dev-ruby/dnsruby-1.53 ) curl? ( net-misc/curl ) mysql? ( virtual/mysql dev-perl/DBD-mysql ) opensc? ( dev-libs/opensc ) softhsm? ( dev-libs/softhsm ) sqlite? ( dev-db/sqlite:3 dev-perl/DBD-SQLite ) doc? ( app-doc/doxygen ) test? ( app-text/trang ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-lang/perl dev-libs/libxml2 dev-libs/libxslt >=net-libs/ldns-1.6.12 auditor? ( dev-lang/ruby[ssl] >=dev-ruby/dnsruby-1.53 ) curl? ( net-misc/curl ) mysql? ( virtual/mysql dev-perl/DBD-mysql ) opensc? ( dev-libs/opensc ) softhsm? ( dev-libs/softhsm ) sqlite? ( dev-db/sqlite:3 dev-perl/DBD-SQLite ) doc? ( app-doc/doxygen ) test? ( app-text/trang ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-lang/perl dev-libs/libxml2 dev-libs/libxslt >=net-libs/ldns-1.6.12 auditor? ( dev-lang/ruby[ssl] >=dev-ruby/dnsruby-1.53 ) curl? ( net-misc/curl ) mysql? ( virtual/mysql dev-perl/DBD-mysql ) opensc? ( dev-libs/opensc ) softhsm? ( dev-libs/softhsm ) sqlite? ( dev-db/sqlite:3 dev-perl/DBD-SQLite )
 0
 http://www.opendnssec.org/files/source/opendnssec-1.3.7.tar.gz
diff --git a/metadata/cache/net-dns/pdns-3.0 b/metadata/cache/net-dns/pdns-3.0
index f37844fdbf1d..b77745bba73a 100644
--- a/metadata/cache/net-dns/pdns-3.0
+++ b/metadata/cache/net-dns/pdns-3.0
@@ -1,4 +1,4 @@
-mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-base ) ldap? ( >=net-nds/openldap-2.0.27-r4 ) sqlite? ( =dev-db/sqlite-2.8* ) sqlite3? ( =dev-db/sqlite-3* ) opendbx? ( dev-db/opendbx ) !static? ( >=dev-libs/boost-1.34 ) >=dev-util/pkgconfig-0.9.0 static? ( >=dev-libs/boost-1.34[static-libs] ) doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-base ) ldap? ( >=net-nds/openldap-2.0.27-r4 ) sqlite? ( =dev-db/sqlite-2.8* ) sqlite3? ( =dev-db/sqlite-3* ) opendbx? ( dev-db/opendbx ) !static? ( >=dev-libs/boost-1.34 ) >=dev-util/pkgconfig-0.9.0 static? ( >=dev-libs/boost-1.34[static-libs] ) doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-base ) ldap? ( >=net-nds/openldap-2.0.27-r4 ) sqlite? ( =dev-db/sqlite-2.8* ) sqlite3? ( =dev-db/sqlite-3* ) opendbx? ( dev-db/opendbx ) !static? ( >=dev-libs/boost-1.34 )
 0
 http://downloads.powerdns.com/releases/pdns-3.0.tar.gz
diff --git a/metadata/cache/net-dns/pdns-3.0.1 b/metadata/cache/net-dns/pdns-3.0.1
index 4858fcc1352a..b0cbfda2bf89 100644
--- a/metadata/cache/net-dns/pdns-3.0.1
+++ b/metadata/cache/net-dns/pdns-3.0.1
@@ -1,4 +1,4 @@
-mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-base ) ldap? ( >=net-nds/openldap-2.0.27-r4 ) sqlite? ( =dev-db/sqlite-2.8* ) sqlite3? ( =dev-db/sqlite-3* ) opendbx? ( dev-db/opendbx ) !static? ( >=dev-libs/boost-1.34 ) >=dev-util/pkgconfig-0.9.0 static? ( >=dev-libs/boost-1.34[static-libs] ) doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-base ) ldap? ( >=net-nds/openldap-2.0.27-r4 ) sqlite? ( =dev-db/sqlite-2.8* ) sqlite3? ( =dev-db/sqlite-3* ) opendbx? ( dev-db/opendbx ) !static? ( >=dev-libs/boost-1.34 ) >=dev-util/pkgconfig-0.9.0 static? ( >=dev-libs/boost-1.34[static-libs] ) doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-base ) ldap? ( >=net-nds/openldap-2.0.27-r4 ) sqlite? ( =dev-db/sqlite-2.8* ) sqlite3? ( =dev-db/sqlite-3* ) opendbx? ( dev-db/opendbx ) !static? ( >=dev-libs/boost-1.34 )
 0
 http://downloads.powerdns.com/releases/pdns-3.0.1.tar.gz
diff --git a/metadata/cache/net-firewall/fwbuilder-4.2.2.3541 b/metadata/cache/net-firewall/fwbuilder-4.2.2.3541
index d1569bdddeda..b16a17175d9d 100644
--- a/metadata/cache/net-firewall/fwbuilder-4.2.2.3541
+++ b/metadata/cache/net-firewall/fwbuilder-4.2.2.3541
@@ -1,4 +1,4 @@
->=x11-libs/qt-gui-4.3 dev-libs/openssl dev-libs/elfutils sys-devel/gnuconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=x11-libs/qt-gui-4.3 dev-libs/openssl dev-libs/elfutils sys-devel/gnuconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=x11-libs/qt-gui-4.3 dev-libs/openssl dev-libs/elfutils sys-devel/gnuconfig
 0
 mirror://sourceforge/fwbuilder/fwbuilder-4.2.2.3541.tar.gz
diff --git a/metadata/cache/net-firewall/fwbuilder-5.0.0.3568 b/metadata/cache/net-firewall/fwbuilder-5.0.0.3568
index 1a73b1ce6f3d..2acc6d14081e 100644
--- a/metadata/cache/net-firewall/fwbuilder-5.0.0.3568
+++ b/metadata/cache/net-firewall/fwbuilder-5.0.0.3568
@@ -1,4 +1,4 @@
->=x11-libs/qt-gui-4.3 dev-libs/openssl dev-libs/elfutils || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=x11-libs/qt-gui-4.3 dev-libs/openssl dev-libs/elfutils || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=x11-libs/qt-gui-4.3 dev-libs/openssl dev-libs/elfutils
 0
 mirror://sourceforge/fwbuilder/fwbuilder-5.0.0.3568.tar.gz
diff --git a/metadata/cache/net-firewall/fwbuilder-5.0.1.3592-r1 b/metadata/cache/net-firewall/fwbuilder-5.0.1.3592-r1
index c9f5d8350ff3..239e8574628c 100644
--- a/metadata/cache/net-firewall/fwbuilder-5.0.1.3592-r1
+++ b/metadata/cache/net-firewall/fwbuilder-5.0.1.3592-r1
@@ -1,4 +1,4 @@
->=x11-libs/qt-gui-4.3 dev-libs/openssl dev-libs/elfutils || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=x11-libs/qt-gui-4.3 dev-libs/openssl dev-libs/elfutils || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=x11-libs/qt-gui-4.3 dev-libs/openssl dev-libs/elfutils
 0
 mirror://sourceforge/fwbuilder/fwbuilder-5.0.1.3592.tar.gz
diff --git a/metadata/cache/net-firewall/ipsec-tools-0.7.3-r1 b/metadata/cache/net-firewall/ipsec-tools-0.7.3-r1
index 26e618e7576b..a8d5b2c7d4d0 100644
--- a/metadata/cache/net-firewall/ipsec-tools-0.7.3-r1
+++ b/metadata/cache/net-firewall/ipsec-tools-0.7.3-r1
@@ -1,4 +1,4 @@
-selinux? ( sys-libs/libselinux ) readline? ( sys-libs/readline ) pam? ( sys-libs/pam ) ldap? ( net-nds/openldap ) kerberos? ( virtual/krb5 ) >=dev-libs/openssl-0.9.8 iconv? ( virtual/libiconv ) >=sys-kernel/linux-headers-2.6.30 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+selinux? ( sys-libs/libselinux ) readline? ( sys-libs/readline ) pam? ( sys-libs/pam ) ldap? ( net-nds/openldap ) kerberos? ( virtual/krb5 ) >=dev-libs/openssl-0.9.8 iconv? ( virtual/libiconv ) >=sys-kernel/linux-headers-2.6.30 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 selinux? ( sys-libs/libselinux ) readline? ( sys-libs/readline ) pam? ( sys-libs/pam ) ldap? ( net-nds/openldap ) kerberos? ( virtual/krb5 ) >=dev-libs/openssl-0.9.8 iconv? ( virtual/libiconv ) selinux? ( sec-policy/selinux-ipsec-tools )
 0
 mirror://sourceforge/ipsec-tools/ipsec-tools-0.7.3.tar.bz2
diff --git a/metadata/cache/net-firewall/ipsec-tools-0.8.0-r3 b/metadata/cache/net-firewall/ipsec-tools-0.8.0-r3
index 0e0ddadc04e9..929324947750 100644
--- a/metadata/cache/net-firewall/ipsec-tools-0.8.0-r3
+++ b/metadata/cache/net-firewall/ipsec-tools-0.8.0-r3
@@ -1,4 +1,4 @@
-dev-libs/openssl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) readline? ( sys-libs/readline ) selinux? ( sys-libs/libselinux sec-policy/selinux-ipsec-tools ) >=sys-kernel/linux-headers-2.6.30 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-libs/openssl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) readline? ( sys-libs/readline ) selinux? ( sys-libs/libselinux sec-policy/selinux-ipsec-tools ) >=sys-kernel/linux-headers-2.6.30 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-libs/openssl kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( sys-libs/pam ) readline? ( sys-libs/readline ) selinux? ( sys-libs/libselinux sec-policy/selinux-ipsec-tools )
 0
 mirror://sourceforge/ipsec-tools/ipsec-tools-0.8.0.tar.bz2
diff --git a/metadata/cache/net-firewall/ipset-6.10 b/metadata/cache/net-firewall/ipset-6.10
index 7e4a26a9c3db..4a0a75253500 100644
--- a/metadata/cache/net-firewall/ipset-6.10
+++ b/metadata/cache/net-firewall/ipset-6.10
@@ -1,4 +1,4 @@
->=net-firewall/iptables-1.4.4 net-libs/libmnl || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
+>=net-firewall/iptables-1.4.4 net-libs/libmnl || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
 >=net-firewall/iptables-1.4.4 net-libs/libmnl kernel_linux? ( virtual/modutils )
 0
 http://ipset.netfilter.org/ipset-6.10.tar.bz2
diff --git a/metadata/cache/net-firewall/ipset-6.11 b/metadata/cache/net-firewall/ipset-6.11
index 4fbbe7913903..45a5151318ca 100644
--- a/metadata/cache/net-firewall/ipset-6.11
+++ b/metadata/cache/net-firewall/ipset-6.11
@@ -1,4 +1,4 @@
->=net-firewall/iptables-1.4.4 net-libs/libmnl || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
+>=net-firewall/iptables-1.4.4 net-libs/libmnl || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
 >=net-firewall/iptables-1.4.4 net-libs/libmnl kernel_linux? ( virtual/modutils )
 0
 http://ipset.netfilter.org/ipset-6.11.tar.bz2
diff --git a/metadata/cache/net-firewall/ipset-6.8 b/metadata/cache/net-firewall/ipset-6.8
index 56f487ba4964..ec27b056aa01 100644
--- a/metadata/cache/net-firewall/ipset-6.8
+++ b/metadata/cache/net-firewall/ipset-6.8
@@ -1,4 +1,4 @@
->=net-firewall/iptables-1.4.4 net-libs/libmnl || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
+>=net-firewall/iptables-1.4.4 net-libs/libmnl || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
 >=net-firewall/iptables-1.4.4 net-libs/libmnl kernel_linux? ( virtual/modutils )
 0
 http://ipset.netfilter.org/ipset-6.8.tar.bz2
diff --git a/metadata/cache/net-firewall/ipset-6.9.1 b/metadata/cache/net-firewall/ipset-6.9.1
index 5f613b956f8b..692a0ddca569 100644
--- a/metadata/cache/net-firewall/ipset-6.9.1
+++ b/metadata/cache/net-firewall/ipset-6.9.1
@@ -1,4 +1,4 @@
->=net-firewall/iptables-1.4.4 net-libs/libmnl || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
+>=net-firewall/iptables-1.4.4 net-libs/libmnl || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
 >=net-firewall/iptables-1.4.4 net-libs/libmnl kernel_linux? ( virtual/modutils )
 0
 http://ipset.netfilter.org/ipset-6.9.1.tar.bz2
diff --git a/metadata/cache/net-firewall/ipset-6.9.1-r1 b/metadata/cache/net-firewall/ipset-6.9.1-r1
index 5f613b956f8b..692a0ddca569 100644
--- a/metadata/cache/net-firewall/ipset-6.9.1-r1
+++ b/metadata/cache/net-firewall/ipset-6.9.1-r1
@@ -1,4 +1,4 @@
->=net-firewall/iptables-1.4.4 net-libs/libmnl || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
+>=net-firewall/iptables-1.4.4 net-libs/libmnl || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
 >=net-firewall/iptables-1.4.4 net-libs/libmnl kernel_linux? ( virtual/modutils )
 0
 http://ipset.netfilter.org/ipset-6.9.1.tar.bz2
diff --git a/metadata/cache/net-firewall/ipset-6.9.1-r2 b/metadata/cache/net-firewall/ipset-6.9.1-r2
index 5f613b956f8b..692a0ddca569 100644
--- a/metadata/cache/net-firewall/ipset-6.9.1-r2
+++ b/metadata/cache/net-firewall/ipset-6.9.1-r2
@@ -1,4 +1,4 @@
->=net-firewall/iptables-1.4.4 net-libs/libmnl || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
+>=net-firewall/iptables-1.4.4 net-libs/libmnl || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
 >=net-firewall/iptables-1.4.4 net-libs/libmnl kernel_linux? ( virtual/modutils )
 0
 http://ipset.netfilter.org/ipset-6.9.1.tar.bz2
diff --git a/metadata/cache/net-fs/autofs-4.1.4 b/metadata/cache/net-fs/autofs-4.1.4
index c7c401e5aaa5..10833c0bb20b 100644
--- a/metadata/cache/net-fs/autofs-4.1.4
+++ b/metadata/cache/net-fs/autofs-4.1.4
@@ -1,4 +1,4 @@
-hesiod? ( net-dns/hesiod ) ldap? ( >=net-nds/openldap-2.0 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+hesiod? ( net-dns/hesiod ) ldap? ( >=net-nds/openldap-2.0 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 hesiod? ( net-dns/hesiod ) ldap? ( >=net-nds/openldap-2.0 )
 0
 mirror://kernel/linux/daemons/autofs/v4/autofs-4.1.4.tar.bz2 mirror://gentoo/autofs-4.1.4-patches-1.tar.lzma
diff --git a/metadata/cache/net-fs/autofs-4.1.4-r1 b/metadata/cache/net-fs/autofs-4.1.4-r1
index 0dabab8024ed..6ca8a3eaf86d 100644
--- a/metadata/cache/net-fs/autofs-4.1.4-r1
+++ b/metadata/cache/net-fs/autofs-4.1.4-r1
@@ -1,4 +1,4 @@
-hesiod? ( net-dns/hesiod ) ldap? ( >=net-nds/openldap-2.0 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+hesiod? ( net-dns/hesiod ) ldap? ( >=net-nds/openldap-2.0 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 hesiod? ( net-dns/hesiod ) ldap? ( >=net-nds/openldap-2.0 )
 0
 mirror://kernel/linux/daemons/autofs/v4/autofs-4.1.4.tar.bz2 mirror://gentoo/autofs-4.1.4-patches-1.tar.lzma
diff --git a/metadata/cache/net-fs/autofs-5.0.5 b/metadata/cache/net-fs/autofs-5.0.5
index 3fa2ab5ed7e2..f8d4a9a0c34f 100644
--- a/metadata/cache/net-fs/autofs-5.0.5
+++ b/metadata/cache/net-fs/autofs-5.0.5
@@ -1,4 +1,4 @@
-hesiod? ( net-dns/hesiod ) ldap? ( >=net-nds/openldap-2.0 sasl? ( dev-libs/cyrus-sasl dev-libs/libxml2 virtual/krb5 ) ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+hesiod? ( net-dns/hesiod ) ldap? ( >=net-nds/openldap-2.0 sasl? ( dev-libs/cyrus-sasl dev-libs/libxml2 virtual/krb5 ) ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 hesiod? ( net-dns/hesiod ) ldap? ( >=net-nds/openldap-2.0 sasl? ( dev-libs/cyrus-sasl dev-libs/libxml2 virtual/krb5 ) )
 0
 mirror://kernel/linux/daemons/autofs/v5/autofs-5.0.5.tar.bz2 mirror://gentoo/autofs-5.0.5-patches-1.tar.lzma
diff --git a/metadata/cache/net-fs/autofs-5.0.5-r3 b/metadata/cache/net-fs/autofs-5.0.5-r3
index f90f1d5b08f0..05b32cad1f55 100644
--- a/metadata/cache/net-fs/autofs-5.0.5-r3
+++ b/metadata/cache/net-fs/autofs-5.0.5-r3
@@ -1,4 +1,4 @@
-hesiod? ( net-dns/hesiod ) ldap? ( >=net-nds/openldap-2.0 sasl? ( dev-libs/cyrus-sasl dev-libs/libxml2 virtual/krb5 ) ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+hesiod? ( net-dns/hesiod ) ldap? ( >=net-nds/openldap-2.0 sasl? ( dev-libs/cyrus-sasl dev-libs/libxml2 virtual/krb5 ) ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 hesiod? ( net-dns/hesiod ) ldap? ( >=net-nds/openldap-2.0 sasl? ( dev-libs/cyrus-sasl dev-libs/libxml2 virtual/krb5 ) )
 0
 mirror://kernel/linux/daemons/autofs/v5/autofs-5.0.5.tar.bz2 mirror://gentoo/autofs-5.0.5-patches-3.tar.lzma
diff --git a/metadata/cache/net-fs/autofs-5.0.5-r4 b/metadata/cache/net-fs/autofs-5.0.5-r4
index 7bf246372a72..1c4f64d9ae01 100644
--- a/metadata/cache/net-fs/autofs-5.0.5-r4
+++ b/metadata/cache/net-fs/autofs-5.0.5-r4
@@ -1,4 +1,4 @@
-hesiod? ( net-dns/hesiod ) ldap? ( >=net-nds/openldap-2.0 sasl? ( dev-libs/cyrus-sasl dev-libs/libxml2 virtual/krb5 ) ) sys-devel/flex virtual/yacc || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+hesiod? ( net-dns/hesiod ) ldap? ( >=net-nds/openldap-2.0 sasl? ( dev-libs/cyrus-sasl dev-libs/libxml2 virtual/krb5 ) ) sys-devel/flex virtual/yacc || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 hesiod? ( net-dns/hesiod ) ldap? ( >=net-nds/openldap-2.0 sasl? ( dev-libs/cyrus-sasl dev-libs/libxml2 virtual/krb5 ) )
 0
 mirror://kernel/linux/daemons/autofs/v5/autofs-5.0.5.tar.bz2 mirror://gentoo/autofs-5.0.5-patches-4.tar.lzma
diff --git a/metadata/cache/net-fs/autofs-5.0.5-r5 b/metadata/cache/net-fs/autofs-5.0.5-r5
index 7cb5f443f6a0..0af902af8164 100644
--- a/metadata/cache/net-fs/autofs-5.0.5-r5
+++ b/metadata/cache/net-fs/autofs-5.0.5-r5
@@ -1,4 +1,4 @@
-hesiod? ( net-dns/hesiod ) ldap? ( >=net-nds/openldap-2.0 sasl? ( dev-libs/cyrus-sasl dev-libs/libxml2 virtual/krb5 ) ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+hesiod? ( net-dns/hesiod ) ldap? ( >=net-nds/openldap-2.0 sasl? ( dev-libs/cyrus-sasl dev-libs/libxml2 virtual/krb5 ) ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 hesiod? ( net-dns/hesiod ) ldap? ( >=net-nds/openldap-2.0 sasl? ( dev-libs/cyrus-sasl dev-libs/libxml2 virtual/krb5 ) )
 0
 mirror://kernel/linux/daemons/autofs/v5/autofs-5.0.5.tar.bz2 mirror://gentoo/autofs-5.0.5-patches-5.tar.lzma
diff --git a/metadata/cache/net-fs/autofs-5.0.6 b/metadata/cache/net-fs/autofs-5.0.6
index 00f5d6085b23..b6f6bfa50358 100644
--- a/metadata/cache/net-fs/autofs-5.0.6
+++ b/metadata/cache/net-fs/autofs-5.0.6
@@ -1,4 +1,4 @@
-hesiod? ( net-dns/hesiod ) ldap? ( >=net-nds/openldap-2.0 sasl? ( dev-libs/cyrus-sasl dev-libs/libxml2 virtual/krb5 ) ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+hesiod? ( net-dns/hesiod ) ldap? ( >=net-nds/openldap-2.0 sasl? ( dev-libs/cyrus-sasl dev-libs/libxml2 virtual/krb5 ) ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 hesiod? ( net-dns/hesiod ) ldap? ( >=net-nds/openldap-2.0 sasl? ( dev-libs/cyrus-sasl dev-libs/libxml2 virtual/krb5 ) )
 0
 mirror://kernel/linux/daemons/autofs/v5/autofs-5.0.6.tar.bz2
diff --git a/metadata/cache/net-fs/autofs-5.0.6-r1 b/metadata/cache/net-fs/autofs-5.0.6-r1
index df382d6b47c2..f8760d625207 100644
--- a/metadata/cache/net-fs/autofs-5.0.6-r1
+++ b/metadata/cache/net-fs/autofs-5.0.6-r1
@@ -1,4 +1,4 @@
-hesiod? ( net-dns/hesiod ) ldap? ( >=net-nds/openldap-2.0 sasl? ( dev-libs/cyrus-sasl dev-libs/libxml2 virtual/krb5 ) ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+hesiod? ( net-dns/hesiod ) ldap? ( >=net-nds/openldap-2.0 sasl? ( dev-libs/cyrus-sasl dev-libs/libxml2 virtual/krb5 ) ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 hesiod? ( net-dns/hesiod ) ldap? ( >=net-nds/openldap-2.0 sasl? ( dev-libs/cyrus-sasl dev-libs/libxml2 virtual/krb5 ) )
 0
 mirror://kernel/linux/daemons/autofs/v5/autofs-5.0.6.tar.bz2
diff --git a/metadata/cache/net-fs/autofs-5.0.6-r2 b/metadata/cache/net-fs/autofs-5.0.6-r2
index ed7fa49094e0..cbbf27cc1c22 100644
--- a/metadata/cache/net-fs/autofs-5.0.6-r2
+++ b/metadata/cache/net-fs/autofs-5.0.6-r2
@@ -1,4 +1,4 @@
-hesiod? ( net-dns/hesiod ) ldap? ( >=net-nds/openldap-2.0 sasl? ( dev-libs/cyrus-sasl dev-libs/libxml2 virtual/krb5 ) ) sys-devel/flex virtual/yacc || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+hesiod? ( net-dns/hesiod ) ldap? ( >=net-nds/openldap-2.0 sasl? ( dev-libs/cyrus-sasl dev-libs/libxml2 virtual/krb5 ) ) sys-devel/flex virtual/yacc || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 hesiod? ( net-dns/hesiod ) ldap? ( >=net-nds/openldap-2.0 sasl? ( dev-libs/cyrus-sasl dev-libs/libxml2 virtual/krb5 ) )
 0
 mirror://kernel/linux/daemons/autofs/v5/autofs-5.0.6.tar.bz2
diff --git a/metadata/cache/net-fs/autofs-5.0.6-r3 b/metadata/cache/net-fs/autofs-5.0.6-r3
index e9e2b69a9a15..a08693e4ad5c 100644
--- a/metadata/cache/net-fs/autofs-5.0.6-r3
+++ b/metadata/cache/net-fs/autofs-5.0.6-r3
@@ -1,4 +1,4 @@
-hesiod? ( net-dns/hesiod ) ldap? ( >=net-nds/openldap-2.0 sasl? ( dev-libs/cyrus-sasl dev-libs/libxml2 virtual/krb5 ) ) sys-devel/flex virtual/yacc || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+hesiod? ( net-dns/hesiod ) ldap? ( >=net-nds/openldap-2.0 sasl? ( dev-libs/cyrus-sasl dev-libs/libxml2 virtual/krb5 ) ) sys-devel/flex virtual/yacc || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 hesiod? ( net-dns/hesiod ) ldap? ( >=net-nds/openldap-2.0 sasl? ( dev-libs/cyrus-sasl dev-libs/libxml2 virtual/krb5 ) )
 0
 mirror://kernel/linux/daemons/autofs/v5/autofs-5.0.6.tar.bz2
diff --git a/metadata/cache/net-fs/autofs-5.0.6-r4 b/metadata/cache/net-fs/autofs-5.0.6-r4
index ecd453c8e3b9..51b440d25186 100644
--- a/metadata/cache/net-fs/autofs-5.0.6-r4
+++ b/metadata/cache/net-fs/autofs-5.0.6-r4
@@ -1,4 +1,4 @@
-hesiod? ( net-dns/hesiod ) ldap? ( >=net-nds/openldap-2.0 sasl? ( dev-libs/cyrus-sasl dev-libs/libxml2 virtual/krb5 ) ) sys-devel/flex virtual/yacc || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+hesiod? ( net-dns/hesiod ) ldap? ( >=net-nds/openldap-2.0 sasl? ( dev-libs/cyrus-sasl dev-libs/libxml2 virtual/krb5 ) ) sys-devel/flex virtual/yacc || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 hesiod? ( net-dns/hesiod ) ldap? ( >=net-nds/openldap-2.0 sasl? ( dev-libs/cyrus-sasl dev-libs/libxml2 virtual/krb5 ) )
 0
 mirror://kernel/linux/daemons/autofs/v5/autofs-5.0.6.tar.bz2
diff --git a/metadata/cache/net-fs/autofs-5.0.6-r5 b/metadata/cache/net-fs/autofs-5.0.6-r5
index 32a144d5dff8..5d6973021aa7 100644
--- a/metadata/cache/net-fs/autofs-5.0.6-r5
+++ b/metadata/cache/net-fs/autofs-5.0.6-r5
@@ -1,4 +1,4 @@
-hesiod? ( net-dns/hesiod ) ldap? ( >=net-nds/openldap-2.0 sasl? ( dev-libs/cyrus-sasl dev-libs/libxml2 virtual/krb5 ) ) sys-devel/flex virtual/yacc || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+hesiod? ( net-dns/hesiod ) ldap? ( >=net-nds/openldap-2.0 sasl? ( dev-libs/cyrus-sasl dev-libs/libxml2 virtual/krb5 ) ) sys-devel/flex virtual/yacc || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 hesiod? ( net-dns/hesiod ) ldap? ( >=net-nds/openldap-2.0 sasl? ( dev-libs/cyrus-sasl dev-libs/libxml2 virtual/krb5 ) )
 0
 mirror://kernel/linux/daemons/autofs/v5/autofs-5.0.6.tar.bz2 mirror://gentoo/autofs-5.0.6-patches-1.tar.lzma
diff --git a/metadata/cache/net-fs/curlftpfs-0.9.2-r1 b/metadata/cache/net-fs/curlftpfs-0.9.2-r1
index ecb2b3ec4718..b4b60a2a57c3 100644
--- a/metadata/cache/net-fs/curlftpfs-0.9.2-r1
+++ b/metadata/cache/net-fs/curlftpfs-0.9.2-r1
@@ -1,4 +1,4 @@
->=net-misc/curl-7.17.0 >=sys-fs/fuse-2.2 >=dev-libs/glib-2.0 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=net-misc/curl-7.17.0 >=sys-fs/fuse-2.2 >=dev-libs/glib-2.0 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=net-misc/curl-7.17.0 >=sys-fs/fuse-2.2 >=dev-libs/glib-2.0
 0
 mirror://sourceforge/curlftpfs/curlftpfs-0.9.2.tar.gz
diff --git a/metadata/cache/net-fs/davfs2-1.3.3 b/metadata/cache/net-fs/davfs2-1.3.3
index dc0e7da1d757..24048b3766f8 100644
--- a/metadata/cache/net-fs/davfs2-1.3.3
+++ b/metadata/cache/net-fs/davfs2-1.3.3
@@ -1,4 +1,4 @@
-dev-libs/libxml2 net-libs/neon sys-libs/zlib || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
+dev-libs/libxml2 net-libs/neon sys-libs/zlib || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
 dev-libs/libxml2 net-libs/neon sys-libs/zlib kernel_linux? ( virtual/modutils )
 0
 mirror://sourceforge/dav/davfs2-1.3.3.tar.gz
diff --git a/metadata/cache/net-fs/davfs2-1.4.1 b/metadata/cache/net-fs/davfs2-1.4.1
index cd8aaf63d103..8b7795add874 100644
--- a/metadata/cache/net-fs/davfs2-1.4.1
+++ b/metadata/cache/net-fs/davfs2-1.4.1
@@ -1,4 +1,4 @@
-dev-libs/libxml2 net-libs/neon sys-libs/zlib || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
+dev-libs/libxml2 net-libs/neon sys-libs/zlib || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
 dev-libs/libxml2 net-libs/neon sys-libs/zlib kernel_linux? ( virtual/modutils )
 0
 http://mirror.lihnidos.org/GNU/savannah/davfs2/davfs2-1.4.1.tar.gz
diff --git a/metadata/cache/net-fs/davfs2-1.4.5-r1 b/metadata/cache/net-fs/davfs2-1.4.5-r1
index ddf078a48fd4..eee23902bc09 100644
--- a/metadata/cache/net-fs/davfs2-1.4.5-r1
+++ b/metadata/cache/net-fs/davfs2-1.4.5-r1
@@ -1,4 +1,4 @@
-dev-libs/libxml2 net-libs/neon sys-libs/zlib || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
+dev-libs/libxml2 net-libs/neon sys-libs/zlib || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
 dev-libs/libxml2 net-libs/neon sys-libs/zlib kernel_linux? ( virtual/modutils )
 0
 http://mirror.lihnidos.org/GNU/savannah/davfs2/davfs2-1.4.5.tar.gz
diff --git a/metadata/cache/net-fs/libnfs-1.3.0 b/metadata/cache/net-fs/libnfs-1.3.0
index 514fa9f28946..f6221f5b9713 100644
--- a/metadata/cache/net-fs/libnfs-1.3.0
+++ b/metadata/cache/net-fs/libnfs-1.3.0
@@ -1,4 +1,4 @@
-net-libs/libtirpc dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+net-libs/libtirpc dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 net-libs/libtirpc
 0
 https://github.com/sahlberg/libnfs/tarball/libnfs-1.3.0 -> libnfs-1.3.0.tgz
diff --git a/metadata/cache/net-fs/libnfs-9999 b/metadata/cache/net-fs/libnfs-9999
index 09a5dc202721..901fe259c5a1 100644
--- a/metadata/cache/net-fs/libnfs-9999
+++ b/metadata/cache/net-fs/libnfs-9999
@@ -1,4 +1,4 @@
-net-libs/libtirpc dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
+net-libs/libtirpc dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
 net-libs/libtirpc
 0
 
diff --git a/metadata/cache/net-fs/netatalk-2.2.1-r1 b/metadata/cache/net-fs/netatalk-2.2.1-r1
index 0d2b7a7c1fb9..a4b5cf0f0b8b 100644
--- a/metadata/cache/net-fs/netatalk-2.2.1-r1
+++ b/metadata/cache/net-fs/netatalk-2.2.1-r1
@@ -1,4 +1,4 @@
->=sys-libs/db-4.2.52 avahi? ( net-dns/avahi[dbus] ) cracklib? ( sys-libs/cracklib ) pam? ( virtual/pam ) ssl? ( dev-libs/openssl ) tcpd? ( sys-apps/tcp-wrappers ) slp? ( net-libs/openslp ) kerberos? ( virtual/krb5 ) >=sys-apps/coreutils-7.1 !app-text/yudit dev-libs/libgcrypt appletalk? ( cups? ( net-print/cups ) ) acl? ( sys-apps/attr sys-apps/acl ) ldap? ( net-nds/openldap ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=sys-libs/db-4.2.52 avahi? ( net-dns/avahi[dbus] ) cracklib? ( sys-libs/cracklib ) pam? ( virtual/pam ) ssl? ( dev-libs/openssl ) tcpd? ( sys-apps/tcp-wrappers ) slp? ( net-libs/openslp ) kerberos? ( virtual/krb5 ) >=sys-apps/coreutils-7.1 !app-text/yudit dev-libs/libgcrypt appletalk? ( cups? ( net-print/cups ) ) acl? ( sys-apps/attr sys-apps/acl ) ldap? ( net-nds/openldap ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=sys-libs/db-4.2.52 avahi? ( net-dns/avahi[dbus] ) cracklib? ( sys-libs/cracklib ) pam? ( virtual/pam ) ssl? ( dev-libs/openssl ) tcpd? ( sys-apps/tcp-wrappers ) slp? ( net-libs/openslp ) kerberos? ( virtual/krb5 ) >=sys-apps/coreutils-7.1 !app-text/yudit dev-libs/libgcrypt appletalk? ( cups? ( net-print/cups ) ) acl? ( sys-apps/attr sys-apps/acl ) ldap? ( net-nds/openldap )
 0
 mirror://sourceforge/netatalk/netatalk-2.2.1.tar.bz2
diff --git a/metadata/cache/net-fs/netatalk-2.2.1-r2 b/metadata/cache/net-fs/netatalk-2.2.1-r2
index 024a54386977..edbec69c068d 100644
--- a/metadata/cache/net-fs/netatalk-2.2.1-r2
+++ b/metadata/cache/net-fs/netatalk-2.2.1-r2
@@ -1,4 +1,4 @@
->=sys-libs/db-4.2.52 avahi? ( net-dns/avahi[dbus] ) cracklib? ( sys-libs/cracklib ) pam? ( virtual/pam ) ssl? ( dev-libs/openssl ) tcpd? ( sys-apps/tcp-wrappers ) slp? ( net-libs/openslp ) kerberos? ( virtual/krb5 ) >=sys-apps/coreutils-7.1 !app-text/yudit dev-libs/libgcrypt appletalk? ( cups? ( net-print/cups ) ) acl? ( sys-apps/attr sys-apps/acl ) ldap? ( net-nds/openldap ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=sys-libs/db-4.2.52 avahi? ( net-dns/avahi[dbus] ) cracklib? ( sys-libs/cracklib ) pam? ( virtual/pam ) ssl? ( dev-libs/openssl ) tcpd? ( sys-apps/tcp-wrappers ) slp? ( net-libs/openslp ) kerberos? ( virtual/krb5 ) >=sys-apps/coreutils-7.1 !app-text/yudit dev-libs/libgcrypt appletalk? ( cups? ( net-print/cups ) ) acl? ( sys-apps/attr sys-apps/acl ) ldap? ( net-nds/openldap ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 sys-apps/openrc
 0
 mirror://sourceforge/netatalk/netatalk-2.2.1.tar.bz2
diff --git a/metadata/cache/net-fs/nfs-utils-1.2.2-r2 b/metadata/cache/net-fs/nfs-utils-1.2.2-r2
index b31e0f305e58..8b37f2707de8 100644
--- a/metadata/cache/net-fs/nfs-utils-1.2.2-r2
+++ b/metadata/cache/net-fs/nfs-utils-1.2.2-r2
@@ -1,4 +1,4 @@
-tcpd? ( sys-apps/tcp-wrappers ) caps? ( sys-libs/libcap ) sys-libs/e2fsprogs-libs net-nds/rpcbind net-libs/libtirpc nfsv4? ( >=dev-libs/libevent-1.0b >=net-libs/libnfsidmap-0.21-r1 kerberos? ( net-libs/librpcsecgss net-libs/libgssglue net-libs/libtirpc[kerberos] app-crypt/mit-krb5 ) ) >=sys-apps/util-linux-2.12r-r7 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+tcpd? ( sys-apps/tcp-wrappers ) caps? ( sys-libs/libcap ) sys-libs/e2fsprogs-libs net-nds/rpcbind net-libs/libtirpc nfsv4? ( >=dev-libs/libevent-1.0b >=net-libs/libnfsidmap-0.21-r1 kerberos? ( net-libs/librpcsecgss net-libs/libgssglue net-libs/libtirpc[kerberos] app-crypt/mit-krb5 ) ) >=sys-apps/util-linux-2.12r-r7 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 tcpd? ( sys-apps/tcp-wrappers ) caps? ( sys-libs/libcap ) sys-libs/e2fsprogs-libs net-nds/rpcbind net-libs/libtirpc nfsv4? ( >=dev-libs/libevent-1.0b >=net-libs/libnfsidmap-0.21-r1 kerberos? ( net-libs/librpcsecgss net-libs/libgssglue net-libs/libtirpc[kerberos] app-crypt/mit-krb5 ) ) !net-nds/portmap
 0
 mirror://sourceforge/nfs/nfs-utils-1.2.2.tar.bz2
diff --git a/metadata/cache/net-fs/nfs-utils-1.2.4 b/metadata/cache/net-fs/nfs-utils-1.2.4
index 55d2239f3123..159acdaf9c88 100644
--- a/metadata/cache/net-fs/nfs-utils-1.2.4
+++ b/metadata/cache/net-fs/nfs-utils-1.2.4
@@ -1,4 +1,4 @@
-tcpd? ( sys-apps/tcp-wrappers ) caps? ( sys-libs/libcap ) sys-libs/e2fsprogs-libs net-nds/rpcbind net-libs/libtirpc nfsv4? ( >=dev-libs/libevent-1.0b >=net-libs/libnfsidmap-0.21-r1 kerberos? ( net-libs/librpcsecgss net-libs/libgssglue net-libs/libtirpc[kerberos] app-crypt/mit-krb5 ) nfsidmap? ( >=net-libs/libnfsidmap-0.24 sys-apps/keyutils ) ) selinux? ( sec-policy/selinux-rpc sec-policy/selinux-rpcbind ) dev-util/pkgconfig !<sys-apps/util-linux-2.12r-r7 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+tcpd? ( sys-apps/tcp-wrappers ) caps? ( sys-libs/libcap ) sys-libs/e2fsprogs-libs net-nds/rpcbind net-libs/libtirpc nfsv4? ( >=dev-libs/libevent-1.0b >=net-libs/libnfsidmap-0.21-r1 kerberos? ( net-libs/librpcsecgss net-libs/libgssglue net-libs/libtirpc[kerberos] app-crypt/mit-krb5 ) nfsidmap? ( >=net-libs/libnfsidmap-0.24 sys-apps/keyutils ) ) selinux? ( sec-policy/selinux-rpc sec-policy/selinux-rpcbind ) dev-util/pkgconfig !<sys-apps/util-linux-2.12r-r7 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 tcpd? ( sys-apps/tcp-wrappers ) caps? ( sys-libs/libcap ) sys-libs/e2fsprogs-libs net-nds/rpcbind net-libs/libtirpc nfsv4? ( >=dev-libs/libevent-1.0b >=net-libs/libnfsidmap-0.21-r1 kerberos? ( net-libs/librpcsecgss net-libs/libgssglue net-libs/libtirpc[kerberos] app-crypt/mit-krb5 ) nfsidmap? ( >=net-libs/libnfsidmap-0.24 sys-apps/keyutils ) ) selinux? ( sec-policy/selinux-rpc sec-policy/selinux-rpcbind ) !net-nds/portmap
 0
 mirror://sourceforge/nfs/nfs-utils-1.2.4.tar.bz2
diff --git a/metadata/cache/net-fs/nfs-utils-1.2.5 b/metadata/cache/net-fs/nfs-utils-1.2.5
index bdc1169a1908..30589061b50e 100644
--- a/metadata/cache/net-fs/nfs-utils-1.2.5
+++ b/metadata/cache/net-fs/nfs-utils-1.2.5
@@ -1,4 +1,4 @@
-tcpd? ( sys-apps/tcp-wrappers ) caps? ( sys-libs/libcap ) sys-libs/e2fsprogs-libs net-nds/rpcbind net-libs/libtirpc nfsv4? ( >=dev-libs/libevent-1.0b >=net-libs/libnfsidmap-0.21-r1 kerberos? ( net-libs/librpcsecgss >=net-libs/libgssglue-0.3 net-libs/libtirpc[kerberos] app-crypt/mit-krb5 ) nfsidmap? ( >=net-libs/libnfsidmap-0.24 sys-apps/keyutils ) ) nfsv41? ( sys-fs/lvm2 ) selinux? ( sec-policy/selinux-rpc sec-policy/selinux-rpcbind ) dev-util/pkgconfig !<sys-apps/util-linux-2.12r-r7 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+tcpd? ( sys-apps/tcp-wrappers ) caps? ( sys-libs/libcap ) sys-libs/e2fsprogs-libs net-nds/rpcbind net-libs/libtirpc nfsv4? ( >=dev-libs/libevent-1.0b >=net-libs/libnfsidmap-0.21-r1 kerberos? ( net-libs/librpcsecgss >=net-libs/libgssglue-0.3 net-libs/libtirpc[kerberos] app-crypt/mit-krb5 ) nfsidmap? ( >=net-libs/libnfsidmap-0.24 sys-apps/keyutils ) ) nfsv41? ( sys-fs/lvm2 ) selinux? ( sec-policy/selinux-rpc sec-policy/selinux-rpcbind ) dev-util/pkgconfig !<sys-apps/util-linux-2.12r-r7 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 tcpd? ( sys-apps/tcp-wrappers ) caps? ( sys-libs/libcap ) sys-libs/e2fsprogs-libs net-nds/rpcbind net-libs/libtirpc nfsv4? ( >=dev-libs/libevent-1.0b >=net-libs/libnfsidmap-0.21-r1 kerberos? ( net-libs/librpcsecgss >=net-libs/libgssglue-0.3 net-libs/libtirpc[kerberos] app-crypt/mit-krb5 ) nfsidmap? ( >=net-libs/libnfsidmap-0.24 sys-apps/keyutils ) ) nfsv41? ( sys-fs/lvm2 ) selinux? ( sec-policy/selinux-rpc sec-policy/selinux-rpcbind ) !net-nds/portmap
 0
 mirror://sourceforge/nfs/nfs-utils-1.2.5.tar.bz2
diff --git a/metadata/cache/net-fs/openafs-1.4.14-r1 b/metadata/cache/net-fs/openafs-1.4.14-r1
index c14c7e8f4b51..02da833c05c3 100644
--- a/metadata/cache/net-fs/openafs-1.4.14-r1
+++ b/metadata/cache/net-fs/openafs-1.4.14-r1
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 ~net-fs/openafs-kernel-1.4.14 pam? ( sys-libs/pam ) kerberos? ( virtual/krb5 )
 0
 http://openafs.org/dl/1.4.14/openafs-1.4.14-src.tar.bz2 http://openafs.org/dl/1.4.14/openafs-1.4.14-doc.tar.bz2 mirror://gentoo/openafs-1.4.14-patches-2.tar.bz2
diff --git a/metadata/cache/net-fs/openafs-1.4.14.1 b/metadata/cache/net-fs/openafs-1.4.14.1
index 5171e646c181..298c6fab41e1 100644
--- a/metadata/cache/net-fs/openafs-1.4.14.1
+++ b/metadata/cache/net-fs/openafs-1.4.14.1
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 ~net-fs/openafs-kernel-1.4.14.1 pam? ( sys-libs/pam ) kerberos? ( virtual/krb5 )
 0
 http://openafs.org/dl/1.4.14.1/openafs-1.4.14.1-src.tar.bz2 http://openafs.org/dl/1.4.14.1/openafs-1.4.14.1-doc.tar.bz2 mirror://gentoo/openafs-1.4.14.1-patches-1.tar.bz2
diff --git a/metadata/cache/net-fs/openafs-1.6.0 b/metadata/cache/net-fs/openafs-1.6.0
index 95bef3973e92..77b8ca0d3dca 100644
--- a/metadata/cache/net-fs/openafs-1.6.0
+++ b/metadata/cache/net-fs/openafs-1.6.0
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 ~net-fs/openafs-kernel-1.6.0 sys-libs/ncurses pam? ( sys-libs/pam ) kerberos? ( virtual/krb5 )
 0
 http://openafs.org/dl/openafs/1.6.0/openafs-1.6.0-src.tar.bz2 http://openafs.org/dl/openafs/1.6.0/openafs-1.6.0-doc.tar.bz2 mirror://gentoo/openafs-1.6.0-patches-1.tar.bz2
diff --git a/metadata/cache/net-fs/openafs-1.6.1_pre1 b/metadata/cache/net-fs/openafs-1.6.1_pre1
index af4a8763d4e6..9ae8e31c5bf2 100644
--- a/metadata/cache/net-fs/openafs-1.6.1_pre1
+++ b/metadata/cache/net-fs/openafs-1.6.1_pre1
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 ~net-fs/openafs-kernel-1.6.1_pre1 sys-libs/ncurses pam? ( sys-libs/pam ) kerberos? ( virtual/krb5 )
 0
 http://openafs.org/dl/candidate/1.6.1pre1/openafs-1.6.1pre1-src.tar.bz2 http://openafs.org/dl/candidate/1.6.1pre1/openafs-1.6.1pre1-doc.tar.bz2 mirror://gentoo/openafs-1.6.1_pre1-patches-1.tar.bz2
diff --git a/metadata/cache/net-fs/openafs-kernel-1.4.14 b/metadata/cache/net-fs/openafs-kernel-1.4.14
index a0fca8820039..f748d34d0802 100644
--- a/metadata/cache/net-fs/openafs-kernel-1.4.14
+++ b/metadata/cache/net-fs/openafs-kernel-1.4.14
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
+|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
 kernel_linux? ( virtual/modutils )
 0
 http://openafs.org/dl/1.4.14/openafs-1.4.14-src.tar.bz2 mirror://gentoo/openafs-1.4.14-patches-1.tar.bz2
diff --git a/metadata/cache/net-fs/openafs-kernel-1.4.14.1 b/metadata/cache/net-fs/openafs-kernel-1.4.14.1
index e1a4f6abca57..ac6045e6b763 100644
--- a/metadata/cache/net-fs/openafs-kernel-1.4.14.1
+++ b/metadata/cache/net-fs/openafs-kernel-1.4.14.1
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
+|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
 kernel_linux? ( virtual/modutils )
 0
 http://openafs.org/dl/1.4.14.1/openafs-1.4.14.1-src.tar.bz2 mirror://gentoo/openafs-1.4.14.1-patches-1.tar.bz2
diff --git a/metadata/cache/net-fs/openafs-kernel-1.6.0 b/metadata/cache/net-fs/openafs-kernel-1.6.0
index 0e3a46422521..650ba80c18af 100644
--- a/metadata/cache/net-fs/openafs-kernel-1.6.0
+++ b/metadata/cache/net-fs/openafs-kernel-1.6.0
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
+|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
 kernel_linux? ( virtual/modutils )
 0
 http://openafs.org/dl/openafs/1.6.0/openafs-1.6.0-src.tar.bz2 mirror://gentoo/openafs-1.6.0-patches-1.tar.bz2
diff --git a/metadata/cache/net-fs/openafs-kernel-1.6.1_pre1 b/metadata/cache/net-fs/openafs-kernel-1.6.1_pre1
index afffd5a88ee2..ebe71bfde15c 100644
--- a/metadata/cache/net-fs/openafs-kernel-1.6.1_pre1
+++ b/metadata/cache/net-fs/openafs-kernel-1.6.1_pre1
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
+|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
 kernel_linux? ( virtual/modutils )
 0
 http://openafs.org/dl/openafs/1.6.1pre1/openafs-1.6.1pre1-src.tar.bz2 mirror://gentoo/openafs-1.6.1_pre1-patches-1.tar.bz2
diff --git a/metadata/cache/net-fs/smbnetfs-0.5.3 b/metadata/cache/net-fs/smbnetfs-0.5.3
index 0e1cb9ab1da1..e644e8c2725a 100644
--- a/metadata/cache/net-fs/smbnetfs-0.5.3
+++ b/metadata/cache/net-fs/smbnetfs-0.5.3
@@ -1,4 +1,4 @@
->=sys-fs/fuse-2.3 >=net-fs/samba-3.2[smbclient] gnome? ( gnome-base/gnome-keyring ) dev-util/pkgconfig sys-devel/make || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=sys-fs/fuse-2.3 >=net-fs/samba-3.2[smbclient] gnome? ( gnome-base/gnome-keyring ) dev-util/pkgconfig sys-devel/make || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=sys-fs/fuse-2.3 >=net-fs/samba-3.2[smbclient] gnome? ( gnome-base/gnome-keyring )
 0
 mirror://sourceforge/smbnetfs/smbnetfs-0.5.3.tar.bz2
diff --git a/metadata/cache/net-ftp/filezilla-3.5.1 b/metadata/cache/net-ftp/filezilla-3.5.1
index 36e9b61e8ebc..0667bc3fea1d 100644
--- a/metadata/cache/net-ftp/filezilla-3.5.1
+++ b/metadata/cache/net-ftp/filezilla-3.5.1
@@ -1,4 +1,4 @@
->=app-admin/eselect-wxwidgets-0.7-r1 >=dev-db/sqlite-3.7 >=dev-libs/tinyxml-2.6.1-r1[stl] net-dns/libidn >=net-libs/gnutls-2.8.3 >=x11-libs/wxGTK-2.8.9:2.8[X] x11-misc/xdg-utils dbus? ( sys-apps/dbus ) dev-util/pkgconfig >=sys-devel/libtool-1.4 nls? ( >=sys-devel/gettext-0.11 ) test? ( dev-util/cppunit ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=app-admin/eselect-wxwidgets-0.7-r1 >=dev-db/sqlite-3.7 >=dev-libs/tinyxml-2.6.1-r1[stl] net-dns/libidn >=net-libs/gnutls-2.8.3 >=x11-libs/wxGTK-2.8.9:2.8[X] x11-misc/xdg-utils dbus? ( sys-apps/dbus ) dev-util/pkgconfig >=sys-devel/libtool-1.4 nls? ( >=sys-devel/gettext-0.11 ) test? ( dev-util/cppunit ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=app-admin/eselect-wxwidgets-0.7-r1 >=dev-db/sqlite-3.7 >=dev-libs/tinyxml-2.6.1-r1[stl] net-dns/libidn >=net-libs/gnutls-2.8.3 >=x11-libs/wxGTK-2.8.9:2.8[X] x11-misc/xdg-utils dbus? ( sys-apps/dbus )
 0
 mirror://sourceforge/filezilla/FileZilla_3.5.1_src.tar.bz2
diff --git a/metadata/cache/net-ftp/filezilla-3.5.2 b/metadata/cache/net-ftp/filezilla-3.5.2
index 519294e94be7..8c3503f4de8f 100644
--- a/metadata/cache/net-ftp/filezilla-3.5.2
+++ b/metadata/cache/net-ftp/filezilla-3.5.2
@@ -1,4 +1,4 @@
->=app-admin/eselect-wxwidgets-0.7-r1 >=dev-db/sqlite-3.7 >=dev-libs/tinyxml-2.6.1-r1[stl] net-dns/libidn >=net-libs/gnutls-2.8.3 >=x11-libs/wxGTK-2.8.9:2.8[X] x11-misc/xdg-utils dbus? ( sys-apps/dbus ) dev-util/pkgconfig >=sys-devel/libtool-1.4 nls? ( >=sys-devel/gettext-0.11 ) test? ( dev-util/cppunit ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=app-admin/eselect-wxwidgets-0.7-r1 >=dev-db/sqlite-3.7 >=dev-libs/tinyxml-2.6.1-r1[stl] net-dns/libidn >=net-libs/gnutls-2.8.3 >=x11-libs/wxGTK-2.8.9:2.8[X] x11-misc/xdg-utils dbus? ( sys-apps/dbus ) dev-util/pkgconfig >=sys-devel/libtool-1.4 nls? ( >=sys-devel/gettext-0.11 ) test? ( dev-util/cppunit ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=app-admin/eselect-wxwidgets-0.7-r1 >=dev-db/sqlite-3.7 >=dev-libs/tinyxml-2.6.1-r1[stl] net-dns/libidn >=net-libs/gnutls-2.8.3 >=x11-libs/wxGTK-2.8.9:2.8[X] x11-misc/xdg-utils dbus? ( sys-apps/dbus )
 0
 mirror://sourceforge/filezilla/FileZilla_3.5.2_src.tar.bz2
diff --git a/metadata/cache/net-ftp/filezilla-3.5.3 b/metadata/cache/net-ftp/filezilla-3.5.3
index dbc28dfbd783..36dbcc928600 100644
--- a/metadata/cache/net-ftp/filezilla-3.5.3
+++ b/metadata/cache/net-ftp/filezilla-3.5.3
@@ -1,4 +1,4 @@
->=app-admin/eselect-wxwidgets-0.7-r1 >=dev-db/sqlite-3.7 >=dev-libs/tinyxml-2.6.1-r1[stl] net-dns/libidn >=net-libs/gnutls-2.8.3 >=x11-libs/wxGTK-2.8.12:2.8[X] x11-misc/xdg-utils dbus? ( sys-apps/dbus ) dev-util/pkgconfig >=sys-devel/libtool-1.4 nls? ( >=sys-devel/gettext-0.11 ) test? ( dev-util/cppunit ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=app-admin/eselect-wxwidgets-0.7-r1 >=dev-db/sqlite-3.7 >=dev-libs/tinyxml-2.6.1-r1[stl] net-dns/libidn >=net-libs/gnutls-2.8.3 >=x11-libs/wxGTK-2.8.12:2.8[X] x11-misc/xdg-utils dbus? ( sys-apps/dbus ) dev-util/pkgconfig >=sys-devel/libtool-1.4 nls? ( >=sys-devel/gettext-0.11 ) test? ( dev-util/cppunit ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=app-admin/eselect-wxwidgets-0.7-r1 >=dev-db/sqlite-3.7 >=dev-libs/tinyxml-2.6.1-r1[stl] net-dns/libidn >=net-libs/gnutls-2.8.3 >=x11-libs/wxGTK-2.8.12:2.8[X] x11-misc/xdg-utils dbus? ( sys-apps/dbus )
 0
 mirror://sourceforge/filezilla/FileZilla_3.5.3_src.tar.bz2
diff --git a/metadata/cache/net-ftp/frox-0.7.18-r4 b/metadata/cache/net-ftp/frox-0.7.18-r4
index e72975d707d9..01e50bec40b9 100644
--- a/metadata/cache/net-ftp/frox-0.7.18-r4
+++ b/metadata/cache/net-ftp/frox-0.7.18-r4
@@ -1,4 +1,4 @@
-clamav? ( >=app-antivirus/clamav-0.80 ) ssl? ( dev-libs/openssl ) kernel_linux? ( >=sys-kernel/linux-headers-2.6 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+clamav? ( >=app-antivirus/clamav-0.80 ) ssl? ( dev-libs/openssl ) kernel_linux? ( >=sys-kernel/linux-headers-2.6 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 clamav? ( >=app-antivirus/clamav-0.80 ) ssl? ( dev-libs/openssl ) kernel_linux? ( >=sys-kernel/linux-headers-2.6 )
 0
 http://frox.sourceforge.net/download/frox-0.7.18.tar.bz2
diff --git a/metadata/cache/net-ftp/gftp-9999 b/metadata/cache/net-ftp/gftp-9999
index 4e6f23cbebaf..691b8d79470c 100644
--- a/metadata/cache/net-ftp/gftp-9999
+++ b/metadata/cache/net-ftp/gftp-9999
@@ -1,4 +1,4 @@
-dev-libs/glib:2 sys-libs/ncurses sys-libs/readline gtk? ( x11-libs/gtk+:2 ) ssl? ( dev-libs/openssl ) sys-devel/gettext >=dev-util/intltool-0.35.5 >=dev-util/pkgconfig-0.9 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/subversion net-misc/rsync
+dev-libs/glib:2 sys-libs/ncurses sys-libs/readline gtk? ( x11-libs/gtk+:2 ) ssl? ( dev-libs/openssl ) sys-devel/gettext >=dev-util/intltool-0.35.5 >=dev-util/pkgconfig-0.9 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/subversion net-misc/rsync
 dev-libs/glib:2 sys-libs/ncurses sys-libs/readline gtk? ( x11-libs/gtk+:2 ) ssl? ( dev-libs/openssl )
 0
 
diff --git a/metadata/cache/net-ftp/lftp-4.3.3 b/metadata/cache/net-ftp/lftp-4.3.3
index 59779ebf92f8..0bdb21c23563 100644
--- a/metadata/cache/net-ftp/lftp-4.3.3
+++ b/metadata/cache/net-ftp/lftp-4.3.3
@@ -1,4 +1,4 @@
-dev-libs/expat >=sys-libs/ncurses-5.1 socks5? ( >=net-proxy/dante-1.1.12 virtual/pam ) ssl? ( gnutls? ( >=net-libs/gnutls-1.2.3 ) !gnutls? ( >=dev-libs/openssl-0.9.6 ) ) >=sys-libs/readline-5.1 =sys-devel/libtool-2* app-arch/xz-utils dev-lang/perl dev-util/pkgconfig nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-libs/expat >=sys-libs/ncurses-5.1 socks5? ( >=net-proxy/dante-1.1.12 virtual/pam ) ssl? ( gnutls? ( >=net-libs/gnutls-1.2.3 ) !gnutls? ( >=dev-libs/openssl-0.9.6 ) ) >=sys-libs/readline-5.1 =sys-devel/libtool-2* app-arch/xz-utils dev-lang/perl dev-util/pkgconfig nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-libs/expat >=sys-libs/ncurses-5.1 socks5? ( >=net-proxy/dante-1.1.12 virtual/pam ) ssl? ( gnutls? ( >=net-libs/gnutls-1.2.3 ) !gnutls? ( >=dev-libs/openssl-0.9.6 ) ) >=sys-libs/readline-5.1
 0
 http://ftp.yars.free.net/pub/source/lftp/lftp-4.3.3.tar.xz
diff --git a/metadata/cache/net-ftp/lftp-4.3.4-r1 b/metadata/cache/net-ftp/lftp-4.3.4-r1
index 1ad275a78a04..a69a42c6ca6e 100644
--- a/metadata/cache/net-ftp/lftp-4.3.4-r1
+++ b/metadata/cache/net-ftp/lftp-4.3.4-r1
@@ -1,4 +1,4 @@
-dev-libs/expat >=sys-libs/ncurses-5.1 socks5? ( >=net-proxy/dante-1.1.12 virtual/pam ) ssl? ( gnutls? ( >=net-libs/gnutls-1.2.3 ) !gnutls? ( >=dev-libs/openssl-0.9.6 ) ) >=sys-libs/readline-5.1 =sys-devel/libtool-2* app-arch/xz-utils dev-lang/perl dev-util/pkgconfig nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-libs/expat >=sys-libs/ncurses-5.1 socks5? ( >=net-proxy/dante-1.1.12 virtual/pam ) ssl? ( gnutls? ( >=net-libs/gnutls-1.2.3 ) !gnutls? ( >=dev-libs/openssl-0.9.6 ) ) >=sys-libs/readline-5.1 =sys-devel/libtool-2* app-arch/xz-utils dev-lang/perl dev-util/pkgconfig nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-libs/expat >=sys-libs/ncurses-5.1 socks5? ( >=net-proxy/dante-1.1.12 virtual/pam ) ssl? ( gnutls? ( >=net-libs/gnutls-1.2.3 ) !gnutls? ( >=dev-libs/openssl-0.9.6 ) ) >=sys-libs/readline-5.1
 0
 http://ftp.yars.free.net/pub/source/lftp/lftp-4.3.4.tar.xz
diff --git a/metadata/cache/net-ftp/lftp-4.3.5 b/metadata/cache/net-ftp/lftp-4.3.5
index 8844dfbc3ab4..9f7c85f8aa45 100644
--- a/metadata/cache/net-ftp/lftp-4.3.5
+++ b/metadata/cache/net-ftp/lftp-4.3.5
@@ -1,4 +1,4 @@
-dev-libs/expat >=sys-libs/ncurses-5.1 socks5? ( >=net-proxy/dante-1.1.12 virtual/pam ) ssl? ( gnutls? ( >=net-libs/gnutls-1.2.3 ) !gnutls? ( >=dev-libs/openssl-0.9.6 ) ) >=sys-libs/readline-5.1 =sys-devel/libtool-2* app-arch/xz-utils dev-lang/perl dev-util/pkgconfig nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-libs/expat >=sys-libs/ncurses-5.1 socks5? ( >=net-proxy/dante-1.1.12 virtual/pam ) ssl? ( gnutls? ( >=net-libs/gnutls-1.2.3 ) !gnutls? ( >=dev-libs/openssl-0.9.6 ) ) >=sys-libs/readline-5.1 =sys-devel/libtool-2* app-arch/xz-utils dev-lang/perl dev-util/pkgconfig nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-libs/expat >=sys-libs/ncurses-5.1 socks5? ( >=net-proxy/dante-1.1.12 virtual/pam ) ssl? ( gnutls? ( >=net-libs/gnutls-1.2.3 ) !gnutls? ( >=dev-libs/openssl-0.9.6 ) ) >=sys-libs/readline-5.1
 0
 http://ftp.yars.free.net/pub/source/lftp/lftp-4.3.5.tar.xz
diff --git a/metadata/cache/net-ftp/oftpd-0.3.7-r7 b/metadata/cache/net-ftp/oftpd-0.3.7-r7
index 3c4b005f2a70..2a010a4f0753 100644
--- a/metadata/cache/net-ftp/oftpd-0.3.7-r7
+++ b/metadata/cache/net-ftp/oftpd-0.3.7-r7
@@ -1,4 +1,4 @@
-net-ftp/ftpbase || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+net-ftp/ftpbase || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 net-ftp/ftpbase
 0
 http://www.time-travellers.org/oftpd/oftpd-0.3.7.tar.gz ftp://ftp.deepspace6.net/pub/ds6/sources/oftpd/oftpd-0.3.6-ipv6rel2.patch.gz
diff --git a/metadata/cache/net-ftp/proftpd-1.3.3g b/metadata/cache/net-ftp/proftpd-1.3.3g
index 1c5a62c49b65..1be28f9be88f 100644
--- a/metadata/cache/net-ftp/proftpd-1.3.3g
+++ b/metadata/cache/net-ftp/proftpd-1.3.3g
@@ -1,4 +1,4 @@
-acl? ( sys-apps/acl sys-apps/attr ) caps? ( sys-libs/libcap ) clamav? ( app-antivirus/clamav ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) mysql? ( virtual/mysql ) ncurses? ( sys-libs/ncurses ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql-base ) sftp? ( dev-libs/openssl ) ssl? ( dev-libs/openssl ) tcpd? ( sys-apps/tcp-wrappers ) xinetd? ( virtual/inetd ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+acl? ( sys-apps/acl sys-apps/attr ) caps? ( sys-libs/libcap ) clamav? ( app-antivirus/clamav ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) mysql? ( virtual/mysql ) ncurses? ( sys-libs/ncurses ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql-base ) sftp? ( dev-libs/openssl ) ssl? ( dev-libs/openssl ) tcpd? ( sys-apps/tcp-wrappers ) xinetd? ( virtual/inetd ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 acl? ( sys-apps/acl sys-apps/attr ) caps? ( sys-libs/libcap ) clamav? ( app-antivirus/clamav ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) mysql? ( virtual/mysql ) ncurses? ( sys-libs/ncurses ) pam? ( virtual/pam ) postgres? ( dev-db/postgresql-base ) sftp? ( dev-libs/openssl ) ssl? ( dev-libs/openssl ) tcpd? ( sys-apps/tcp-wrappers ) xinetd? ( virtual/inetd ) net-ftp/ftpbase selinux? ( sec-policy/selinux-ftpd )
 0
 ftp://ftp.proftpd.org/distrib/source/proftpd-1.3.3g.tar.bz2 case? ( http://www.castaglia.org/proftpd/modules/proftpd-mod-case-0.4.tar.gz ) clamav? ( https://secure.thrallingpenguin.com/redmine/attachments/download/1/mod_clamav-0.11rc.tar.gz ) deflate? ( http://www.castaglia.org/proftpd/modules/proftpd-mod-deflate-0.5.4.tar.gz ) kerberos? ( mirror://sourceforge/gssmod/mod_gss-1.3.3.tar.gz ) vroot? ( http://www.castaglia.org/proftpd/modules/proftpd-mod-vroot-0.9.2.tar.gz )
diff --git a/metadata/cache/net-ftp/proftpd-1.3.4a b/metadata/cache/net-ftp/proftpd-1.3.4a
index 892e04f87878..1b5458a61880 100644
--- a/metadata/cache/net-ftp/proftpd-1.3.4a
+++ b/metadata/cache/net-ftp/proftpd-1.3.4a
@@ -1,4 +1,4 @@
-acl? ( virtual/acl ) caps? ( sys-libs/libcap ) clamav? ( app-antivirus/clamav ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) memcache? ( >=dev-libs/libmemcached-0.41 ) mysql? ( virtual/mysql ) nls? ( virtual/libiconv ) ncurses? ( sys-libs/ncurses ) pam? ( virtual/pam ) pcre? ( dev-libs/libpcre ) postgres? ( dev-db/postgresql-base ) sftp? ( dev-libs/openssl ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/openssl ) xinetd? ( virtual/inetd ) test? ( dev-libs/check ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+acl? ( virtual/acl ) caps? ( sys-libs/libcap ) clamav? ( app-antivirus/clamav ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) memcache? ( >=dev-libs/libmemcached-0.41 ) mysql? ( virtual/mysql ) nls? ( virtual/libiconv ) ncurses? ( sys-libs/ncurses ) pam? ( virtual/pam ) pcre? ( dev-libs/libpcre ) postgres? ( dev-db/postgresql-base ) sftp? ( dev-libs/openssl ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/openssl ) xinetd? ( virtual/inetd ) test? ( dev-libs/check ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 acl? ( virtual/acl ) caps? ( sys-libs/libcap ) clamav? ( app-antivirus/clamav ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) memcache? ( >=dev-libs/libmemcached-0.41 ) mysql? ( virtual/mysql ) nls? ( virtual/libiconv ) ncurses? ( sys-libs/ncurses ) pam? ( virtual/pam ) pcre? ( dev-libs/libpcre ) postgres? ( dev-db/postgresql-base ) sftp? ( dev-libs/openssl ) sqlite? ( dev-db/sqlite:3 ) ssl? ( dev-libs/openssl ) xinetd? ( virtual/inetd ) net-ftp/ftpbase selinux? ( sec-policy/selinux-ftpd )
 0
 ftp://ftp.proftpd.org/distrib/source/proftpd-1.3.4a.tar.bz2 case? ( http://www.castaglia.org/proftpd/modules/proftpd-mod-case-0.7.tar.gz ) clamav? ( https://secure.thrallingpenguin.com/redmine/attachments/download/1/mod_clamav-0.11rc.tar.gz ) diskuse? ( http://www.castaglia.org/proftpd/modules/proftpd-mod-diskuse-0.9.tar.gz ) kerberos? ( mirror://sourceforge/gssmod/mod_gss-1.3.3.tar.gz ) vroot? ( http://www.castaglia.org/proftpd/modules/proftpd-mod-vroot-0.9.2.tar.gz )
diff --git a/metadata/cache/net-im/amsn-0.98.4-r1 b/metadata/cache/net-im/amsn-0.98.4-r1
index 605200725472..999a4a4c65ee 100644
--- a/metadata/cache/net-im/amsn-0.98.4-r1
+++ b/metadata/cache/net-im/amsn-0.98.4-r1
@@ -1,4 +1,4 @@
->=dev-lang/tcl-8.4 >=dev-lang/tk-8.4 virtual/jpeg media-libs/libpng >=dev-tcltk/snack-2.2.10 >=net-libs/gupnp-igd-0.1.3 media-libs/libv4l media-libs/imlib || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+>=dev-lang/tcl-8.4 >=dev-lang/tk-8.4 virtual/jpeg media-libs/libpng >=dev-tcltk/snack-2.2.10 >=net-libs/gupnp-igd-0.1.3 media-libs/libv4l media-libs/imlib || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 >=dev-lang/tcl-8.4 >=dev-lang/tk-8.4 virtual/jpeg media-libs/libpng >=dev-tcltk/snack-2.2.10 >=net-libs/gupnp-igd-0.1.3 media-libs/libv4l media-libs/imlib >=dev-tcltk/tls-1.5 virtual/ffmpeg[encode]
 0
 mirror://sourceforge/amsn/amsn/0.98.4/amsn-0.98.4-src.tar.bz2
diff --git a/metadata/cache/net-im/ayttm-0.6.3 b/metadata/cache/net-im/ayttm-0.6.3
index 80c21a498bf0..078f7282858a 100644
--- a/metadata/cache/net-im/ayttm-0.6.3
+++ b/metadata/cache/net-im/ayttm-0.6.3
@@ -1,4 +1,4 @@
-app-text/enchant dev-libs/glib:2 dev-libs/openssl virtual/libiconv x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXpm x11-libs/pango crypt? ( app-crypt/gpgme ) webcam? ( media-libs/jasper ) xscreensaver? ( x11-libs/libXScrnSaver ) yahoo? ( net-libs/libyahoo2 ) sys-devel/bison sys-devel/flex nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+app-text/enchant dev-libs/glib:2 dev-libs/openssl virtual/libiconv x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXpm x11-libs/pango crypt? ( app-crypt/gpgme ) webcam? ( media-libs/jasper ) xscreensaver? ( x11-libs/libXScrnSaver ) yahoo? ( net-libs/libyahoo2 ) sys-devel/bison sys-devel/flex nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 app-text/enchant dev-libs/glib:2 dev-libs/openssl virtual/libiconv x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXpm x11-libs/pango crypt? ( app-crypt/gpgme ) webcam? ( media-libs/jasper ) xscreensaver? ( x11-libs/libXScrnSaver ) yahoo? ( net-libs/libyahoo2 ) webcam? ( media-tv/xawtv )
 0
 mirror://sourceforge/ayttm/0.6.3/ayttm-0.6.3.tar.bz2
diff --git a/metadata/cache/net-im/climm-0.7 b/metadata/cache/net-im/climm-0.7
index d5a736ad2564..4232218dc183 100644
--- a/metadata/cache/net-im/climm-0.7
+++ b/metadata/cache/net-im/climm-0.7
@@ -1,4 +1,4 @@
-jabber? ( || ( >=dev-libs/iksemel-1.4[ssl] >=dev-libs/iksemel-1.3[gnutls] ) ) ssl? ( gnutls? ( >=net-libs/gnutls-0.8.10 dev-libs/libgcrypt ) !gnutls? ( !jabber? ( dev-libs/openssl ) jabber? ( >=net-libs/gnutls-0.8.10 ) ) ) tcl? ( dev-lang/tcl ) otr? ( >=net-libs/libotr-3.0.0 ) ssl? ( gnutls? ( dev-util/pkgconfig ) !gnutls? ( jabber? ( dev-util/pkgconfig ) ) ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+jabber? ( || ( >=dev-libs/iksemel-1.4[ssl] >=dev-libs/iksemel-1.3[gnutls] ) ) ssl? ( gnutls? ( >=net-libs/gnutls-0.8.10 dev-libs/libgcrypt ) !gnutls? ( !jabber? ( dev-libs/openssl ) jabber? ( >=net-libs/gnutls-0.8.10 ) ) ) tcl? ( dev-lang/tcl ) otr? ( >=net-libs/libotr-3.0.0 ) ssl? ( gnutls? ( dev-util/pkgconfig ) !gnutls? ( jabber? ( dev-util/pkgconfig ) ) ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 jabber? ( || ( >=dev-libs/iksemel-1.4[ssl] >=dev-libs/iksemel-1.3[gnutls] ) ) ssl? ( gnutls? ( >=net-libs/gnutls-0.8.10 dev-libs/libgcrypt ) !gnutls? ( !jabber? ( dev-libs/openssl ) jabber? ( >=net-libs/gnutls-0.8.10 ) ) ) tcl? ( dev-lang/tcl ) otr? ( >=net-libs/libotr-3.0.0 )
 0
 http://www.climm.org/source/climm-0.7.tgz
diff --git a/metadata/cache/net-im/ekg-1.8_rc1 b/metadata/cache/net-im/ekg-1.8_rc1
index 8718f7b6f13a..a00e12e8a76b 100644
--- a/metadata/cache/net-im/ekg-1.8_rc1
+++ b/metadata/cache/net-im/ekg-1.8_rc1
@@ -1,4 +1,4 @@
->=sys-devel/automake-1.7 >=sys-devel/autoconf-2.50 net-libs/libgadu ssl? ( >=dev-libs/openssl-0.9.6 ) ncurses? ( sys-libs/ncurses ) readline? ( sys-libs/readline ) zlib? ( sys-libs/zlib ) python? ( dev-lang/python ) spell? ( >=app-text/aspell-0.50.3 ) gif? ( media-libs/giflib ) jpeg? ( virtual/jpeg ) gtk? ( x11-libs/gtk+:2 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=sys-devel/automake-1.7 >=sys-devel/autoconf-2.50 net-libs/libgadu ssl? ( >=dev-libs/openssl-0.9.6 ) ncurses? ( sys-libs/ncurses ) readline? ( sys-libs/readline ) zlib? ( sys-libs/zlib ) python? ( dev-lang/python ) spell? ( >=app-text/aspell-0.50.3 ) gif? ( media-libs/giflib ) jpeg? ( virtual/jpeg ) gtk? ( x11-libs/gtk+:2 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 net-libs/libgadu ssl? ( >=dev-libs/openssl-0.9.6 ) ncurses? ( sys-libs/ncurses ) readline? ( sys-libs/readline ) zlib? ( sys-libs/zlib ) python? ( dev-lang/python ) spell? ( >=app-text/aspell-0.50.3 ) gif? ( media-libs/giflib ) jpeg? ( virtual/jpeg ) gtk? ( x11-libs/gtk+:2 )
 0
 http://ekg.chmurka.net/ekg-1.8rc1.tar.gz
diff --git a/metadata/cache/net-im/ekg-1.8_rc1-r1 b/metadata/cache/net-im/ekg-1.8_rc1-r1
index cbbc29294107..83e8a1473983 100644
--- a/metadata/cache/net-im/ekg-1.8_rc1-r1
+++ b/metadata/cache/net-im/ekg-1.8_rc1-r1
@@ -1,4 +1,4 @@
->=sys-devel/automake-1.7 >=sys-devel/autoconf-2.50 net-libs/libgadu ssl? ( >=dev-libs/openssl-0.9.6 ) ncurses? ( sys-libs/ncurses ) readline? ( sys-libs/readline ) zlib? ( sys-libs/zlib ) python? ( dev-lang/python ) spell? ( >=app-text/aspell-0.50.3 ) gif? ( media-libs/giflib ) jpeg? ( virtual/jpeg ) gtk? ( x11-libs/gtk+:2 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=sys-devel/automake-1.7 >=sys-devel/autoconf-2.50 net-libs/libgadu ssl? ( >=dev-libs/openssl-0.9.6 ) ncurses? ( sys-libs/ncurses ) readline? ( sys-libs/readline ) zlib? ( sys-libs/zlib ) python? ( dev-lang/python ) spell? ( >=app-text/aspell-0.50.3 ) gif? ( media-libs/giflib ) jpeg? ( virtual/jpeg ) gtk? ( x11-libs/gtk+:2 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 net-libs/libgadu ssl? ( >=dev-libs/openssl-0.9.6 ) ncurses? ( sys-libs/ncurses ) readline? ( sys-libs/readline ) zlib? ( sys-libs/zlib ) python? ( dev-lang/python ) spell? ( >=app-text/aspell-0.50.3 ) gif? ( media-libs/giflib ) jpeg? ( virtual/jpeg ) gtk? ( x11-libs/gtk+:2 )
 0
 http://ekg.chmurka.net/ekg-1.8rc1.tar.gz
diff --git a/metadata/cache/net-im/linpopup-2.0.4-r1 b/metadata/cache/net-im/linpopup-2.0.4-r1
index 4b9e561e1fa1..34fa2c3f6918 100644
--- a/metadata/cache/net-im/linpopup-2.0.4-r1
+++ b/metadata/cache/net-im/linpopup-2.0.4-r1
@@ -1,4 +1,4 @@
-x11-libs/libX11 x11-libs/libXmu x11-libs/gtk+:2 dev-util/pkgconfig x11-proto/xproto || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+x11-libs/libX11 x11-libs/libXmu x11-libs/gtk+:2 dev-util/pkgconfig x11-proto/xproto || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 x11-libs/libX11 x11-libs/libXmu x11-libs/gtk+:2
 0
 mirror://sourceforge/linpopup2/linpopup-2.0.4.tar.bz2
diff --git a/metadata/cache/net-im/linpopup-2.1.0 b/metadata/cache/net-im/linpopup-2.1.0
index ef722cae0079..36ce07afb75a 100644
--- a/metadata/cache/net-im/linpopup-2.1.0
+++ b/metadata/cache/net-im/linpopup-2.1.0
@@ -1,4 +1,4 @@
-x11-libs/libX11 x11-libs/libXmu x11-libs/gtk+:2 dev-util/pkgconfig x11-proto/xproto || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+x11-libs/libX11 x11-libs/libXmu x11-libs/gtk+:2 dev-util/pkgconfig x11-proto/xproto || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 x11-libs/libX11 x11-libs/libXmu x11-libs/gtk+:2
 0
 mirror://sourceforge/linpopup2/linpopup-2.1.0.tar.bz2
diff --git a/metadata/cache/net-im/tleenx2-20060309 b/metadata/cache/net-im/tleenx2-20060309
index c36bc78d54cd..a10e0706e96d 100644
--- a/metadata/cache/net-im/tleenx2-20060309
+++ b/metadata/cache/net-im/tleenx2-20060309
@@ -1,4 +1,4 @@
-dev-util/pkgconfig net-libs/libtlen x11-libs/gtk+:2 x11-libs/libXScrnSaver || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-util/pkgconfig net-libs/libtlen x11-libs/gtk+:2 x11-libs/libXScrnSaver || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 net-libs/libtlen x11-libs/gtk+:2 x11-libs/libXScrnSaver
 0
 mirror://sourceforge/tleenx/TleenX2-20060309.tar.gz
diff --git a/metadata/cache/net-irc/anope-1.8.7 b/metadata/cache/net-irc/anope-1.8.7
index 77395deb8cca..7de04eed8861 100644
--- a/metadata/cache/net-irc/anope-1.8.7
+++ b/metadata/cache/net-irc/anope-1.8.7
@@ -1,4 +1,4 @@
-mysql? ( virtual/mysql ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+mysql? ( virtual/mysql ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 mysql? ( virtual/mysql )
 0
 mirror://sourceforge/anope/anope-1.8.7.tar.gz
diff --git a/metadata/cache/net-irc/atheme-services-6.0.10 b/metadata/cache/net-irc/atheme-services-6.0.10
index 64d4ac3b4b58..0b2e554042eb 100644
--- a/metadata/cache/net-irc/atheme-services-6.0.10
+++ b/metadata/cache/net-irc/atheme-services-6.0.10
@@ -1,4 +1,4 @@
-dev-libs/libmowgli:0 cracklib? ( sys-libs/cracklib ) ldap? ( net-nds/openldap ) nls? ( sys-devel/gettext ) pcre? ( dev-libs/libpcre ) ssl? ( dev-libs/openssl ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-lang/perl[-build]
+dev-libs/libmowgli:0 cracklib? ( sys-libs/cracklib ) ldap? ( net-nds/openldap ) nls? ( sys-devel/gettext ) pcre? ( dev-libs/libpcre ) ssl? ( dev-libs/openssl ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-lang/perl[-build]
 dev-libs/libmowgli:0 cracklib? ( sys-libs/cracklib ) ldap? ( net-nds/openldap ) nls? ( sys-devel/gettext ) pcre? ( dev-libs/libpcre ) ssl? ( dev-libs/openssl ) dev-lang/perl[-build]
 0
 http://atheme.net/downloads/atheme-services-6.0.10.tar.bz2
diff --git a/metadata/cache/net-irc/atheme-services-7.0.0_alpha11 b/metadata/cache/net-irc/atheme-services-7.0.0_alpha11
index e603420ce4e4..9dd4655b1443 100644
--- a/metadata/cache/net-irc/atheme-services-7.0.0_alpha11
+++ b/metadata/cache/net-irc/atheme-services-7.0.0_alpha11
@@ -1,4 +1,4 @@
-dev-libs/libmowgli:2 cracklib? ( sys-libs/cracklib ) ldap? ( net-nds/openldap ) nls? ( sys-devel/gettext ) perl? ( dev-lang/perl ) pcre? ( dev-libs/libpcre ) ssl? ( dev-libs/openssl ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-lang/perl[-build]
+dev-libs/libmowgli:2 cracklib? ( sys-libs/cracklib ) ldap? ( net-nds/openldap ) nls? ( sys-devel/gettext ) perl? ( dev-lang/perl ) pcre? ( dev-libs/libpcre ) ssl? ( dev-libs/openssl ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-lang/perl[-build]
 dev-libs/libmowgli:2 cracklib? ( sys-libs/cracklib ) ldap? ( net-nds/openldap ) nls? ( sys-devel/gettext ) perl? ( dev-lang/perl ) pcre? ( dev-libs/libpcre ) ssl? ( dev-libs/openssl ) dev-lang/perl[-build]
 0
 http://atheme.net/downloads/atheme-services-7.0.0-alpha11.tar.bz2
diff --git a/metadata/cache/net-irc/atheme-services-7.0.0_alpha9 b/metadata/cache/net-irc/atheme-services-7.0.0_alpha9
index 736b47381f45..22f39fba046b 100644
--- a/metadata/cache/net-irc/atheme-services-7.0.0_alpha9
+++ b/metadata/cache/net-irc/atheme-services-7.0.0_alpha9
@@ -1,4 +1,4 @@
->=dev-libs/libmowgli-0.9.95:0 cracklib? ( sys-libs/cracklib ) ldap? ( net-nds/openldap ) nls? ( sys-devel/gettext ) perl? ( dev-lang/perl ) pcre? ( dev-libs/libpcre ) ssl? ( dev-libs/openssl ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-lang/perl[-build]
+>=dev-libs/libmowgli-0.9.95:0 cracklib? ( sys-libs/cracklib ) ldap? ( net-nds/openldap ) nls? ( sys-devel/gettext ) perl? ( dev-lang/perl ) pcre? ( dev-libs/libpcre ) ssl? ( dev-libs/openssl ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-lang/perl[-build]
 >=dev-libs/libmowgli-0.9.95:0 cracklib? ( sys-libs/cracklib ) ldap? ( net-nds/openldap ) nls? ( sys-devel/gettext ) perl? ( dev-lang/perl ) pcre? ( dev-libs/libpcre ) ssl? ( dev-libs/openssl ) dev-lang/perl[-build]
 0
 http://atheme.net/downloads/atheme-services-7.0.0-alpha9.tar.bz2
diff --git a/metadata/cache/net-irc/bip-0.8.8-r1 b/metadata/cache/net-irc/bip-0.8.8-r1
index 446ebddb9c57..0dff62f99189 100644
--- a/metadata/cache/net-irc/bip-0.8.8-r1
+++ b/metadata/cache/net-irc/bip-0.8.8-r1
@@ -1,4 +1,4 @@
-sys-devel/flex virtual/yacc ssl? ( dev-libs/openssl ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+sys-devel/flex virtual/yacc ssl? ( dev-libs/openssl ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 sys-devel/flex virtual/yacc ssl? ( dev-libs/openssl ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) oidentd? ( >=net-misc/oidentd-2.0 )
 0
 ftp://ftp.duckcorp.org/bip/bip-0.8.8.tar.gz
diff --git a/metadata/cache/net-irc/bobotpp-2.2.3 b/metadata/cache/net-irc/bobotpp-2.2.3
index 53e88e59aa06..1d77eb0cc5c1 100644
--- a/metadata/cache/net-irc/bobotpp-2.2.3
+++ b/metadata/cache/net-irc/bobotpp-2.2.3
@@ -1,4 +1,4 @@
-guile? ( dev-scheme/guile ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+guile? ( dev-scheme/guile ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 guile? ( dev-scheme/guile )
 0
 http://savannah.nongnu.org/download/bobotpp/bobotpp-2.2.3.tar.gz
diff --git a/metadata/cache/net-irc/charybdis-3.3.0 b/metadata/cache/net-irc/charybdis-3.3.0
index 40fd87ce67bf..e2511a88e199 100644
--- a/metadata/cache/net-irc/charybdis-3.3.0
+++ b/metadata/cache/net-irc/charybdis-3.3.0
@@ -1,4 +1,4 @@
-ssl? ( dev-libs/openssl ) zlib? ( sys-libs/zlib ) virtual/yacc sys-devel/flex || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+ssl? ( dev-libs/openssl ) zlib? ( sys-libs/zlib ) virtual/yacc sys-devel/flex || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 ssl? ( dev-libs/openssl ) zlib? ( sys-libs/zlib )
 0
 http://www.stack.nl/~jilles/irc/charybdis-3.3.0.tbz2 http://dev.gentoo.org/~binki/distfiles/net-irc/charybdis/charybdis-3.3.0-patches.tar.bz2
diff --git a/metadata/cache/net-irc/epic4-2.10.1 b/metadata/cache/net-irc/epic4-2.10.1
index 1549e5fb56b3..3c457a24d178 100644
--- a/metadata/cache/net-irc/epic4-2.10.1
+++ b/metadata/cache/net-irc/epic4-2.10.1
@@ -1,4 +1,4 @@
->=sys-libs/ncurses-5.2 perl? ( dev-lang/perl ) ssl? ( >=dev-libs/openssl-0.9.5 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=sys-libs/ncurses-5.2 perl? ( dev-lang/perl ) ssl? ( >=dev-libs/openssl-0.9.5 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=sys-libs/ncurses-5.2 perl? ( dev-lang/perl ) ssl? ( >=dev-libs/openssl-0.9.5 )
 0
 ftp://ftp.epicsol.org/pub/epic/EPIC4-PRODUCTION/epic4-2.10.1.tar.bz2 ftp://prbh.org/pub/epic/EPIC4-PRODUCTION/epic4-help-20050315.tar.gz mirror://gentoo/epic4-local.bz2
diff --git a/metadata/cache/net-irc/epic5-1.1.2 b/metadata/cache/net-irc/epic5-1.1.2
index 19d4df6ba336..372991c801f5 100644
--- a/metadata/cache/net-irc/epic5-1.1.2
+++ b/metadata/cache/net-irc/epic5-1.1.2
@@ -1,4 +1,4 @@
-virtual/libiconv >=dev-libs/openssl-0.9.8e-r3 >=sys-libs/ncurses-5.6-r2 archive? ( app-arch/libarchive ) perl? ( >=dev-lang/perl-5.8.8-r2 ) tcl? ( dev-lang/tcl ) socks5? ( net-proxy/dante ) ruby? ( dev-lang/ruby:1.8 ) valgrind? ( dev-util/valgrind ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+virtual/libiconv >=dev-libs/openssl-0.9.8e-r3 >=sys-libs/ncurses-5.6-r2 archive? ( app-arch/libarchive ) perl? ( >=dev-lang/perl-5.8.8-r2 ) tcl? ( dev-lang/tcl ) socks5? ( net-proxy/dante ) ruby? ( dev-lang/ruby:1.8 ) valgrind? ( dev-util/valgrind ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 virtual/libiconv >=dev-libs/openssl-0.9.8e-r3 >=sys-libs/ncurses-5.6-r2 archive? ( app-arch/libarchive ) perl? ( >=dev-lang/perl-5.8.8-r2 ) tcl? ( dev-lang/tcl ) socks5? ( net-proxy/dante ) ruby? ( dev-lang/ruby:1.8 )
 0
 ftp://ftp.epicsol.org/pub/epic/EPIC5-PRODUCTION/epic5-1.1.2.tar.bz2
diff --git a/metadata/cache/net-irc/irssi-9999 b/metadata/cache/net-irc/irssi-9999
index 7f086284c7a0..c2fb6674b9ec 100644
--- a/metadata/cache/net-irc/irssi-9999
+++ b/metadata/cache/net-irc/irssi-9999
@@ -1,4 +1,4 @@
-sys-libs/ncurses >=dev-libs/glib-2.2.1 ssl? ( dev-libs/openssl ) perl? ( dev-lang/perl ) socks5? ( >=net-proxy/dante-1.1.18 ) >=dev-util/pkgconfig-0.9.0 >=sys-devel/autoconf-2.58 dev-lang/perl www-client/lynx || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-lang/perl[-build] dev-vcs/subversion net-misc/rsync
+sys-libs/ncurses >=dev-libs/glib-2.2.1 ssl? ( dev-libs/openssl ) perl? ( dev-lang/perl ) socks5? ( >=net-proxy/dante-1.1.18 ) >=dev-util/pkgconfig-0.9.0 >=sys-devel/autoconf-2.58 dev-lang/perl www-client/lynx || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-lang/perl[-build] dev-vcs/subversion net-misc/rsync
 sys-libs/ncurses >=dev-libs/glib-2.2.1 ssl? ( dev-libs/openssl ) perl? ( dev-lang/perl ) socks5? ( >=net-proxy/dante-1.1.18 ) perl? ( !net-im/silc-client ) dev-lang/perl[-build]
 0
 
diff --git a/metadata/cache/net-irc/ultimate-3.0.2-r2 b/metadata/cache/net-irc/ultimate-3.0.2-r2
index 9ff93a47f623..0e6e4692efb7 100644
--- a/metadata/cache/net-irc/ultimate-3.0.2-r2
+++ b/metadata/cache/net-irc/ultimate-3.0.2-r2
@@ -1,4 +1,4 @@
-sys-libs/zlib ssl? ( dev-libs/openssl ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 ssl? ( dev-libs/openssl )
+sys-libs/zlib ssl? ( dev-libs/openssl ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 ssl? ( dev-libs/openssl )
 sys-libs/zlib ssl? ( dev-libs/openssl )
 0
 mirror://sourceforge/ultimate/Ultimate3.0.2.tar.bz2
diff --git a/metadata/cache/net-irc/xchat-2.8.8-r1 b/metadata/cache/net-irc/xchat-2.8.8-r1
index 340073f4732b..36705ee084c0 100644
--- a/metadata/cache/net-irc/xchat-2.8.8-r1
+++ b/metadata/cache/net-irc/xchat-2.8.8-r1
@@ -1,4 +1,4 @@
->=dev-libs/glib-2.6.0:2 gtk? ( >=x11-libs/gtk+-2.10.0:2 ) ssl? ( >=dev-libs/openssl-0.9.6d ) perl? ( >=dev-lang/perl-5.8.0 ) python? ( =dev-lang/python-2* ) tcl? ( dev-lang/tcl ) dbus? ( >=dev-libs/dbus-glib-0.71 ) spell? ( app-text/gtkspell:2 ) libnotify? ( x11-libs/libnotify ) ntlm? ( net-libs/libntlm ) x11-libs/pango !<net-irc/xchat-gnome-0.9 >=dev-util/pkgconfig-0.16 nls? ( sys-devel/gettext ) >=sys-apps/sed-4 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-libs/glib-2.6.0:2 gtk? ( >=x11-libs/gtk+-2.10.0:2 ) ssl? ( >=dev-libs/openssl-0.9.6d ) perl? ( >=dev-lang/perl-5.8.0 ) python? ( =dev-lang/python-2* ) tcl? ( dev-lang/tcl ) dbus? ( >=dev-libs/dbus-glib-0.71 ) spell? ( app-text/gtkspell:2 ) libnotify? ( x11-libs/libnotify ) ntlm? ( net-libs/libntlm ) x11-libs/pango !<net-irc/xchat-gnome-0.9 >=dev-util/pkgconfig-0.16 nls? ( sys-devel/gettext ) >=sys-apps/sed-4 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=dev-libs/glib-2.6.0:2 gtk? ( >=x11-libs/gtk+-2.10.0:2 ) ssl? ( >=dev-libs/openssl-0.9.6d ) perl? ( >=dev-lang/perl-5.8.0 ) python? ( =dev-lang/python-2* ) tcl? ( dev-lang/tcl ) dbus? ( >=dev-libs/dbus-glib-0.71 ) spell? ( app-text/gtkspell:2 ) libnotify? ( x11-libs/libnotify ) ntlm? ( net-libs/libntlm ) x11-libs/pango !<net-irc/xchat-gnome-0.9
 2
 http://www.xchat.org/files/source/2.8/xchat-2.8.8.tar.bz2 mirror://sourceforge/xchat/xchat-2.8.8.tar.bz2 xchatdccserver? ( mirror://gentoo/xchat-dccserver-0.6.patch.bz2 )
diff --git a/metadata/cache/net-irc/xchat-2.8.8-r2 b/metadata/cache/net-irc/xchat-2.8.8-r2
index f3c3ab191bbb..81d59e06375d 100644
--- a/metadata/cache/net-irc/xchat-2.8.8-r2
+++ b/metadata/cache/net-irc/xchat-2.8.8-r2
@@ -1,4 +1,4 @@
->=dev-libs/glib-2.6.0:2 gtk? ( >=x11-libs/gtk+-2.10.0:2 ) ssl? ( >=dev-libs/openssl-0.9.6d ) perl? ( >=dev-lang/perl-5.8.0 ) python? ( =dev-lang/python-2* ) tcl? ( dev-lang/tcl ) dbus? ( >=dev-libs/dbus-glib-0.71 ) spell? ( app-text/gtkspell:2 ) libnotify? ( x11-libs/libnotify ) ntlm? ( net-libs/libntlm ) x11-libs/pango !<net-irc/xchat-gnome-0.9 >=dev-util/pkgconfig-0.16 nls? ( sys-devel/gettext ) >=sys-apps/sed-4 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-libs/glib-2.6.0:2 gtk? ( >=x11-libs/gtk+-2.10.0:2 ) ssl? ( >=dev-libs/openssl-0.9.6d ) perl? ( >=dev-lang/perl-5.8.0 ) python? ( =dev-lang/python-2* ) tcl? ( dev-lang/tcl ) dbus? ( >=dev-libs/dbus-glib-0.71 ) spell? ( app-text/gtkspell:2 ) libnotify? ( x11-libs/libnotify ) ntlm? ( net-libs/libntlm ) x11-libs/pango !<net-irc/xchat-gnome-0.9 >=dev-util/pkgconfig-0.16 nls? ( sys-devel/gettext ) >=sys-apps/sed-4 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=dev-libs/glib-2.6.0:2 gtk? ( >=x11-libs/gtk+-2.10.0:2 ) ssl? ( >=dev-libs/openssl-0.9.6d ) perl? ( >=dev-lang/perl-5.8.0 ) python? ( =dev-lang/python-2* ) tcl? ( dev-lang/tcl ) dbus? ( >=dev-libs/dbus-glib-0.71 ) spell? ( app-text/gtkspell:2 ) libnotify? ( x11-libs/libnotify ) ntlm? ( net-libs/libntlm ) x11-libs/pango !<net-irc/xchat-gnome-0.9
 2
 http://www.xchat.org/files/source/2.8/xchat-2.8.8.tar.bz2 mirror://sourceforge/xchat/xchat-2.8.8.tar.bz2 hires-icons? ( http://dev.gentoo.org/~nirbheek/dist/xchat_irc_icon_by_half_left-d3bjxuo.zip ) xchatdccserver? ( mirror://gentoo/xchat-dccserver-0.6.patch.bz2 )
diff --git a/metadata/cache/net-irc/xchat-gnome-0.26.1-r2 b/metadata/cache/net-irc/xchat-gnome-0.26.1-r2
index 82e19c12d942..1116921a3cf5 100644
--- a/metadata/cache/net-irc/xchat-gnome-0.26.1-r2
+++ b/metadata/cache/net-irc/xchat-gnome-0.26.1-r2
@@ -1,4 +1,4 @@
->=dev-libs/glib-2.18:2 >=gnome-base/libgnome-2.16.0 >=gnome-base/gconf-2.8.0 >=gnome-base/libgnomeui-2.16.0 >=gnome-base/libglade-2.3.2 >=media-libs/libcanberra-0.3[gtk] >=x11-libs/gtk+-2.14:2 >=x11-libs/libsexy-0.1.11 x11-libs/libX11 spell? ( app-text/enchant ) ssl? ( >=dev-libs/openssl-0.9.6d ) perl? ( >=dev-lang/perl-5.6.1 ) tcl? ( dev-lang/tcl ) dbus? ( >=sys-apps/dbus-0.60 ) libnotify? ( >=x11-libs/libnotify-0.3.2 ) >=dev-util/pkgconfig-0.7 >=app-text/gnome-doc-utils-0.3.2 nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 python? ( =dev-lang/python-2* )
+>=dev-libs/glib-2.18:2 >=gnome-base/libgnome-2.16.0 >=gnome-base/gconf-2.8.0 >=gnome-base/libgnomeui-2.16.0 >=gnome-base/libglade-2.3.2 >=media-libs/libcanberra-0.3[gtk] >=x11-libs/gtk+-2.14:2 >=x11-libs/libsexy-0.1.11 x11-libs/libX11 spell? ( app-text/enchant ) ssl? ( >=dev-libs/openssl-0.9.6d ) perl? ( >=dev-lang/perl-5.6.1 ) tcl? ( dev-lang/tcl ) dbus? ( >=sys-apps/dbus-0.60 ) libnotify? ( >=x11-libs/libnotify-0.3.2 ) >=dev-util/pkgconfig-0.7 >=app-text/gnome-doc-utils-0.3.2 nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 python? ( =dev-lang/python-2* )
 >=dev-libs/glib-2.18:2 >=gnome-base/libgnome-2.16.0 >=gnome-base/gconf-2.8.0 >=gnome-base/libgnomeui-2.16.0 >=gnome-base/libglade-2.3.2 >=media-libs/libcanberra-0.3[gtk] >=x11-libs/gtk+-2.14:2 >=x11-libs/libsexy-0.1.11 x11-libs/libX11 spell? ( app-text/enchant ) ssl? ( >=dev-libs/openssl-0.9.6d ) perl? ( >=dev-lang/perl-5.6.1 ) tcl? ( dev-lang/tcl ) dbus? ( >=sys-apps/dbus-0.60 ) libnotify? ( >=x11-libs/libnotify-0.3.2 ) python? ( =dev-lang/python-2* )
 0
 mirror://gnome/sources/xchat-gnome/0.26/xchat-gnome-0.26.1.tar.bz2
diff --git a/metadata/cache/net-libs/dslib-2.0 b/metadata/cache/net-libs/dslib-2.0.2
similarity index 93%
rename from metadata/cache/net-libs/dslib-2.0
rename to metadata/cache/net-libs/dslib-2.0.2
index d0e4329e5df8..e40b54407031 100644
--- a/metadata/cache/net-libs/dslib-2.0
+++ b/metadata/cache/net-libs/dslib-2.0.2
@@ -1,7 +1,7 @@
 dev-python/pyasn1 dev-python/pyopenssl dev-python/sudsds dev-lang/python
 dev-python/pyasn1 dev-python/pyopenssl dev-python/sudsds dev-lang/python
 0
-http://www.nic.cz/public_media/datove_schranky/releases/datovka-2.0/src/dslib-2.0.tar.gz
+http://www.nic.cz/public_media/datove_schranky/releases/datovka-2.0.2/src/dslib-2.0.2.tar.gz
 
 http://labs.nic.cz/page/969/datovka/
 GPL-2
diff --git a/metadata/cache/net-libs/glib-networking-2.30.1-r1 b/metadata/cache/net-libs/glib-networking-2.30.1-r1
index e591956c749c..8a9c58942c92 100644
--- a/metadata/cache/net-libs/glib-networking-2.30.1-r1
+++ b/metadata/cache/net-libs/glib-networking-2.30.1-r1
@@ -1,4 +1,4 @@
->=dev-libs/glib-2.29.16:2 gnome? ( gnome-base/gsettings-desktop-schemas ) libproxy? ( >=net-libs/libproxy-0.4.6-r3 ) ssl? ( app-misc/ca-certificates >=net-libs/gnutls-2.1.7 ) >=dev-util/intltool-0.35.0 >=dev-util/pkgconfig-0.9 sys-devel/gettext >=sys-devel/autoconf-2.65:2.5 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
+>=dev-libs/glib-2.29.16:2 gnome? ( gnome-base/gsettings-desktop-schemas ) libproxy? ( >=net-libs/libproxy-0.4.6-r3 ) ssl? ( app-misc/ca-certificates >=net-libs/gnutls-2.1.7 ) >=dev-util/intltool-0.35.0 >=dev-util/pkgconfig-0.9 sys-devel/gettext >=sys-devel/autoconf-2.65:2.5 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
 >=dev-libs/glib-2.29.16:2 gnome? ( gnome-base/gsettings-desktop-schemas ) libproxy? ( >=net-libs/libproxy-0.4.6-r3 ) ssl? ( app-misc/ca-certificates >=net-libs/gnutls-2.1.7 )
 0
 mirror://gnome/sources/glib-networking/2.30/glib-networking-2.30.1.tar.xz
diff --git a/metadata/cache/net-libs/gloox-0.9.9.5 b/metadata/cache/net-libs/gloox-0.9.9.5
index 175dea1e6afe..610647d0ad32 100644
--- a/metadata/cache/net-libs/gloox-0.9.9.5
+++ b/metadata/cache/net-libs/gloox-0.9.9.5
@@ -1,4 +1,4 @@
-idn? ( >=net-dns/libidn-0.5.0 ) gnutls? ( >=net-libs/gnutls-1.2.0 ) ssl? ( >=dev-libs/openssl-0.9.8 ) zlib? ( >=sys-libs/zlib-1.2.3 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+idn? ( >=net-dns/libidn-0.5.0 ) gnutls? ( >=net-libs/gnutls-1.2.0 ) ssl? ( >=dev-libs/openssl-0.9.8 ) zlib? ( >=sys-libs/zlib-1.2.3 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 idn? ( >=net-dns/libidn-0.5.0 ) gnutls? ( >=net-libs/gnutls-1.2.0 ) ssl? ( >=dev-libs/openssl-0.9.8 ) zlib? ( >=sys-libs/zlib-1.2.3 )
 0
 http://camaya.net/download/gloox-0.9.9.5.tar.bz2
diff --git a/metadata/cache/net-libs/gnet-2.0.8-r1 b/metadata/cache/net-libs/gnet-2.0.8-r1
index e6ad7b8b92d3..b6c43bd8a389 100644
--- a/metadata/cache/net-libs/gnet-2.0.8-r1
+++ b/metadata/cache/net-libs/gnet-2.0.8-r1
@@ -1,4 +1,4 @@
->=dev-libs/glib-2.6:2 dev-util/pkgconfig doc? ( >=dev-util/gtk-doc-1.2 ) >=dev-libs/check-0.9.7 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+>=dev-libs/glib-2.6:2 dev-util/pkgconfig doc? ( >=dev-util/gtk-doc-1.2 ) >=dev-libs/check-0.9.7 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 >=dev-libs/glib-2.6:2
 2
 mirror://gnome/sources/gnet/2.0/gnet-2.0.8.tar.bz2
diff --git a/metadata/cache/net-libs/gnutls-2.10.5 b/metadata/cache/net-libs/gnutls-2.10.5
index 0c9a02aae9d7..ea82660c9408 100644
--- a/metadata/cache/net-libs/gnutls-2.10.5
+++ b/metadata/cache/net-libs/gnutls-2.10.5
@@ -1,4 +1,4 @@
->=dev-libs/libgcrypt-1.4.0 >=dev-libs/libtasn1-0.3.4 nls? ( virtual/libintl ) guile? ( >=dev-scheme/guile-1.8[networking] ) zlib? ( >=sys-libs/zlib-1.2.3.1 ) !bindist? ( lzo? ( >=dev-libs/lzo-2 ) ) sys-devel/libtool doc? ( dev-util/gtk-doc ) nls? ( sys-devel/gettext ) test? ( app-misc/datefudge ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-libs/libgcrypt-1.4.0 >=dev-libs/libtasn1-0.3.4 nls? ( virtual/libintl ) guile? ( >=dev-scheme/guile-1.8[networking] ) zlib? ( >=sys-libs/zlib-1.2.3.1 ) !bindist? ( lzo? ( >=dev-libs/lzo-2 ) ) sys-devel/libtool doc? ( dev-util/gtk-doc ) nls? ( sys-devel/gettext ) test? ( app-misc/datefudge ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=dev-libs/libgcrypt-1.4.0 >=dev-libs/libtasn1-0.3.4 nls? ( virtual/libintl ) guile? ( >=dev-scheme/guile-1.8[networking] ) zlib? ( >=sys-libs/zlib-1.2.3.1 ) !bindist? ( lzo? ( >=dev-libs/lzo-2 ) )
 0
 mirror://gnu/gnutls/gnutls-2.10.5.tar.bz2
diff --git a/metadata/cache/net-libs/gnutls-2.12.17 b/metadata/cache/net-libs/gnutls-2.12.17
index f8f2723e9d36..48945dc90eb6 100644
--- a/metadata/cache/net-libs/gnutls-2.12.17
+++ b/metadata/cache/net-libs/gnutls-2.12.17
@@ -1,4 +1,4 @@
->=dev-libs/libtasn1-0.3.4 guile? ( >=dev-scheme/guile-1.8[networking] ) nettle? ( >=dev-libs/nettle-2.1[gmp] ) !nettle? ( >=dev-libs/libgcrypt-1.4.0 ) nls? ( virtual/libintl ) pkcs11? ( app-crypt/p11-kit ) zlib? ( >=sys-libs/zlib-1.2.3.1 ) !bindist? ( lzo? ( >=dev-libs/lzo-2 ) ) sys-devel/libtool doc? ( dev-util/gtk-doc ) nls? ( sys-devel/gettext ) test? ( app-misc/datefudge ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-libs/libtasn1-0.3.4 guile? ( >=dev-scheme/guile-1.8[networking] ) nettle? ( >=dev-libs/nettle-2.1[gmp] ) !nettle? ( >=dev-libs/libgcrypt-1.4.0 ) nls? ( virtual/libintl ) pkcs11? ( app-crypt/p11-kit ) zlib? ( >=sys-libs/zlib-1.2.3.1 ) !bindist? ( lzo? ( >=dev-libs/lzo-2 ) ) sys-devel/libtool doc? ( dev-util/gtk-doc ) nls? ( sys-devel/gettext ) test? ( app-misc/datefudge ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=dev-libs/libtasn1-0.3.4 guile? ( >=dev-scheme/guile-1.8[networking] ) nettle? ( >=dev-libs/nettle-2.1[gmp] ) !nettle? ( >=dev-libs/libgcrypt-1.4.0 ) nls? ( virtual/libintl ) pkcs11? ( app-crypt/p11-kit ) zlib? ( >=sys-libs/zlib-1.2.3.1 ) !bindist? ( lzo? ( >=dev-libs/lzo-2 ) )
 0
 mirror://gnu/gnutls/gnutls-2.12.17.tar.bz2
diff --git a/metadata/cache/net-libs/gnutls-2.12.18 b/metadata/cache/net-libs/gnutls-2.12.18
index e1e089e20d6b..d2b90f007ffc 100644
--- a/metadata/cache/net-libs/gnutls-2.12.18
+++ b/metadata/cache/net-libs/gnutls-2.12.18
@@ -1,4 +1,4 @@
->=dev-libs/libtasn1-0.3.4 guile? ( >=dev-scheme/guile-1.8[networking] ) nettle? ( >=dev-libs/nettle-2.1[gmp] ) !nettle? ( >=dev-libs/libgcrypt-1.4.0 ) nls? ( virtual/libintl ) pkcs11? ( app-crypt/p11-kit ) zlib? ( >=sys-libs/zlib-1.2.3.1 ) !bindist? ( lzo? ( >=dev-libs/lzo-2 ) ) sys-devel/libtool doc? ( dev-util/gtk-doc ) nls? ( sys-devel/gettext ) test? ( app-misc/datefudge ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-libs/libtasn1-0.3.4 guile? ( >=dev-scheme/guile-1.8[networking] ) nettle? ( >=dev-libs/nettle-2.1[gmp] ) !nettle? ( >=dev-libs/libgcrypt-1.4.0 ) nls? ( virtual/libintl ) pkcs11? ( app-crypt/p11-kit ) zlib? ( >=sys-libs/zlib-1.2.3.1 ) !bindist? ( lzo? ( >=dev-libs/lzo-2 ) ) sys-devel/libtool doc? ( dev-util/gtk-doc ) nls? ( sys-devel/gettext ) test? ( app-misc/datefudge ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=dev-libs/libtasn1-0.3.4 guile? ( >=dev-scheme/guile-1.8[networking] ) nettle? ( >=dev-libs/nettle-2.1[gmp] ) !nettle? ( >=dev-libs/libgcrypt-1.4.0 ) nls? ( virtual/libintl ) pkcs11? ( app-crypt/p11-kit ) zlib? ( >=sys-libs/zlib-1.2.3.1 ) !bindist? ( lzo? ( >=dev-libs/lzo-2 ) )
 0
 mirror://gnu/gnutls/gnutls-2.12.18.tar.bz2
diff --git a/metadata/cache/net-libs/gnutls-3.0.15 b/metadata/cache/net-libs/gnutls-3.0.15
index aab3f9ea7f7c..f3fcd8ee111c 100644
--- a/metadata/cache/net-libs/gnutls-3.0.15
+++ b/metadata/cache/net-libs/gnutls-3.0.15
@@ -1,4 +1,4 @@
->=dev-libs/libtasn1-0.3.4 >=dev-libs/nettle-2.4[gmp] >=sys-devel/autogen-5.15 guile? ( >=dev-scheme/guile-1.8[networking] ) nls? ( virtual/libintl ) pkcs11? ( >=app-crypt/p11-kit-0.11 ) zlib? ( >=sys-libs/zlib-1.2.3.1 ) sys-devel/libtool doc? ( dev-util/gtk-doc ) nls? ( sys-devel/gettext ) test? ( app-misc/datefudge ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-libs/libtasn1-0.3.4 >=dev-libs/nettle-2.4[gmp] >=sys-devel/autogen-5.15 guile? ( >=dev-scheme/guile-1.8[networking] ) nls? ( virtual/libintl ) pkcs11? ( >=app-crypt/p11-kit-0.11 ) zlib? ( >=sys-libs/zlib-1.2.3.1 ) sys-devel/libtool doc? ( dev-util/gtk-doc ) nls? ( sys-devel/gettext ) test? ( app-misc/datefudge ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=dev-libs/libtasn1-0.3.4 >=dev-libs/nettle-2.4[gmp] >=sys-devel/autogen-5.15 guile? ( >=dev-scheme/guile-1.8[networking] ) nls? ( virtual/libintl ) pkcs11? ( >=app-crypt/p11-kit-0.11 ) zlib? ( >=sys-libs/zlib-1.2.3.1 )
 0
 mirror://gnu/gnutls/gnutls-3.0.15.tar.xz
diff --git a/metadata/cache/net-libs/gnutls-3.0.16 b/metadata/cache/net-libs/gnutls-3.0.16
index 0ce2b355f454..28fd20954a6a 100644
--- a/metadata/cache/net-libs/gnutls-3.0.16
+++ b/metadata/cache/net-libs/gnutls-3.0.16
@@ -1,4 +1,4 @@
->=dev-libs/libtasn1-0.3.4 >=dev-libs/nettle-2.4[gmp] >=sys-devel/autogen-5.15 guile? ( >=dev-scheme/guile-1.8[networking] ) nls? ( virtual/libintl ) pkcs11? ( >=app-crypt/p11-kit-0.11 ) zlib? ( >=sys-libs/zlib-1.2.3.1 ) sys-devel/libtool doc? ( dev-util/gtk-doc ) nls? ( sys-devel/gettext ) test? ( app-misc/datefudge ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-libs/libtasn1-0.3.4 >=dev-libs/nettle-2.4[gmp] >=sys-devel/autogen-5.15 guile? ( >=dev-scheme/guile-1.8[networking] ) nls? ( virtual/libintl ) pkcs11? ( >=app-crypt/p11-kit-0.11 ) zlib? ( >=sys-libs/zlib-1.2.3.1 ) sys-devel/libtool doc? ( dev-util/gtk-doc ) nls? ( sys-devel/gettext ) test? ( app-misc/datefudge ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=dev-libs/libtasn1-0.3.4 >=dev-libs/nettle-2.4[gmp] >=sys-devel/autogen-5.15 guile? ( >=dev-scheme/guile-1.8[networking] ) nls? ( virtual/libintl ) pkcs11? ( >=app-crypt/p11-kit-0.11 ) zlib? ( >=sys-libs/zlib-1.2.3.1 )
 0
 mirror://gnu/gnutls/gnutls-3.0.16.tar.xz
diff --git a/metadata/cache/net-libs/gsoap-2.7.17 b/metadata/cache/net-libs/gsoap-2.7.17
index 16d741b67e39..27571750178f 100644
--- a/metadata/cache/net-libs/gsoap-2.7.17
+++ b/metadata/cache/net-libs/gsoap-2.7.17
@@ -1,4 +1,4 @@
-app-arch/unzip sys-devel/flex sys-devel/bison sys-libs/zlib ssl? ( dev-libs/openssl ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+app-arch/unzip sys-devel/flex sys-devel/bison sys-libs/zlib ssl? ( dev-libs/openssl ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 mirror://sourceforge/gsoap2/gsoap_2.7.17.zip
diff --git a/metadata/cache/net-libs/gsoap-2.8.0 b/metadata/cache/net-libs/gsoap-2.8.0
index f0084c9ad65e..f80ef0967566 100644
--- a/metadata/cache/net-libs/gsoap-2.8.0
+++ b/metadata/cache/net-libs/gsoap-2.8.0
@@ -1,4 +1,4 @@
-app-arch/unzip sys-devel/flex sys-devel/bison sys-libs/zlib ssl? ( dev-libs/openssl ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+app-arch/unzip sys-devel/flex sys-devel/bison sys-libs/zlib ssl? ( dev-libs/openssl ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 mirror://sourceforge/gsoap2/gsoap_2.8.0.zip
diff --git a/metadata/cache/net-libs/gsoap-2.8.1 b/metadata/cache/net-libs/gsoap-2.8.1
index d4ad4d409d40..eba8d7197fc5 100644
--- a/metadata/cache/net-libs/gsoap-2.8.1
+++ b/metadata/cache/net-libs/gsoap-2.8.1
@@ -1,4 +1,4 @@
-app-arch/unzip sys-devel/flex sys-devel/bison sys-libs/zlib ssl? ( dev-libs/openssl ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+app-arch/unzip sys-devel/flex sys-devel/bison sys-libs/zlib ssl? ( dev-libs/openssl ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 mirror://sourceforge/gsoap2/gsoap_2.8.1.zip
diff --git a/metadata/cache/net-libs/gupnp-igd-0.1.11 b/metadata/cache/net-libs/gupnp-igd-0.1.11
index e33a61dfa4aa..d9f2df33e632 100644
--- a/metadata/cache/net-libs/gupnp-igd-0.1.11
+++ b/metadata/cache/net-libs/gupnp-igd-0.1.11
@@ -1,4 +1,4 @@
->=net-libs/gupnp-0.13.2 !>=net-libs/gupnp-0.17 >=dev-libs/glib-2.16:2 introspection? ( >=dev-libs/gobject-introspection-0.10 ) python? ( >=dev-python/pygobject-2.16:2 ) dev-util/pkgconfig sys-devel/gettext dev-util/gtk-doc-am || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) )
+>=net-libs/gupnp-0.13.2 !>=net-libs/gupnp-0.17 >=dev-libs/glib-2.16:2 introspection? ( >=dev-libs/gobject-introspection-0.10 ) python? ( >=dev-python/pygobject-2.16:2 ) dev-util/pkgconfig sys-devel/gettext dev-util/gtk-doc-am || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) )
 >=net-libs/gupnp-0.13.2 !>=net-libs/gupnp-0.17 >=dev-libs/glib-2.16:2 introspection? ( >=dev-libs/gobject-introspection-0.10 ) python? ( >=dev-python/pygobject-2.16:2 ) python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) )
 0
 http://www.gupnp.org/sites/all/files/sources/gupnp-igd-0.1.11.tar.gz
diff --git a/metadata/cache/net-libs/gupnp-igd-0.1.7 b/metadata/cache/net-libs/gupnp-igd-0.1.7
index 4fa4787118eb..c54bab733860 100644
--- a/metadata/cache/net-libs/gupnp-igd-0.1.7
+++ b/metadata/cache/net-libs/gupnp-igd-0.1.7
@@ -1,4 +1,4 @@
->=net-libs/gupnp-0.13.2 !>=net-libs/gupnp-0.17 >=dev-libs/glib-2.16:2 python? ( >=dev-python/pygobject-2.16:2 ) dev-util/pkgconfig sys-devel/gettext dev-util/gtk-doc-am || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) )
+>=net-libs/gupnp-0.13.2 !>=net-libs/gupnp-0.17 >=dev-libs/glib-2.16:2 python? ( >=dev-python/pygobject-2.16:2 ) dev-util/pkgconfig sys-devel/gettext dev-util/gtk-doc-am || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) )
 >=net-libs/gupnp-0.13.2 !>=net-libs/gupnp-0.17 >=dev-libs/glib-2.16:2 python? ( >=dev-python/pygobject-2.16:2 ) python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) )
 0
 http://www.gupnp.org/sites/all/files/sources/gupnp-igd-0.1.7.tar.gz
diff --git a/metadata/cache/net-libs/gupnp-igd-0.2.1 b/metadata/cache/net-libs/gupnp-igd-0.2.1
index 854bc95af3ce..14cb34cbc91f 100644
--- a/metadata/cache/net-libs/gupnp-igd-0.2.1
+++ b/metadata/cache/net-libs/gupnp-igd-0.2.1
@@ -1,4 +1,4 @@
->=net-libs/gupnp-0.18 >=dev-libs/glib-2.16:2 introspection? ( >=dev-libs/gobject-introspection-0.10 ) python? ( >=dev-python/pygobject-2.16:2 ) dev-util/pkgconfig sys-devel/gettext dev-util/gtk-doc-am || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) )
+>=net-libs/gupnp-0.18 >=dev-libs/glib-2.16:2 introspection? ( >=dev-libs/gobject-introspection-0.10 ) python? ( >=dev-python/pygobject-2.16:2 ) dev-util/pkgconfig sys-devel/gettext dev-util/gtk-doc-am || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) )
 >=net-libs/gupnp-0.18 >=dev-libs/glib-2.16:2 introspection? ( >=dev-libs/gobject-introspection-0.10 ) python? ( >=dev-python/pygobject-2.16:2 ) python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) )
 0
 http://www.gupnp.org/sites/all/files/sources/gupnp-igd-0.2.1.tar.gz
diff --git a/metadata/cache/net-libs/ldns-1.6.12 b/metadata/cache/net-libs/ldns-1.6.12
index b67dbb5fa8e3..3fac52019d17 100644
--- a/metadata/cache/net-libs/ldns-1.6.12
+++ b/metadata/cache/net-libs/ldns-1.6.12
@@ -1,4 +1,4 @@
-ssl? ( >=dev-libs/openssl-0.9.7 ) gost? ( >=dev-libs/openssl-1 ) python? ( dev-lang/swig ) doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) )
+ssl? ( >=dev-libs/openssl-0.9.7 ) gost? ( >=dev-libs/openssl-1 ) python? ( dev-lang/swig ) doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) )
 ssl? ( >=dev-libs/openssl-0.9.7 ) gost? ( >=dev-libs/openssl-1 ) python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) )
 0
 http://www.nlnetlabs.nl/downloads/ldns/ldns-1.6.12.tar.gz
diff --git a/metadata/cache/net-libs/libbt-1.06 b/metadata/cache/net-libs/libbt-1.06
index f5094cd9f4e8..135a54482e4e 100644
--- a/metadata/cache/net-libs/libbt-1.06
+++ b/metadata/cache/net-libs/libbt-1.06
@@ -1,4 +1,4 @@
-dev-libs/openssl net-misc/curl >=sys-apps/util-linux-2.16.2 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-libs/openssl net-misc/curl >=sys-apps/util-linux-2.16.2 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-libs/openssl net-misc/curl >=sys-apps/util-linux-2.16.2
 0
 mirror://sourceforge/libbt/libbt-1.06.tar.gz
diff --git a/metadata/cache/net-libs/libdmapsharing-2.1.13 b/metadata/cache/net-libs/libdmapsharing-2.1.13
index 197dc1346752..e631769c1276 100644
--- a/metadata/cache/net-libs/libdmapsharing-2.1.13
+++ b/metadata/cache/net-libs/libdmapsharing-2.1.13
@@ -1,4 +1,4 @@
-dev-libs/glib:2 >=net-dns/avahi-0.6 >=net-libs/libsoup-2.32:2.4 >=media-libs/gstreamer-0.10:0.10 >=media-libs/gst-plugins-base-0.10.24:0.10 sys-libs/zlib || ( x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 ) dev-util/pkgconfig doc? ( >=dev-util/gtk-doc-1 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-libs/glib:2 >=net-dns/avahi-0.6 >=net-libs/libsoup-2.32:2.4 >=media-libs/gstreamer-0.10:0.10 >=media-libs/gst-plugins-base-0.10.24:0.10 sys-libs/zlib || ( x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 ) dev-util/pkgconfig doc? ( >=dev-util/gtk-doc-1 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-libs/glib:2 >=net-dns/avahi-0.6 >=net-libs/libsoup-2.32:2.4 >=media-libs/gstreamer-0.10:0.10 >=media-libs/gst-plugins-base-0.10.24:0.10 sys-libs/zlib || ( x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 )
 2.2
 http://www.flyn.org/projects/libdmapsharing/libdmapsharing-2.1.13.tar.gz
diff --git a/metadata/cache/net-libs/libeXosip-3.3.0 b/metadata/cache/net-libs/libeXosip-3.3.0
index c8faa9046edc..518524792b36 100644
--- a/metadata/cache/net-libs/libeXosip-3.3.0
+++ b/metadata/cache/net-libs/libeXosip-3.3.0
@@ -1,4 +1,4 @@
->=net-libs/libosip-3.2.0 ssl? ( dev-libs/openssl ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=net-libs/libosip-3.2.0 ssl? ( dev-libs/openssl ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=net-libs/libosip-3.2.0 ssl? ( dev-libs/openssl )
 0
 http://download.savannah.nongnu.org/releases/exosip/libeXosip2-3.3.0.tar.gz
diff --git a/metadata/cache/net-libs/libetpan-1.0 b/metadata/cache/net-libs/libetpan-1.0
index 169090229d45..1d77451ec89f 100644
--- a/metadata/cache/net-libs/libetpan-1.0
+++ b/metadata/cache/net-libs/libetpan-1.0
@@ -1,4 +1,4 @@
-berkdb? ( sys-libs/db ) gnutls? ( net-libs/gnutls ) !gnutls? ( ssl? ( dev-libs/openssl ) ) sasl? ( dev-libs/cyrus-sasl ) liblockfile? ( net-libs/liblockfile ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+berkdb? ( sys-libs/db ) gnutls? ( net-libs/gnutls ) !gnutls? ( ssl? ( dev-libs/openssl ) ) sasl? ( dev-libs/cyrus-sasl ) liblockfile? ( net-libs/liblockfile ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 berkdb? ( sys-libs/db ) gnutls? ( net-libs/gnutls ) !gnutls? ( ssl? ( dev-libs/openssl ) ) sasl? ( dev-libs/cyrus-sasl ) liblockfile? ( net-libs/liblockfile )
 0
 mirror://sourceforge/libetpan/libetpan-1.0.tar.gz
diff --git a/metadata/cache/net-libs/libetpan-1.1 b/metadata/cache/net-libs/libetpan-1.1
index a615425d04ca..70ed8c16b1e1 100644
--- a/metadata/cache/net-libs/libetpan-1.1
+++ b/metadata/cache/net-libs/libetpan-1.1
@@ -1,4 +1,4 @@
-berkdb? ( sys-libs/db ) gnutls? ( net-libs/gnutls ) !gnutls? ( ssl? ( dev-libs/openssl ) ) sasl? ( dev-libs/cyrus-sasl ) liblockfile? ( net-libs/liblockfile ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+berkdb? ( sys-libs/db ) gnutls? ( net-libs/gnutls ) !gnutls? ( ssl? ( dev-libs/openssl ) ) sasl? ( dev-libs/cyrus-sasl ) liblockfile? ( net-libs/liblockfile ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 berkdb? ( sys-libs/db ) gnutls? ( net-libs/gnutls ) !gnutls? ( ssl? ( dev-libs/openssl ) ) sasl? ( dev-libs/cyrus-sasl ) liblockfile? ( net-libs/liblockfile )
 0
 mirror://sourceforge/libetpan/libetpan-1.1.tar.gz
diff --git a/metadata/cache/net-libs/libgsasl-1.6.1 b/metadata/cache/net-libs/libgsasl-1.6.1
index 66d45802357b..10865046909e 100644
--- a/metadata/cache/net-libs/libgsasl-1.6.1
+++ b/metadata/cache/net-libs/libgsasl-1.6.1
@@ -1,4 +1,4 @@
-gcrypt? ( dev-libs/libgcrypt ) idn? ( net-dns/libidn ) kerberos? ( virtual/krb5 ) nls? ( >=sys-devel/gettext-0.18.1 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+gcrypt? ( dev-libs/libgcrypt ) idn? ( net-dns/libidn ) kerberos? ( virtual/krb5 ) nls? ( >=sys-devel/gettext-0.18.1 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 gcrypt? ( dev-libs/libgcrypt ) idn? ( net-dns/libidn ) kerberos? ( virtual/krb5 ) nls? ( >=sys-devel/gettext-0.18.1 ) !net-misc/gsasl
 0
 mirror://gnu/gsasl/libgsasl-1.6.1.tar.gz
diff --git a/metadata/cache/net-libs/libircclient-1.3 b/metadata/cache/net-libs/libircclient-1.3
index bf0a1af9a87f..66193d276a3d 100644
--- a/metadata/cache/net-libs/libircclient-1.3
+++ b/metadata/cache/net-libs/libircclient-1.3
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 mirror://sourceforge/libircclient/libircclient-1.3.tar.gz
diff --git a/metadata/cache/net-libs/liblockfile-1.08 b/metadata/cache/net-libs/liblockfile-1.08
index fdf5427f953b..eb9a78056f47 100644
--- a/metadata/cache/net-libs/liblockfile-1.08
+++ b/metadata/cache/net-libs/liblockfile-1.08
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 mirror://debian/pool/main/libl/liblockfile/liblockfile_1.08.orig.tar.gz
diff --git a/metadata/cache/net-libs/liblockfile-1.09 b/metadata/cache/net-libs/liblockfile-1.09
index 310c6caefb37..992dc78b3871 100644
--- a/metadata/cache/net-libs/liblockfile-1.09
+++ b/metadata/cache/net-libs/liblockfile-1.09
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 mirror://debian/pool/main/libl/liblockfile/liblockfile_1.09.orig.tar.gz
diff --git a/metadata/cache/net-libs/libnfsidmap-0.23-r1 b/metadata/cache/net-libs/libnfsidmap-0.23-r1
index bfe73f791059..ace230c34eea 100644
--- a/metadata/cache/net-libs/libnfsidmap-0.23-r1
+++ b/metadata/cache/net-libs/libnfsidmap-0.23-r1
@@ -1,4 +1,4 @@
-ldap? ( net-nds/openldap ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+ldap? ( net-nds/openldap ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 ldap? ( net-nds/openldap ) !<net-fs/nfs-utils-1.2.2 !net-fs/idmapd
 0
 http://www.citi.umich.edu/projects/nfsv4/linux/libnfsidmap/libnfsidmap-0.23.tar.gz
diff --git a/metadata/cache/net-libs/libnfsidmap-0.24 b/metadata/cache/net-libs/libnfsidmap-0.24
index 0b6e3d320d28..130be4888912 100644
--- a/metadata/cache/net-libs/libnfsidmap-0.24
+++ b/metadata/cache/net-libs/libnfsidmap-0.24
@@ -1,4 +1,4 @@
-ldap? ( net-nds/openldap ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+ldap? ( net-nds/openldap ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 ldap? ( net-nds/openldap ) !<net-fs/nfs-utils-1.2.2 !net-fs/idmapd
 0
 http://www.citi.umich.edu/projects/nfsv4/linux/libnfsidmap/libnfsidmap-0.24.tar.gz
diff --git a/metadata/cache/net-libs/liboping-1.6.1 b/metadata/cache/net-libs/liboping-1.6.1
index dd0d7fef9793..dd7ec6ce0628 100644
--- a/metadata/cache/net-libs/liboping-1.6.1
+++ b/metadata/cache/net-libs/liboping-1.6.1
@@ -1,4 +1,4 @@
-sys-libs/ncurses perl? ( dev-lang/perl sys-devel/libperl ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+sys-libs/ncurses perl? ( dev-lang/perl sys-devel/libperl ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 sys-libs/ncurses perl? ( dev-lang/perl sys-devel/libperl )
 0
 http://verplant.org/liboping/files/liboping-1.6.1.tar.bz2
diff --git a/metadata/cache/net-libs/libosip-3.3.0 b/metadata/cache/net-libs/libosip-3.3.0
index cd5850d0c770..8d68f65a03e2 100644
--- a/metadata/cache/net-libs/libosip-3.3.0
+++ b/metadata/cache/net-libs/libosip-3.3.0
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 2
 mirror://gnu/osip/libosip2-3.3.0.tar.gz
diff --git a/metadata/cache/net-libs/libosip-3.5.0 b/metadata/cache/net-libs/libosip-3.5.0
index f03445e81a32..726570c2e928 100644
--- a/metadata/cache/net-libs/libosip-3.5.0
+++ b/metadata/cache/net-libs/libosip-3.5.0
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 2
 mirror://gnu/osip/libosip2-3.5.0.tar.gz
diff --git a/metadata/cache/net-libs/libpcap-1.1.1-r1 b/metadata/cache/net-libs/libpcap-1.1.1-r1
index ea0c7939bca9..8d43a64a6438 100644
--- a/metadata/cache/net-libs/libpcap-1.1.1-r1
+++ b/metadata/cache/net-libs/libpcap-1.1.1-r1
@@ -1,4 +1,4 @@
-bluetooth? ( net-wireless/bluez ) libnl? ( dev-libs/libnl:1.1 ) sys-devel/flex virtual/yacc || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+bluetooth? ( net-wireless/bluez ) libnl? ( dev-libs/libnl:1.1 ) sys-devel/flex virtual/yacc || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 bluetooth? ( net-wireless/bluez ) libnl? ( dev-libs/libnl:1.1 )
 0
 http://www.tcpdump.org/release/libpcap-1.1.1.tar.gz http://www.jp.tcpdump.org/release/libpcap-1.1.1.tar.gz
diff --git a/metadata/cache/net-libs/libpcap-1.2.0 b/metadata/cache/net-libs/libpcap-1.2.0
index 9824e14f1426..64e88c8f5b99 100644
--- a/metadata/cache/net-libs/libpcap-1.2.0
+++ b/metadata/cache/net-libs/libpcap-1.2.0
@@ -1,4 +1,4 @@
-bluetooth? ( net-wireless/bluez ) libnl? ( dev-libs/libnl:1.1 ) sys-devel/flex virtual/yacc || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+bluetooth? ( net-wireless/bluez ) libnl? ( dev-libs/libnl:1.1 ) sys-devel/flex virtual/yacc || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 bluetooth? ( net-wireless/bluez ) libnl? ( dev-libs/libnl:1.1 )
 0
 http://www.tcpdump.org/release/libpcap-1.2.0.tar.gz http://www.jp.tcpdump.org/release/libpcap-1.2.0.tar.gz
diff --git a/metadata/cache/net-libs/libpcap-1.2.1 b/metadata/cache/net-libs/libpcap-1.2.1
index 1e583da879e3..d20d3cc9cd02 100644
--- a/metadata/cache/net-libs/libpcap-1.2.1
+++ b/metadata/cache/net-libs/libpcap-1.2.1
@@ -1,4 +1,4 @@
-bluetooth? ( net-wireless/bluez ) libnl? ( dev-libs/libnl:1.1 ) sys-devel/flex virtual/yacc || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+bluetooth? ( net-wireless/bluez ) libnl? ( dev-libs/libnl:1.1 ) sys-devel/flex virtual/yacc || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 bluetooth? ( net-wireless/bluez ) libnl? ( dev-libs/libnl:1.1 )
 0
 http://www.tcpdump.org/release/libpcap-1.2.1.tar.gz http://www.jp.tcpdump.org/release/libpcap-1.2.1.tar.gz
diff --git a/metadata/cache/net-libs/libsoup-2.34.3 b/metadata/cache/net-libs/libsoup-2.34.3
index 9e15e11b6430..61f116685df8 100644
--- a/metadata/cache/net-libs/libsoup-2.34.3
+++ b/metadata/cache/net-libs/libsoup-2.34.3
@@ -1,4 +1,4 @@
->=dev-libs/glib-2.27.5:2 >=dev-libs/libxml2-2:2 net-libs/glib-networking[ssl?] introspection? ( >=dev-libs/gobject-introspection-0.9.5 ) >=dev-util/pkgconfig-0.9 >=dev-util/gtk-doc-am-1.10 doc? ( >=dev-util/gtk-doc-1.10 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
+>=dev-libs/glib-2.27.5:2 >=dev-libs/libxml2-2:2 net-libs/glib-networking[ssl?] introspection? ( >=dev-libs/gobject-introspection-0.9.5 ) >=dev-util/pkgconfig-0.9 >=dev-util/gtk-doc-am-1.10 doc? ( >=dev-util/gtk-doc-1.10 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
 >=dev-libs/glib-2.27.5:2 >=dev-libs/libxml2-2:2 net-libs/glib-networking[ssl?] introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
 2.4
 mirror://gnome/sources/libsoup/2.34/libsoup-2.34.3.tar.xz
diff --git a/metadata/cache/net-libs/libsoup-2.36.1 b/metadata/cache/net-libs/libsoup-2.36.1
index ea486aa93664..660374af3a52 100644
--- a/metadata/cache/net-libs/libsoup-2.36.1
+++ b/metadata/cache/net-libs/libsoup-2.36.1
@@ -1,4 +1,4 @@
->=dev-libs/glib-2.30.0:2 >=dev-libs/libxml2-2:2 >=net-libs/glib-networking-2.30.0[ssl?] introspection? ( >=dev-libs/gobject-introspection-0.9.5 ) samba? ( net-fs/samba ) >=dev-util/pkgconfig-0.9 >=dev-util/gtk-doc-am-1.10 doc? ( >=dev-util/gtk-doc-1.10 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
+>=dev-libs/glib-2.30.0:2 >=dev-libs/libxml2-2:2 >=net-libs/glib-networking-2.30.0[ssl?] introspection? ( >=dev-libs/gobject-introspection-0.9.5 ) samba? ( net-fs/samba ) >=dev-util/pkgconfig-0.9 >=dev-util/gtk-doc-am-1.10 doc? ( >=dev-util/gtk-doc-1.10 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
 >=dev-libs/glib-2.30.0:2 >=dev-libs/libxml2-2:2 >=net-libs/glib-networking-2.30.0[ssl?] introspection? ( >=dev-libs/gobject-introspection-0.9.5 ) samba? ( net-fs/samba )
 2.4
 mirror://gnome/sources/libsoup/2.36/libsoup-2.36.1.tar.xz
diff --git a/metadata/cache/net-libs/libsoup-2.36.1-r1 b/metadata/cache/net-libs/libsoup-2.36.1-r1
index 08cb57f494ec..97dfe514cdd1 100644
--- a/metadata/cache/net-libs/libsoup-2.36.1-r1
+++ b/metadata/cache/net-libs/libsoup-2.36.1-r1
@@ -1,4 +1,4 @@
->=dev-libs/glib-2.30.0:2 >=dev-libs/libxml2-2:2 >=net-libs/glib-networking-2.30.0[ssl?] introspection? ( >=dev-libs/gobject-introspection-0.9.5 ) samba? ( net-fs/samba ) >=dev-util/pkgconfig-0.9 >=dev-util/gtk-doc-am-1.10 doc? ( >=dev-util/gtk-doc-1.10 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
+>=dev-libs/glib-2.30.0:2 >=dev-libs/libxml2-2:2 >=net-libs/glib-networking-2.30.0[ssl?] introspection? ( >=dev-libs/gobject-introspection-0.9.5 ) samba? ( net-fs/samba ) >=dev-util/pkgconfig-0.9 >=dev-util/gtk-doc-am-1.10 doc? ( >=dev-util/gtk-doc-1.10 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
 >=dev-libs/glib-2.30.0:2 >=dev-libs/libxml2-2:2 >=net-libs/glib-networking-2.30.0[ssl?] introspection? ( >=dev-libs/gobject-introspection-0.9.5 ) samba? ( net-fs/samba )
 2.4
 mirror://gnome/sources/libsoup/2.36/libsoup-2.36.1.tar.xz
diff --git a/metadata/cache/net-libs/libsoup-gnome-2.34.3 b/metadata/cache/net-libs/libsoup-gnome-2.34.3
index 6b97bf56880a..5d14654dc5ab 100644
--- a/metadata/cache/net-libs/libsoup-gnome-2.34.3
+++ b/metadata/cache/net-libs/libsoup-gnome-2.34.3
@@ -1,4 +1,4 @@
-~net-libs/libsoup-2.34.3 || ( gnome-base/libgnome-keyring <gnome-base/gnome-keyring-2.29.4 ) dev-db/sqlite:3 introspection? ( >=dev-libs/gobject-introspection-0.9.5 ) >=dev-util/pkgconfig-0.9 >=dev-util/gtk-doc-am-1.10 doc? ( >=dev-util/gtk-doc-1.10 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
+~net-libs/libsoup-2.34.3 || ( gnome-base/libgnome-keyring <gnome-base/gnome-keyring-2.29.4 ) dev-db/sqlite:3 introspection? ( >=dev-libs/gobject-introspection-0.9.5 ) >=dev-util/pkgconfig-0.9 >=dev-util/gtk-doc-am-1.10 doc? ( >=dev-util/gtk-doc-1.10 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
 ~net-libs/libsoup-2.34.3 || ( gnome-base/libgnome-keyring <gnome-base/gnome-keyring-2.29.4 ) dev-db/sqlite:3 introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
 2.4
 mirror://gnome/sources/libsoup/2.34/libsoup-2.34.3.tar.xz
diff --git a/metadata/cache/net-libs/libsoup-gnome-2.36.1 b/metadata/cache/net-libs/libsoup-gnome-2.36.1
index c9aba4a217a0..28c21f17b95f 100644
--- a/metadata/cache/net-libs/libsoup-gnome-2.36.1
+++ b/metadata/cache/net-libs/libsoup-gnome-2.36.1
@@ -1,4 +1,4 @@
-~net-libs/libsoup-2.36.1 || ( gnome-base/libgnome-keyring <gnome-base/gnome-keyring-2.29.4 ) dev-db/sqlite:3 introspection? ( >=dev-libs/gobject-introspection-0.9.5 ) >=dev-util/pkgconfig-0.9 >=dev-util/gtk-doc-am-1.10 doc? ( >=dev-util/gtk-doc-1.10 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
+~net-libs/libsoup-2.36.1 || ( gnome-base/libgnome-keyring <gnome-base/gnome-keyring-2.29.4 ) dev-db/sqlite:3 introspection? ( >=dev-libs/gobject-introspection-0.9.5 ) >=dev-util/pkgconfig-0.9 >=dev-util/gtk-doc-am-1.10 doc? ( >=dev-util/gtk-doc-1.10 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
 ~net-libs/libsoup-2.36.1 || ( gnome-base/libgnome-keyring <gnome-base/gnome-keyring-2.29.4 ) dev-db/sqlite:3 introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
 2.4
 mirror://gnome/sources/libsoup/2.36/libsoup-2.36.1.tar.xz
diff --git a/metadata/cache/net-libs/libyahoo2-1.0.1 b/metadata/cache/net-libs/libyahoo2-1.0.1
index 132c3eef2c43..1950ab96cbec 100644
--- a/metadata/cache/net-libs/libyahoo2-1.0.1
+++ b/metadata/cache/net-libs/libyahoo2-1.0.1
@@ -1,4 +1,4 @@
-dev-libs/glib:2 ssl? ( dev-libs/openssl ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-libs/glib:2 ssl? ( dev-libs/openssl ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-libs/glib:2 ssl? ( dev-libs/openssl )
 0
 mirror://sourceforge/libyahoo2/libyahoo2-1.0.1.tar.gz
diff --git a/metadata/cache/net-libs/loudmouth-1.4.3-r2 b/metadata/cache/net-libs/loudmouth-1.4.3-r2
index a9fc7ad77d59..a134eb6320c0 100644
--- a/metadata/cache/net-libs/loudmouth-1.4.3-r2
+++ b/metadata/cache/net-libs/loudmouth-1.4.3-r2
@@ -1,4 +1,4 @@
->=dev-libs/glib-2.4 net-dns/libidn ssl? ( >=net-libs/gnutls-1.4.0 ) asyncns? ( net-libs/libasyncns ) test? ( dev-libs/check ) dev-util/pkgconfig doc? ( >=dev-util/gtk-doc-1 ) >=dev-util/gtk-doc-am-1 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+>=dev-libs/glib-2.4 net-dns/libidn ssl? ( >=net-libs/gnutls-1.4.0 ) asyncns? ( net-libs/libasyncns ) test? ( dev-libs/check ) dev-util/pkgconfig doc? ( >=dev-util/gtk-doc-1 ) >=dev-util/gtk-doc-am-1 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 >=dev-libs/glib-2.4 net-dns/libidn ssl? ( >=net-libs/gnutls-1.4.0 ) asyncns? ( net-libs/libasyncns )
 0
 mirror://gnome/sources/loudmouth/1.4/loudmouth-1.4.3.tar.bz2
diff --git a/metadata/cache/net-libs/neon-0.29.6 b/metadata/cache/net-libs/neon-0.29.6
index c696a120bf2b..206cc120db12 100644
--- a/metadata/cache/net-libs/neon-0.29.6
+++ b/metadata/cache/net-libs/neon-0.29.6
@@ -1,4 +1,4 @@
-expat? ( dev-libs/expat ) !expat? ( dev-libs/libxml2 ) gnutls? ( app-misc/ca-certificates >=net-libs/gnutls-2.0 pkcs11? ( dev-libs/pakchois ) ) !gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6f pkcs11? ( dev-libs/pakchois ) ) ) kerberos? ( virtual/krb5 ) libproxy? ( net-libs/libproxy ) nls? ( virtual/libintl ) zlib? ( sys-libs/zlib ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+expat? ( dev-libs/expat ) !expat? ( dev-libs/libxml2 ) gnutls? ( app-misc/ca-certificates >=net-libs/gnutls-2.0 pkcs11? ( dev-libs/pakchois ) ) !gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6f pkcs11? ( dev-libs/pakchois ) ) ) kerberos? ( virtual/krb5 ) libproxy? ( net-libs/libproxy ) nls? ( virtual/libintl ) zlib? ( sys-libs/zlib ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 expat? ( dev-libs/expat ) !expat? ( dev-libs/libxml2 ) gnutls? ( app-misc/ca-certificates >=net-libs/gnutls-2.0 pkcs11? ( dev-libs/pakchois ) ) !gnutls? ( ssl? ( >=dev-libs/openssl-0.9.6f pkcs11? ( dev-libs/pakchois ) ) ) kerberos? ( virtual/krb5 ) libproxy? ( net-libs/libproxy ) nls? ( virtual/libintl ) zlib? ( sys-libs/zlib )
 0
 http://www.webdav.org/neon/neon-0.29.6.tar.gz
diff --git a/metadata/cache/net-libs/opal-3.6.8 b/metadata/cache/net-libs/opal-3.6.8
index 93d680d2988b..27bb490ae039 100644
--- a/metadata/cache/net-libs/opal-3.6.8
+++ b/metadata/cache/net-libs/opal-3.6.8
@@ -1,4 +1,4 @@
->=net-libs/ptlib-2.6.6[stun,debug=,audio?,dtmf?,ipv6?,ldap?,ssl?,video?,vxml?,wav?,xml?] >=media-libs/speex-1.2_beta fax? ( net-libs/ptlib[asn] ) h323? ( net-libs/ptlib[asn] ) ivr? ( net-libs/ptlib[xml,vxml] ) java? ( >=virtual/jre-1.4 ) plugins? ( dev-libs/ilbc-rfc3951 media-sound/gsm capi? ( net-dialup/capi4k-utils ) celt? ( media-libs/celt ) ffmpeg? ( >=media-video/ffmpeg-0.5[encode] ) ixj? ( sys-kernel/linux-headers ) sbc? ( media-libs/libsamplerate ) theora? ( media-libs/libtheora ) x264? ( >=media-video/ffmpeg-0.4.7 media-libs/x264 ) ) srtp? ( net-libs/libsrtp ) dev-util/pkgconfig >=sys-devel/gcc-3 java? ( swig? ( dev-lang/swig ) >=virtual/jdk-1.4 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool java? ( >=dev-java/java-config-2.1.9-r1 )
+>=net-libs/ptlib-2.6.6[stun,debug=,audio?,dtmf?,ipv6?,ldap?,ssl?,video?,vxml?,wav?,xml?] >=media-libs/speex-1.2_beta fax? ( net-libs/ptlib[asn] ) h323? ( net-libs/ptlib[asn] ) ivr? ( net-libs/ptlib[xml,vxml] ) java? ( >=virtual/jre-1.4 ) plugins? ( dev-libs/ilbc-rfc3951 media-sound/gsm capi? ( net-dialup/capi4k-utils ) celt? ( media-libs/celt ) ffmpeg? ( >=media-video/ffmpeg-0.5[encode] ) ixj? ( sys-kernel/linux-headers ) sbc? ( media-libs/libsamplerate ) theora? ( media-libs/libtheora ) x264? ( >=media-video/ffmpeg-0.4.7 media-libs/x264 ) ) srtp? ( net-libs/libsrtp ) dev-util/pkgconfig >=sys-devel/gcc-3 java? ( swig? ( dev-lang/swig ) >=virtual/jdk-1.4 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool java? ( >=dev-java/java-config-2.1.9-r1 )
 >=net-libs/ptlib-2.6.6[stun,debug=,audio?,dtmf?,ipv6?,ldap?,ssl?,video?,vxml?,wav?,xml?] >=media-libs/speex-1.2_beta fax? ( net-libs/ptlib[asn] ) h323? ( net-libs/ptlib[asn] ) ivr? ( net-libs/ptlib[xml,vxml] ) java? ( >=virtual/jre-1.4 ) plugins? ( dev-libs/ilbc-rfc3951 media-sound/gsm capi? ( net-dialup/capi4k-utils ) celt? ( media-libs/celt ) ffmpeg? ( >=media-video/ffmpeg-0.5[encode] ) ixj? ( sys-kernel/linux-headers ) sbc? ( media-libs/libsamplerate ) theora? ( media-libs/libtheora ) x264? ( >=media-video/ffmpeg-0.4.7 media-libs/x264 ) ) srtp? ( net-libs/libsrtp ) java? ( >=dev-java/java-config-2.1.9-r1 )
 0
 mirror://sourceforge/opalvoip/opal-3.6.8.tar.bz2 doc? ( mirror://sourceforge/opalvoip/opal-3.6.7-htmldoc.tar.bz2 )
diff --git a/metadata/cache/net-libs/opal-3.6.8-r1 b/metadata/cache/net-libs/opal-3.6.8-r1
index cf639bb7b35e..d29a5d0f1942 100644
--- a/metadata/cache/net-libs/opal-3.6.8-r1
+++ b/metadata/cache/net-libs/opal-3.6.8-r1
@@ -1,4 +1,4 @@
->=net-libs/ptlib-2.6.6[stun,debug=,audio?,dtmf?,ipv6?,ldap?,ssl?,video?,vxml?,wav?,xml?] >=media-libs/speex-1.2_beta fax? ( net-libs/ptlib[asn] ) h323? ( net-libs/ptlib[asn] ) ivr? ( net-libs/ptlib[xml,vxml] ) java? ( >=virtual/jre-1.4 ) plugins? ( dev-libs/ilbc-rfc3951 media-sound/gsm capi? ( net-dialup/capi4k-utils ) celt? ( media-libs/celt ) ffmpeg? ( >=media-video/ffmpeg-0.5[encode] ) ixj? ( sys-kernel/linux-headers ) sbc? ( media-libs/libsamplerate ) theora? ( media-libs/libtheora ) x264? ( >=media-video/ffmpeg-0.4.7 media-libs/x264 ) ) srtp? ( net-libs/libsrtp ) dev-util/pkgconfig >=sys-devel/gcc-3 java? ( swig? ( dev-lang/swig ) >=virtual/jdk-1.4 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool java? ( >=dev-java/java-config-2.1.9-r1 )
+>=net-libs/ptlib-2.6.6[stun,debug=,audio?,dtmf?,ipv6?,ldap?,ssl?,video?,vxml?,wav?,xml?] >=media-libs/speex-1.2_beta fax? ( net-libs/ptlib[asn] ) h323? ( net-libs/ptlib[asn] ) ivr? ( net-libs/ptlib[xml,vxml] ) java? ( >=virtual/jre-1.4 ) plugins? ( dev-libs/ilbc-rfc3951 media-sound/gsm capi? ( net-dialup/capi4k-utils ) celt? ( media-libs/celt ) ffmpeg? ( >=media-video/ffmpeg-0.5[encode] ) ixj? ( sys-kernel/linux-headers ) sbc? ( media-libs/libsamplerate ) theora? ( media-libs/libtheora ) x264? ( >=media-video/ffmpeg-0.4.7 media-libs/x264 ) ) srtp? ( net-libs/libsrtp ) dev-util/pkgconfig >=sys-devel/gcc-3 java? ( swig? ( dev-lang/swig ) >=virtual/jdk-1.4 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool java? ( >=dev-java/java-config-2.1.9-r1 )
 >=net-libs/ptlib-2.6.6[stun,debug=,audio?,dtmf?,ipv6?,ldap?,ssl?,video?,vxml?,wav?,xml?] >=media-libs/speex-1.2_beta fax? ( net-libs/ptlib[asn] ) h323? ( net-libs/ptlib[asn] ) ivr? ( net-libs/ptlib[xml,vxml] ) java? ( >=virtual/jre-1.4 ) plugins? ( dev-libs/ilbc-rfc3951 media-sound/gsm capi? ( net-dialup/capi4k-utils ) celt? ( media-libs/celt ) ffmpeg? ( >=media-video/ffmpeg-0.5[encode] ) ixj? ( sys-kernel/linux-headers ) sbc? ( media-libs/libsamplerate ) theora? ( media-libs/libtheora ) x264? ( >=media-video/ffmpeg-0.4.7 media-libs/x264 ) ) srtp? ( net-libs/libsrtp ) java? ( >=dev-java/java-config-2.1.9-r1 )
 0
 mirror://sourceforge/opalvoip/opal-3.6.8.tar.bz2 doc? ( mirror://sourceforge/opalvoip/opal-3.6.7-htmldoc.tar.bz2 )
diff --git a/metadata/cache/net-libs/opal-3.6.8-r2 b/metadata/cache/net-libs/opal-3.6.8-r2
index 20e487ebb46d..3307c9efd879 100644
--- a/metadata/cache/net-libs/opal-3.6.8-r2
+++ b/metadata/cache/net-libs/opal-3.6.8-r2
@@ -1,4 +1,4 @@
->=net-libs/ptlib-2.6.6[stun,debug=,audio?,dtmf?,ipv6?,ldap?,ssl?,video?,vxml?,wav?,xml?] >=media-libs/speex-1.2_beta fax? ( net-libs/ptlib[asn] ) h323? ( net-libs/ptlib[asn] ) ivr? ( net-libs/ptlib[http,xml,vxml] ) java? ( >=virtual/jre-1.4 ) plugins? ( media-sound/gsm capi? ( net-dialup/capi4k-utils ) celt? ( media-libs/celt ) ffmpeg? ( virtual/ffmpeg[encode] ) ixj? ( sys-kernel/linux-headers ) ilbc? ( dev-libs/ilbc-rfc3951 ) sbc? ( media-libs/libsamplerate ) theora? ( media-libs/libtheora ) x264? ( virtual/ffmpeg media-libs/x264 ) ) srtp? ( net-libs/libsrtp ) vxml? ( net-libs/ptlib[http,vxml] ) dev-util/pkgconfig >=sys-devel/gcc-3 java? ( swig? ( dev-lang/swig ) >=virtual/jdk-1.4 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool java? ( >=dev-java/java-config-2.1.9-r1 )
+>=net-libs/ptlib-2.6.6[stun,debug=,audio?,dtmf?,ipv6?,ldap?,ssl?,video?,vxml?,wav?,xml?] >=media-libs/speex-1.2_beta fax? ( net-libs/ptlib[asn] ) h323? ( net-libs/ptlib[asn] ) ivr? ( net-libs/ptlib[http,xml,vxml] ) java? ( >=virtual/jre-1.4 ) plugins? ( media-sound/gsm capi? ( net-dialup/capi4k-utils ) celt? ( media-libs/celt ) ffmpeg? ( virtual/ffmpeg[encode] ) ixj? ( sys-kernel/linux-headers ) ilbc? ( dev-libs/ilbc-rfc3951 ) sbc? ( media-libs/libsamplerate ) theora? ( media-libs/libtheora ) x264? ( virtual/ffmpeg media-libs/x264 ) ) srtp? ( net-libs/libsrtp ) vxml? ( net-libs/ptlib[http,vxml] ) dev-util/pkgconfig >=sys-devel/gcc-3 java? ( swig? ( dev-lang/swig ) >=virtual/jdk-1.4 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool java? ( >=dev-java/java-config-2.1.9-r1 )
 >=net-libs/ptlib-2.6.6[stun,debug=,audio?,dtmf?,ipv6?,ldap?,ssl?,video?,vxml?,wav?,xml?] >=media-libs/speex-1.2_beta fax? ( net-libs/ptlib[asn] ) h323? ( net-libs/ptlib[asn] ) ivr? ( net-libs/ptlib[http,xml,vxml] ) java? ( >=virtual/jre-1.4 ) plugins? ( media-sound/gsm capi? ( net-dialup/capi4k-utils ) celt? ( media-libs/celt ) ffmpeg? ( virtual/ffmpeg[encode] ) ixj? ( sys-kernel/linux-headers ) ilbc? ( dev-libs/ilbc-rfc3951 ) sbc? ( media-libs/libsamplerate ) theora? ( media-libs/libtheora ) x264? ( virtual/ffmpeg media-libs/x264 ) ) srtp? ( net-libs/libsrtp ) vxml? ( net-libs/ptlib[http,vxml] ) java? ( >=dev-java/java-config-2.1.9-r1 )
 0
 mirror://sourceforge/opalvoip/opal-3.6.8.tar.bz2 doc? ( mirror://sourceforge/opalvoip/opal-3.6.7-htmldoc.tar.bz2 )
diff --git a/metadata/cache/net-libs/openmq-cclient-4.4.1 b/metadata/cache/net-libs/openmq-cclient-4.4.1
index b11a0eeab4f4..1e8bb939db41 100644
--- a/metadata/cache/net-libs/openmq-cclient-4.4.1
+++ b/metadata/cache/net-libs/openmq-cclient-4.4.1
@@ -1,4 +1,4 @@
-dev-libs/nss dev-libs/nspr dev-util/pkgconfig app-arch/unzip || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-libs/nss dev-libs/nspr dev-util/pkgconfig app-arch/unzip || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-libs/nss dev-libs/nspr
 0
 http://download.java.net/mq/open-mq/4.4u1/b7-final/openmq4_4-source.zip -> openmq4.4u1b7-final-source.zip
diff --git a/metadata/cache/net-libs/openpgm-5.1.116 b/metadata/cache/net-libs/openpgm-5.1.116
index 2006445c9d8a..d5dd3f5f87aa 100644
--- a/metadata/cache/net-libs/openpgm-5.1.116
+++ b/metadata/cache/net-libs/openpgm-5.1.116
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 http://openpgm.googlecode.com/files/libpgm-5.1.116~dfsg.tar.gz
diff --git a/metadata/cache/net-libs/openpgm-5.1.118 b/metadata/cache/net-libs/openpgm-5.1.118
index 7c61c79da3e2..6cf132a8853a 100644
--- a/metadata/cache/net-libs/openpgm-5.1.118
+++ b/metadata/cache/net-libs/openpgm-5.1.118
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 http://openpgm.googlecode.com/files/libpgm-5.1.118~dfsg.tar.gz
diff --git a/metadata/cache/net-libs/serf-0.7.2 b/metadata/cache/net-libs/serf-0.7.2
index 1f38292208ab..a92ea11bf8ce 100644
--- a/metadata/cache/net-libs/serf-0.7.2
+++ b/metadata/cache/net-libs/serf-0.7.2
@@ -1,4 +1,4 @@
-dev-libs/apr:1 dev-libs/apr-util:1 dev-libs/openssl sys-libs/zlib || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-libs/apr:1 dev-libs/apr-util:1 dev-libs/openssl sys-libs/zlib || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-libs/apr:1 dev-libs/apr-util:1 dev-libs/openssl sys-libs/zlib
 0
 http://serf.googlecode.com/files/serf-0.7.2.tar.bz2
diff --git a/metadata/cache/net-libs/serf-1.0.0 b/metadata/cache/net-libs/serf-1.0.0
index 72e29b503419..1b559d6652bb 100644
--- a/metadata/cache/net-libs/serf-1.0.0
+++ b/metadata/cache/net-libs/serf-1.0.0
@@ -1,4 +1,4 @@
-dev-libs/apr:1 dev-libs/apr-util:1 dev-libs/openssl sys-libs/zlib || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-libs/apr:1 dev-libs/apr-util:1 dev-libs/openssl sys-libs/zlib || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-libs/apr:1 dev-libs/apr-util:1 dev-libs/openssl sys-libs/zlib
 1
 http://serf.googlecode.com/files/serf-1.0.0.tar.bz2
diff --git a/metadata/cache/net-libs/serf-1.0.1 b/metadata/cache/net-libs/serf-1.0.1
index be9425ce3d73..e2783bb08877 100644
--- a/metadata/cache/net-libs/serf-1.0.1
+++ b/metadata/cache/net-libs/serf-1.0.1
@@ -1,4 +1,4 @@
-dev-libs/apr:1 dev-libs/apr-util:1 dev-libs/openssl sys-libs/zlib || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-libs/apr:1 dev-libs/apr-util:1 dev-libs/openssl sys-libs/zlib || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-libs/apr:1 dev-libs/apr-util:1 dev-libs/openssl sys-libs/zlib
 1
 http://serf.googlecode.com/files/serf-1.0.1.tar.bz2
diff --git a/metadata/cache/net-libs/webkit-gtk-1.4.3-r200 b/metadata/cache/net-libs/webkit-gtk-1.4.3-r200
index 4397b11c2eb0..4223f5e79735 100644
--- a/metadata/cache/net-libs/webkit-gtk-1.4.3-r200
+++ b/metadata/cache/net-libs/webkit-gtk-1.4.3-r200
@@ -1,4 +1,4 @@
-dev-libs/libxml2:2 dev-libs/libxslt virtual/jpeg >=media-libs/libpng-1.4:0 x11-libs/cairo >=dev-libs/glib-2.27.90:2 >=x11-libs/gtk+-2.13:2[aqua=,introspection?] >=dev-libs/icu-3.8.1-r1 >=net-libs/libsoup-2.33.6:2.4[introspection?] dev-db/sqlite:3 >=x11-libs/pango-1.12 x11-libs/libXrender gstreamer? ( media-libs/gstreamer:0.10 >=media-libs/gst-plugins-base-0.10.25:0.10 ) introspection? ( >=dev-libs/gobject-introspection-0.9.5 ) spell? ( >=app-text/enchant-0.22 ) >=sys-devel/flex-2.5.33 sys-devel/gettext virtual/yacc dev-util/gperf dev-util/pkgconfig dev-util/gtk-doc-am doc? ( >=dev-util/gtk-doc-1.10 ) test? ( x11-themes/hicolor-icon-theme ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+dev-libs/libxml2:2 dev-libs/libxslt virtual/jpeg >=media-libs/libpng-1.4:0 x11-libs/cairo >=dev-libs/glib-2.27.90:2 >=x11-libs/gtk+-2.13:2[aqua=,introspection?] >=dev-libs/icu-3.8.1-r1 >=net-libs/libsoup-2.33.6:2.4[introspection?] dev-db/sqlite:3 >=x11-libs/pango-1.12 x11-libs/libXrender gstreamer? ( media-libs/gstreamer:0.10 >=media-libs/gst-plugins-base-0.10.25:0.10 ) introspection? ( >=dev-libs/gobject-introspection-0.9.5 ) spell? ( >=app-text/enchant-0.22 ) >=sys-devel/flex-2.5.33 sys-devel/gettext virtual/yacc dev-util/gperf dev-util/pkgconfig dev-util/gtk-doc-am doc? ( >=dev-util/gtk-doc-1.10 ) test? ( x11-themes/hicolor-icon-theme ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 dev-libs/libxml2:2 dev-libs/libxslt virtual/jpeg >=media-libs/libpng-1.4:0 x11-libs/cairo >=dev-libs/glib-2.27.90:2 >=x11-libs/gtk+-2.13:2[aqua=,introspection?] >=dev-libs/icu-3.8.1-r1 >=net-libs/libsoup-2.33.6:2.4[introspection?] dev-db/sqlite:3 >=x11-libs/pango-1.12 x11-libs/libXrender gstreamer? ( media-libs/gstreamer:0.10 >=media-libs/gst-plugins-base-0.10.25:0.10 ) introspection? ( >=dev-libs/gobject-introspection-0.9.5 ) spell? ( >=app-text/enchant-0.22 )
 2
 http://www.webkitgtk.org/webkit-1.4.3.tar.gz
diff --git a/metadata/cache/net-libs/webkit-gtk-1.4.3-r300 b/metadata/cache/net-libs/webkit-gtk-1.4.3-r300
index 6bfbaba38953..7ebd0a3851ac 100644
--- a/metadata/cache/net-libs/webkit-gtk-1.4.3-r300
+++ b/metadata/cache/net-libs/webkit-gtk-1.4.3-r300
@@ -1,4 +1,4 @@
-dev-libs/libxml2:2 dev-libs/libxslt virtual/jpeg >=media-libs/libpng-1.4:0 x11-libs/cairo >=dev-libs/glib-2.27.90:2 >=x11-libs/gtk+-3.0:3[aqua=,introspection?] >=dev-libs/icu-3.8.1-r1 >=net-libs/libsoup-2.33.6:2.4[introspection?] dev-db/sqlite:3 >=x11-libs/pango-1.12 x11-libs/libXrender gstreamer? ( media-libs/gstreamer:0.10 >=media-libs/gst-plugins-base-0.10.25:0.10 ) introspection? ( >=dev-libs/gobject-introspection-0.9.5 ) spell? ( >=app-text/enchant-0.22 ) >=sys-devel/flex-2.5.33 sys-devel/gettext virtual/yacc dev-util/gperf dev-util/pkgconfig dev-util/gtk-doc-am doc? ( >=dev-util/gtk-doc-1.10 ) test? ( x11-themes/hicolor-icon-theme ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+dev-libs/libxml2:2 dev-libs/libxslt virtual/jpeg >=media-libs/libpng-1.4:0 x11-libs/cairo >=dev-libs/glib-2.27.90:2 >=x11-libs/gtk+-3.0:3[aqua=,introspection?] >=dev-libs/icu-3.8.1-r1 >=net-libs/libsoup-2.33.6:2.4[introspection?] dev-db/sqlite:3 >=x11-libs/pango-1.12 x11-libs/libXrender gstreamer? ( media-libs/gstreamer:0.10 >=media-libs/gst-plugins-base-0.10.25:0.10 ) introspection? ( >=dev-libs/gobject-introspection-0.9.5 ) spell? ( >=app-text/enchant-0.22 ) >=sys-devel/flex-2.5.33 sys-devel/gettext virtual/yacc dev-util/gperf dev-util/pkgconfig dev-util/gtk-doc-am doc? ( >=dev-util/gtk-doc-1.10 ) test? ( x11-themes/hicolor-icon-theme ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 dev-libs/libxml2:2 dev-libs/libxslt virtual/jpeg >=media-libs/libpng-1.4:0 x11-libs/cairo >=dev-libs/glib-2.27.90:2 >=x11-libs/gtk+-3.0:3[aqua=,introspection?] >=dev-libs/icu-3.8.1-r1 >=net-libs/libsoup-2.33.6:2.4[introspection?] dev-db/sqlite:3 >=x11-libs/pango-1.12 x11-libs/libXrender gstreamer? ( media-libs/gstreamer:0.10 >=media-libs/gst-plugins-base-0.10.25:0.10 ) introspection? ( >=dev-libs/gobject-introspection-0.9.5 ) spell? ( >=app-text/enchant-0.22 )
 3
 http://www.webkitgtk.org/webkit-1.4.3.tar.gz
diff --git a/metadata/cache/net-libs/webkit-gtk-1.6.1-r201 b/metadata/cache/net-libs/webkit-gtk-1.6.1-r201
index 290ab78909f4..b57e057fe601 100644
--- a/metadata/cache/net-libs/webkit-gtk-1.6.1-r201
+++ b/metadata/cache/net-libs/webkit-gtk-1.6.1-r201
@@ -1,4 +1,4 @@
-dev-libs/libxml2:2 dev-libs/libxslt virtual/jpeg >=media-libs/libpng-1.4:0 >=x11-libs/cairo-1.10 >=dev-libs/glib-2.27.90:2 >=x11-libs/gtk+-2.13:2[aqua=,introspection?] >=dev-libs/icu-3.8.1-r1 >=net-libs/libsoup-2.33.6:2.4[introspection?] dev-db/sqlite:3 >=x11-libs/pango-1.12 x11-libs/libXrender gstreamer? ( media-libs/gstreamer:0.10 >=media-libs/gst-plugins-base-0.10.30:0.10 ) introspection? ( >=dev-libs/gobject-introspection-0.9.5 ) spell? ( >=app-text/enchant-0.22 ) webgl? ( virtual/opengl ) >=sys-devel/flex-2.5.33 sys-devel/gettext virtual/yacc dev-util/gperf dev-util/pkgconfig dev-util/gtk-doc-am test? ( x11-themes/hicolor-icon-theme ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=sys-apps/sed-4
+dev-libs/libxml2:2 dev-libs/libxslt virtual/jpeg >=media-libs/libpng-1.4:0 >=x11-libs/cairo-1.10 >=dev-libs/glib-2.27.90:2 >=x11-libs/gtk+-2.13:2[aqua=,introspection?] >=dev-libs/icu-3.8.1-r1 >=net-libs/libsoup-2.33.6:2.4[introspection?] dev-db/sqlite:3 >=x11-libs/pango-1.12 x11-libs/libXrender gstreamer? ( media-libs/gstreamer:0.10 >=media-libs/gst-plugins-base-0.10.30:0.10 ) introspection? ( >=dev-libs/gobject-introspection-0.9.5 ) spell? ( >=app-text/enchant-0.22 ) webgl? ( virtual/opengl ) >=sys-devel/flex-2.5.33 sys-devel/gettext virtual/yacc dev-util/gperf dev-util/pkgconfig dev-util/gtk-doc-am test? ( x11-themes/hicolor-icon-theme ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=sys-apps/sed-4
 dev-libs/libxml2:2 dev-libs/libxslt virtual/jpeg >=media-libs/libpng-1.4:0 >=x11-libs/cairo-1.10 >=dev-libs/glib-2.27.90:2 >=x11-libs/gtk+-2.13:2[aqua=,introspection?] >=dev-libs/icu-3.8.1-r1 >=net-libs/libsoup-2.33.6:2.4[introspection?] dev-db/sqlite:3 >=x11-libs/pango-1.12 x11-libs/libXrender gstreamer? ( media-libs/gstreamer:0.10 >=media-libs/gst-plugins-base-0.10.30:0.10 ) introspection? ( >=dev-libs/gobject-introspection-0.9.5 ) spell? ( >=app-text/enchant-0.22 ) webgl? ( virtual/opengl )
 2
 mirror://gentoo/webkit-gtk-1.6.1.tar.xz
diff --git a/metadata/cache/net-libs/webkit-gtk-1.6.1-r301 b/metadata/cache/net-libs/webkit-gtk-1.6.1-r301
index 1ee68fcc1d0e..7da60da302b7 100644
--- a/metadata/cache/net-libs/webkit-gtk-1.6.1-r301
+++ b/metadata/cache/net-libs/webkit-gtk-1.6.1-r301
@@ -1,4 +1,4 @@
-dev-libs/libxml2:2 dev-libs/libxslt virtual/jpeg >=media-libs/libpng-1.4:0 >=x11-libs/cairo-1.10 >=dev-libs/glib-2.27.90:2 >=x11-libs/gtk+-3.0:3[aqua=,introspection?] >=dev-libs/icu-3.8.1-r1 >=net-libs/libsoup-2.33.6:2.4[introspection?] dev-db/sqlite:3 >=x11-libs/pango-1.12 x11-libs/libXrender gstreamer? ( media-libs/gstreamer:0.10 >=media-libs/gst-plugins-base-0.10.30:0.10 ) introspection? ( >=dev-libs/gobject-introspection-0.9.5 ) spell? ( >=app-text/enchant-0.22 ) webgl? ( virtual/opengl ) >=sys-devel/flex-2.5.33 sys-devel/gettext virtual/yacc dev-util/gperf dev-util/pkgconfig dev-util/gtk-doc-am doc? ( >=dev-util/gtk-doc-1.10 ) test? ( x11-themes/hicolor-icon-theme ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=sys-apps/sed-4
+dev-libs/libxml2:2 dev-libs/libxslt virtual/jpeg >=media-libs/libpng-1.4:0 >=x11-libs/cairo-1.10 >=dev-libs/glib-2.27.90:2 >=x11-libs/gtk+-3.0:3[aqua=,introspection?] >=dev-libs/icu-3.8.1-r1 >=net-libs/libsoup-2.33.6:2.4[introspection?] dev-db/sqlite:3 >=x11-libs/pango-1.12 x11-libs/libXrender gstreamer? ( media-libs/gstreamer:0.10 >=media-libs/gst-plugins-base-0.10.30:0.10 ) introspection? ( >=dev-libs/gobject-introspection-0.9.5 ) spell? ( >=app-text/enchant-0.22 ) webgl? ( virtual/opengl ) >=sys-devel/flex-2.5.33 sys-devel/gettext virtual/yacc dev-util/gperf dev-util/pkgconfig dev-util/gtk-doc-am doc? ( >=dev-util/gtk-doc-1.10 ) test? ( x11-themes/hicolor-icon-theme ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=sys-apps/sed-4
 dev-libs/libxml2:2 dev-libs/libxslt virtual/jpeg >=media-libs/libpng-1.4:0 >=x11-libs/cairo-1.10 >=dev-libs/glib-2.27.90:2 >=x11-libs/gtk+-3.0:3[aqua=,introspection?] >=dev-libs/icu-3.8.1-r1 >=net-libs/libsoup-2.33.6:2.4[introspection?] dev-db/sqlite:3 >=x11-libs/pango-1.12 x11-libs/libXrender gstreamer? ( media-libs/gstreamer:0.10 >=media-libs/gst-plugins-base-0.10.30:0.10 ) introspection? ( >=dev-libs/gobject-introspection-0.9.5 ) spell? ( >=app-text/enchant-0.22 ) webgl? ( virtual/opengl )
 3
 mirror://gentoo/webkit-gtk-1.6.1.tar.xz
diff --git a/metadata/cache/net-libs/webkit-gtk-1.6.3-r200 b/metadata/cache/net-libs/webkit-gtk-1.6.3-r200
index fcb50f45da57..bf0c33a34979 100644
--- a/metadata/cache/net-libs/webkit-gtk-1.6.3-r200
+++ b/metadata/cache/net-libs/webkit-gtk-1.6.3-r200
@@ -1,4 +1,4 @@
-dev-libs/libxml2:2 dev-libs/libxslt virtual/jpeg >=media-libs/libpng-1.4:0 >=x11-libs/cairo-1.10 >=dev-libs/glib-2.27.90:2 >=x11-libs/gtk+-2.13:2[aqua=,introspection?] >=dev-libs/icu-3.8.1-r1 >=net-libs/libsoup-2.33.6:2.4[introspection?] dev-db/sqlite:3 >=x11-libs/pango-1.12 x11-libs/libXrender gstreamer? ( media-libs/gstreamer:0.10 >=media-libs/gst-plugins-base-0.10.30:0.10 ) introspection? ( >=dev-libs/gobject-introspection-0.9.5 ) spell? ( >=app-text/enchant-0.22 ) webgl? ( virtual/opengl ) >=sys-devel/flex-2.5.33 sys-devel/gettext virtual/yacc dev-util/gperf dev-util/pkgconfig dev-util/gtk-doc-am sys-apps/paxctl test? ( x11-themes/hicolor-icon-theme ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=sys-apps/sed-4
+dev-libs/libxml2:2 dev-libs/libxslt virtual/jpeg >=media-libs/libpng-1.4:0 >=x11-libs/cairo-1.10 >=dev-libs/glib-2.27.90:2 >=x11-libs/gtk+-2.13:2[aqua=,introspection?] >=dev-libs/icu-3.8.1-r1 >=net-libs/libsoup-2.33.6:2.4[introspection?] dev-db/sqlite:3 >=x11-libs/pango-1.12 x11-libs/libXrender gstreamer? ( media-libs/gstreamer:0.10 >=media-libs/gst-plugins-base-0.10.30:0.10 ) introspection? ( >=dev-libs/gobject-introspection-0.9.5 ) spell? ( >=app-text/enchant-0.22 ) webgl? ( virtual/opengl ) >=sys-devel/flex-2.5.33 sys-devel/gettext virtual/yacc dev-util/gperf dev-util/pkgconfig dev-util/gtk-doc-am sys-apps/paxctl test? ( x11-themes/hicolor-icon-theme ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=sys-apps/sed-4
 dev-libs/libxml2:2 dev-libs/libxslt virtual/jpeg >=media-libs/libpng-1.4:0 >=x11-libs/cairo-1.10 >=dev-libs/glib-2.27.90:2 >=x11-libs/gtk+-2.13:2[aqua=,introspection?] >=dev-libs/icu-3.8.1-r1 >=net-libs/libsoup-2.33.6:2.4[introspection?] dev-db/sqlite:3 >=x11-libs/pango-1.12 x11-libs/libXrender gstreamer? ( media-libs/gstreamer:0.10 >=media-libs/gst-plugins-base-0.10.30:0.10 ) introspection? ( >=dev-libs/gobject-introspection-0.9.5 ) spell? ( >=app-text/enchant-0.22 ) webgl? ( virtual/opengl )
 2
 http://www.webkitgtk.org/webkit-1.6.3.tar.xz
diff --git a/metadata/cache/net-libs/webkit-gtk-1.6.3-r300 b/metadata/cache/net-libs/webkit-gtk-1.6.3-r300
index 1a1eb8fe3fdc..d99aba07faba 100644
--- a/metadata/cache/net-libs/webkit-gtk-1.6.3-r300
+++ b/metadata/cache/net-libs/webkit-gtk-1.6.3-r300
@@ -1,4 +1,4 @@
-dev-libs/libxml2:2 dev-libs/libxslt virtual/jpeg >=media-libs/libpng-1.4:0 >=x11-libs/cairo-1.10 >=dev-libs/glib-2.27.90:2 >=x11-libs/gtk+-3.0:3[aqua=,introspection?] >=dev-libs/icu-3.8.1-r1 >=net-libs/libsoup-2.33.6:2.4[introspection?] dev-db/sqlite:3 >=x11-libs/pango-1.12 x11-libs/libXrender gstreamer? ( media-libs/gstreamer:0.10 >=media-libs/gst-plugins-base-0.10.30:0.10 ) introspection? ( >=dev-libs/gobject-introspection-0.9.5 ) spell? ( >=app-text/enchant-0.22 ) webgl? ( virtual/opengl ) >=sys-devel/flex-2.5.33 sys-devel/gettext virtual/yacc dev-util/gperf dev-util/pkgconfig dev-util/gtk-doc-am sys-apps/paxctl test? ( x11-themes/hicolor-icon-theme ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=sys-apps/sed-4
+dev-libs/libxml2:2 dev-libs/libxslt virtual/jpeg >=media-libs/libpng-1.4:0 >=x11-libs/cairo-1.10 >=dev-libs/glib-2.27.90:2 >=x11-libs/gtk+-3.0:3[aqua=,introspection?] >=dev-libs/icu-3.8.1-r1 >=net-libs/libsoup-2.33.6:2.4[introspection?] dev-db/sqlite:3 >=x11-libs/pango-1.12 x11-libs/libXrender gstreamer? ( media-libs/gstreamer:0.10 >=media-libs/gst-plugins-base-0.10.30:0.10 ) introspection? ( >=dev-libs/gobject-introspection-0.9.5 ) spell? ( >=app-text/enchant-0.22 ) webgl? ( virtual/opengl ) >=sys-devel/flex-2.5.33 sys-devel/gettext virtual/yacc dev-util/gperf dev-util/pkgconfig dev-util/gtk-doc-am sys-apps/paxctl test? ( x11-themes/hicolor-icon-theme ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) >=sys-apps/sed-4
 dev-libs/libxml2:2 dev-libs/libxslt virtual/jpeg >=media-libs/libpng-1.4:0 >=x11-libs/cairo-1.10 >=dev-libs/glib-2.27.90:2 >=x11-libs/gtk+-3.0:3[aqua=,introspection?] >=dev-libs/icu-3.8.1-r1 >=net-libs/libsoup-2.33.6:2.4[introspection?] dev-db/sqlite:3 >=x11-libs/pango-1.12 x11-libs/libXrender gstreamer? ( media-libs/gstreamer:0.10 >=media-libs/gst-plugins-base-0.10.30:0.10 ) introspection? ( >=dev-libs/gobject-introspection-0.9.5 ) spell? ( >=app-text/enchant-0.22 ) webgl? ( virtual/opengl )
 3
 http://www.webkitgtk.org/webkit-1.6.3.tar.xz
diff --git a/metadata/cache/net-libs/wvstreams-4.6.1-r1 b/metadata/cache/net-libs/wvstreams-4.6.1-r1
index a08fac3b57fb..496103be7222 100644
--- a/metadata/cache/net-libs/wvstreams-4.6.1-r1
+++ b/metadata/cache/net-libs/wvstreams-4.6.1-r1
@@ -1,4 +1,4 @@
-sys-libs/readline sys-libs/zlib dbus? ( >=sys-apps/dbus-1.2.14 ) dev-libs/openssl pam? ( sys-libs/pam ) virtual/c++-tr1-functional dev-util/pkgconfig doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+sys-libs/readline sys-libs/zlib dbus? ( >=sys-apps/dbus-1.2.14 ) dev-libs/openssl pam? ( sys-libs/pam ) virtual/c++-tr1-functional dev-util/pkgconfig doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 sys-libs/readline sys-libs/zlib dbus? ( >=sys-apps/dbus-1.2.14 ) dev-libs/openssl pam? ( sys-libs/pam ) virtual/c++-tr1-functional
 0
 http://wvstreams.googlecode.com/files/wvstreams-4.6.1.tar.gz
diff --git a/metadata/cache/net-libs/xulrunner-1.9.2.17 b/metadata/cache/net-libs/xulrunner-1.9.2.17
index 81a77ed8b6d1..7b3ced4f3e09 100644
--- a/metadata/cache/net-libs/xulrunner-1.9.2.17
+++ b/metadata/cache/net-libs/xulrunner-1.9.2.17
@@ -1,4 +1,4 @@
-java? ( >=virtual/jdk-1.4 ) >=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.12.8 >=dev-libs/nspr-4.8.6 system-sqlite? ( >=dev-db/sqlite-3.7.4[fts3,secure-delete] ) alsa? ( media-libs/alsa-lib ) >=app-text/hunspell-1.2 >=x11-libs/cairo-1.8.8[X] x11-libs/libXt x11-libs/pixman >=dev-libs/libevent-1.4.7 gnome? ( >=gnome-base/gnome-vfs-2.16.3 >=gnome-base/libgnomeui-2.16.1 >=gnome-base/gconf-2.16.0 >=gnome-base/libgnome-2.16.0 ) wifi? ( net-wireless/wireless-tools ) libnotify? ( >=x11-libs/libnotify-0.4 ) =dev-lang/python-2*[threads] dev-util/pkgconfig x11-libs/libXrender x11-libs/libXt x11-libs/libXmu >=sys-libs/zlib-1.1.4 dev-util/pkgconfig =dev-lang/python-2*[threads] app-arch/zip app-arch/unzip >=app-text/hunspell-1.2 dev-libs/expat >=dev-libs/libIDL-0.8.0 >=dev-libs/libevent-1.4.7 >=x11-libs/cairo-1.8[X] >=x11-libs/gtk+-2.8.6:2 >=x11-libs/pango-1.10.1[X] virtual/jpeg virtual/freedesktop-icon-theme alsa? ( media-libs/alsa-lib ) dbus? ( >=dev-libs/dbus-glib-0.72 ) libnotify? ( >=x11-libs/libnotify-0.4 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) wifi? ( net-wireless/wireless-tools ) java? ( >=dev-java/java-config-2.1.9-r1 ) || ( >=sys-devel/automake-1.11.1 ) =sys-devel/autoconf-2.1* sys-devel/libtool
+java? ( >=virtual/jdk-1.4 ) >=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.12.8 >=dev-libs/nspr-4.8.6 system-sqlite? ( >=dev-db/sqlite-3.7.4[fts3,secure-delete] ) alsa? ( media-libs/alsa-lib ) >=app-text/hunspell-1.2 >=x11-libs/cairo-1.8.8[X] x11-libs/libXt x11-libs/pixman >=dev-libs/libevent-1.4.7 gnome? ( >=gnome-base/gnome-vfs-2.16.3 >=gnome-base/libgnomeui-2.16.1 >=gnome-base/gconf-2.16.0 >=gnome-base/libgnome-2.16.0 ) wifi? ( net-wireless/wireless-tools ) libnotify? ( >=x11-libs/libnotify-0.4 ) =dev-lang/python-2*[threads] dev-util/pkgconfig x11-libs/libXrender x11-libs/libXt x11-libs/libXmu >=sys-libs/zlib-1.1.4 dev-util/pkgconfig =dev-lang/python-2*[threads] app-arch/zip app-arch/unzip >=app-text/hunspell-1.2 dev-libs/expat >=dev-libs/libIDL-0.8.0 >=dev-libs/libevent-1.4.7 >=x11-libs/cairo-1.8[X] >=x11-libs/gtk+-2.8.6:2 >=x11-libs/pango-1.10.1[X] virtual/jpeg virtual/freedesktop-icon-theme alsa? ( media-libs/alsa-lib ) dbus? ( >=dev-libs/dbus-glib-0.72 ) libnotify? ( >=x11-libs/libnotify-0.4 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) wifi? ( net-wireless/wireless-tools ) java? ( >=dev-java/java-config-2.1.9-r1 ) || ( >=sys-devel/automake-1.11.1:1.11 ) =sys-devel/autoconf-2.1* sys-devel/libtool
 java? ( >=virtual/jre-1.4 ) >=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.12.8 >=dev-libs/nspr-4.8.6 system-sqlite? ( >=dev-db/sqlite-3.7.4[fts3,secure-delete] ) alsa? ( media-libs/alsa-lib ) >=app-text/hunspell-1.2 >=x11-libs/cairo-1.8.8[X] x11-libs/libXt x11-libs/pixman >=dev-libs/libevent-1.4.7 gnome? ( >=gnome-base/gnome-vfs-2.16.3 >=gnome-base/libgnomeui-2.16.1 >=gnome-base/gconf-2.16.0 >=gnome-base/libgnome-2.16.0 ) wifi? ( net-wireless/wireless-tools ) libnotify? ( >=x11-libs/libnotify-0.4 ) x11-libs/libXrender x11-libs/libXt x11-libs/libXmu >=sys-libs/zlib-1.1.4 app-arch/zip app-arch/unzip >=app-text/hunspell-1.2 dev-libs/expat >=dev-libs/libIDL-0.8.0 >=dev-libs/libevent-1.4.7 >=x11-libs/cairo-1.8[X] >=x11-libs/gtk+-2.8.6:2 >=x11-libs/pango-1.10.1[X] virtual/jpeg virtual/freedesktop-icon-theme alsa? ( media-libs/alsa-lib ) dbus? ( >=dev-libs/dbus-glib-0.72 ) libnotify? ( >=x11-libs/libnotify-0.4 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) wifi? ( net-wireless/wireless-tools ) java? ( >=dev-java/java-config-2.1.9-r1 )
 1.9
 ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/3.6.17/source/firefox-3.6.17.source.tar.bz2 http://dev.gentoo.org/~anarchy/mozilla/patchsets/xulrunner-1.9.2-patches-0.9.tar.bz2
diff --git a/metadata/cache/net-libs/xulrunner-1.9.2.20 b/metadata/cache/net-libs/xulrunner-1.9.2.20
index c524f2eff124..c1fd179d118b 100644
--- a/metadata/cache/net-libs/xulrunner-1.9.2.20
+++ b/metadata/cache/net-libs/xulrunner-1.9.2.20
@@ -1,4 +1,4 @@
-java? ( >=virtual/jdk-1.4 ) >=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.12.8 >=dev-libs/nspr-4.8.6 system-sqlite? ( >=dev-db/sqlite-3.7.4[fts3,secure-delete] ) alsa? ( media-libs/alsa-lib ) >=app-text/hunspell-1.2 >=x11-libs/cairo-1.8.8[X] x11-libs/libXt x11-libs/pixman >=dev-libs/libevent-1.4.7 gnome? ( >=gnome-base/gnome-vfs-2.16.3 >=gnome-base/libgnomeui-2.16.1 >=gnome-base/gconf-2.16.0 >=gnome-base/libgnome-2.16.0 ) wifi? ( net-wireless/wireless-tools ) libnotify? ( >=x11-libs/libnotify-0.4 ) =dev-lang/python-2*[threads] dev-util/pkgconfig x11-libs/libXrender x11-libs/libXt x11-libs/libXmu >=sys-libs/zlib-1.1.4 dev-util/pkgconfig =dev-lang/python-2*[threads] app-arch/zip app-arch/unzip >=app-text/hunspell-1.2 dev-libs/expat >=dev-libs/libIDL-0.8.0 >=dev-libs/libevent-1.4.7 >=x11-libs/cairo-1.8[X] >=x11-libs/gtk+-2.8.6:2 >=x11-libs/pango-1.10.1[X] virtual/jpeg virtual/freedesktop-icon-theme alsa? ( media-libs/alsa-lib ) dbus? ( >=dev-libs/dbus-glib-0.72 ) libnotify? ( >=x11-libs/libnotify-0.4 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) wifi? ( net-wireless/wireless-tools ) java? ( >=dev-java/java-config-2.1.9-r1 ) || ( >=sys-devel/automake-1.11.1 ) =sys-devel/autoconf-2.1* sys-devel/libtool
+java? ( >=virtual/jdk-1.4 ) >=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.12.8 >=dev-libs/nspr-4.8.6 system-sqlite? ( >=dev-db/sqlite-3.7.4[fts3,secure-delete] ) alsa? ( media-libs/alsa-lib ) >=app-text/hunspell-1.2 >=x11-libs/cairo-1.8.8[X] x11-libs/libXt x11-libs/pixman >=dev-libs/libevent-1.4.7 gnome? ( >=gnome-base/gnome-vfs-2.16.3 >=gnome-base/libgnomeui-2.16.1 >=gnome-base/gconf-2.16.0 >=gnome-base/libgnome-2.16.0 ) wifi? ( net-wireless/wireless-tools ) libnotify? ( >=x11-libs/libnotify-0.4 ) =dev-lang/python-2*[threads] dev-util/pkgconfig x11-libs/libXrender x11-libs/libXt x11-libs/libXmu >=sys-libs/zlib-1.1.4 dev-util/pkgconfig =dev-lang/python-2*[threads] app-arch/zip app-arch/unzip >=app-text/hunspell-1.2 dev-libs/expat >=dev-libs/libIDL-0.8.0 >=dev-libs/libevent-1.4.7 >=x11-libs/cairo-1.8[X] >=x11-libs/gtk+-2.8.6:2 >=x11-libs/pango-1.10.1[X] virtual/jpeg virtual/freedesktop-icon-theme alsa? ( media-libs/alsa-lib ) dbus? ( >=dev-libs/dbus-glib-0.72 ) libnotify? ( >=x11-libs/libnotify-0.4 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) wifi? ( net-wireless/wireless-tools ) java? ( >=dev-java/java-config-2.1.9-r1 ) || ( >=sys-devel/automake-1.11.1:1.11 ) =sys-devel/autoconf-2.1* sys-devel/libtool
 java? ( >=virtual/jre-1.4 ) >=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.12.8 >=dev-libs/nspr-4.8.6 system-sqlite? ( >=dev-db/sqlite-3.7.4[fts3,secure-delete] ) alsa? ( media-libs/alsa-lib ) >=app-text/hunspell-1.2 >=x11-libs/cairo-1.8.8[X] x11-libs/libXt x11-libs/pixman >=dev-libs/libevent-1.4.7 gnome? ( >=gnome-base/gnome-vfs-2.16.3 >=gnome-base/libgnomeui-2.16.1 >=gnome-base/gconf-2.16.0 >=gnome-base/libgnome-2.16.0 ) wifi? ( net-wireless/wireless-tools ) libnotify? ( >=x11-libs/libnotify-0.4 ) x11-libs/libXrender x11-libs/libXt x11-libs/libXmu >=sys-libs/zlib-1.1.4 app-arch/zip app-arch/unzip >=app-text/hunspell-1.2 dev-libs/expat >=dev-libs/libIDL-0.8.0 >=dev-libs/libevent-1.4.7 >=x11-libs/cairo-1.8[X] >=x11-libs/gtk+-2.8.6:2 >=x11-libs/pango-1.10.1[X] virtual/jpeg virtual/freedesktop-icon-theme alsa? ( media-libs/alsa-lib ) dbus? ( >=dev-libs/dbus-glib-0.72 ) libnotify? ( >=x11-libs/libnotify-0.4 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) wifi? ( net-wireless/wireless-tools ) java? ( >=dev-java/java-config-2.1.9-r1 )
 1.9
 ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/3.6.20/source/firefox-3.6.20.source.tar.bz2 http://dev.gentoo.org/~anarchy/mozilla/patchsets/xulrunner-1.9.2-patches-0.9.tar.bz2
diff --git a/metadata/cache/net-libs/xulrunner-1.9.2.21 b/metadata/cache/net-libs/xulrunner-1.9.2.21
index 7e7f438adb6a..54a798bd63e2 100644
--- a/metadata/cache/net-libs/xulrunner-1.9.2.21
+++ b/metadata/cache/net-libs/xulrunner-1.9.2.21
@@ -1,4 +1,4 @@
-java? ( >=virtual/jdk-1.4 ) >=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.12.8 >=dev-libs/nspr-4.8.6 system-sqlite? ( >=dev-db/sqlite-3.7.4[fts3,secure-delete] ) alsa? ( media-libs/alsa-lib ) >=app-text/hunspell-1.2 >=x11-libs/cairo-1.8.8[X] x11-libs/libXt x11-libs/pixman >=dev-libs/libevent-1.4.7 gnome? ( >=gnome-base/gnome-vfs-2.16.3 >=gnome-base/libgnomeui-2.16.1 >=gnome-base/gconf-2.16.0 >=gnome-base/libgnome-2.16.0 ) wifi? ( net-wireless/wireless-tools ) libnotify? ( >=x11-libs/libnotify-0.4 ) =dev-lang/python-2*[threads] dev-util/pkgconfig x11-libs/libXrender x11-libs/libXt x11-libs/libXmu >=sys-libs/zlib-1.1.4 dev-util/pkgconfig =dev-lang/python-2*[threads] app-arch/zip app-arch/unzip >=app-text/hunspell-1.2 dev-libs/expat >=dev-libs/libIDL-0.8.0 >=dev-libs/libevent-1.4.7 >=x11-libs/cairo-1.8[X] >=x11-libs/gtk+-2.8.6:2 >=x11-libs/pango-1.10.1[X] virtual/jpeg virtual/freedesktop-icon-theme alsa? ( media-libs/alsa-lib ) dbus? ( >=dev-libs/dbus-glib-0.72 ) libnotify? ( >=x11-libs/libnotify-0.4 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) wifi? ( net-wireless/wireless-tools ) java? ( >=dev-java/java-config-2.1.9-r1 ) || ( >=sys-devel/automake-1.11.1 ) =sys-devel/autoconf-2.1* sys-devel/libtool
+java? ( >=virtual/jdk-1.4 ) >=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.12.8 >=dev-libs/nspr-4.8.6 system-sqlite? ( >=dev-db/sqlite-3.7.4[fts3,secure-delete] ) alsa? ( media-libs/alsa-lib ) >=app-text/hunspell-1.2 >=x11-libs/cairo-1.8.8[X] x11-libs/libXt x11-libs/pixman >=dev-libs/libevent-1.4.7 gnome? ( >=gnome-base/gnome-vfs-2.16.3 >=gnome-base/libgnomeui-2.16.1 >=gnome-base/gconf-2.16.0 >=gnome-base/libgnome-2.16.0 ) wifi? ( net-wireless/wireless-tools ) libnotify? ( >=x11-libs/libnotify-0.4 ) =dev-lang/python-2*[threads] dev-util/pkgconfig x11-libs/libXrender x11-libs/libXt x11-libs/libXmu >=sys-libs/zlib-1.1.4 dev-util/pkgconfig =dev-lang/python-2*[threads] app-arch/zip app-arch/unzip >=app-text/hunspell-1.2 dev-libs/expat >=dev-libs/libIDL-0.8.0 >=dev-libs/libevent-1.4.7 >=x11-libs/cairo-1.8[X] >=x11-libs/gtk+-2.8.6:2 >=x11-libs/pango-1.10.1[X] virtual/jpeg virtual/freedesktop-icon-theme alsa? ( media-libs/alsa-lib ) dbus? ( >=dev-libs/dbus-glib-0.72 ) libnotify? ( >=x11-libs/libnotify-0.4 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) wifi? ( net-wireless/wireless-tools ) java? ( >=dev-java/java-config-2.1.9-r1 ) || ( >=sys-devel/automake-1.11.1:1.11 ) =sys-devel/autoconf-2.1* sys-devel/libtool
 java? ( >=virtual/jre-1.4 ) >=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.12.8 >=dev-libs/nspr-4.8.6 system-sqlite? ( >=dev-db/sqlite-3.7.4[fts3,secure-delete] ) alsa? ( media-libs/alsa-lib ) >=app-text/hunspell-1.2 >=x11-libs/cairo-1.8.8[X] x11-libs/libXt x11-libs/pixman >=dev-libs/libevent-1.4.7 gnome? ( >=gnome-base/gnome-vfs-2.16.3 >=gnome-base/libgnomeui-2.16.1 >=gnome-base/gconf-2.16.0 >=gnome-base/libgnome-2.16.0 ) wifi? ( net-wireless/wireless-tools ) libnotify? ( >=x11-libs/libnotify-0.4 ) x11-libs/libXrender x11-libs/libXt x11-libs/libXmu >=sys-libs/zlib-1.1.4 app-arch/zip app-arch/unzip >=app-text/hunspell-1.2 dev-libs/expat >=dev-libs/libIDL-0.8.0 >=dev-libs/libevent-1.4.7 >=x11-libs/cairo-1.8[X] >=x11-libs/gtk+-2.8.6:2 >=x11-libs/pango-1.10.1[X] virtual/jpeg virtual/freedesktop-icon-theme alsa? ( media-libs/alsa-lib ) dbus? ( >=dev-libs/dbus-glib-0.72 ) libnotify? ( >=x11-libs/libnotify-0.4 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) wifi? ( net-wireless/wireless-tools ) java? ( >=dev-java/java-config-2.1.9-r1 )
 1.9
 ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/3.6.21/source/firefox-3.6.21.source.tar.bz2 http://dev.gentoo.org/~anarchy/mozilla/patchsets/xulrunner-1.9.2-patches-0.9.tar.bz2
diff --git a/metadata/cache/net-libs/xulrunner-1.9.2.22 b/metadata/cache/net-libs/xulrunner-1.9.2.22
index 9feae9aa94ad..216c6c6040d0 100644
--- a/metadata/cache/net-libs/xulrunner-1.9.2.22
+++ b/metadata/cache/net-libs/xulrunner-1.9.2.22
@@ -1,4 +1,4 @@
-java? ( >=virtual/jdk-1.4 ) >=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.12.8 >=dev-libs/nspr-4.8.6 system-sqlite? ( >=dev-db/sqlite-3.7.4[fts3,secure-delete] ) alsa? ( media-libs/alsa-lib ) >=app-text/hunspell-1.2 >=x11-libs/cairo-1.8.8[X] x11-libs/libXt x11-libs/pixman >=dev-libs/libevent-1.4.7 gnome? ( >=gnome-base/gnome-vfs-2.16.3 >=gnome-base/libgnomeui-2.16.1 >=gnome-base/gconf-2.16.0 >=gnome-base/libgnome-2.16.0 ) wifi? ( net-wireless/wireless-tools ) libnotify? ( >=x11-libs/libnotify-0.4 ) =dev-lang/python-2*[threads] dev-util/pkgconfig x11-libs/libXrender x11-libs/libXt x11-libs/libXmu >=sys-libs/zlib-1.1.4 dev-util/pkgconfig =dev-lang/python-2*[threads] app-arch/zip app-arch/unzip >=app-text/hunspell-1.2 dev-libs/expat >=dev-libs/libIDL-0.8.0 >=dev-libs/libevent-1.4.7 >=x11-libs/cairo-1.8[X] >=x11-libs/gtk+-2.8.6:2 >=x11-libs/pango-1.10.1[X] virtual/jpeg virtual/freedesktop-icon-theme alsa? ( media-libs/alsa-lib ) dbus? ( >=dev-libs/dbus-glib-0.72 ) libnotify? ( >=x11-libs/libnotify-0.4 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) wifi? ( net-wireless/wireless-tools ) java? ( >=dev-java/java-config-2.1.9-r1 ) || ( >=sys-devel/automake-1.11.1 ) =sys-devel/autoconf-2.1* sys-devel/libtool
+java? ( >=virtual/jdk-1.4 ) >=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.12.8 >=dev-libs/nspr-4.8.6 system-sqlite? ( >=dev-db/sqlite-3.7.4[fts3,secure-delete] ) alsa? ( media-libs/alsa-lib ) >=app-text/hunspell-1.2 >=x11-libs/cairo-1.8.8[X] x11-libs/libXt x11-libs/pixman >=dev-libs/libevent-1.4.7 gnome? ( >=gnome-base/gnome-vfs-2.16.3 >=gnome-base/libgnomeui-2.16.1 >=gnome-base/gconf-2.16.0 >=gnome-base/libgnome-2.16.0 ) wifi? ( net-wireless/wireless-tools ) libnotify? ( >=x11-libs/libnotify-0.4 ) =dev-lang/python-2*[threads] dev-util/pkgconfig x11-libs/libXrender x11-libs/libXt x11-libs/libXmu >=sys-libs/zlib-1.1.4 dev-util/pkgconfig =dev-lang/python-2*[threads] app-arch/zip app-arch/unzip >=app-text/hunspell-1.2 dev-libs/expat >=dev-libs/libIDL-0.8.0 >=dev-libs/libevent-1.4.7 >=x11-libs/cairo-1.8[X] >=x11-libs/gtk+-2.8.6:2 >=x11-libs/pango-1.10.1[X] virtual/jpeg virtual/freedesktop-icon-theme alsa? ( media-libs/alsa-lib ) dbus? ( >=dev-libs/dbus-glib-0.72 ) libnotify? ( >=x11-libs/libnotify-0.4 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) wifi? ( net-wireless/wireless-tools ) java? ( >=dev-java/java-config-2.1.9-r1 ) || ( >=sys-devel/automake-1.11.1:1.11 ) =sys-devel/autoconf-2.1* sys-devel/libtool
 java? ( >=virtual/jre-1.4 ) >=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.12.8 >=dev-libs/nspr-4.8.6 system-sqlite? ( >=dev-db/sqlite-3.7.4[fts3,secure-delete] ) alsa? ( media-libs/alsa-lib ) >=app-text/hunspell-1.2 >=x11-libs/cairo-1.8.8[X] x11-libs/libXt x11-libs/pixman >=dev-libs/libevent-1.4.7 gnome? ( >=gnome-base/gnome-vfs-2.16.3 >=gnome-base/libgnomeui-2.16.1 >=gnome-base/gconf-2.16.0 >=gnome-base/libgnome-2.16.0 ) wifi? ( net-wireless/wireless-tools ) libnotify? ( >=x11-libs/libnotify-0.4 ) x11-libs/libXrender x11-libs/libXt x11-libs/libXmu >=sys-libs/zlib-1.1.4 app-arch/zip app-arch/unzip >=app-text/hunspell-1.2 dev-libs/expat >=dev-libs/libIDL-0.8.0 >=dev-libs/libevent-1.4.7 >=x11-libs/cairo-1.8[X] >=x11-libs/gtk+-2.8.6:2 >=x11-libs/pango-1.10.1[X] virtual/jpeg virtual/freedesktop-icon-theme alsa? ( media-libs/alsa-lib ) dbus? ( >=dev-libs/dbus-glib-0.72 ) libnotify? ( >=x11-libs/libnotify-0.4 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) wifi? ( net-wireless/wireless-tools ) java? ( >=dev-java/java-config-2.1.9-r1 )
 1.9
 ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/3.6.22/source/firefox-3.6.22.source.tar.bz2 http://dev.gentoo.org/~anarchy/mozilla/patchsets/xulrunner-1.9.2-patches-0.9.tar.bz2
diff --git a/metadata/cache/net-libs/xulrunner-2.0.1-r1 b/metadata/cache/net-libs/xulrunner-2.0.1-r1
index 91b43c944382..dbe7f94b7509 100644
--- a/metadata/cache/net-libs/xulrunner-2.0.1-r1
+++ b/metadata/cache/net-libs/xulrunner-2.0.1-r1
@@ -1,4 +1,4 @@
->=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.12.9 >=dev-libs/nspr-4.8.7 >=dev-libs/glib-2.26 gconf? ( >=gnome-base/gconf-1.2.1:2 ) media-libs/libpng[apng] virtual/libffi system-sqlite? ( >=dev-db/sqlite-3.7.4[fts3,secure-delete,unlock-notify,debug=] ) webm? ( media-libs/libvpx media-libs/alsa-lib media-libs/mesa ) !www-plugins/weave dev-util/pkgconfig webm? ( amd64? ( >=dev-lang/yasm-1.1.0 ) x86? ( >=dev-lang/yasm-1.1.0 ) ) x11-libs/libXrender x11-libs/libXt x11-libs/libXmu >=sys-libs/zlib-1.1.4 dev-util/pkgconfig =dev-lang/python-2*[threads] app-arch/zip app-arch/unzip >=app-text/hunspell-1.2 dev-libs/expat >=dev-libs/libIDL-0.8.0 >=dev-libs/libevent-1.4.7 >=x11-libs/cairo-1.8[X] >=x11-libs/gtk+-2.8.6:2 >=x11-libs/pango-1.10.1[X] virtual/jpeg virtual/freedesktop-icon-theme alsa? ( media-libs/alsa-lib ) dbus? ( >=dev-libs/dbus-glib-0.72 ) libnotify? ( >=x11-libs/libnotify-0.4 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) wifi? ( net-wireless/wireless-tools ) || ( >=sys-devel/automake-1.11.1 ) =sys-devel/autoconf-2.1* sys-devel/libtool
+>=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.12.9 >=dev-libs/nspr-4.8.7 >=dev-libs/glib-2.26 gconf? ( >=gnome-base/gconf-1.2.1:2 ) media-libs/libpng[apng] virtual/libffi system-sqlite? ( >=dev-db/sqlite-3.7.4[fts3,secure-delete,unlock-notify,debug=] ) webm? ( media-libs/libvpx media-libs/alsa-lib media-libs/mesa ) !www-plugins/weave dev-util/pkgconfig webm? ( amd64? ( >=dev-lang/yasm-1.1.0 ) x86? ( >=dev-lang/yasm-1.1.0 ) ) x11-libs/libXrender x11-libs/libXt x11-libs/libXmu >=sys-libs/zlib-1.1.4 dev-util/pkgconfig =dev-lang/python-2*[threads] app-arch/zip app-arch/unzip >=app-text/hunspell-1.2 dev-libs/expat >=dev-libs/libIDL-0.8.0 >=dev-libs/libevent-1.4.7 >=x11-libs/cairo-1.8[X] >=x11-libs/gtk+-2.8.6:2 >=x11-libs/pango-1.10.1[X] virtual/jpeg virtual/freedesktop-icon-theme alsa? ( media-libs/alsa-lib ) dbus? ( >=dev-libs/dbus-glib-0.72 ) libnotify? ( >=x11-libs/libnotify-0.4 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) wifi? ( net-wireless/wireless-tools ) || ( >=sys-devel/automake-1.11.1:1.11 ) =sys-devel/autoconf-2.1* sys-devel/libtool
 >=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.12.9 >=dev-libs/nspr-4.8.7 >=dev-libs/glib-2.26 gconf? ( >=gnome-base/gconf-1.2.1:2 ) media-libs/libpng[apng] virtual/libffi system-sqlite? ( >=dev-db/sqlite-3.7.4[fts3,secure-delete,unlock-notify,debug=] ) webm? ( media-libs/libvpx media-libs/alsa-lib media-libs/mesa ) !www-plugins/weave x11-libs/libXrender x11-libs/libXt x11-libs/libXmu >=sys-libs/zlib-1.1.4 app-arch/zip app-arch/unzip >=app-text/hunspell-1.2 dev-libs/expat >=dev-libs/libIDL-0.8.0 >=dev-libs/libevent-1.4.7 >=x11-libs/cairo-1.8[X] >=x11-libs/gtk+-2.8.6:2 >=x11-libs/pango-1.10.1[X] virtual/jpeg virtual/freedesktop-icon-theme alsa? ( media-libs/alsa-lib ) dbus? ( >=dev-libs/dbus-glib-0.72 ) libnotify? ( >=x11-libs/libnotify-0.4 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) wifi? ( net-wireless/wireless-tools )
 1.9
 http://dev.gentoo.org/~anarchy/mozilla/patchsets/xulrunner-2.0-patches-1.8.tar.bz2 ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/4.0.1/source/firefox-4.0.1.source.tar.bz2
diff --git a/metadata/cache/net-libs/zeromq-2.1.10 b/metadata/cache/net-libs/zeromq-2.1.10
index ffd58c773ae2..f9f5dc9de9db 100644
--- a/metadata/cache/net-libs/zeromq-2.1.10
+++ b/metadata/cache/net-libs/zeromq-2.1.10
@@ -1,4 +1,4 @@
-pgm? ( dev-util/pkgconfig =net-libs/openpgm-5.1.116 ) sys-apps/util-linux || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+pgm? ( dev-util/pkgconfig =net-libs/openpgm-5.1.116 ) sys-apps/util-linux || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 http://download.zeromq.org/zeromq-2.1.10.tar.gz
diff --git a/metadata/cache/net-libs/zeromq-2.1.11 b/metadata/cache/net-libs/zeromq-2.1.11
index d06e3b6a80e9..595131b0b378 100644
--- a/metadata/cache/net-libs/zeromq-2.1.11
+++ b/metadata/cache/net-libs/zeromq-2.1.11
@@ -1,4 +1,4 @@
-pgm? ( dev-util/pkgconfig =net-libs/openpgm-5.1.118 ) sys-apps/util-linux || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+pgm? ( dev-util/pkgconfig =net-libs/openpgm-5.1.118 ) sys-apps/util-linux || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 http://download.zeromq.org/zeromq-2.1.11.tar.gz
diff --git a/metadata/cache/net-libs/zeromq-2.1.7 b/metadata/cache/net-libs/zeromq-2.1.7
index 9c7c908ab577..29133b54b923 100644
--- a/metadata/cache/net-libs/zeromq-2.1.7
+++ b/metadata/cache/net-libs/zeromq-2.1.7
@@ -1,4 +1,4 @@
-pgm? ( dev-util/pkgconfig =net-libs/openpgm-5.1.116 ) sys-apps/util-linux || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+pgm? ( dev-util/pkgconfig =net-libs/openpgm-5.1.116 ) sys-apps/util-linux || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 http://download.zeromq.org/zeromq-2.1.7.tar.gz
diff --git a/metadata/cache/net-libs/zeromq-2.1.9 b/metadata/cache/net-libs/zeromq-2.1.9
index edcef4d3466a..72d5d1c050ac 100644
--- a/metadata/cache/net-libs/zeromq-2.1.9
+++ b/metadata/cache/net-libs/zeromq-2.1.9
@@ -1,4 +1,4 @@
-pgm? ( dev-util/pkgconfig =net-libs/openpgm-5.1.116 ) sys-apps/util-linux || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+pgm? ( dev-util/pkgconfig =net-libs/openpgm-5.1.116 ) sys-apps/util-linux || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 http://download.zeromq.org/zeromq-2.1.9.tar.gz
diff --git a/metadata/cache/net-mail/courier-imap-4.6.0 b/metadata/cache/net-mail/courier-imap-4.6.0
index e400e3a4cc0f..2d63cd8d0506 100644
--- a/metadata/cache/net-mail/courier-imap-4.6.0
+++ b/metadata/cache/net-mail/courier-imap-4.6.0
@@ -1,4 +1,4 @@
-gnutls? ( net-libs/gnutls ) !gnutls? ( >=dev-libs/openssl-0.9.6 ) >=net-libs/courier-authlib-0.61 >=net-mail/mailbase-0.00-r8 berkdb? ( sys-libs/db ) fam? ( virtual/fam ) gdbm? ( >=sys-libs/gdbm-1.8.0 ) selinux? ( sec-policy/selinux-courier-imap ) dev-lang/perl !mail-mta/courier userland_GNU? ( sys-process/procps ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+gnutls? ( net-libs/gnutls ) !gnutls? ( >=dev-libs/openssl-0.9.6 ) >=net-libs/courier-authlib-0.61 >=net-mail/mailbase-0.00-r8 berkdb? ( sys-libs/db ) fam? ( virtual/fam ) gdbm? ( >=sys-libs/gdbm-1.8.0 ) selinux? ( sec-policy/selinux-courier-imap ) dev-lang/perl !mail-mta/courier userland_GNU? ( sys-process/procps ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 gnutls? ( net-libs/gnutls ) !gnutls? ( >=dev-libs/openssl-0.9.6 ) >=net-libs/courier-authlib-0.61 >=net-mail/mailbase-0.00-r8 berkdb? ( sys-libs/db ) fam? ( virtual/fam ) gdbm? ( >=sys-libs/gdbm-1.8.0 ) selinux? ( sec-policy/selinux-courier-imap ) !mail-mta/courier !net-mail/bincimap !net-mail/cyrus-imapd !net-mail/uw-imap
 0
 mirror://sourceforge/courier/courier-imap-4.6.0.tar.bz2
diff --git a/metadata/cache/net-mail/courier-imap-4.8.0 b/metadata/cache/net-mail/courier-imap-4.8.0
index 945a5c837a5d..9182ce090ae1 100644
--- a/metadata/cache/net-mail/courier-imap-4.8.0
+++ b/metadata/cache/net-mail/courier-imap-4.8.0
@@ -1,4 +1,4 @@
-gnutls? ( net-libs/gnutls ) !gnutls? ( >=dev-libs/openssl-0.9.6 ) >=net-libs/courier-authlib-0.61 >=net-mail/mailbase-0.00-r8 berkdb? ( sys-libs/db ) fam? ( virtual/fam ) gdbm? ( >=sys-libs/gdbm-1.8.0 ) selinux? ( sec-policy/selinux-courier-imap ) dev-lang/perl !mail-mta/courier userland_GNU? ( sys-process/procps ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+gnutls? ( net-libs/gnutls ) !gnutls? ( >=dev-libs/openssl-0.9.6 ) >=net-libs/courier-authlib-0.61 >=net-mail/mailbase-0.00-r8 berkdb? ( sys-libs/db ) fam? ( virtual/fam ) gdbm? ( >=sys-libs/gdbm-1.8.0 ) selinux? ( sec-policy/selinux-courier-imap ) dev-lang/perl !mail-mta/courier userland_GNU? ( sys-process/procps ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 gnutls? ( net-libs/gnutls ) !gnutls? ( >=dev-libs/openssl-0.9.6 ) >=net-libs/courier-authlib-0.61 >=net-mail/mailbase-0.00-r8 berkdb? ( sys-libs/db ) fam? ( virtual/fam ) gdbm? ( >=sys-libs/gdbm-1.8.0 ) selinux? ( sec-policy/selinux-courier-imap ) !mail-mta/courier !net-mail/bincimap !net-mail/cyrus-imapd !net-mail/uw-imap
 0
 mirror://sourceforge/courier/courier-imap-4.8.0.tar.bz2
diff --git a/metadata/cache/net-mail/fetchmail-6.3.21 b/metadata/cache/net-mail/fetchmail-6.3.21
index 10a0c0d18369..1eb843b4c3b8 100644
--- a/metadata/cache/net-mail/fetchmail-6.3.21
+++ b/metadata/cache/net-mail/fetchmail-6.3.21
@@ -1,4 +1,4 @@
-hesiod? ( net-dns/hesiod ) ssl? ( >=dev-libs/openssl-0.9.6 ) kerberos? ( virtual/krb5 >=dev-libs/openssl-0.9.6 ) nls? ( virtual/libintl ) elibc_FreeBSD? ( sys-libs/e2fsprogs-libs ) socks? ( net-proxy/dante ) sys-devel/flex nls? ( sys-devel/gettext ) tk? ( =dev-lang/python-2* ) tk? ( =dev-lang/python-2*[tk] ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+hesiod? ( net-dns/hesiod ) ssl? ( >=dev-libs/openssl-0.9.6 ) kerberos? ( virtual/krb5 >=dev-libs/openssl-0.9.6 ) nls? ( virtual/libintl ) elibc_FreeBSD? ( sys-libs/e2fsprogs-libs ) socks? ( net-proxy/dante ) sys-devel/flex nls? ( sys-devel/gettext ) tk? ( =dev-lang/python-2* ) tk? ( =dev-lang/python-2*[tk] ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 hesiod? ( net-dns/hesiod ) ssl? ( >=dev-libs/openssl-0.9.6 ) kerberos? ( virtual/krb5 >=dev-libs/openssl-0.9.6 ) nls? ( virtual/libintl ) elibc_FreeBSD? ( sys-libs/e2fsprogs-libs ) socks? ( net-proxy/dante ) tk? ( =dev-lang/python-2* ) tk? ( =dev-lang/python-2*[tk] )
 0
 mirror://berlios/fetchmail/fetchmail-6.3.21.tar.bz2
diff --git a/metadata/cache/net-mail/gnubiff-2.2.13-r2 b/metadata/cache/net-mail/gnubiff-2.2.13-r2
index 5e8cb3fb16b1..b02694129fcf 100644
--- a/metadata/cache/net-mail/gnubiff-2.2.13-r2
+++ b/metadata/cache/net-mail/gnubiff-2.2.13-r2
@@ -1,4 +1,4 @@
->=x11-libs/gtk+-2.6:2 >=gnome-base/libglade-2.3 dev-libs/popt gnome? ( || ( gnome-base/gnome-panel[bonobo] <gnome-base/gnome-panel-2.32 ) >=gnome-base/libgnome-2.2 >=gnome-base/libgnomeui-2.2 ) password? ( dev-libs/openssl ) fam? ( virtual/fam ) x11-proto/xproto dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=x11-libs/gtk+-2.6:2 >=gnome-base/libglade-2.3 dev-libs/popt gnome? ( || ( gnome-base/gnome-panel[bonobo] <gnome-base/gnome-panel-2.32 ) >=gnome-base/libgnome-2.2 >=gnome-base/libgnomeui-2.2 ) password? ( dev-libs/openssl ) fam? ( virtual/fam ) x11-proto/xproto dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=x11-libs/gtk+-2.6:2 >=gnome-base/libglade-2.3 dev-libs/popt gnome? ( || ( gnome-base/gnome-panel[bonobo] <gnome-base/gnome-panel-2.32 ) >=gnome-base/libgnome-2.2 >=gnome-base/libgnomeui-2.2 ) password? ( dev-libs/openssl ) fam? ( virtual/fam ) x11-proto/xproto
 0
 mirror://sourceforge/gnubiff/gnubiff-2.2.13.tar.gz
diff --git a/metadata/cache/net-mail/gnubiff-2.2.13-r3 b/metadata/cache/net-mail/gnubiff-2.2.13-r3
index ac01dc5f4309..2abf25efb66c 100644
--- a/metadata/cache/net-mail/gnubiff-2.2.13-r3
+++ b/metadata/cache/net-mail/gnubiff-2.2.13-r3
@@ -1,4 +1,4 @@
->=x11-libs/gtk+-2.6:2 >=gnome-base/libglade-2.3 dev-libs/popt password? ( dev-libs/openssl:0 ) fam? ( virtual/fam ) x11-proto/xproto dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=x11-libs/gtk+-2.6:2 >=gnome-base/libglade-2.3 dev-libs/popt password? ( dev-libs/openssl:0 ) fam? ( virtual/fam ) x11-proto/xproto dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=x11-libs/gtk+-2.6:2 >=gnome-base/libglade-2.3 dev-libs/popt password? ( dev-libs/openssl:0 ) fam? ( virtual/fam ) x11-proto/xproto
 0
 mirror://sourceforge/gnubiff/gnubiff-2.2.13.tar.gz
diff --git a/metadata/cache/net-mail/gnubiff-2.2.15 b/metadata/cache/net-mail/gnubiff-2.2.15
index 822030140ac3..c4079b1157f8 100644
--- a/metadata/cache/net-mail/gnubiff-2.2.15
+++ b/metadata/cache/net-mail/gnubiff-2.2.15
@@ -1,4 +1,4 @@
->=x11-libs/gtk+-3:3 >=gnome-base/libglade-2.3 dev-libs/popt password? ( dev-libs/openssl ) fam? ( virtual/fam ) gnome? ( >=gnome-base/gnome-panel-3.0 ) x11-proto/xproto x11-libs/libX11 x11-libs/pango x11-libs/gdk-pixbuf dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=x11-libs/gtk+-3:3 >=gnome-base/libglade-2.3 dev-libs/popt password? ( dev-libs/openssl ) fam? ( virtual/fam ) gnome? ( >=gnome-base/gnome-panel-3.0 ) x11-proto/xproto x11-libs/libX11 x11-libs/pango x11-libs/gdk-pixbuf dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=x11-libs/gtk+-3:3 >=gnome-base/libglade-2.3 dev-libs/popt password? ( dev-libs/openssl ) fam? ( virtual/fam ) gnome? ( >=gnome-base/gnome-panel-3.0 ) x11-proto/xproto x11-libs/libX11 x11-libs/pango x11-libs/gdk-pixbuf
 0
 mirror://sourceforge/gnubiff/gnubiff-2.2.15.tar.gz
diff --git a/metadata/cache/net-mail/libpst-0.6.52 b/metadata/cache/net-mail/libpst-0.6.52
index fdb7e7f983ca..c14c7b3a1be7 100644
--- a/metadata/cache/net-mail/libpst-0.6.52
+++ b/metadata/cache/net-mail/libpst-0.6.52
@@ -1,4 +1,4 @@
-dii? ( media-gfx/imagemagick[png] ) virtual/libiconv dii? ( media-libs/gd[png] ) python? ( <dev-libs/boost-1.48[python] ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dii? ( media-gfx/imagemagick[png] ) virtual/libiconv dii? ( media-libs/gd[png] ) python? ( <dev-libs/boost-1.48[python] ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dii? ( media-gfx/imagemagick[png] )
 0
 http://www.five-ten-sg.com/libpst/packages/libpst-0.6.52.tar.gz
diff --git a/metadata/cache/net-mail/libpst-0.6.53 b/metadata/cache/net-mail/libpst-0.6.53
index bf3189909707..ecc467872855 100644
--- a/metadata/cache/net-mail/libpst-0.6.53
+++ b/metadata/cache/net-mail/libpst-0.6.53
@@ -1,4 +1,4 @@
-dii? ( media-gfx/imagemagick[png] ) virtual/libiconv dii? ( media-libs/gd[png] ) python? ( <dev-libs/boost-1.48[python] ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dii? ( media-gfx/imagemagick[png] ) virtual/libiconv dii? ( media-libs/gd[png] ) python? ( <dev-libs/boost-1.48[python] ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dii? ( media-gfx/imagemagick[png] )
 0
 http://www.five-ten-sg.com/libpst/packages/libpst-0.6.53.tar.gz
diff --git a/metadata/cache/net-mail/libpst-0.6.54 b/metadata/cache/net-mail/libpst-0.6.54
index e461d6ea6270..34f21476016c 100644
--- a/metadata/cache/net-mail/libpst-0.6.54
+++ b/metadata/cache/net-mail/libpst-0.6.54
@@ -1,4 +1,4 @@
-dii? ( media-gfx/imagemagick[png] ) virtual/libiconv dii? ( media-libs/gd[png] ) python? ( <dev-libs/boost-1.48[python] ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( =dev-lang/python-2* )
+dii? ( media-gfx/imagemagick[png] ) virtual/libiconv dii? ( media-libs/gd[png] ) python? ( <dev-libs/boost-1.48[python] ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( =dev-lang/python-2* )
 dii? ( media-gfx/imagemagick[png] ) python? ( =dev-lang/python-2* )
 0
 http://www.five-ten-sg.com/libpst/packages/libpst-0.6.54.tar.gz
diff --git a/metadata/cache/net-mail/libpst-0.6.54-r1 b/metadata/cache/net-mail/libpst-0.6.54-r1
index 9635020633c0..393855819b13 100644
--- a/metadata/cache/net-mail/libpst-0.6.54-r1
+++ b/metadata/cache/net-mail/libpst-0.6.54-r1
@@ -1,4 +1,4 @@
-dii? ( media-gfx/imagemagick[png] ) virtual/libiconv dii? ( media-libs/gd[png] ) python? ( >=dev-libs/boost-1.48[python] ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( =dev-lang/python-2* )
+dii? ( media-gfx/imagemagick[png] ) virtual/libiconv dii? ( media-libs/gd[png] ) python? ( >=dev-libs/boost-1.48[python] ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( =dev-lang/python-2* )
 dii? ( media-gfx/imagemagick[png] ) python? ( =dev-lang/python-2* )
 0
 http://www.five-ten-sg.com/libpst/packages/libpst-0.6.54.tar.gz
diff --git a/metadata/cache/net-mail/mpack-1.6-r2 b/metadata/cache/net-mail/mpack-1.6-r2
index 0884056e28c7..77d8d55a4456 100644
--- a/metadata/cache/net-mail/mpack-1.6-r2
+++ b/metadata/cache/net-mail/mpack-1.6-r2
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 ftp://ftp.andrew.cmu.edu/pub/mpack/mpack-1.6.tar.gz
diff --git a/metadata/cache/net-mail/mpack-1.6-r3 b/metadata/cache/net-mail/mpack-1.6-r3
index a7fe51b46266..d7fd376c1a14 100644
--- a/metadata/cache/net-mail/mpack-1.6-r3
+++ b/metadata/cache/net-mail/mpack-1.6-r3
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 ftp://ftp.andrew.cmu.edu/pub/mpack/mpack-1.6.tar.gz
diff --git a/metadata/cache/net-mail/tpop3d-1.5.5 b/metadata/cache/net-mail/tpop3d-1.5.5
index 969b11339e4a..e4749b94bf1c 100644
--- a/metadata/cache/net-mail/tpop3d-1.5.5
+++ b/metadata/cache/net-mail/tpop3d-1.5.5
@@ -1,4 +1,4 @@
-sha1? ( >=dev-libs/openssl-0.9.6 ) ssl? ( >=dev-libs/openssl-0.9.6 ) ldap? ( >=net-nds/openldap-2.0.7 ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-server ) perl? ( >=dev-lang/perl-5.6.1 ) pam? ( virtual/pam >=net-mail/mailbase-0.00-r8 ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) drac? ( mail-client/drac ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+sha1? ( >=dev-libs/openssl-0.9.6 ) ssl? ( >=dev-libs/openssl-0.9.6 ) ldap? ( >=net-nds/openldap-2.0.7 ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-server ) perl? ( >=dev-lang/perl-5.6.1 ) pam? ( virtual/pam >=net-mail/mailbase-0.00-r8 ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) drac? ( mail-client/drac ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 sha1? ( >=dev-libs/openssl-0.9.6 ) ssl? ( >=dev-libs/openssl-0.9.6 ) ldap? ( >=net-nds/openldap-2.0.7 ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-server ) perl? ( >=dev-lang/perl-5.6.1 ) pam? ( virtual/pam >=net-mail/mailbase-0.00-r8 ) tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
 0
 http://download.savannah.nongnu.org/releases/tpop3d/tpop3d-1.5.5.tar.gz
diff --git a/metadata/cache/net-mail/vchkuser-0.3.3 b/metadata/cache/net-mail/vchkuser-0.3.3
index 7f47a79dddf3..f19c7a1595a6 100644
--- a/metadata/cache/net-mail/vchkuser-0.3.3
+++ b/metadata/cache/net-mail/vchkuser-0.3.3
@@ -1,4 +1,4 @@
-net-mail/vpopmail || ( mail-mta/netqmail[qmail-spp] mail-mta/qmail-ldap[qmail-spp] ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+net-mail/vpopmail || ( mail-mta/netqmail[qmail-spp] mail-mta/qmail-ldap[qmail-spp] ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 
 0
 http://bb.xnull.de/projects/vchkuser/dist/vchkuser-0.3.3.tar.bz2
diff --git a/metadata/cache/net-mail/vchkuser-0.4 b/metadata/cache/net-mail/vchkuser-0.4
index 709abd5daea6..36d1ac300ad3 100644
--- a/metadata/cache/net-mail/vchkuser-0.4
+++ b/metadata/cache/net-mail/vchkuser-0.4
@@ -1,4 +1,4 @@
-net-mail/vpopmail || ( mail-mta/netqmail[qmail-spp] mail-mta/qmail-ldap[qmail-spp] ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+net-mail/vpopmail || ( mail-mta/netqmail[qmail-spp] mail-mta/qmail-ldap[qmail-spp] ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 
 0
 http://github.com/hollow/vchkuser/tarball/v0.4 -> vchkuser-0.4.tar.gz
diff --git a/metadata/cache/net-mail/vpopmail-5.4.30-r1 b/metadata/cache/net-mail/vpopmail-5.4.30-r1
index b000870f5be7..ac3988e503ef 100644
--- a/metadata/cache/net-mail/vpopmail-5.4.30-r1
+++ b/metadata/cache/net-mail/vpopmail-5.4.30-r1
@@ -1,4 +1,4 @@
-virtual/qmail maildrop? ( mail-filter/maildrop ) mysql? ( virtual/mysql ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 >=sys-apps/sed-4
+virtual/qmail maildrop? ( mail-filter/maildrop ) mysql? ( virtual/mysql ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 >=sys-apps/sed-4
 virtual/qmail maildrop? ( mail-filter/maildrop ) mysql? ( virtual/mysql )
 0
 mirror://sourceforge/vpopmail/vpopmail-5.4.30.tar.gz
diff --git a/metadata/cache/net-mail/vpopmail-5.4.30-r2 b/metadata/cache/net-mail/vpopmail-5.4.30-r2
index 5b71610596a4..a90bbffbbc33 100644
--- a/metadata/cache/net-mail/vpopmail-5.4.30-r2
+++ b/metadata/cache/net-mail/vpopmail-5.4.30-r2
@@ -1,4 +1,4 @@
-virtual/qmail maildrop? ( mail-filter/maildrop ) mysql? ( virtual/mysql ) spamassassin? ( mail-filter/spamassassin ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 >=sys-apps/sed-4
+virtual/qmail maildrop? ( mail-filter/maildrop ) mysql? ( virtual/mysql ) spamassassin? ( mail-filter/spamassassin ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 >=sys-apps/sed-4
 virtual/qmail maildrop? ( mail-filter/maildrop ) mysql? ( virtual/mysql ) spamassassin? ( mail-filter/spamassassin )
 0
 mirror://sourceforge/vpopmail/vpopmail-5.4.30.tar.gz
diff --git a/metadata/cache/net-mail/vpopmail-5.4.33 b/metadata/cache/net-mail/vpopmail-5.4.33
index d2034c300a31..74a8ae997318 100644
--- a/metadata/cache/net-mail/vpopmail-5.4.33
+++ b/metadata/cache/net-mail/vpopmail-5.4.33
@@ -1,4 +1,4 @@
-virtual/qmail maildrop? ( mail-filter/maildrop ) mysql? ( virtual/mysql ) spamassassin? ( mail-filter/spamassassin ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 >=sys-apps/sed-4
+virtual/qmail maildrop? ( mail-filter/maildrop ) mysql? ( virtual/mysql ) spamassassin? ( mail-filter/spamassassin ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 >=sys-apps/sed-4
 virtual/qmail maildrop? ( mail-filter/maildrop ) mysql? ( virtual/mysql ) spamassassin? ( mail-filter/spamassassin )
 0
 mirror://sourceforge/vpopmail/vpopmail-5.4.33.tar.gz
diff --git a/metadata/cache/net-misc/arpd-0.2-r1 b/metadata/cache/net-misc/arpd-0.2-r1
index 3011ce4c930a..4e96b7a643af 100644
--- a/metadata/cache/net-misc/arpd-0.2-r1
+++ b/metadata/cache/net-misc/arpd-0.2-r1
@@ -1,4 +1,4 @@
->=dev-libs/libdnet-1.4 >=dev-libs/libevent-0.6 net-libs/libpcap !sys-apps/iproute2 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-libs/libdnet-1.4 >=dev-libs/libevent-0.6 net-libs/libpcap !sys-apps/iproute2 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=dev-libs/libdnet-1.4 >=dev-libs/libevent-0.6 net-libs/libpcap !sys-apps/iproute2
 0
 http://www.citi.umich.edu/u/provos/honeyd/arpd-0.2.tar.gz
diff --git a/metadata/cache/net-misc/asterisk-1.8.10.1 b/metadata/cache/net-misc/asterisk-1.8.10.1
index 94d494823849..74198d58f7fe 100644
--- a/metadata/cache/net-misc/asterisk-1.8.10.1
+++ b/metadata/cache/net-misc/asterisk-1.8.10.1
@@ -1,4 +1,4 @@
-dev-libs/popt dev-libs/libxml2 dev-libs/openssl sys-libs/ncurses sys-libs/zlib ais? ( sys-cluster/openais ) alsa? ( media-libs/alsa-lib ) bluetooth? ( net-wireless/bluez ) calendar? ( net-libs/neon dev-libs/libical dev-libs/iksemel ) caps? ( sys-libs/libcap ) curl? ( net-misc/curl ) dahdi? ( >=net-libs/libpri-1.4.12_beta2 net-misc/dahdi-tools ) freetds? ( dev-db/freetds ) gtalk? ( dev-libs/iksemel ) http? ( dev-libs/gmime:2.4 ) iconv? ( virtual/libiconv ) jabber? ( dev-libs/iksemel ) jingle? ( dev-libs/iksemel ) ldap? ( net-nds/openldap ) lua? ( dev-lang/lua ) mysql? ( virtual/mysql ) newt? ( dev-libs/newt ) odbc? ( dev-db/unixODBC ) osplookup? ( net-libs/osptoolkit ) portaudio? ( media-libs/portaudio ) postgres? ( dev-db/postgresql-base ) radius? ( net-dialup/radiusclient-ng ) snmp? ( net-analyzer/net-snmp ) span? ( media-libs/spandsp ) speex? ( media-libs/speex ) sqlite? ( dev-db/sqlite:0 ) sqlite3? ( dev-db/sqlite:3 ) srtp? ( net-libs/libsrtp ) usb? ( dev-libs/libusb media-libs/alsa-lib ) vorbis? ( media-libs/libvorbis ) !net-libs/openh323 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-libs/popt dev-libs/libxml2 dev-libs/openssl sys-libs/ncurses sys-libs/zlib ais? ( sys-cluster/openais ) alsa? ( media-libs/alsa-lib ) bluetooth? ( net-wireless/bluez ) calendar? ( net-libs/neon dev-libs/libical dev-libs/iksemel ) caps? ( sys-libs/libcap ) curl? ( net-misc/curl ) dahdi? ( >=net-libs/libpri-1.4.12_beta2 net-misc/dahdi-tools ) freetds? ( dev-db/freetds ) gtalk? ( dev-libs/iksemel ) http? ( dev-libs/gmime:2.4 ) iconv? ( virtual/libiconv ) jabber? ( dev-libs/iksemel ) jingle? ( dev-libs/iksemel ) ldap? ( net-nds/openldap ) lua? ( dev-lang/lua ) mysql? ( virtual/mysql ) newt? ( dev-libs/newt ) odbc? ( dev-db/unixODBC ) osplookup? ( net-libs/osptoolkit ) portaudio? ( media-libs/portaudio ) postgres? ( dev-db/postgresql-base ) radius? ( net-dialup/radiusclient-ng ) snmp? ( net-analyzer/net-snmp ) span? ( media-libs/spandsp ) speex? ( media-libs/speex ) sqlite? ( dev-db/sqlite:0 ) sqlite3? ( dev-db/sqlite:3 ) srtp? ( net-libs/libsrtp ) usb? ( dev-libs/libusb media-libs/alsa-lib ) vorbis? ( media-libs/libvorbis ) !net-libs/openh323 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-libs/popt dev-libs/libxml2 dev-libs/openssl sys-libs/ncurses sys-libs/zlib ais? ( sys-cluster/openais ) alsa? ( media-libs/alsa-lib ) bluetooth? ( net-wireless/bluez ) calendar? ( net-libs/neon dev-libs/libical dev-libs/iksemel ) caps? ( sys-libs/libcap ) curl? ( net-misc/curl ) dahdi? ( >=net-libs/libpri-1.4.12_beta2 net-misc/dahdi-tools ) freetds? ( dev-db/freetds ) gtalk? ( dev-libs/iksemel ) http? ( dev-libs/gmime:2.4 ) iconv? ( virtual/libiconv ) jabber? ( dev-libs/iksemel ) jingle? ( dev-libs/iksemel ) ldap? ( net-nds/openldap ) lua? ( dev-lang/lua ) mysql? ( virtual/mysql ) newt? ( dev-libs/newt ) odbc? ( dev-db/unixODBC ) osplookup? ( net-libs/osptoolkit ) portaudio? ( media-libs/portaudio ) postgres? ( dev-db/postgresql-base ) radius? ( net-dialup/radiusclient-ng ) snmp? ( net-analyzer/net-snmp ) span? ( media-libs/spandsp ) speex? ( media-libs/speex ) sqlite? ( dev-db/sqlite:0 ) sqlite3? ( dev-db/sqlite:3 ) srtp? ( net-libs/libsrtp ) usb? ( dev-libs/libusb media-libs/alsa-lib ) vorbis? ( media-libs/libvorbis ) syslog? ( virtual/logger )
 0
 http://downloads.asterisk.org/pub/telephony/asterisk/asterisk-1.8.10.1.tar.gz mirror://gentoo/gentoo-asterisk-patchset-1.10.tar.bz2
diff --git a/metadata/cache/net-misc/asterisk-1.8.8.2 b/metadata/cache/net-misc/asterisk-1.8.8.2
index f2781ef5138c..985203a01494 100644
--- a/metadata/cache/net-misc/asterisk-1.8.8.2
+++ b/metadata/cache/net-misc/asterisk-1.8.8.2
@@ -1,4 +1,4 @@
-dev-libs/popt dev-libs/libxml2 dev-libs/openssl ais? ( sys-cluster/openais ) alsa? ( media-libs/alsa-lib ) bluetooth? ( net-wireless/bluez ) calendar? ( net-libs/neon dev-libs/libical dev-libs/iksemel ) caps? ( sys-libs/libcap ) curl? ( net-misc/curl ) dahdi? ( >=net-libs/libpri-1.4.12_beta2 net-misc/dahdi-tools ) freetds? ( dev-db/freetds ) gtalk? ( dev-libs/iksemel ) http? ( dev-libs/gmime:2.4 ) iconv? ( virtual/libiconv ) jabber? ( dev-libs/iksemel ) jingle? ( dev-libs/iksemel ) ldap? ( net-nds/openldap ) lua? ( dev-lang/lua ) mysql? ( virtual/mysql ) newt? ( dev-libs/newt ) odbc? ( dev-db/unixODBC ) osplookup? ( net-libs/osptoolkit ) portaudio? ( media-libs/portaudio ) postgres? ( dev-db/postgresql-base ) radius? ( net-dialup/radiusclient-ng ) snmp? ( net-analyzer/net-snmp ) span? ( media-libs/spandsp ) speex? ( media-libs/speex ) sqlite? ( dev-db/sqlite:0 ) sqlite3? ( dev-db/sqlite:3 ) srtp? ( net-libs/libsrtp ) usb? ( dev-libs/libusb media-libs/alsa-lib ) vorbis? ( media-libs/libvorbis ) !net-libs/openh323 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-libs/popt dev-libs/libxml2 dev-libs/openssl ais? ( sys-cluster/openais ) alsa? ( media-libs/alsa-lib ) bluetooth? ( net-wireless/bluez ) calendar? ( net-libs/neon dev-libs/libical dev-libs/iksemel ) caps? ( sys-libs/libcap ) curl? ( net-misc/curl ) dahdi? ( >=net-libs/libpri-1.4.12_beta2 net-misc/dahdi-tools ) freetds? ( dev-db/freetds ) gtalk? ( dev-libs/iksemel ) http? ( dev-libs/gmime:2.4 ) iconv? ( virtual/libiconv ) jabber? ( dev-libs/iksemel ) jingle? ( dev-libs/iksemel ) ldap? ( net-nds/openldap ) lua? ( dev-lang/lua ) mysql? ( virtual/mysql ) newt? ( dev-libs/newt ) odbc? ( dev-db/unixODBC ) osplookup? ( net-libs/osptoolkit ) portaudio? ( media-libs/portaudio ) postgres? ( dev-db/postgresql-base ) radius? ( net-dialup/radiusclient-ng ) snmp? ( net-analyzer/net-snmp ) span? ( media-libs/spandsp ) speex? ( media-libs/speex ) sqlite? ( dev-db/sqlite:0 ) sqlite3? ( dev-db/sqlite:3 ) srtp? ( net-libs/libsrtp ) usb? ( dev-libs/libusb media-libs/alsa-lib ) vorbis? ( media-libs/libvorbis ) !net-libs/openh323 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-libs/popt dev-libs/libxml2 dev-libs/openssl ais? ( sys-cluster/openais ) alsa? ( media-libs/alsa-lib ) bluetooth? ( net-wireless/bluez ) calendar? ( net-libs/neon dev-libs/libical dev-libs/iksemel ) caps? ( sys-libs/libcap ) curl? ( net-misc/curl ) dahdi? ( >=net-libs/libpri-1.4.12_beta2 net-misc/dahdi-tools ) freetds? ( dev-db/freetds ) gtalk? ( dev-libs/iksemel ) http? ( dev-libs/gmime:2.4 ) iconv? ( virtual/libiconv ) jabber? ( dev-libs/iksemel ) jingle? ( dev-libs/iksemel ) ldap? ( net-nds/openldap ) lua? ( dev-lang/lua ) mysql? ( virtual/mysql ) newt? ( dev-libs/newt ) odbc? ( dev-db/unixODBC ) osplookup? ( net-libs/osptoolkit ) portaudio? ( media-libs/portaudio ) postgres? ( dev-db/postgresql-base ) radius? ( net-dialup/radiusclient-ng ) snmp? ( net-analyzer/net-snmp ) span? ( media-libs/spandsp ) speex? ( media-libs/speex ) sqlite? ( dev-db/sqlite:0 ) sqlite3? ( dev-db/sqlite:3 ) srtp? ( net-libs/libsrtp ) usb? ( dev-libs/libusb media-libs/alsa-lib ) vorbis? ( media-libs/libvorbis ) syslog? ( virtual/logger )
 0
 http://downloads.asterisk.org/pub/telephony/asterisk/asterisk-1.8.8.2.tar.gz mirror://gentoo/gentoo-asterisk-patchset-1.7.tar.bz2
diff --git a/metadata/cache/net-misc/asterisk-10.2.1 b/metadata/cache/net-misc/asterisk-10.2.1
index 64fba18e3fa5..a33b393f677f 100644
--- a/metadata/cache/net-misc/asterisk-10.2.1
+++ b/metadata/cache/net-misc/asterisk-10.2.1
@@ -1,4 +1,4 @@
-dev-db/sqlite:3 dev-libs/popt dev-libs/libxml2 dev-libs/openssl sys-libs/ncurses sys-libs/zlib ais? ( sys-cluster/openais ) alsa? ( media-libs/alsa-lib ) bluetooth? ( net-wireless/bluez ) calendar? ( net-libs/neon dev-libs/libical dev-libs/iksemel ) caps? ( sys-libs/libcap ) curl? ( net-misc/curl ) dahdi? ( >=net-libs/libpri-1.4.12_beta2 net-misc/dahdi-tools ) freetds? ( dev-db/freetds ) gtalk? ( dev-libs/iksemel ) http? ( dev-libs/gmime:2.4 ) iconv? ( virtual/libiconv ) jabber? ( dev-libs/iksemel ) jingle? ( dev-libs/iksemel ) ldap? ( net-nds/openldap ) lua? ( dev-lang/lua ) mysql? ( virtual/mysql ) newt? ( dev-libs/newt ) odbc? ( dev-db/unixODBC ) osplookup? ( net-libs/osptoolkit ) portaudio? ( media-libs/portaudio ) postgres? ( dev-db/postgresql-base ) radius? ( net-dialup/radiusclient-ng ) snmp? ( net-analyzer/net-snmp ) span? ( media-libs/spandsp ) speex? ( media-libs/speex ) srtp? ( net-libs/libsrtp ) usb? ( dev-libs/libusb media-libs/alsa-lib ) vorbis? ( media-libs/libvorbis ) !net-libs/openh323 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-db/sqlite:3 dev-libs/popt dev-libs/libxml2 dev-libs/openssl sys-libs/ncurses sys-libs/zlib ais? ( sys-cluster/openais ) alsa? ( media-libs/alsa-lib ) bluetooth? ( net-wireless/bluez ) calendar? ( net-libs/neon dev-libs/libical dev-libs/iksemel ) caps? ( sys-libs/libcap ) curl? ( net-misc/curl ) dahdi? ( >=net-libs/libpri-1.4.12_beta2 net-misc/dahdi-tools ) freetds? ( dev-db/freetds ) gtalk? ( dev-libs/iksemel ) http? ( dev-libs/gmime:2.4 ) iconv? ( virtual/libiconv ) jabber? ( dev-libs/iksemel ) jingle? ( dev-libs/iksemel ) ldap? ( net-nds/openldap ) lua? ( dev-lang/lua ) mysql? ( virtual/mysql ) newt? ( dev-libs/newt ) odbc? ( dev-db/unixODBC ) osplookup? ( net-libs/osptoolkit ) portaudio? ( media-libs/portaudio ) postgres? ( dev-db/postgresql-base ) radius? ( net-dialup/radiusclient-ng ) snmp? ( net-analyzer/net-snmp ) span? ( media-libs/spandsp ) speex? ( media-libs/speex ) srtp? ( net-libs/libsrtp ) usb? ( dev-libs/libusb media-libs/alsa-lib ) vorbis? ( media-libs/libvorbis ) !net-libs/openh323 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-db/sqlite:3 dev-libs/popt dev-libs/libxml2 dev-libs/openssl sys-libs/ncurses sys-libs/zlib ais? ( sys-cluster/openais ) alsa? ( media-libs/alsa-lib ) bluetooth? ( net-wireless/bluez ) calendar? ( net-libs/neon dev-libs/libical dev-libs/iksemel ) caps? ( sys-libs/libcap ) curl? ( net-misc/curl ) dahdi? ( >=net-libs/libpri-1.4.12_beta2 net-misc/dahdi-tools ) freetds? ( dev-db/freetds ) gtalk? ( dev-libs/iksemel ) http? ( dev-libs/gmime:2.4 ) iconv? ( virtual/libiconv ) jabber? ( dev-libs/iksemel ) jingle? ( dev-libs/iksemel ) ldap? ( net-nds/openldap ) lua? ( dev-lang/lua ) mysql? ( virtual/mysql ) newt? ( dev-libs/newt ) odbc? ( dev-db/unixODBC ) osplookup? ( net-libs/osptoolkit ) portaudio? ( media-libs/portaudio ) postgres? ( dev-db/postgresql-base ) radius? ( net-dialup/radiusclient-ng ) snmp? ( net-analyzer/net-snmp ) span? ( media-libs/spandsp ) speex? ( media-libs/speex ) srtp? ( net-libs/libsrtp ) usb? ( dev-libs/libusb media-libs/alsa-lib ) vorbis? ( media-libs/libvorbis ) syslog? ( virtual/logger )
 0
 http://downloads.asterisk.org/pub/telephony/asterisk/asterisk-10.2.1.tar.gz mirror://gentoo/gentoo-asterisk-patchset-2.2.tar.bz2
diff --git a/metadata/cache/net-misc/bird-1.2.4 b/metadata/cache/net-misc/bird-1.2.4
index 7ced81d36987..8a3a4e8cf1c9 100644
--- a/metadata/cache/net-misc/bird-1.2.4
+++ b/metadata/cache/net-misc/bird-1.2.4
@@ -1,4 +1,4 @@
-sys-devel/flex sys-devel/bison sys-devel/m4 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+sys-devel/flex sys-devel/bison sys-devel/m4 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 sys-libs/ncurses sys-libs/readline
 0
 ftp://bird.network.cz/pub/bird/bird-1.2.4.tar.gz
diff --git a/metadata/cache/net-misc/bird-1.3.0 b/metadata/cache/net-misc/bird-1.3.0
index 9182397bc240..48c4d4b6428c 100644
--- a/metadata/cache/net-misc/bird-1.3.0
+++ b/metadata/cache/net-misc/bird-1.3.0
@@ -1,4 +1,4 @@
-sys-devel/flex sys-devel/bison sys-devel/m4 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+sys-devel/flex sys-devel/bison sys-devel/m4 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 sys-libs/ncurses sys-libs/readline
 0
 ftp://bird.network.cz/pub/bird/bird-1.3.0.tar.gz
diff --git a/metadata/cache/net-misc/bird-1.3.1 b/metadata/cache/net-misc/bird-1.3.1
index f3d80a5be6e0..97443ad5eec8 100644
--- a/metadata/cache/net-misc/bird-1.3.1
+++ b/metadata/cache/net-misc/bird-1.3.1
@@ -1,4 +1,4 @@
-sys-devel/flex sys-devel/bison sys-devel/m4 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+sys-devel/flex sys-devel/bison sys-devel/m4 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 sys-libs/ncurses sys-libs/readline
 0
 ftp://bird.network.cz/pub/bird/bird-1.3.1.tar.gz
diff --git a/metadata/cache/net-misc/bird-1.3.2 b/metadata/cache/net-misc/bird-1.3.2
index e20d9ef0b9d8..35d0a0334c2f 100644
--- a/metadata/cache/net-misc/bird-1.3.2
+++ b/metadata/cache/net-misc/bird-1.3.2
@@ -1,4 +1,4 @@
-sys-devel/flex sys-devel/bison sys-devel/m4 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+sys-devel/flex sys-devel/bison sys-devel/m4 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 sys-libs/ncurses sys-libs/readline
 0
 ftp://bird.network.cz/pub/bird/bird-1.3.2.tar.gz
diff --git a/metadata/cache/net-misc/bird-1.3.6 b/metadata/cache/net-misc/bird-1.3.6
index 684b15050256..3af40ea777e9 100644
--- a/metadata/cache/net-misc/bird-1.3.6
+++ b/metadata/cache/net-misc/bird-1.3.6
@@ -1,4 +1,4 @@
-sys-devel/flex sys-devel/bison sys-devel/m4 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+sys-devel/flex sys-devel/bison sys-devel/m4 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 sys-libs/ncurses sys-libs/readline
 0
 ftp://bird.network.cz/pub/bird/bird-1.3.6.tar.gz
diff --git a/metadata/cache/net-misc/bridge-utils-1.5 b/metadata/cache/net-misc/bridge-utils-1.5
index a101f05ee58a..2532b5abca2d 100644
--- a/metadata/cache/net-misc/bridge-utils-1.5
+++ b/metadata/cache/net-misc/bridge-utils-1.5
@@ -1,4 +1,4 @@
-virtual/os-headers || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+virtual/os-headers || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 mirror://sourceforge/bridge/bridge-utils-1.5.tar.gz
diff --git a/metadata/cache/net-misc/cadaver-0.23.3 b/metadata/cache/net-misc/cadaver-0.23.3
index 70141c1ef5c2..76f6fcb5265c 100644
--- a/metadata/cache/net-misc/cadaver-0.23.3
+++ b/metadata/cache/net-misc/cadaver-0.23.3
@@ -1,4 +1,4 @@
->=net-libs/neon-0.27.0 sys-devel/gettext || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=net-libs/neon-0.27.0 sys-devel/gettext || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=net-libs/neon-0.27.0
 0
 http://www.webdav.org/cadaver/cadaver-0.23.3.tar.gz
diff --git a/metadata/cache/net-misc/corkscrew-2.0 b/metadata/cache/net-misc/corkscrew-2.0
index 41da863652b4..851a6bacf2ef 100644
--- a/metadata/cache/net-misc/corkscrew-2.0
+++ b/metadata/cache/net-misc/corkscrew-2.0
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 http://www.agroman.net/corkscrew/corkscrew-2.0.tar.gz
diff --git a/metadata/cache/net-misc/curl-7.21.4 b/metadata/cache/net-misc/curl-7.21.4
index 80cbc21855fa..af7aebab55cd 100644
--- a/metadata/cache/net-misc/curl-7.21.4
+++ b/metadata/cache/net-misc/curl-7.21.4
@@ -1,4 +1,4 @@
-ldap? ( net-nds/openldap ) ssl? ( gnutls? ( net-libs/gnutls dev-libs/libgcrypt app-misc/ca-certificates ) nss? ( !gnutls? ( dev-libs/nss app-misc/ca-certificates ) ) !gnutls? ( !nss? ( dev-libs/openssl ) ) ) idn? ( net-dns/libidn ) ares? ( >=net-dns/c-ares-1.4.0 ) kerberos? ( virtual/krb5 ) ssh? ( >=net-libs/libssh2-0.16 ) dev-util/pkgconfig test? ( sys-apps/diffutils dev-lang/perl ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+ldap? ( net-nds/openldap ) ssl? ( gnutls? ( net-libs/gnutls dev-libs/libgcrypt app-misc/ca-certificates ) nss? ( !gnutls? ( dev-libs/nss app-misc/ca-certificates ) ) !gnutls? ( !nss? ( dev-libs/openssl ) ) ) idn? ( net-dns/libidn ) ares? ( >=net-dns/c-ares-1.4.0 ) kerberos? ( virtual/krb5 ) ssh? ( >=net-libs/libssh2-0.16 ) dev-util/pkgconfig test? ( sys-apps/diffutils dev-lang/perl ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 ldap? ( net-nds/openldap ) ssl? ( gnutls? ( net-libs/gnutls dev-libs/libgcrypt app-misc/ca-certificates ) nss? ( !gnutls? ( dev-libs/nss app-misc/ca-certificates ) ) !gnutls? ( !nss? ( dev-libs/openssl ) ) ) idn? ( net-dns/libidn ) ares? ( >=net-dns/c-ares-1.4.0 ) kerberos? ( virtual/krb5 ) ssh? ( >=net-libs/libssh2-0.16 )
 0
 http://curl.haxx.se/download/curl-7.21.4.tar.bz2
diff --git a/metadata/cache/net-misc/curl-7.21.6 b/metadata/cache/net-misc/curl-7.21.6
index a4b509747935..626f17754c22 100644
--- a/metadata/cache/net-misc/curl-7.21.6
+++ b/metadata/cache/net-misc/curl-7.21.6
@@ -1,4 +1,4 @@
-ldap? ( net-nds/openldap ) ssl? ( gnutls? ( net-libs/gnutls dev-libs/libgcrypt app-misc/ca-certificates ) nss? ( !gnutls? ( dev-libs/nss app-misc/ca-certificates ) ) !gnutls? ( !nss? ( dev-libs/openssl ) ) ) idn? ( net-dns/libidn ) ares? ( >=net-dns/c-ares-1.4.0 ) kerberos? ( virtual/krb5 ) ssh? ( >=net-libs/libssh2-0.16 ) dev-util/pkgconfig test? ( sys-apps/diffutils dev-lang/perl ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+ldap? ( net-nds/openldap ) ssl? ( gnutls? ( net-libs/gnutls dev-libs/libgcrypt app-misc/ca-certificates ) nss? ( !gnutls? ( dev-libs/nss app-misc/ca-certificates ) ) !gnutls? ( !nss? ( dev-libs/openssl ) ) ) idn? ( net-dns/libidn ) ares? ( >=net-dns/c-ares-1.4.0 ) kerberos? ( virtual/krb5 ) ssh? ( >=net-libs/libssh2-0.16 ) dev-util/pkgconfig test? ( sys-apps/diffutils dev-lang/perl ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 ldap? ( net-nds/openldap ) ssl? ( gnutls? ( net-libs/gnutls dev-libs/libgcrypt app-misc/ca-certificates ) nss? ( !gnutls? ( dev-libs/nss app-misc/ca-certificates ) ) !gnutls? ( !nss? ( dev-libs/openssl ) ) ) idn? ( net-dns/libidn ) ares? ( >=net-dns/c-ares-1.4.0 ) kerberos? ( virtual/krb5 ) ssh? ( >=net-libs/libssh2-0.16 )
 0
 http://curl.haxx.se/download/curl-7.21.6.tar.bz2
diff --git a/metadata/cache/net-misc/curl-7.21.7 b/metadata/cache/net-misc/curl-7.21.7
index fa2654c42f2d..fe12fc225d2a 100644
--- a/metadata/cache/net-misc/curl-7.21.7
+++ b/metadata/cache/net-misc/curl-7.21.7
@@ -1,4 +1,4 @@
-ldap? ( net-nds/openldap ) ssl? ( gnutls? ( net-libs/gnutls dev-libs/libgcrypt app-misc/ca-certificates ) nss? ( !gnutls? ( dev-libs/nss app-misc/ca-certificates ) ) !gnutls? ( !nss? ( dev-libs/openssl ) ) ) idn? ( net-dns/libidn ) ares? ( >=net-dns/c-ares-1.6 ) kerberos? ( virtual/krb5 ) ssh? ( >=net-libs/libssh2-0.16 ) dev-util/pkgconfig test? ( sys-apps/diffutils dev-lang/perl ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+ldap? ( net-nds/openldap ) ssl? ( gnutls? ( net-libs/gnutls dev-libs/libgcrypt app-misc/ca-certificates ) nss? ( !gnutls? ( dev-libs/nss app-misc/ca-certificates ) ) !gnutls? ( !nss? ( dev-libs/openssl ) ) ) idn? ( net-dns/libidn ) ares? ( >=net-dns/c-ares-1.6 ) kerberos? ( virtual/krb5 ) ssh? ( >=net-libs/libssh2-0.16 ) dev-util/pkgconfig test? ( sys-apps/diffutils dev-lang/perl ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 ldap? ( net-nds/openldap ) ssl? ( gnutls? ( net-libs/gnutls dev-libs/libgcrypt app-misc/ca-certificates ) nss? ( !gnutls? ( dev-libs/nss app-misc/ca-certificates ) ) !gnutls? ( !nss? ( dev-libs/openssl ) ) ) idn? ( net-dns/libidn ) ares? ( >=net-dns/c-ares-1.6 ) kerberos? ( virtual/krb5 ) ssh? ( >=net-libs/libssh2-0.16 )
 0
 http://curl.haxx.se/download/curl-7.21.7.tar.bz2
diff --git a/metadata/cache/net-misc/curl-7.21.7-r2 b/metadata/cache/net-misc/curl-7.21.7-r2
index bc945778326f..7e949c7c92d2 100644
--- a/metadata/cache/net-misc/curl-7.21.7-r2
+++ b/metadata/cache/net-misc/curl-7.21.7-r2
@@ -1,4 +1,4 @@
-ldap? ( net-nds/openldap ) ssl? ( gnutls? ( net-libs/gnutls dev-libs/libgcrypt app-misc/ca-certificates ) nss? ( !gnutls? ( dev-libs/nss app-misc/ca-certificates ) ) !gnutls? ( !nss? ( dev-libs/openssl ) ) ) idn? ( net-dns/libidn ) ares? ( >=net-dns/c-ares-1.6 ) kerberos? ( virtual/krb5 ) ssh? ( >=net-libs/libssh2-0.16 ) sys-apps/ed dev-util/pkgconfig test? ( sys-apps/diffutils dev-lang/perl ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+ldap? ( net-nds/openldap ) ssl? ( gnutls? ( net-libs/gnutls dev-libs/libgcrypt app-misc/ca-certificates ) nss? ( !gnutls? ( dev-libs/nss app-misc/ca-certificates ) ) !gnutls? ( !nss? ( dev-libs/openssl ) ) ) idn? ( net-dns/libidn ) ares? ( >=net-dns/c-ares-1.6 ) kerberos? ( virtual/krb5 ) ssh? ( >=net-libs/libssh2-0.16 ) sys-apps/ed dev-util/pkgconfig test? ( sys-apps/diffutils dev-lang/perl ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 ldap? ( net-nds/openldap ) ssl? ( gnutls? ( net-libs/gnutls dev-libs/libgcrypt app-misc/ca-certificates ) nss? ( !gnutls? ( dev-libs/nss app-misc/ca-certificates ) ) !gnutls? ( !nss? ( dev-libs/openssl ) ) ) idn? ( net-dns/libidn ) ares? ( >=net-dns/c-ares-1.6 ) kerberos? ( virtual/krb5 ) ssh? ( >=net-libs/libssh2-0.16 )
 0
 http://curl.haxx.se/download/curl-7.21.7.tar.bz2
diff --git a/metadata/cache/net-misc/curl-7.22.0 b/metadata/cache/net-misc/curl-7.22.0
index c31fcc8517e8..50debee74a3f 100644
--- a/metadata/cache/net-misc/curl-7.22.0
+++ b/metadata/cache/net-misc/curl-7.22.0
@@ -1,4 +1,4 @@
-ldap? ( net-nds/openldap ) gnutls? ( net-libs/gnutls dev-libs/libgcrypt app-misc/ca-certificates ) ssl? ( !gnutls? ( dev-libs/openssl ) ) nss? ( !gnutls? ( !ssl? ( dev-libs/nss app-misc/ca-certificates ) ) ) idn? ( net-dns/libidn ) ares? ( >=net-dns/c-ares-1.6 ) kerberos? ( virtual/krb5 ) ssh? ( >=net-libs/libssh2-0.16 ) sys-apps/ed dev-util/pkgconfig test? ( sys-apps/diffutils dev-lang/perl ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+ldap? ( net-nds/openldap ) gnutls? ( net-libs/gnutls dev-libs/libgcrypt app-misc/ca-certificates ) ssl? ( !gnutls? ( dev-libs/openssl ) ) nss? ( !gnutls? ( !ssl? ( dev-libs/nss app-misc/ca-certificates ) ) ) idn? ( net-dns/libidn ) ares? ( >=net-dns/c-ares-1.6 ) kerberos? ( virtual/krb5 ) ssh? ( >=net-libs/libssh2-0.16 ) sys-apps/ed dev-util/pkgconfig test? ( sys-apps/diffutils dev-lang/perl ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 ldap? ( net-nds/openldap ) gnutls? ( net-libs/gnutls dev-libs/libgcrypt app-misc/ca-certificates ) ssl? ( !gnutls? ( dev-libs/openssl ) ) nss? ( !gnutls? ( !ssl? ( dev-libs/nss app-misc/ca-certificates ) ) ) idn? ( net-dns/libidn ) ares? ( >=net-dns/c-ares-1.6 ) kerberos? ( virtual/krb5 ) ssh? ( >=net-libs/libssh2-0.16 )
 0
 http://curl.haxx.se/download/curl-7.22.0.tar.bz2
diff --git a/metadata/cache/net-misc/curl-7.23.1 b/metadata/cache/net-misc/curl-7.23.1
index aad8d9af5786..b22d53f3edd6 100644
--- a/metadata/cache/net-misc/curl-7.23.1
+++ b/metadata/cache/net-misc/curl-7.23.1
@@ -1,4 +1,4 @@
-ldap? ( net-nds/openldap ) gnutls? ( net-libs/gnutls dev-libs/libgcrypt app-misc/ca-certificates ) ssl? ( !gnutls? ( dev-libs/openssl ) ) nss? ( !gnutls? ( !ssl? ( dev-libs/nss app-misc/ca-certificates ) ) ) idn? ( net-dns/libidn ) ares? ( >=net-dns/c-ares-1.6 ) kerberos? ( virtual/krb5 ) ssh? ( >=net-libs/libssh2-0.16 ) sys-apps/ed dev-util/pkgconfig test? ( sys-apps/diffutils dev-lang/perl ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+ldap? ( net-nds/openldap ) gnutls? ( net-libs/gnutls dev-libs/libgcrypt app-misc/ca-certificates ) ssl? ( !gnutls? ( dev-libs/openssl ) ) nss? ( !gnutls? ( !ssl? ( dev-libs/nss app-misc/ca-certificates ) ) ) idn? ( net-dns/libidn ) ares? ( >=net-dns/c-ares-1.6 ) kerberos? ( virtual/krb5 ) ssh? ( >=net-libs/libssh2-0.16 ) sys-apps/ed dev-util/pkgconfig test? ( sys-apps/diffutils dev-lang/perl ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 ldap? ( net-nds/openldap ) gnutls? ( net-libs/gnutls dev-libs/libgcrypt app-misc/ca-certificates ) ssl? ( !gnutls? ( dev-libs/openssl ) ) nss? ( !gnutls? ( !ssl? ( dev-libs/nss app-misc/ca-certificates ) ) ) idn? ( net-dns/libidn ) ares? ( >=net-dns/c-ares-1.6 ) kerberos? ( virtual/krb5 ) ssh? ( >=net-libs/libssh2-0.16 )
 0
 http://curl.haxx.se/download/curl-7.23.1.tar.bz2
diff --git a/metadata/cache/net-misc/curl-7.24.0 b/metadata/cache/net-misc/curl-7.24.0
index 81fcbdf329d3..05ed61841662 100644
--- a/metadata/cache/net-misc/curl-7.24.0
+++ b/metadata/cache/net-misc/curl-7.24.0
@@ -1,4 +1,4 @@
-ldap? ( net-nds/openldap ) gnutls? ( net-libs/gnutls dev-libs/libgcrypt app-misc/ca-certificates ) ssl? ( !gnutls? ( dev-libs/openssl ) ) nss? ( !gnutls? ( !ssl? ( dev-libs/nss app-misc/ca-certificates ) ) ) idn? ( net-dns/libidn ) ares? ( >=net-dns/c-ares-1.6 ) kerberos? ( virtual/krb5 ) ssh? ( >=net-libs/libssh2-0.16 ) sys-apps/ed dev-util/pkgconfig test? ( sys-apps/diffutils dev-lang/perl ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+ldap? ( net-nds/openldap ) gnutls? ( net-libs/gnutls dev-libs/libgcrypt app-misc/ca-certificates ) ssl? ( !gnutls? ( dev-libs/openssl ) ) nss? ( !gnutls? ( !ssl? ( dev-libs/nss app-misc/ca-certificates ) ) ) idn? ( net-dns/libidn ) ares? ( >=net-dns/c-ares-1.6 ) kerberos? ( virtual/krb5 ) ssh? ( >=net-libs/libssh2-0.16 ) sys-apps/ed dev-util/pkgconfig test? ( sys-apps/diffutils dev-lang/perl ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 ldap? ( net-nds/openldap ) gnutls? ( net-libs/gnutls dev-libs/libgcrypt app-misc/ca-certificates ) ssl? ( !gnutls? ( dev-libs/openssl ) ) nss? ( !gnutls? ( !ssl? ( dev-libs/nss app-misc/ca-certificates ) ) ) idn? ( net-dns/libidn ) ares? ( >=net-dns/c-ares-1.6 ) kerberos? ( virtual/krb5 ) ssh? ( >=net-libs/libssh2-0.16 )
 0
 http://curl.haxx.se/download/curl-7.24.0.tar.bz2
diff --git a/metadata/cache/net-misc/dibbler-0.8.0 b/metadata/cache/net-misc/dibbler-0.8.0
index dbc577c23455..5f05f34f8133 100644
--- a/metadata/cache/net-misc/dibbler-0.8.0
+++ b/metadata/cache/net-misc/dibbler-0.8.0
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 http://klub.com.pl/dhcpv6/dibbler/dibbler-0.8.0-src.tar.gz
diff --git a/metadata/cache/net-misc/drivel-3.0.0 b/metadata/cache/net-misc/drivel-3.0.0
index 25527ad148e0..62e094cb79bf 100644
--- a/metadata/cache/net-misc/drivel-3.0.0
+++ b/metadata/cache/net-misc/drivel-3.0.0
@@ -1,4 +1,4 @@
->=dev-libs/glib-2.16.6:2 >=x11-libs/gtk+-2.16.5:2 >=gnome-base/gconf-2:2 >=gnome-base/gnome-vfs-2.6:2 >=x11-libs/gtksourceview-2.2.2:2.0 >=net-libs/libsoup-2.4.1:2.4 >=dev-libs/libxml2-2.4.0:2 spell? ( >=app-text/gtkspell-2.0.10:2 ) dbus? ( >=dev-libs/dbus-glib-0.78 ) >=dev-util/pkgconfig-0.12.0 >=app-text/gnome-doc-utils-0.3.2 >=dev-util/intltool-0.21 >=app-text/scrollkeeper-0.3.5 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+>=dev-libs/glib-2.16.6:2 >=x11-libs/gtk+-2.16.5:2 >=gnome-base/gconf-2:2 >=gnome-base/gnome-vfs-2.6:2 >=x11-libs/gtksourceview-2.2.2:2.0 >=net-libs/libsoup-2.4.1:2.4 >=dev-libs/libxml2-2.4.0:2 spell? ( >=app-text/gtkspell-2.0.10:2 ) dbus? ( >=dev-libs/dbus-glib-0.78 ) >=dev-util/pkgconfig-0.12.0 >=app-text/gnome-doc-utils-0.3.2 >=dev-util/intltool-0.21 >=app-text/scrollkeeper-0.3.5 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 >=dev-libs/glib-2.16.6:2 >=x11-libs/gtk+-2.16.5:2 >=gnome-base/gconf-2:2 >=gnome-base/gnome-vfs-2.6:2 >=x11-libs/gtksourceview-2.2.2:2.0 >=net-libs/libsoup-2.4.1:2.4 >=dev-libs/libxml2-2.4.0:2 spell? ( >=app-text/gtkspell-2.0.10:2 ) dbus? ( >=dev-libs/dbus-glib-0.78 )
 0
 mirror://sourceforge/drivel/drivel-3.0.0.tar.bz2
diff --git a/metadata/cache/net-misc/drivel-3.0.3 b/metadata/cache/net-misc/drivel-3.0.3
index 78b5b032ef92..d16de84858fc 100644
--- a/metadata/cache/net-misc/drivel-3.0.3
+++ b/metadata/cache/net-misc/drivel-3.0.3
@@ -1,4 +1,4 @@
->=dev-libs/glib-2.16.6:2 >=x11-libs/gtk+-2.16.5:2 >=gnome-base/gconf-2:2 >=gnome-base/gnome-vfs-2.6:2 >=x11-libs/gtksourceview-2.2.2:2.0 >=net-libs/libsoup-2.4.1:2.4 >=dev-libs/libxml2-2.4.0:2 spell? ( >=app-text/gtkspell-2.0.10:2 ) dbus? ( >=dev-libs/dbus-glib-0.78 ) >=dev-util/pkgconfig-0.12.0 >=app-text/gnome-doc-utils-0.3.2 >=dev-util/intltool-0.21 >=app-text/scrollkeeper-0.3.5 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+>=dev-libs/glib-2.16.6:2 >=x11-libs/gtk+-2.16.5:2 >=gnome-base/gconf-2:2 >=gnome-base/gnome-vfs-2.6:2 >=x11-libs/gtksourceview-2.2.2:2.0 >=net-libs/libsoup-2.4.1:2.4 >=dev-libs/libxml2-2.4.0:2 spell? ( >=app-text/gtkspell-2.0.10:2 ) dbus? ( >=dev-libs/dbus-glib-0.78 ) >=dev-util/pkgconfig-0.12.0 >=app-text/gnome-doc-utils-0.3.2 >=dev-util/intltool-0.21 >=app-text/scrollkeeper-0.3.5 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 >=dev-libs/glib-2.16.6:2 >=x11-libs/gtk+-2.16.5:2 >=gnome-base/gconf-2:2 >=gnome-base/gnome-vfs-2.6:2 >=x11-libs/gtksourceview-2.2.2:2.0 >=net-libs/libsoup-2.4.1:2.4 >=dev-libs/libxml2-2.4.0:2 spell? ( >=app-text/gtkspell-2.0.10:2 ) dbus? ( >=dev-libs/dbus-glib-0.78 )
 0
 mirror://sourceforge/drivel/drivel-3.0.3.tar.bz2
diff --git a/metadata/cache/net-misc/gsasl-1.6.1 b/metadata/cache/net-misc/gsasl-1.6.1
index 854f78fe3783..8a4cdb88ed95 100644
--- a/metadata/cache/net-misc/gsasl-1.6.1
+++ b/metadata/cache/net-misc/gsasl-1.6.1
@@ -1,4 +1,4 @@
-gcrypt? ( dev-libs/libgcrypt ) idn? ( net-dns/libidn ) kerberos? ( virtual/krb5 ) nls? ( >=sys-devel/gettext-0.18.1 ) ntlm? ( net-libs/libntlm ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+gcrypt? ( dev-libs/libgcrypt ) idn? ( net-dns/libidn ) kerberos? ( virtual/krb5 ) nls? ( >=sys-devel/gettext-0.18.1 ) ntlm? ( net-libs/libntlm ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 gcrypt? ( dev-libs/libgcrypt ) idn? ( net-dns/libidn ) kerberos? ( virtual/krb5 ) nls? ( >=sys-devel/gettext-0.18.1 ) ntlm? ( net-libs/libntlm )
 0
 mirror://gnu/gsasl/gsasl-1.6.1.tar.gz
diff --git a/metadata/cache/net-misc/italc-1.0.9 b/metadata/cache/net-misc/italc-1.0.9
index 6fdb2d9e7829..59cb94aff2b0 100644
--- a/metadata/cache/net-misc/italc-1.0.9
+++ b/metadata/cache/net-misc/italc-1.0.9
@@ -1,4 +1,4 @@
-dev-libs/lzo sys-apps/tcp-wrappers virtual/jpeg sys-libs/zlib dev-libs/openssl x11-libs/qt-core x11-libs/qt-xmlpatterns system-libvncserver? ( net-libs/libvncserver ) xinerama? ( x11-libs/libXinerama ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libXtst x11-apps/xinput x11-libs/qt-gui:4 ) X? ( x11-proto/inputproto ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-libs/lzo sys-apps/tcp-wrappers virtual/jpeg sys-libs/zlib dev-libs/openssl x11-libs/qt-core x11-libs/qt-xmlpatterns system-libvncserver? ( net-libs/libvncserver ) xinerama? ( x11-libs/libXinerama ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libXtst x11-apps/xinput x11-libs/qt-gui:4 ) X? ( x11-proto/inputproto ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-libs/lzo sys-apps/tcp-wrappers virtual/jpeg sys-libs/zlib dev-libs/openssl x11-libs/qt-core x11-libs/qt-xmlpatterns system-libvncserver? ( net-libs/libvncserver ) xinerama? ( x11-libs/libXinerama ) X? ( x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libXtst x11-apps/xinput x11-libs/qt-gui:4 )
 0
 mirror://sourceforge/italc/italc-1.0.9.tar.bz2
diff --git a/metadata/cache/net-misc/l7-filter-userspace-0.11 b/metadata/cache/net-misc/l7-filter-userspace-0.11
index 0fabfa0a4d0d..16a4f2f178ab 100644
--- a/metadata/cache/net-misc/l7-filter-userspace-0.11
+++ b/metadata/cache/net-misc/l7-filter-userspace-0.11
@@ -1,4 +1,4 @@
->=net-libs/libnetfilter_conntrack-0.0.100 net-libs/libnetfilter_queue || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=net-libs/libnetfilter_conntrack-0.0.100 net-libs/libnetfilter_queue || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 net-misc/l7-protocols >=net-libs/libnetfilter_conntrack-0.0.100 net-libs/libnetfilter_queue
 0
 mirror://sourceforge/l7-filter/l7-filter-userspace-0.11.tar.gz
diff --git a/metadata/cache/net-misc/lambdamoo-1.8.1-r2 b/metadata/cache/net-misc/lambdamoo-1.8.1-r2
index dbece09c29f3..7eb2a395a37d 100644
--- a/metadata/cache/net-misc/lambdamoo-1.8.1-r2
+++ b/metadata/cache/net-misc/lambdamoo-1.8.1-r2
@@ -1,4 +1,4 @@
-sys-devel/bison || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+sys-devel/bison || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 mirror://sourceforge/lambdamoo/LambdaMOO-1.8.1.tar.gz
diff --git a/metadata/cache/net-misc/mediatomb-0.12.1 b/metadata/cache/net-misc/mediatomb-0.12.1
index d52d047e7459..6811bf231d8e 100644
--- a/metadata/cache/net-misc/mediatomb-0.12.1
+++ b/metadata/cache/net-misc/mediatomb-0.12.1
@@ -1,4 +1,4 @@
-mysql? ( virtual/mysql ) !mysql? ( >=dev-db/sqlite-3 ) javascript? ( dev-lang/spidermonkey ) dev-libs/expat taglib? ( media-libs/taglib ) !taglib? ( media-libs/id3lib ) lastfm? ( >=media-libs/lastfmlib-0.4 ) exif? ( media-libs/libexif ) libextractor? ( media-libs/libextractor ) mp4? ( media-libs/libmp4v2 ) ffmpeg? ( virtual/ffmpeg ) thumbnail? ( media-video/ffmpegthumbnailer[jpeg] ) net-misc/curl sys-apps/file sys-libs/zlib virtual/libiconv || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+mysql? ( virtual/mysql ) !mysql? ( >=dev-db/sqlite-3 ) javascript? ( dev-lang/spidermonkey ) dev-libs/expat taglib? ( media-libs/taglib ) !taglib? ( media-libs/id3lib ) lastfm? ( >=media-libs/lastfmlib-0.4 ) exif? ( media-libs/libexif ) libextractor? ( media-libs/libextractor ) mp4? ( media-libs/libmp4v2 ) ffmpeg? ( virtual/ffmpeg ) thumbnail? ( media-video/ffmpegthumbnailer[jpeg] ) net-misc/curl sys-apps/file sys-libs/zlib virtual/libiconv || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 mysql? ( virtual/mysql ) !mysql? ( >=dev-db/sqlite-3 ) javascript? ( dev-lang/spidermonkey ) dev-libs/expat taglib? ( media-libs/taglib ) !taglib? ( media-libs/id3lib ) lastfm? ( >=media-libs/lastfmlib-0.4 ) exif? ( media-libs/libexif ) libextractor? ( media-libs/libextractor ) mp4? ( media-libs/libmp4v2 ) ffmpeg? ( virtual/ffmpeg ) thumbnail? ( media-video/ffmpegthumbnailer[jpeg] ) net-misc/curl sys-apps/file sys-libs/zlib virtual/libiconv
 0
 mirror://sourceforge/mediatomb/mediatomb-0.12.1.tar.gz
diff --git a/metadata/cache/net-misc/mediatomb-0.12.1-r1 b/metadata/cache/net-misc/mediatomb-0.12.1-r1
index d52d047e7459..6811bf231d8e 100644
--- a/metadata/cache/net-misc/mediatomb-0.12.1-r1
+++ b/metadata/cache/net-misc/mediatomb-0.12.1-r1
@@ -1,4 +1,4 @@
-mysql? ( virtual/mysql ) !mysql? ( >=dev-db/sqlite-3 ) javascript? ( dev-lang/spidermonkey ) dev-libs/expat taglib? ( media-libs/taglib ) !taglib? ( media-libs/id3lib ) lastfm? ( >=media-libs/lastfmlib-0.4 ) exif? ( media-libs/libexif ) libextractor? ( media-libs/libextractor ) mp4? ( media-libs/libmp4v2 ) ffmpeg? ( virtual/ffmpeg ) thumbnail? ( media-video/ffmpegthumbnailer[jpeg] ) net-misc/curl sys-apps/file sys-libs/zlib virtual/libiconv || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+mysql? ( virtual/mysql ) !mysql? ( >=dev-db/sqlite-3 ) javascript? ( dev-lang/spidermonkey ) dev-libs/expat taglib? ( media-libs/taglib ) !taglib? ( media-libs/id3lib ) lastfm? ( >=media-libs/lastfmlib-0.4 ) exif? ( media-libs/libexif ) libextractor? ( media-libs/libextractor ) mp4? ( media-libs/libmp4v2 ) ffmpeg? ( virtual/ffmpeg ) thumbnail? ( media-video/ffmpegthumbnailer[jpeg] ) net-misc/curl sys-apps/file sys-libs/zlib virtual/libiconv || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 mysql? ( virtual/mysql ) !mysql? ( >=dev-db/sqlite-3 ) javascript? ( dev-lang/spidermonkey ) dev-libs/expat taglib? ( media-libs/taglib ) !taglib? ( media-libs/id3lib ) lastfm? ( >=media-libs/lastfmlib-0.4 ) exif? ( media-libs/libexif ) libextractor? ( media-libs/libextractor ) mp4? ( media-libs/libmp4v2 ) ffmpeg? ( virtual/ffmpeg ) thumbnail? ( media-video/ffmpegthumbnailer[jpeg] ) net-misc/curl sys-apps/file sys-libs/zlib virtual/libiconv
 0
 mirror://sourceforge/mediatomb/mediatomb-0.12.1.tar.gz
diff --git a/metadata/cache/net-misc/memcached-1.4.0-r3 b/metadata/cache/net-misc/memcached-1.4.0-r3
index 7e7330350ea4..698219e5f47c 100644
--- a/metadata/cache/net-misc/memcached-1.4.0-r3
+++ b/metadata/cache/net-misc/memcached-1.4.0-r3
@@ -1,4 +1,4 @@
->=dev-libs/libevent-1.4 dev-lang/perl test? ( virtual/perl-Test-Harness >=dev-perl/Cache-Memcached-1.24 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-libs/libevent-1.4 dev-lang/perl test? ( virtual/perl-Test-Harness >=dev-perl/Cache-Memcached-1.24 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=dev-libs/libevent-1.4 dev-lang/perl
 0
 http://memcached.googlecode.com/files/memcached-1.4.0.tar.gz
diff --git a/metadata/cache/net-misc/memcached-1.4.1-r1 b/metadata/cache/net-misc/memcached-1.4.1-r1
index 2082e6a10763..0125512f39ff 100644
--- a/metadata/cache/net-misc/memcached-1.4.1-r1
+++ b/metadata/cache/net-misc/memcached-1.4.1-r1
@@ -1,4 +1,4 @@
->=dev-libs/libevent-1.4 dev-lang/perl test? ( virtual/perl-Test-Harness >=dev-perl/Cache-Memcached-1.24 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-libs/libevent-1.4 dev-lang/perl test? ( virtual/perl-Test-Harness >=dev-perl/Cache-Memcached-1.24 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=dev-libs/libevent-1.4 dev-lang/perl
 0
 http://memcached.googlecode.com/files/memcached-1.4.1.tar.gz
diff --git a/metadata/cache/net-misc/memcached-1.4.10-r1 b/metadata/cache/net-misc/memcached-1.4.10-r1
index 96f29c380108..9d993cda65e2 100644
--- a/metadata/cache/net-misc/memcached-1.4.10-r1
+++ b/metadata/cache/net-misc/memcached-1.4.10-r1
@@ -1,4 +1,4 @@
->=dev-libs/libevent-1.4 dev-lang/perl sasl? ( dev-libs/cyrus-sasl ) test? ( virtual/perl-Test-Harness >=dev-perl/Cache-Memcached-1.24 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-libs/libevent-1.4 dev-lang/perl sasl? ( dev-libs/cyrus-sasl ) test? ( virtual/perl-Test-Harness >=dev-perl/Cache-Memcached-1.24 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=dev-libs/libevent-1.4 dev-lang/perl sasl? ( dev-libs/cyrus-sasl )
 0
 http://memcached.googlecode.com/files/memcached-1.4.10.tar.gz
diff --git a/metadata/cache/net-misc/memcached-1.4.11 b/metadata/cache/net-misc/memcached-1.4.11
index a5c37659b534..0f65ce9159e7 100644
--- a/metadata/cache/net-misc/memcached-1.4.11
+++ b/metadata/cache/net-misc/memcached-1.4.11
@@ -1,4 +1,4 @@
->=dev-libs/libevent-1.4 dev-lang/perl sasl? ( dev-libs/cyrus-sasl ) test? ( virtual/perl-Test-Harness >=dev-perl/Cache-Memcached-1.24 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-libs/libevent-1.4 dev-lang/perl sasl? ( dev-libs/cyrus-sasl ) test? ( virtual/perl-Test-Harness >=dev-perl/Cache-Memcached-1.24 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=dev-libs/libevent-1.4 dev-lang/perl sasl? ( dev-libs/cyrus-sasl )
 0
 http://memcached.googlecode.com/files/memcached-1.4.11.tar.gz
diff --git a/metadata/cache/net-misc/memcached-1.4.13 b/metadata/cache/net-misc/memcached-1.4.13
index f4209f30995b..44ce3b611020 100644
--- a/metadata/cache/net-misc/memcached-1.4.13
+++ b/metadata/cache/net-misc/memcached-1.4.13
@@ -1,4 +1,4 @@
->=dev-libs/libevent-1.4 dev-lang/perl sasl? ( dev-libs/cyrus-sasl ) test? ( virtual/perl-Test-Harness >=dev-perl/Cache-Memcached-1.24 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-libs/libevent-1.4 dev-lang/perl sasl? ( dev-libs/cyrus-sasl ) test? ( virtual/perl-Test-Harness >=dev-perl/Cache-Memcached-1.24 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=dev-libs/libevent-1.4 dev-lang/perl sasl? ( dev-libs/cyrus-sasl )
 0
 http://memcached.googlecode.com/files/memcached-1.4.13.tar.gz
diff --git a/metadata/cache/net-misc/memcached-1.4.2-r1 b/metadata/cache/net-misc/memcached-1.4.2-r1
index 5f4b91bb2fe5..92cc2383ca4b 100644
--- a/metadata/cache/net-misc/memcached-1.4.2-r1
+++ b/metadata/cache/net-misc/memcached-1.4.2-r1
@@ -1,4 +1,4 @@
->=dev-libs/libevent-1.4 dev-lang/perl test? ( virtual/perl-Test-Harness >=dev-perl/Cache-Memcached-1.24 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-libs/libevent-1.4 dev-lang/perl test? ( virtual/perl-Test-Harness >=dev-perl/Cache-Memcached-1.24 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=dev-libs/libevent-1.4 dev-lang/perl
 0
 http://memcached.googlecode.com/files/memcached-1.4.2.tar.gz
diff --git a/metadata/cache/net-misc/memcached-1.4.4-r1 b/metadata/cache/net-misc/memcached-1.4.4-r1
index 2e509fb71075..8d85f4227cc8 100644
--- a/metadata/cache/net-misc/memcached-1.4.4-r1
+++ b/metadata/cache/net-misc/memcached-1.4.4-r1
@@ -1,4 +1,4 @@
->=dev-libs/libevent-1.4 dev-lang/perl sasl? ( dev-libs/cyrus-sasl ) test? ( virtual/perl-Test-Harness >=dev-perl/Cache-Memcached-1.24 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-libs/libevent-1.4 dev-lang/perl sasl? ( dev-libs/cyrus-sasl ) test? ( virtual/perl-Test-Harness >=dev-perl/Cache-Memcached-1.24 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=dev-libs/libevent-1.4 dev-lang/perl sasl? ( dev-libs/cyrus-sasl )
 0
 http://memcached.googlecode.com/files/memcached-1.4.4.tar.gz
diff --git a/metadata/cache/net-misc/memcached-1.4.5-r1 b/metadata/cache/net-misc/memcached-1.4.5-r1
index d5ace18ccf3b..bae6cfeffeda 100644
--- a/metadata/cache/net-misc/memcached-1.4.5-r1
+++ b/metadata/cache/net-misc/memcached-1.4.5-r1
@@ -1,4 +1,4 @@
->=dev-libs/libevent-1.4 dev-lang/perl sasl? ( dev-libs/cyrus-sasl ) test? ( virtual/perl-Test-Harness >=dev-perl/Cache-Memcached-1.24 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-libs/libevent-1.4 dev-lang/perl sasl? ( dev-libs/cyrus-sasl ) test? ( virtual/perl-Test-Harness >=dev-perl/Cache-Memcached-1.24 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=dev-libs/libevent-1.4 dev-lang/perl sasl? ( dev-libs/cyrus-sasl )
 0
 http://memcached.googlecode.com/files/memcached-1.4.5.tar.gz
diff --git a/metadata/cache/net-misc/memcached-1.4.7-r1 b/metadata/cache/net-misc/memcached-1.4.7-r1
index af52e05279f2..da0de2b93ff2 100644
--- a/metadata/cache/net-misc/memcached-1.4.7-r1
+++ b/metadata/cache/net-misc/memcached-1.4.7-r1
@@ -1,4 +1,4 @@
->=dev-libs/libevent-1.4 dev-lang/perl sasl? ( dev-libs/cyrus-sasl ) test? ( virtual/perl-Test-Harness >=dev-perl/Cache-Memcached-1.24 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-libs/libevent-1.4 dev-lang/perl sasl? ( dev-libs/cyrus-sasl ) test? ( virtual/perl-Test-Harness >=dev-perl/Cache-Memcached-1.24 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=dev-libs/libevent-1.4 dev-lang/perl sasl? ( dev-libs/cyrus-sasl )
 0
 http://memcached.googlecode.com/files/memcached-1.4.7.tar.gz
diff --git a/metadata/cache/net-misc/memcached-1.4.8-r1 b/metadata/cache/net-misc/memcached-1.4.8-r1
index 9cefbfa69734..e5064c1e0419 100644
--- a/metadata/cache/net-misc/memcached-1.4.8-r1
+++ b/metadata/cache/net-misc/memcached-1.4.8-r1
@@ -1,4 +1,4 @@
->=dev-libs/libevent-1.4 dev-lang/perl sasl? ( dev-libs/cyrus-sasl ) test? ( virtual/perl-Test-Harness >=dev-perl/Cache-Memcached-1.24 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-libs/libevent-1.4 dev-lang/perl sasl? ( dev-libs/cyrus-sasl ) test? ( virtual/perl-Test-Harness >=dev-perl/Cache-Memcached-1.24 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=dev-libs/libevent-1.4 dev-lang/perl sasl? ( dev-libs/cyrus-sasl )
 0
 http://memcached.googlecode.com/files/memcached-1.4.8.tar.gz
diff --git a/metadata/cache/net-misc/mico-2.3.13-r5 b/metadata/cache/net-misc/mico-2.3.13-r5
index 8bdc82c4e383..4e58dbde8d85 100644
--- a/metadata/cache/net-misc/mico-2.3.13-r5
+++ b/metadata/cache/net-misc/mico-2.3.13-r5
@@ -1,4 +1,4 @@
-gtk? ( x11-libs/gtk+:2 ) postgres? ( dev-db/postgresql-base ) qt4? ( x11-libs/qt-gui:4[qt3support] ) ssl? ( dev-libs/openssl ) tcl? ( dev-lang/tcl ) X? ( x11-libs/libXt ) >=sys-devel/flex-2.5.2 >=sys-devel/bison-1.22 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+gtk? ( x11-libs/gtk+:2 ) postgres? ( dev-db/postgresql-base ) qt4? ( x11-libs/qt-gui:4[qt3support] ) ssl? ( dev-libs/openssl ) tcl? ( dev-lang/tcl ) X? ( x11-libs/libXt ) >=sys-devel/flex-2.5.2 >=sys-devel/bison-1.22 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 gtk? ( x11-libs/gtk+:2 ) postgres? ( dev-db/postgresql-base ) qt4? ( x11-libs/qt-gui:4[qt3support] ) ssl? ( dev-libs/openssl ) tcl? ( dev-lang/tcl ) X? ( x11-libs/libXt )
 0
 http://www.mico.org/mico-2.3.13.tar.gz http://dev.gentoo.org/~haubi/distfiles/mico-2.3.13-gentoo-patches-0.2.tar.bz2
diff --git a/metadata/cache/net-misc/mico-9999 b/metadata/cache/net-misc/mico-9999
index 110a4772f14f..561e4d972041 100644
--- a/metadata/cache/net-misc/mico-9999
+++ b/metadata/cache/net-misc/mico-9999
@@ -1,4 +1,4 @@
-gtk? ( x11-libs/gtk+:2 ) postgres? ( dev-db/postgresql-base ) qt4? ( x11-libs/qt-gui:4[qt3support] ) ssl? ( dev-libs/openssl ) tcl? ( dev-lang/tcl ) X? ( x11-libs/libXt ) >=sys-devel/flex-2.5.2 >=sys-devel/bison-1.22 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/darcs
+gtk? ( x11-libs/gtk+:2 ) postgres? ( dev-db/postgresql-base ) qt4? ( x11-libs/qt-gui:4[qt3support] ) ssl? ( dev-libs/openssl ) tcl? ( dev-lang/tcl ) X? ( x11-libs/libXt ) >=sys-devel/flex-2.5.2 >=sys-devel/bison-1.22 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/darcs
 gtk? ( x11-libs/gtk+:2 ) postgres? ( dev-db/postgresql-base ) qt4? ( x11-libs/qt-gui:4[qt3support] ) ssl? ( dev-libs/openssl ) tcl? ( dev-lang/tcl ) X? ( x11-libs/libXt )
 0
 http://dev.gentoo.org/~haubi/distfiles/mico-9999-gentoo-patches-20110526.tar.bz2
diff --git a/metadata/cache/net-misc/neatx-0.3.1_p59-r1 b/metadata/cache/net-misc/neatx-0.3.1_p59-r1
index f41a7a086cff..73a8da027417 100644
--- a/metadata/cache/net-misc/neatx-0.3.1_p59-r1
+++ b/metadata/cache/net-misc/neatx-0.3.1_p59-r1
@@ -1,4 +1,4 @@
-dev-python/docutils || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool =dev-lang/python-2*
+dev-python/docutils || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool =dev-lang/python-2*
 dev-python/pexpect dev-python/simplejson >=dev-python/pygtk-2.14 >=dev-python/pygobject-2.14:2 app-portage/portage-utils media-fonts/font-misc-misc media-fonts/font-cursor-misc || ( net-analyzer/gnu-netcat net-analyzer/netcat net-analyzer/netcat6 ) net-misc/nx =dev-lang/python-2*
 0
 mirror://gentoo/neatx-0.3.1_p59.tar.bz2
diff --git a/metadata/cache/net-misc/neatx-0.3.1_p59-r2 b/metadata/cache/net-misc/neatx-0.3.1_p59-r2
index 29a5a49c5bc4..016fb641f3c3 100644
--- a/metadata/cache/net-misc/neatx-0.3.1_p59-r2
+++ b/metadata/cache/net-misc/neatx-0.3.1_p59-r2
@@ -1,4 +1,4 @@
-dev-python/docutils || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool =dev-lang/python-2*
+dev-python/docutils || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool =dev-lang/python-2*
 dev-python/pexpect dev-python/simplejson >=dev-python/pygtk-2.14 >=dev-python/pygobject-2.14:2 app-portage/portage-utils media-fonts/font-misc-misc media-fonts/font-cursor-misc || ( net-analyzer/gnu-netcat net-analyzer/netcat net-analyzer/netcat6 ) net-misc/nx =dev-lang/python-2*
 0
 mirror://gentoo/neatx-0.3.1_p59.tar.bz2
diff --git a/metadata/cache/net-misc/netstat-nat-1.4.10 b/metadata/cache/net-misc/netstat-nat-1.4.10
index c5e87ea3229c..b65337c900a4 100644
--- a/metadata/cache/net-misc/netstat-nat-1.4.10
+++ b/metadata/cache/net-misc/netstat-nat-1.4.10
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 http://tweegy.nl/download/netstat-nat-1.4.10.tar.gz
diff --git a/metadata/cache/net-misc/networkmanager-0.8.4.0-r2 b/metadata/cache/net-misc/networkmanager-0.8.4.0-r2
index d2cbe3c121c7..34a731457fe1 100644
--- a/metadata/cache/net-misc/networkmanager-0.8.4.0-r2
+++ b/metadata/cache/net-misc/networkmanager-0.8.4.0-r2
@@ -1,4 +1,4 @@
->=sys-apps/dbus-1.2 >=dev-libs/dbus-glib-0.75 >=net-wireless/wireless-tools-28_pre9 || ( >=sys-fs/udev-171[gudev] >=sys-fs/udev-145[extras] ) >=dev-libs/glib-2.18 >=sys-auth/polkit-0.92 >=dev-libs/libnl-1.1:1.1 ppp? ( >=net-misc/modemmanager-0.4 >=net-dialup/ppp-2.4.5 ) >=net-wireless/wpa_supplicant-0.5.10[dbus] bluetooth? ( net-wireless/bluez ) || ( sys-libs/e2fsprogs-libs <sys-fs/e2fsprogs-1.41.0 ) avahi? ( net-dns/avahi[autoipd] ) gnutls? ( nss? ( >=dev-libs/nss-3.11 ) !nss? ( dev-libs/libgcrypt net-libs/gnutls ) ) !gnutls? ( >=dev-libs/nss-3.11 ) dhclient? ( dhcpcd? ( >=net-misc/dhcpcd-4.0.0_rc3 ) !dhcpcd? ( net-misc/dhcp ) ) !dhclient? ( >=net-misc/dhcpcd-4.0.0_rc3 ) resolvconf? ( net-dns/openresolv ) connection-sharing? ( net-dns/dnsmasq net-firewall/iptables ) dev-util/pkgconfig dev-util/intltool doc? ( >=dev-util/gtk-doc-1.8 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool !<sys-apps/systemd-29-r4 !=sys-apps/systemd-37-r1
+>=sys-apps/dbus-1.2 >=dev-libs/dbus-glib-0.75 >=net-wireless/wireless-tools-28_pre9 || ( >=sys-fs/udev-171[gudev] >=sys-fs/udev-145[extras] ) >=dev-libs/glib-2.18 >=sys-auth/polkit-0.92 >=dev-libs/libnl-1.1:1.1 ppp? ( >=net-misc/modemmanager-0.4 >=net-dialup/ppp-2.4.5 ) >=net-wireless/wpa_supplicant-0.5.10[dbus] bluetooth? ( net-wireless/bluez ) || ( sys-libs/e2fsprogs-libs <sys-fs/e2fsprogs-1.41.0 ) avahi? ( net-dns/avahi[autoipd] ) gnutls? ( nss? ( >=dev-libs/nss-3.11 ) !nss? ( dev-libs/libgcrypt net-libs/gnutls ) ) !gnutls? ( >=dev-libs/nss-3.11 ) dhclient? ( dhcpcd? ( >=net-misc/dhcpcd-4.0.0_rc3 ) !dhcpcd? ( net-misc/dhcp ) ) !dhclient? ( >=net-misc/dhcpcd-4.0.0_rc3 ) resolvconf? ( net-dns/openresolv ) connection-sharing? ( net-dns/dnsmasq net-firewall/iptables ) dev-util/pkgconfig dev-util/intltool doc? ( >=dev-util/gtk-doc-1.8 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool !<sys-apps/systemd-29-r4 !=sys-apps/systemd-37-r1
 >=sys-apps/dbus-1.2 >=dev-libs/dbus-glib-0.75 >=net-wireless/wireless-tools-28_pre9 || ( >=sys-fs/udev-171[gudev] >=sys-fs/udev-145[extras] ) >=dev-libs/glib-2.18 >=sys-auth/polkit-0.92 >=dev-libs/libnl-1.1:1.1 ppp? ( >=net-misc/modemmanager-0.4 >=net-dialup/ppp-2.4.5 ) >=net-wireless/wpa_supplicant-0.5.10[dbus] bluetooth? ( net-wireless/bluez ) || ( sys-libs/e2fsprogs-libs <sys-fs/e2fsprogs-1.41.0 ) avahi? ( net-dns/avahi[autoipd] ) gnutls? ( nss? ( >=dev-libs/nss-3.11 ) !nss? ( dev-libs/libgcrypt net-libs/gnutls ) ) !gnutls? ( >=dev-libs/nss-3.11 ) dhclient? ( dhcpcd? ( >=net-misc/dhcpcd-4.0.0_rc3 ) !dhcpcd? ( net-misc/dhcp ) ) !dhclient? ( >=net-misc/dhcpcd-4.0.0_rc3 ) resolvconf? ( net-dns/openresolv ) connection-sharing? ( net-dns/dnsmasq net-firewall/iptables )
 0
 mirror://gnome/sources/NetworkManager/0.8/NetworkManager-0.8.4.0.tar.bz2
diff --git a/metadata/cache/net-misc/networkmanager-0.9.0 b/metadata/cache/net-misc/networkmanager-0.9.0
index d8e300a571d8..6e9382bf80c3 100644
--- a/metadata/cache/net-misc/networkmanager-0.9.0
+++ b/metadata/cache/net-misc/networkmanager-0.9.0
@@ -1,4 +1,4 @@
->=sys-apps/dbus-1.2 >=dev-libs/dbus-glib-0.75 >=net-wireless/wireless-tools-28_pre9 || ( >=sys-fs/udev-171[gudev] >=sys-fs/udev-147[extras] ) >=dev-libs/glib-2.26 >=sys-auth/polkit-0.97 >=dev-libs/libnl-1.1:1.1 >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] bluetooth? ( >=net-wireless/bluez-4.82 ) avahi? ( net-dns/avahi[autoipd] ) gnutls? ( dev-libs/libgcrypt net-libs/gnutls ) nss? ( >=dev-libs/nss-3.11 ) dhclient? ( net-misc/dhcp ) dhcpcd? ( >=net-misc/dhcpcd-4.0.0_rc3 ) introspection? ( >=dev-libs/gobject-introspection-0.10.3 ) ppp? ( >=net-misc/modemmanager-0.4 >=net-dialup/ppp-2.4.5 ) resolvconf? ( net-dns/openresolv ) connection-sharing? ( net-dns/dnsmasq net-firewall/iptables ) wimax? ( >=net-wireless/wimax-1.5.1 ) dev-util/pkgconfig >=dev-util/intltool-0.40 >=sys-devel/gettext-0.17 doc? ( >=dev-util/gtk-doc-1.8 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils !<sys-apps/systemd-29-r4 !=sys-apps/systemd-37-r1
+>=sys-apps/dbus-1.2 >=dev-libs/dbus-glib-0.75 >=net-wireless/wireless-tools-28_pre9 || ( >=sys-fs/udev-171[gudev] >=sys-fs/udev-147[extras] ) >=dev-libs/glib-2.26 >=sys-auth/polkit-0.97 >=dev-libs/libnl-1.1:1.1 >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] bluetooth? ( >=net-wireless/bluez-4.82 ) avahi? ( net-dns/avahi[autoipd] ) gnutls? ( dev-libs/libgcrypt net-libs/gnutls ) nss? ( >=dev-libs/nss-3.11 ) dhclient? ( net-misc/dhcp ) dhcpcd? ( >=net-misc/dhcpcd-4.0.0_rc3 ) introspection? ( >=dev-libs/gobject-introspection-0.10.3 ) ppp? ( >=net-misc/modemmanager-0.4 >=net-dialup/ppp-2.4.5 ) resolvconf? ( net-dns/openresolv ) connection-sharing? ( net-dns/dnsmasq net-firewall/iptables ) wimax? ( >=net-wireless/wimax-1.5.1 ) dev-util/pkgconfig >=dev-util/intltool-0.40 >=sys-devel/gettext-0.17 doc? ( >=dev-util/gtk-doc-1.8 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils !<sys-apps/systemd-29-r4 !=sys-apps/systemd-37-r1
 >=sys-apps/dbus-1.2 >=dev-libs/dbus-glib-0.75 >=net-wireless/wireless-tools-28_pre9 || ( >=sys-fs/udev-171[gudev] >=sys-fs/udev-147[extras] ) >=dev-libs/glib-2.26 >=sys-auth/polkit-0.97 >=dev-libs/libnl-1.1:1.1 >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] bluetooth? ( >=net-wireless/bluez-4.82 ) avahi? ( net-dns/avahi[autoipd] ) gnutls? ( dev-libs/libgcrypt net-libs/gnutls ) nss? ( >=dev-libs/nss-3.11 ) dhclient? ( net-misc/dhcp ) dhcpcd? ( >=net-misc/dhcpcd-4.0.0_rc3 ) introspection? ( >=dev-libs/gobject-introspection-0.10.3 ) ppp? ( >=net-misc/modemmanager-0.4 >=net-dialup/ppp-2.4.5 ) resolvconf? ( net-dns/openresolv ) connection-sharing? ( net-dns/dnsmasq net-firewall/iptables ) wimax? ( >=net-wireless/wimax-1.5.1 ) sys-auth/consolekit
 0
 mirror://gnome/sources/NetworkManager/0.9/NetworkManager-0.9.0.tar.xz
diff --git a/metadata/cache/net-misc/networkmanager-0.9.2.0 b/metadata/cache/net-misc/networkmanager-0.9.2.0
index 20c0226935fe..276ba8a09bd4 100644
--- a/metadata/cache/net-misc/networkmanager-0.9.2.0
+++ b/metadata/cache/net-misc/networkmanager-0.9.2.0
@@ -1,4 +1,4 @@
->=sys-apps/dbus-1.2 >=dev-libs/dbus-glib-0.75 >=net-wireless/wireless-tools-28_pre9 || ( >=sys-fs/udev-171[gudev] >=sys-fs/udev-147[extras] ) >=dev-libs/glib-2.26 >=sys-auth/polkit-0.97 dev-libs/libnl:1.1 >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] bluetooth? ( >=net-wireless/bluez-4.82 ) avahi? ( net-dns/avahi[autoipd] ) gnutls? ( dev-libs/libgcrypt net-libs/gnutls ) nss? ( >=dev-libs/nss-3.11 ) dhclient? ( net-misc/dhcp ) dhcpcd? ( >=net-misc/dhcpcd-4.0.0_rc3 ) introspection? ( >=dev-libs/gobject-introspection-0.10.3 ) ppp? ( >=net-misc/modemmanager-0.4 >=net-dialup/ppp-2.4.5 ) resolvconf? ( net-dns/openresolv ) connection-sharing? ( net-dns/dnsmasq net-firewall/iptables ) wimax? ( >=net-wireless/wimax-1.5.1 ) dev-util/pkgconfig >=dev-util/intltool-0.40 >=sys-devel/gettext-0.17 doc? ( >=dev-util/gtk-doc-1.8 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils !<sys-apps/systemd-29-r4 !=sys-apps/systemd-37-r1
+>=sys-apps/dbus-1.2 >=dev-libs/dbus-glib-0.75 >=net-wireless/wireless-tools-28_pre9 || ( >=sys-fs/udev-171[gudev] >=sys-fs/udev-147[extras] ) >=dev-libs/glib-2.26 >=sys-auth/polkit-0.97 dev-libs/libnl:1.1 >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] bluetooth? ( >=net-wireless/bluez-4.82 ) avahi? ( net-dns/avahi[autoipd] ) gnutls? ( dev-libs/libgcrypt net-libs/gnutls ) nss? ( >=dev-libs/nss-3.11 ) dhclient? ( net-misc/dhcp ) dhcpcd? ( >=net-misc/dhcpcd-4.0.0_rc3 ) introspection? ( >=dev-libs/gobject-introspection-0.10.3 ) ppp? ( >=net-misc/modemmanager-0.4 >=net-dialup/ppp-2.4.5 ) resolvconf? ( net-dns/openresolv ) connection-sharing? ( net-dns/dnsmasq net-firewall/iptables ) wimax? ( >=net-wireless/wimax-1.5.1 ) dev-util/pkgconfig >=dev-util/intltool-0.40 >=sys-devel/gettext-0.17 doc? ( >=dev-util/gtk-doc-1.8 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils !<sys-apps/systemd-29-r4 !=sys-apps/systemd-37-r1
 >=sys-apps/dbus-1.2 >=dev-libs/dbus-glib-0.75 >=net-wireless/wireless-tools-28_pre9 || ( >=sys-fs/udev-171[gudev] >=sys-fs/udev-147[extras] ) >=dev-libs/glib-2.26 >=sys-auth/polkit-0.97 dev-libs/libnl:1.1 >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] bluetooth? ( >=net-wireless/bluez-4.82 ) avahi? ( net-dns/avahi[autoipd] ) gnutls? ( dev-libs/libgcrypt net-libs/gnutls ) nss? ( >=dev-libs/nss-3.11 ) dhclient? ( net-misc/dhcp ) dhcpcd? ( >=net-misc/dhcpcd-4.0.0_rc3 ) introspection? ( >=dev-libs/gobject-introspection-0.10.3 ) ppp? ( >=net-misc/modemmanager-0.4 >=net-dialup/ppp-2.4.5 ) resolvconf? ( net-dns/openresolv ) connection-sharing? ( net-dns/dnsmasq net-firewall/iptables ) wimax? ( >=net-wireless/wimax-1.5.1 ) sys-auth/consolekit
 0
 mirror://gnome/sources/NetworkManager/0.9/NetworkManager-0.9.2.0.tar.xz
diff --git a/metadata/cache/net-misc/networkmanager-0.9.2.0-r2 b/metadata/cache/net-misc/networkmanager-0.9.2.0-r2
index 20c0226935fe..276ba8a09bd4 100644
--- a/metadata/cache/net-misc/networkmanager-0.9.2.0-r2
+++ b/metadata/cache/net-misc/networkmanager-0.9.2.0-r2
@@ -1,4 +1,4 @@
->=sys-apps/dbus-1.2 >=dev-libs/dbus-glib-0.75 >=net-wireless/wireless-tools-28_pre9 || ( >=sys-fs/udev-171[gudev] >=sys-fs/udev-147[extras] ) >=dev-libs/glib-2.26 >=sys-auth/polkit-0.97 dev-libs/libnl:1.1 >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] bluetooth? ( >=net-wireless/bluez-4.82 ) avahi? ( net-dns/avahi[autoipd] ) gnutls? ( dev-libs/libgcrypt net-libs/gnutls ) nss? ( >=dev-libs/nss-3.11 ) dhclient? ( net-misc/dhcp ) dhcpcd? ( >=net-misc/dhcpcd-4.0.0_rc3 ) introspection? ( >=dev-libs/gobject-introspection-0.10.3 ) ppp? ( >=net-misc/modemmanager-0.4 >=net-dialup/ppp-2.4.5 ) resolvconf? ( net-dns/openresolv ) connection-sharing? ( net-dns/dnsmasq net-firewall/iptables ) wimax? ( >=net-wireless/wimax-1.5.1 ) dev-util/pkgconfig >=dev-util/intltool-0.40 >=sys-devel/gettext-0.17 doc? ( >=dev-util/gtk-doc-1.8 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils !<sys-apps/systemd-29-r4 !=sys-apps/systemd-37-r1
+>=sys-apps/dbus-1.2 >=dev-libs/dbus-glib-0.75 >=net-wireless/wireless-tools-28_pre9 || ( >=sys-fs/udev-171[gudev] >=sys-fs/udev-147[extras] ) >=dev-libs/glib-2.26 >=sys-auth/polkit-0.97 dev-libs/libnl:1.1 >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] bluetooth? ( >=net-wireless/bluez-4.82 ) avahi? ( net-dns/avahi[autoipd] ) gnutls? ( dev-libs/libgcrypt net-libs/gnutls ) nss? ( >=dev-libs/nss-3.11 ) dhclient? ( net-misc/dhcp ) dhcpcd? ( >=net-misc/dhcpcd-4.0.0_rc3 ) introspection? ( >=dev-libs/gobject-introspection-0.10.3 ) ppp? ( >=net-misc/modemmanager-0.4 >=net-dialup/ppp-2.4.5 ) resolvconf? ( net-dns/openresolv ) connection-sharing? ( net-dns/dnsmasq net-firewall/iptables ) wimax? ( >=net-wireless/wimax-1.5.1 ) dev-util/pkgconfig >=dev-util/intltool-0.40 >=sys-devel/gettext-0.17 doc? ( >=dev-util/gtk-doc-1.8 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils !<sys-apps/systemd-29-r4 !=sys-apps/systemd-37-r1
 >=sys-apps/dbus-1.2 >=dev-libs/dbus-glib-0.75 >=net-wireless/wireless-tools-28_pre9 || ( >=sys-fs/udev-171[gudev] >=sys-fs/udev-147[extras] ) >=dev-libs/glib-2.26 >=sys-auth/polkit-0.97 dev-libs/libnl:1.1 >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] bluetooth? ( >=net-wireless/bluez-4.82 ) avahi? ( net-dns/avahi[autoipd] ) gnutls? ( dev-libs/libgcrypt net-libs/gnutls ) nss? ( >=dev-libs/nss-3.11 ) dhclient? ( net-misc/dhcp ) dhcpcd? ( >=net-misc/dhcpcd-4.0.0_rc3 ) introspection? ( >=dev-libs/gobject-introspection-0.10.3 ) ppp? ( >=net-misc/modemmanager-0.4 >=net-dialup/ppp-2.4.5 ) resolvconf? ( net-dns/openresolv ) connection-sharing? ( net-dns/dnsmasq net-firewall/iptables ) wimax? ( >=net-wireless/wimax-1.5.1 ) sys-auth/consolekit
 0
 mirror://gnome/sources/NetworkManager/0.9/NetworkManager-0.9.2.0.tar.xz
diff --git a/metadata/cache/net-misc/networkmanager-0.9.2.0-r3 b/metadata/cache/net-misc/networkmanager-0.9.2.0-r3
index 20c0226935fe..276ba8a09bd4 100644
--- a/metadata/cache/net-misc/networkmanager-0.9.2.0-r3
+++ b/metadata/cache/net-misc/networkmanager-0.9.2.0-r3
@@ -1,4 +1,4 @@
->=sys-apps/dbus-1.2 >=dev-libs/dbus-glib-0.75 >=net-wireless/wireless-tools-28_pre9 || ( >=sys-fs/udev-171[gudev] >=sys-fs/udev-147[extras] ) >=dev-libs/glib-2.26 >=sys-auth/polkit-0.97 dev-libs/libnl:1.1 >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] bluetooth? ( >=net-wireless/bluez-4.82 ) avahi? ( net-dns/avahi[autoipd] ) gnutls? ( dev-libs/libgcrypt net-libs/gnutls ) nss? ( >=dev-libs/nss-3.11 ) dhclient? ( net-misc/dhcp ) dhcpcd? ( >=net-misc/dhcpcd-4.0.0_rc3 ) introspection? ( >=dev-libs/gobject-introspection-0.10.3 ) ppp? ( >=net-misc/modemmanager-0.4 >=net-dialup/ppp-2.4.5 ) resolvconf? ( net-dns/openresolv ) connection-sharing? ( net-dns/dnsmasq net-firewall/iptables ) wimax? ( >=net-wireless/wimax-1.5.1 ) dev-util/pkgconfig >=dev-util/intltool-0.40 >=sys-devel/gettext-0.17 doc? ( >=dev-util/gtk-doc-1.8 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils !<sys-apps/systemd-29-r4 !=sys-apps/systemd-37-r1
+>=sys-apps/dbus-1.2 >=dev-libs/dbus-glib-0.75 >=net-wireless/wireless-tools-28_pre9 || ( >=sys-fs/udev-171[gudev] >=sys-fs/udev-147[extras] ) >=dev-libs/glib-2.26 >=sys-auth/polkit-0.97 dev-libs/libnl:1.1 >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] bluetooth? ( >=net-wireless/bluez-4.82 ) avahi? ( net-dns/avahi[autoipd] ) gnutls? ( dev-libs/libgcrypt net-libs/gnutls ) nss? ( >=dev-libs/nss-3.11 ) dhclient? ( net-misc/dhcp ) dhcpcd? ( >=net-misc/dhcpcd-4.0.0_rc3 ) introspection? ( >=dev-libs/gobject-introspection-0.10.3 ) ppp? ( >=net-misc/modemmanager-0.4 >=net-dialup/ppp-2.4.5 ) resolvconf? ( net-dns/openresolv ) connection-sharing? ( net-dns/dnsmasq net-firewall/iptables ) wimax? ( >=net-wireless/wimax-1.5.1 ) dev-util/pkgconfig >=dev-util/intltool-0.40 >=sys-devel/gettext-0.17 doc? ( >=dev-util/gtk-doc-1.8 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils !<sys-apps/systemd-29-r4 !=sys-apps/systemd-37-r1
 >=sys-apps/dbus-1.2 >=dev-libs/dbus-glib-0.75 >=net-wireless/wireless-tools-28_pre9 || ( >=sys-fs/udev-171[gudev] >=sys-fs/udev-147[extras] ) >=dev-libs/glib-2.26 >=sys-auth/polkit-0.97 dev-libs/libnl:1.1 >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] bluetooth? ( >=net-wireless/bluez-4.82 ) avahi? ( net-dns/avahi[autoipd] ) gnutls? ( dev-libs/libgcrypt net-libs/gnutls ) nss? ( >=dev-libs/nss-3.11 ) dhclient? ( net-misc/dhcp ) dhcpcd? ( >=net-misc/dhcpcd-4.0.0_rc3 ) introspection? ( >=dev-libs/gobject-introspection-0.10.3 ) ppp? ( >=net-misc/modemmanager-0.4 >=net-dialup/ppp-2.4.5 ) resolvconf? ( net-dns/openresolv ) connection-sharing? ( net-dns/dnsmasq net-firewall/iptables ) wimax? ( >=net-wireless/wimax-1.5.1 ) sys-auth/consolekit
 0
 mirror://gnome/sources/NetworkManager/0.9/NetworkManager-0.9.2.0.tar.xz
diff --git a/metadata/cache/net-misc/networkmanager-0.9.2.0-r5 b/metadata/cache/net-misc/networkmanager-0.9.2.0-r5
index 20c0226935fe..276ba8a09bd4 100644
--- a/metadata/cache/net-misc/networkmanager-0.9.2.0-r5
+++ b/metadata/cache/net-misc/networkmanager-0.9.2.0-r5
@@ -1,4 +1,4 @@
->=sys-apps/dbus-1.2 >=dev-libs/dbus-glib-0.75 >=net-wireless/wireless-tools-28_pre9 || ( >=sys-fs/udev-171[gudev] >=sys-fs/udev-147[extras] ) >=dev-libs/glib-2.26 >=sys-auth/polkit-0.97 dev-libs/libnl:1.1 >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] bluetooth? ( >=net-wireless/bluez-4.82 ) avahi? ( net-dns/avahi[autoipd] ) gnutls? ( dev-libs/libgcrypt net-libs/gnutls ) nss? ( >=dev-libs/nss-3.11 ) dhclient? ( net-misc/dhcp ) dhcpcd? ( >=net-misc/dhcpcd-4.0.0_rc3 ) introspection? ( >=dev-libs/gobject-introspection-0.10.3 ) ppp? ( >=net-misc/modemmanager-0.4 >=net-dialup/ppp-2.4.5 ) resolvconf? ( net-dns/openresolv ) connection-sharing? ( net-dns/dnsmasq net-firewall/iptables ) wimax? ( >=net-wireless/wimax-1.5.1 ) dev-util/pkgconfig >=dev-util/intltool-0.40 >=sys-devel/gettext-0.17 doc? ( >=dev-util/gtk-doc-1.8 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils !<sys-apps/systemd-29-r4 !=sys-apps/systemd-37-r1
+>=sys-apps/dbus-1.2 >=dev-libs/dbus-glib-0.75 >=net-wireless/wireless-tools-28_pre9 || ( >=sys-fs/udev-171[gudev] >=sys-fs/udev-147[extras] ) >=dev-libs/glib-2.26 >=sys-auth/polkit-0.97 dev-libs/libnl:1.1 >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] bluetooth? ( >=net-wireless/bluez-4.82 ) avahi? ( net-dns/avahi[autoipd] ) gnutls? ( dev-libs/libgcrypt net-libs/gnutls ) nss? ( >=dev-libs/nss-3.11 ) dhclient? ( net-misc/dhcp ) dhcpcd? ( >=net-misc/dhcpcd-4.0.0_rc3 ) introspection? ( >=dev-libs/gobject-introspection-0.10.3 ) ppp? ( >=net-misc/modemmanager-0.4 >=net-dialup/ppp-2.4.5 ) resolvconf? ( net-dns/openresolv ) connection-sharing? ( net-dns/dnsmasq net-firewall/iptables ) wimax? ( >=net-wireless/wimax-1.5.1 ) dev-util/pkgconfig >=dev-util/intltool-0.40 >=sys-devel/gettext-0.17 doc? ( >=dev-util/gtk-doc-1.8 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils !<sys-apps/systemd-29-r4 !=sys-apps/systemd-37-r1
 >=sys-apps/dbus-1.2 >=dev-libs/dbus-glib-0.75 >=net-wireless/wireless-tools-28_pre9 || ( >=sys-fs/udev-171[gudev] >=sys-fs/udev-147[extras] ) >=dev-libs/glib-2.26 >=sys-auth/polkit-0.97 dev-libs/libnl:1.1 >=net-wireless/wpa_supplicant-0.7.3-r3[dbus] bluetooth? ( >=net-wireless/bluez-4.82 ) avahi? ( net-dns/avahi[autoipd] ) gnutls? ( dev-libs/libgcrypt net-libs/gnutls ) nss? ( >=dev-libs/nss-3.11 ) dhclient? ( net-misc/dhcp ) dhcpcd? ( >=net-misc/dhcpcd-4.0.0_rc3 ) introspection? ( >=dev-libs/gobject-introspection-0.10.3 ) ppp? ( >=net-misc/modemmanager-0.4 >=net-dialup/ppp-2.4.5 ) resolvconf? ( net-dns/openresolv ) connection-sharing? ( net-dns/dnsmasq net-firewall/iptables ) wimax? ( >=net-wireless/wimax-1.5.1 ) sys-auth/consolekit
 0
 mirror://gnome/sources/NetworkManager/0.9/NetworkManager-0.9.2.0.tar.xz
diff --git a/metadata/cache/net-misc/nx-3.4.0-r3 b/metadata/cache/net-misc/nx-3.4.0-r3
index e9e3ffcc5dd0..ef53a6694ea9 100644
--- a/metadata/cache/net-misc/nx-3.4.0-r3
+++ b/metadata/cache/net-misc/nx-3.4.0-r3
@@ -1,4 +1,4 @@
-x11-libs/libXau x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXdmcp x11-libs/libXpm x11-libs/libXrandr x11-libs/libXtst >=media-libs/libpng-1.2.8 >=sys-libs/zlib-1.2.3 virtual/jpeg x11-misc/gccmakedep x11-misc/imake x11-proto/inputproto || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+x11-libs/libXau x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXdmcp x11-libs/libXpm x11-libs/libXrandr x11-libs/libXtst >=media-libs/libpng-1.2.8 >=sys-libs/zlib-1.2.3 virtual/jpeg x11-misc/gccmakedep x11-misc/imake x11-proto/inputproto || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 x11-libs/libXau x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXdmcp x11-libs/libXpm x11-libs/libXrandr x11-libs/libXtst >=media-libs/libpng-1.2.8 >=sys-libs/zlib-1.2.3 virtual/jpeg
 0
 http://web04.nomachine.com/download/3.4.0/sources/nx-X11-3.4.0-3.tar.gz http://web04.nomachine.com/download/3.4.0/sources/nxagent-3.4.0-11.tar.gz http://web04.nomachine.com/download/3.4.0/sources/nxproxy-3.4.0-2.tar.gz http://web04.nomachine.com/download/3.4.0/sources/nxauth-3.4.0-1.tar.gz http://web04.nomachine.com/download/3.4.0/sources/nxcompext-3.4.0-1.tar.gz http://web04.nomachine.com/download/3.4.0/sources/nxcompshad-3.4.0-3.tar.gz http://web04.nomachine.com/download/3.4.0/sources/nxcomp-3.4.0-1.tar.gz
diff --git a/metadata/cache/net-misc/nx-3.5.0-r1 b/metadata/cache/net-misc/nx-3.5.0-r1
index 7616989ea4fc..b307b99688fb 100644
--- a/metadata/cache/net-misc/nx-3.5.0-r1
+++ b/metadata/cache/net-misc/nx-3.5.0-r1
@@ -1,4 +1,4 @@
-elibc_glibc? ( || ( net-libs/libtirpc <sys-libs/glibc-2.14 ) ) x11-libs/libXau x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXdmcp x11-libs/libXpm x11-libs/libXrandr x11-libs/libXtst >=media-libs/libpng-1.2.8 >=sys-libs/zlib-1.2.3 virtual/jpeg x11-misc/gccmakedep x11-misc/imake x11-proto/inputproto || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+elibc_glibc? ( || ( net-libs/libtirpc <sys-libs/glibc-2.14 ) ) x11-libs/libXau x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXdmcp x11-libs/libXpm x11-libs/libXrandr x11-libs/libXtst >=media-libs/libpng-1.2.8 >=sys-libs/zlib-1.2.3 virtual/jpeg x11-misc/gccmakedep x11-misc/imake x11-proto/inputproto || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 elibc_glibc? ( || ( net-libs/libtirpc <sys-libs/glibc-2.14 ) ) x11-libs/libXau x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXdmcp x11-libs/libXpm x11-libs/libXrandr x11-libs/libXtst >=media-libs/libpng-1.2.8 >=sys-libs/zlib-1.2.3 virtual/jpeg
 0
 http://web04.nomachine.com/download/3.5.0/sources/nx-X11-3.5.0-2.tar.gz http://web04.nomachine.com/download/3.5.0/sources/nxagent-3.5.0-5.tar.gz http://web04.nomachine.com/download/3.5.0/sources/nxproxy-3.5.0-1.tar.gz http://web04.nomachine.com/download/3.5.0/sources/nxauth-3.5.0-1.tar.gz http://web04.nomachine.com/download/3.5.0/sources/nxcompext-3.5.0-1.tar.gz http://web04.nomachine.com/download/3.5.0/sources/nxcompshad-3.5.0-2.tar.gz http://web04.nomachine.com/download/3.5.0/sources/nxcomp-3.5.0-2.tar.gz
diff --git a/metadata/cache/net-misc/nx-3.5.0-r2 b/metadata/cache/net-misc/nx-3.5.0-r2
index be873496b6dc..697714bd0689 100644
--- a/metadata/cache/net-misc/nx-3.5.0-r2
+++ b/metadata/cache/net-misc/nx-3.5.0-r2
@@ -1,4 +1,4 @@
-elibc_glibc? ( || ( net-libs/libtirpc <sys-libs/glibc-2.14 ) ) x11-libs/libXau x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXdmcp x11-libs/libXpm x11-libs/libXrandr x11-libs/libXtst >=media-libs/libpng-1.2.8 >=sys-libs/zlib-1.2.3 virtual/jpeg x11-misc/gccmakedep x11-misc/imake x11-proto/inputproto || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+elibc_glibc? ( || ( net-libs/libtirpc <sys-libs/glibc-2.14 ) ) x11-libs/libXau x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXdmcp x11-libs/libXpm x11-libs/libXrandr x11-libs/libXtst >=media-libs/libpng-1.2.8 >=sys-libs/zlib-1.2.3 virtual/jpeg x11-misc/gccmakedep x11-misc/imake x11-proto/inputproto || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 elibc_glibc? ( || ( net-libs/libtirpc <sys-libs/glibc-2.14 ) ) x11-libs/libXau x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXdmcp x11-libs/libXpm x11-libs/libXrandr x11-libs/libXtst >=media-libs/libpng-1.2.8 >=sys-libs/zlib-1.2.3 virtual/jpeg
 0
 http://web04.nomachine.com/download/3.5.0/sources/nx-X11-3.5.0-2.tar.gz http://web04.nomachine.com/download/3.5.0/sources/nxagent-3.5.0-7.tar.gz http://web04.nomachine.com/download/3.5.0/sources/nxproxy-3.5.0-1.tar.gz http://web04.nomachine.com/download/3.5.0/sources/nxauth-3.5.0-1.tar.gz http://web04.nomachine.com/download/3.5.0/sources/nxcompext-3.5.0-1.tar.gz http://web04.nomachine.com/download/3.5.0/sources/nxcompshad-3.5.0-2.tar.gz http://web04.nomachine.com/download/3.5.0/sources/nxcomp-3.5.0-2.tar.gz
diff --git a/metadata/cache/net-misc/nxcl-0.9-r2 b/metadata/cache/net-misc/nxcl-0.9-r2
index 08768d1aea0d..f70cb3e91e6b 100644
--- a/metadata/cache/net-misc/nxcl-0.9-r2
+++ b/metadata/cache/net-misc/nxcl-0.9-r2
@@ -1,4 +1,4 @@
->=net-misc/nx-3.2.0-r5 dbus? ( sys-apps/dbus ) nxclient? ( net-misc/nxclient ) doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=net-misc/nx-3.2.0-r5 dbus? ( sys-apps/dbus ) nxclient? ( net-misc/nxclient ) doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=net-misc/nx-3.2.0-r5 dbus? ( sys-apps/dbus ) nxclient? ( net-misc/nxclient )
 0
 mirror://berlios/freenx/freenx-client-0.9.tar.bz2
diff --git a/metadata/cache/net-misc/nxsadmin-0.2.1 b/metadata/cache/net-misc/nxsadmin-0.2.1
index 3892a9837e36..a6de5d715c80 100644
--- a/metadata/cache/net-misc/nxsadmin-0.2.1
+++ b/metadata/cache/net-misc/nxsadmin-0.2.1
@@ -1,4 +1,4 @@
-dev-cpp/gtkmm:2.4 dev-util/intltool || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-cpp/gtkmm:2.4 dev-util/intltool || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-cpp/gtkmm:2.4 net-misc/nxserver-freenx
 0
 mirror://berlios/nxsadmin/nxsadmin-0.2.1.tar.gz
diff --git a/metadata/cache/net-misc/openntpd-3.9_p1-r3 b/metadata/cache/net-misc/openntpd-3.9_p1-r3
index 573a5ead2879..e0675dd41cb2 100644
--- a/metadata/cache/net-misc/openntpd-3.9_p1-r3
+++ b/metadata/cache/net-misc/openntpd-3.9_p1-r3
@@ -1,4 +1,4 @@
-ssl? ( dev-libs/openssl ) selinux? ( sec-policy/selinux-ntp ) !<=net-misc/ntp-4.2.0-r2 !net-misc/ntp[-openntpd] || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+ssl? ( dev-libs/openssl ) selinux? ( sec-policy/selinux-ntp ) !<=net-misc/ntp-4.2.0-r2 !net-misc/ntp[-openntpd] || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 ssl? ( dev-libs/openssl ) selinux? ( sec-policy/selinux-ntp ) !<=net-misc/ntp-4.2.0-r2 !net-misc/ntp[-openntpd]
 0
 mirror://openbsd/OpenNTPD/openntpd-3.9p1.tar.gz mirror://debian/pool/main/o/openntpd/openntpd_3.9p1+debian-8.debian.tar.gz
diff --git a/metadata/cache/net-misc/openntpd-3.9_p1-r4 b/metadata/cache/net-misc/openntpd-3.9_p1-r4
index 3337e956dbee..67d5b70f9ddf 100644
--- a/metadata/cache/net-misc/openntpd-3.9_p1-r4
+++ b/metadata/cache/net-misc/openntpd-3.9_p1-r4
@@ -1,4 +1,4 @@
-ssl? ( dev-libs/openssl ) selinux? ( sec-policy/selinux-ntp ) !<=net-misc/ntp-4.2.0-r2 !net-misc/ntp[-openntpd] virtual/yacc || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+ssl? ( dev-libs/openssl ) selinux? ( sec-policy/selinux-ntp ) !<=net-misc/ntp-4.2.0-r2 !net-misc/ntp[-openntpd] virtual/yacc || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 ssl? ( dev-libs/openssl ) selinux? ( sec-policy/selinux-ntp ) !<=net-misc/ntp-4.2.0-r2 !net-misc/ntp[-openntpd]
 0
 mirror://openbsd/OpenNTPD/openntpd-3.9p1.tar.gz mirror://debian/pool/main/o/openntpd/openntpd_3.9p1+debian-8.debian.tar.gz
diff --git a/metadata/cache/net-misc/openr2-1.3.0 b/metadata/cache/net-misc/openr2-1.3.0
index 26e459c88720..3a5915f8456e 100644
--- a/metadata/cache/net-misc/openr2-1.3.0
+++ b/metadata/cache/net-misc/openr2-1.3.0
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 net-misc/dahdi
 0
 http://openr2.googlecode.com/files/openr2-1.3.0.tar.gz
diff --git a/metadata/cache/net-misc/openssh-5.5_p1-r2 b/metadata/cache/net-misc/openssh-5.5_p1-r2
index d9c10a2177ef..4342793fbffd 100644
--- a/metadata/cache/net-misc/openssh-5.5_p1-r2
+++ b/metadata/cache/net-misc/openssh-5.5_p1-r2
@@ -1,4 +1,4 @@
-pam? ( virtual/pam ) kerberos? ( virtual/krb5 ) selinux? ( >=sys-libs/libselinux-1.28 ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ldap? ( net-nds/openldap ) libedit? ( dev-libs/libedit ) >=dev-libs/openssl-0.9.6d >=sys-libs/zlib-1.2.3 tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) X? ( x11-apps/xauth ) userland_GNU? ( virtual/shadow ) dev-util/pkgconfig virtual/os-headers sys-devel/autoconf || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+pam? ( virtual/pam ) kerberos? ( virtual/krb5 ) selinux? ( >=sys-libs/libselinux-1.28 ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ldap? ( net-nds/openldap ) libedit? ( dev-libs/libedit ) >=dev-libs/openssl-0.9.6d >=sys-libs/zlib-1.2.3 tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) X? ( x11-apps/xauth ) userland_GNU? ( virtual/shadow ) dev-util/pkgconfig virtual/os-headers sys-devel/autoconf || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 pam? ( virtual/pam ) kerberos? ( virtual/krb5 ) selinux? ( >=sys-libs/libselinux-1.28 ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ldap? ( net-nds/openldap ) libedit? ( dev-libs/libedit ) >=dev-libs/openssl-0.9.6d >=sys-libs/zlib-1.2.3 tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) X? ( x11-apps/xauth ) userland_GNU? ( virtual/shadow ) pam? ( >=sys-auth/pambase-20081028 )
 0
 mirror://openbsd/OpenSSH/portable/openssh-5.5p1.tar.gz hpn? ( http://www.psc.edu/networking/projects/hpn-ssh/openssh-5.5p1-hpn13v9.diff.gz mirror://gentoo/openssh-5.5p1-hpn13v9.diff.gz ) ldap? ( mirror://gentoo/openssh-lpk-5.4p1-0.3.13.patch.gz ) X509? ( http://roumenpetrov.info/openssh/x509-6.2.3/openssh-5.5p1+x509-6.2.3.diff.gz ) hpn? ( X509? ( mirror://gentoo/openssh-5.4p1-hpn13v7-x509variant.diff.gz ) )
diff --git a/metadata/cache/net-misc/openssh-5.6_p1-r2 b/metadata/cache/net-misc/openssh-5.6_p1-r2
index 5bef2c63c6d7..0bc07967ed5f 100644
--- a/metadata/cache/net-misc/openssh-5.6_p1-r2
+++ b/metadata/cache/net-misc/openssh-5.6_p1-r2
@@ -1,4 +1,4 @@
-pam? ( virtual/pam ) kerberos? ( virtual/krb5 ) selinux? ( >=sys-libs/libselinux-1.28 ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ldap? ( net-nds/openldap ) libedit? ( dev-libs/libedit ) >=dev-libs/openssl-0.9.6d >=sys-libs/zlib-1.2.3 tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) X? ( x11-apps/xauth ) userland_GNU? ( virtual/shadow ) dev-util/pkgconfig virtual/os-headers sys-devel/autoconf || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+pam? ( virtual/pam ) kerberos? ( virtual/krb5 ) selinux? ( >=sys-libs/libselinux-1.28 ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ldap? ( net-nds/openldap ) libedit? ( dev-libs/libedit ) >=dev-libs/openssl-0.9.6d >=sys-libs/zlib-1.2.3 tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) X? ( x11-apps/xauth ) userland_GNU? ( virtual/shadow ) dev-util/pkgconfig virtual/os-headers sys-devel/autoconf || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 pam? ( virtual/pam ) kerberos? ( virtual/krb5 ) selinux? ( >=sys-libs/libselinux-1.28 ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ldap? ( net-nds/openldap ) libedit? ( dev-libs/libedit ) >=dev-libs/openssl-0.9.6d >=sys-libs/zlib-1.2.3 tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) X? ( x11-apps/xauth ) userland_GNU? ( virtual/shadow ) pam? ( >=sys-auth/pambase-20081028 )
 0
 mirror://openbsd/OpenSSH/portable/openssh-5.6p1.tar.gz hpn? ( http://www.psc.edu/networking/projects/hpn-ssh/openssh-5.6p1-hpn13v10.diff.gz mirror://gentoo/openssh-5.6p1-hpn13v10.diff.gz ) ldap? ( mirror://gentoo/openssh-lpk-5.6p1-0.3.13.patch.gz ) X509? ( http://roumenpetrov.info/openssh/x509-6.2.3/openssh-5.6p1+x509-6.2.3.diff.gz )
diff --git a/metadata/cache/net-misc/openssh-5.7_p1-r1 b/metadata/cache/net-misc/openssh-5.7_p1-r1
index ccef069282df..e330d8660ca3 100644
--- a/metadata/cache/net-misc/openssh-5.7_p1-r1
+++ b/metadata/cache/net-misc/openssh-5.7_p1-r1
@@ -1,4 +1,4 @@
-pam? ( virtual/pam ) kerberos? ( virtual/krb5 ) selinux? ( >=sys-libs/libselinux-1.28 ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ldap? ( net-nds/openldap ) libedit? ( dev-libs/libedit ) >=dev-libs/openssl-0.9.6d >=sys-libs/zlib-1.2.3 tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) X? ( x11-apps/xauth ) userland_GNU? ( virtual/shadow ) dev-util/pkgconfig virtual/os-headers sys-devel/autoconf || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+pam? ( virtual/pam ) kerberos? ( virtual/krb5 ) selinux? ( >=sys-libs/libselinux-1.28 ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ldap? ( net-nds/openldap ) libedit? ( dev-libs/libedit ) >=dev-libs/openssl-0.9.6d >=sys-libs/zlib-1.2.3 tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) X? ( x11-apps/xauth ) userland_GNU? ( virtual/shadow ) dev-util/pkgconfig virtual/os-headers sys-devel/autoconf || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 pam? ( virtual/pam ) kerberos? ( virtual/krb5 ) selinux? ( >=sys-libs/libselinux-1.28 ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ldap? ( net-nds/openldap ) libedit? ( dev-libs/libedit ) >=dev-libs/openssl-0.9.6d >=sys-libs/zlib-1.2.3 tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) X? ( x11-apps/xauth ) userland_GNU? ( virtual/shadow ) pam? ( >=sys-auth/pambase-20081028 )
 0
 mirror://openbsd/OpenSSH/portable/openssh-5.7p1.tar.gz hpn? ( http://www.psc.edu/networking/projects/hpn-ssh/openssh-5.7p1-hpn13v10.diff.bz2 mirror://gentoo/openssh-5.7p1-hpn13v10.diff.bz2 ) ldap? ( mirror://gentoo/openssh-lpk-5.7p1-0.3.13.patch.gz ) X509? ( http://roumenpetrov.info/openssh/x509-6.2.4/openssh-5.7p1+x509-6.2.4.diff.gz )
diff --git a/metadata/cache/net-misc/openssh-5.8_p1-r1 b/metadata/cache/net-misc/openssh-5.8_p1-r1
index 3658f1430adc..8f4e845b1855 100644
--- a/metadata/cache/net-misc/openssh-5.8_p1-r1
+++ b/metadata/cache/net-misc/openssh-5.8_p1-r1
@@ -1,4 +1,4 @@
-pam? ( virtual/pam ) kerberos? ( virtual/krb5 ) selinux? ( >=sys-libs/libselinux-1.28 ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ldap? ( net-nds/openldap ) libedit? ( dev-libs/libedit ) >=dev-libs/openssl-0.9.6d >=sys-libs/zlib-1.2.3 tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) X? ( x11-apps/xauth ) userland_GNU? ( virtual/shadow ) dev-util/pkgconfig virtual/os-headers sys-devel/autoconf || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+pam? ( virtual/pam ) kerberos? ( virtual/krb5 ) selinux? ( >=sys-libs/libselinux-1.28 ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ldap? ( net-nds/openldap ) libedit? ( dev-libs/libedit ) >=dev-libs/openssl-0.9.6d >=sys-libs/zlib-1.2.3 tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) X? ( x11-apps/xauth ) userland_GNU? ( virtual/shadow ) dev-util/pkgconfig virtual/os-headers sys-devel/autoconf || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 pam? ( virtual/pam ) kerberos? ( virtual/krb5 ) selinux? ( >=sys-libs/libselinux-1.28 ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ldap? ( net-nds/openldap ) libedit? ( dev-libs/libedit ) >=dev-libs/openssl-0.9.6d >=sys-libs/zlib-1.2.3 tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) X? ( x11-apps/xauth ) userland_GNU? ( virtual/shadow ) pam? ( >=sys-auth/pambase-20081028 )
 0
 mirror://openbsd/OpenSSH/portable/openssh-5.8p1.tar.gz hpn? ( http://www.psc.edu/networking/projects/hpn-ssh/openssh-5.8p1-hpn13v10.diff.bz2 mirror://gentoo/openssh-5.8p1-hpn13v10.diff.bz2 ) ldap? ( mirror://gentoo/openssh-lpk-5.7p1-0.3.13.patch.gz ) X509? ( http://roumenpetrov.info/openssh/x509-6.2.4/openssh-5.8p1+x509-6.2.4.diff.gz )
diff --git a/metadata/cache/net-misc/openssh-5.8_p2 b/metadata/cache/net-misc/openssh-5.8_p2
index 15dcfe75b9b9..3ba59ac97413 100644
--- a/metadata/cache/net-misc/openssh-5.8_p2
+++ b/metadata/cache/net-misc/openssh-5.8_p2
@@ -1,4 +1,4 @@
-pam? ( virtual/pam ) kerberos? ( virtual/krb5 ) selinux? ( >=sys-libs/libselinux-1.28 ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ldap? ( net-nds/openldap ) libedit? ( dev-libs/libedit ) >=dev-libs/openssl-0.9.6d >=sys-libs/zlib-1.2.3 tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) X? ( x11-apps/xauth ) userland_GNU? ( virtual/shadow ) dev-util/pkgconfig virtual/os-headers sys-devel/autoconf || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+pam? ( virtual/pam ) kerberos? ( virtual/krb5 ) selinux? ( >=sys-libs/libselinux-1.28 ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ldap? ( net-nds/openldap ) libedit? ( dev-libs/libedit ) >=dev-libs/openssl-0.9.6d >=sys-libs/zlib-1.2.3 tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) X? ( x11-apps/xauth ) userland_GNU? ( virtual/shadow ) dev-util/pkgconfig virtual/os-headers sys-devel/autoconf || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 pam? ( virtual/pam ) kerberos? ( virtual/krb5 ) selinux? ( >=sys-libs/libselinux-1.28 ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ldap? ( net-nds/openldap ) libedit? ( dev-libs/libedit ) >=dev-libs/openssl-0.9.6d >=sys-libs/zlib-1.2.3 tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) X? ( x11-apps/xauth ) userland_GNU? ( virtual/shadow ) pam? ( >=sys-auth/pambase-20081028 )
 0
 mirror://openbsd/OpenSSH/portable/openssh-5.8p2.tar.gz hpn? ( http://www.psc.edu/networking/projects/hpn-ssh/openssh-5.8p1-hpn13v11.diff.gz mirror://gentoo/openssh-5.8p1-hpn13v11.diff.gz ) ldap? ( mirror://gentoo/openssh-lpk-5.8p2-0.3.14.patch.gz ) X509? ( http://roumenpetrov.info/openssh/x509-6.2.4/openssh-5.8p1+x509-6.2.4.diff.gz )
diff --git a/metadata/cache/net-misc/openssh-5.8_p2-r1 b/metadata/cache/net-misc/openssh-5.8_p2-r1
index 15dcfe75b9b9..3ba59ac97413 100644
--- a/metadata/cache/net-misc/openssh-5.8_p2-r1
+++ b/metadata/cache/net-misc/openssh-5.8_p2-r1
@@ -1,4 +1,4 @@
-pam? ( virtual/pam ) kerberos? ( virtual/krb5 ) selinux? ( >=sys-libs/libselinux-1.28 ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ldap? ( net-nds/openldap ) libedit? ( dev-libs/libedit ) >=dev-libs/openssl-0.9.6d >=sys-libs/zlib-1.2.3 tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) X? ( x11-apps/xauth ) userland_GNU? ( virtual/shadow ) dev-util/pkgconfig virtual/os-headers sys-devel/autoconf || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+pam? ( virtual/pam ) kerberos? ( virtual/krb5 ) selinux? ( >=sys-libs/libselinux-1.28 ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ldap? ( net-nds/openldap ) libedit? ( dev-libs/libedit ) >=dev-libs/openssl-0.9.6d >=sys-libs/zlib-1.2.3 tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) X? ( x11-apps/xauth ) userland_GNU? ( virtual/shadow ) dev-util/pkgconfig virtual/os-headers sys-devel/autoconf || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 pam? ( virtual/pam ) kerberos? ( virtual/krb5 ) selinux? ( >=sys-libs/libselinux-1.28 ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ldap? ( net-nds/openldap ) libedit? ( dev-libs/libedit ) >=dev-libs/openssl-0.9.6d >=sys-libs/zlib-1.2.3 tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) X? ( x11-apps/xauth ) userland_GNU? ( virtual/shadow ) pam? ( >=sys-auth/pambase-20081028 )
 0
 mirror://openbsd/OpenSSH/portable/openssh-5.8p2.tar.gz hpn? ( http://www.psc.edu/networking/projects/hpn-ssh/openssh-5.8p1-hpn13v11.diff.gz mirror://gentoo/openssh-5.8p1-hpn13v11.diff.gz ) ldap? ( mirror://gentoo/openssh-lpk-5.8p2-0.3.14.patch.gz ) X509? ( http://roumenpetrov.info/openssh/x509-6.2.4/openssh-5.8p1+x509-6.2.4.diff.gz )
diff --git a/metadata/cache/net-misc/openssh-5.9_p1-r3 b/metadata/cache/net-misc/openssh-5.9_p1-r3
index 14bef5809735..14f6a996e7e5 100644
--- a/metadata/cache/net-misc/openssh-5.9_p1-r3
+++ b/metadata/cache/net-misc/openssh-5.9_p1-r3
@@ -1,4 +1,4 @@
-pam? ( virtual/pam ) kerberos? ( virtual/krb5 ) selinux? ( >=sys-libs/libselinux-1.28 ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ldap? ( net-nds/openldap ) libedit? ( dev-libs/libedit ) >=dev-libs/openssl-0.9.6d >=sys-libs/zlib-1.2.3 tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) X? ( x11-apps/xauth ) userland_GNU? ( virtual/shadow ) dev-util/pkgconfig virtual/os-headers sys-devel/autoconf || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool !<sys-apps/systemd-29-r4 !=sys-apps/systemd-37-r1
+pam? ( virtual/pam ) kerberos? ( virtual/krb5 ) selinux? ( >=sys-libs/libselinux-1.28 ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ldap? ( net-nds/openldap ) libedit? ( dev-libs/libedit ) >=dev-libs/openssl-0.9.6d >=sys-libs/zlib-1.2.3 tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) X? ( x11-apps/xauth ) userland_GNU? ( virtual/shadow ) dev-util/pkgconfig virtual/os-headers sys-devel/autoconf || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool !<sys-apps/systemd-29-r4 !=sys-apps/systemd-37-r1
 pam? ( virtual/pam ) kerberos? ( virtual/krb5 ) selinux? ( >=sys-libs/libselinux-1.28 ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ldap? ( net-nds/openldap ) libedit? ( dev-libs/libedit ) >=dev-libs/openssl-0.9.6d >=sys-libs/zlib-1.2.3 tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) X? ( x11-apps/xauth ) userland_GNU? ( virtual/shadow ) pam? ( >=sys-auth/pambase-20081028 )
 0
 mirror://openbsd/OpenSSH/portable/openssh-5.9p1.tar.gz hpn? ( http://www.psc.edu/networking/projects/hpn-ssh/openssh-5.9p1-hpn13v11.diff.gz mirror://gentoo/openssh-5.9p1-hpn13v11.diff.gz ) ldap? ( mirror://gentoo/openssh-lpk-5.9p1-0.3.14.patch.gz ) X509? ( http://roumenpetrov.info/openssh/x509-7.0/openssh-5.9p1+x509-7.0.diff.gz )
diff --git a/metadata/cache/net-misc/openssh-5.9_p1-r4 b/metadata/cache/net-misc/openssh-5.9_p1-r4
index 14bef5809735..14f6a996e7e5 100644
--- a/metadata/cache/net-misc/openssh-5.9_p1-r4
+++ b/metadata/cache/net-misc/openssh-5.9_p1-r4
@@ -1,4 +1,4 @@
-pam? ( virtual/pam ) kerberos? ( virtual/krb5 ) selinux? ( >=sys-libs/libselinux-1.28 ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ldap? ( net-nds/openldap ) libedit? ( dev-libs/libedit ) >=dev-libs/openssl-0.9.6d >=sys-libs/zlib-1.2.3 tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) X? ( x11-apps/xauth ) userland_GNU? ( virtual/shadow ) dev-util/pkgconfig virtual/os-headers sys-devel/autoconf || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool !<sys-apps/systemd-29-r4 !=sys-apps/systemd-37-r1
+pam? ( virtual/pam ) kerberos? ( virtual/krb5 ) selinux? ( >=sys-libs/libselinux-1.28 ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ldap? ( net-nds/openldap ) libedit? ( dev-libs/libedit ) >=dev-libs/openssl-0.9.6d >=sys-libs/zlib-1.2.3 tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) X? ( x11-apps/xauth ) userland_GNU? ( virtual/shadow ) dev-util/pkgconfig virtual/os-headers sys-devel/autoconf || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool !<sys-apps/systemd-29-r4 !=sys-apps/systemd-37-r1
 pam? ( virtual/pam ) kerberos? ( virtual/krb5 ) selinux? ( >=sys-libs/libselinux-1.28 ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ldap? ( net-nds/openldap ) libedit? ( dev-libs/libedit ) >=dev-libs/openssl-0.9.6d >=sys-libs/zlib-1.2.3 tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) X? ( x11-apps/xauth ) userland_GNU? ( virtual/shadow ) pam? ( >=sys-auth/pambase-20081028 )
 0
 mirror://openbsd/OpenSSH/portable/openssh-5.9p1.tar.gz hpn? ( http://www.psc.edu/networking/projects/hpn-ssh/openssh-5.9p1-hpn13v11.diff.gz mirror://gentoo/openssh-5.9p1-hpn13v11.diff.gz ) ldap? ( mirror://gentoo/openssh-lpk-5.9p1-0.3.14.patch.gz ) X509? ( http://roumenpetrov.info/openssh/x509-7.0/openssh-5.9p1+x509-7.0.diff.gz )
diff --git a/metadata/cache/net-misc/openvpn-2.1.4 b/metadata/cache/net-misc/openvpn-2.1.4
index 937798550d0a..6c07f1ff788e 100644
--- a/metadata/cache/net-misc/openvpn-2.1.4
+++ b/metadata/cache/net-misc/openvpn-2.1.4
@@ -1,4 +1,4 @@
->=dev-libs/lzo-1.07 kernel_linux? ( iproute2? ( sys-apps/iproute2[-minimal] ) !iproute2? ( sys-apps/net-tools ) ) !minimal? ( pam? ( virtual/pam ) ) selinux? ( sec-policy/selinux-openvpn ) ssl? ( >=dev-libs/openssl-0.9.6 ) pkcs11? ( >=dev-libs/pkcs11-helper-1.05 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-libs/lzo-1.07 kernel_linux? ( iproute2? ( sys-apps/iproute2[-minimal] ) !iproute2? ( sys-apps/net-tools ) ) !minimal? ( pam? ( virtual/pam ) ) selinux? ( sec-policy/selinux-openvpn ) ssl? ( >=dev-libs/openssl-0.9.6 ) pkcs11? ( >=dev-libs/pkcs11-helper-1.05 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=dev-libs/lzo-1.07 kernel_linux? ( iproute2? ( sys-apps/iproute2[-minimal] ) !iproute2? ( sys-apps/net-tools ) ) !minimal? ( pam? ( virtual/pam ) ) selinux? ( sec-policy/selinux-openvpn ) ssl? ( >=dev-libs/openssl-0.9.6 ) pkcs11? ( >=dev-libs/pkcs11-helper-1.05 )
 0
 http://swupdate.openvpn.net/community/releases/openvpn-2.1.4.tar.gz ipv6? ( mirror://github/jjo/openvpn-ipv6/openvpn-2.1.1-ipv6-0.4.11.patch.gz ) eurephia? ( mirror://sourceforge/eurephia/openvpn-2.1.0_eurephia.patch )
diff --git a/metadata/cache/net-misc/openvpn-2.2.0-r1 b/metadata/cache/net-misc/openvpn-2.2.0-r1
index a7f03a70e60e..f647a5ec0824 100644
--- a/metadata/cache/net-misc/openvpn-2.2.0-r1
+++ b/metadata/cache/net-misc/openvpn-2.2.0-r1
@@ -1,4 +1,4 @@
->=dev-libs/lzo-1.07 kernel_linux? ( iproute2? ( sys-apps/iproute2[-minimal] ) !iproute2? ( sys-apps/net-tools ) ) !minimal? ( pam? ( virtual/pam ) ) selinux? ( sec-policy/selinux-openvpn ) ssl? ( >=dev-libs/openssl-0.9.6 ) pkcs11? ( >=dev-libs/pkcs11-helper-1.05 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-libs/lzo-1.07 kernel_linux? ( iproute2? ( sys-apps/iproute2[-minimal] ) !iproute2? ( sys-apps/net-tools ) ) !minimal? ( pam? ( virtual/pam ) ) selinux? ( sec-policy/selinux-openvpn ) ssl? ( >=dev-libs/openssl-0.9.6 ) pkcs11? ( >=dev-libs/pkcs11-helper-1.05 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=dev-libs/lzo-1.07 kernel_linux? ( iproute2? ( sys-apps/iproute2[-minimal] ) !iproute2? ( sys-apps/net-tools ) ) !minimal? ( pam? ( virtual/pam ) ) selinux? ( sec-policy/selinux-openvpn ) ssl? ( >=dev-libs/openssl-0.9.6 ) pkcs11? ( >=dev-libs/pkcs11-helper-1.05 )
 0
 http://swupdate.openvpn.net/community/releases/openvpn-2.2.0.tar.gz ipv6? ( http://www.greenie.net/ipv6/openvpn-2.2RC2-ipv6-20110424-2.patch.gz )
diff --git a/metadata/cache/net-misc/openvpn-9999 b/metadata/cache/net-misc/openvpn-9999
index 42e1a144ba02..1428d4aec922 100644
--- a/metadata/cache/net-misc/openvpn-9999
+++ b/metadata/cache/net-misc/openvpn-9999
@@ -1,4 +1,4 @@
->=dev-libs/lzo-1.07 kernel_linux? ( iproute2? ( sys-apps/iproute2[-minimal] ) !iproute2? ( sys-apps/net-tools ) ) !minimal? ( pam? ( virtual/pam ) ) selinux? ( sec-policy/selinux-openvpn ) ssl? ( >=dev-libs/openssl-0.9.6 ) pkcs11? ( >=dev-libs/pkcs11-helper-1.05 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
+>=dev-libs/lzo-1.07 kernel_linux? ( iproute2? ( sys-apps/iproute2[-minimal] ) !iproute2? ( sys-apps/net-tools ) ) !minimal? ( pam? ( virtual/pam ) ) selinux? ( sec-policy/selinux-openvpn ) ssl? ( >=dev-libs/openssl-0.9.6 ) pkcs11? ( >=dev-libs/pkcs11-helper-1.05 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
 >=dev-libs/lzo-1.07 kernel_linux? ( iproute2? ( sys-apps/iproute2[-minimal] ) !iproute2? ( sys-apps/net-tools ) ) !minimal? ( pam? ( virtual/pam ) ) selinux? ( sec-policy/selinux-openvpn ) ssl? ( >=dev-libs/openssl-0.9.6 ) pkcs11? ( >=dev-libs/pkcs11-helper-1.05 )
 0
 
diff --git a/metadata/cache/net-misc/packETH-1.7.1 b/metadata/cache/net-misc/packETH-1.7.1
index 30a034dfdcb2..c789876d1431 100644
--- a/metadata/cache/net-misc/packETH-1.7.1
+++ b/metadata/cache/net-misc/packETH-1.7.1
@@ -1,4 +1,4 @@
-dev-util/pkgconfig x11-libs/gtk+:2 x11-libs/gdk-pixbuf || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-util/pkgconfig x11-libs/gtk+:2 x11-libs/gdk-pixbuf || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 x11-libs/gtk+:2 x11-libs/gdk-pixbuf
 0
 mirror://sourceforge/packeth/packETH-1.7.1.tar.bz2
diff --git a/metadata/cache/net-misc/putty-0.62 b/metadata/cache/net-misc/putty-0.62
index 91e4d0ad17ea..fa484538b1bc 100644
--- a/metadata/cache/net-misc/putty-0.62
+++ b/metadata/cache/net-misc/putty-0.62
@@ -1,4 +1,4 @@
-!net-misc/pssh dev-libs/glib kerberos? ( virtual/krb5 ) x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/libX11 x11-libs/pango dev-lang/perl dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+!net-misc/pssh dev-libs/glib kerberos? ( virtual/krb5 ) x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/libX11 x11-libs/pango dev-lang/perl dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 !net-misc/pssh dev-libs/glib kerberos? ( virtual/krb5 ) x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/libX11 x11-libs/pango
 0
 http://the.earth.li/~sgtatham/putty/latest/putty-0.62.tar.gz
diff --git a/metadata/cache/net-misc/quagga-0.99.20 b/metadata/cache/net-misc/quagga-0.99.20
index af63cbfdf990..a5d53893832a 100644
--- a/metadata/cache/net-misc/quagga-0.99.20
+++ b/metadata/cache/net-misc/quagga-0.99.20
@@ -1,4 +1,4 @@
-caps? ( sys-libs/libcap ) snmp? ( net-analyzer/net-snmp ) readline? ( sys-libs/readline pam? ( sys-libs/pam ) ) !elibc_glibc? ( dev-libs/libpcre ) >=sys-devel/libtool-2.2.4 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+caps? ( sys-libs/libcap ) snmp? ( net-analyzer/net-snmp ) readline? ( sys-libs/readline pam? ( sys-libs/pam ) ) !elibc_glibc? ( dev-libs/libpcre ) >=sys-devel/libtool-2.2.4 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 caps? ( sys-libs/libcap ) snmp? ( net-analyzer/net-snmp ) readline? ( sys-libs/readline pam? ( sys-libs/pam ) ) !elibc_glibc? ( dev-libs/libpcre ) sys-apps/openrc sys-apps/iproute2
 0
 http://www.quagga.net/download/quagga-0.99.20.tar.gz http://dev.gentoo.org/~flameeyes/quagga/quagga-0.99.20-backports-1.tar.bz2 bgpclassless? ( http://hasso.linux.ee/stuff/patches/quagga/ht-20040304-classless-bgp.patch )
diff --git a/metadata/cache/net-misc/quagga-0.99.20-r1 b/metadata/cache/net-misc/quagga-0.99.20-r1
index 5def2abe7e6a..226194bb9b46 100644
--- a/metadata/cache/net-misc/quagga-0.99.20-r1
+++ b/metadata/cache/net-misc/quagga-0.99.20-r1
@@ -1,4 +1,4 @@
-caps? ( sys-libs/libcap ) snmp? ( net-analyzer/net-snmp ) readline? ( sys-libs/readline pam? ( sys-libs/pam ) ) !elibc_glibc? ( dev-libs/libpcre ) app-arch/xz-utils >=sys-devel/libtool-2.2.4 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+caps? ( sys-libs/libcap ) snmp? ( net-analyzer/net-snmp ) readline? ( sys-libs/readline pam? ( sys-libs/pam ) ) !elibc_glibc? ( dev-libs/libpcre ) app-arch/xz-utils >=sys-devel/libtool-2.2.4 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 caps? ( sys-libs/libcap ) snmp? ( net-analyzer/net-snmp ) readline? ( sys-libs/readline pam? ( sys-libs/pam ) ) !elibc_glibc? ( dev-libs/libpcre ) sys-apps/openrc sys-apps/iproute2
 0
 http://www.quagga.net/download/quagga-0.99.20.tar.gz http://dev.gentoo.org/~flameeyes/quagga/quagga-0.99.20-backports-2.tar.xz bgpclassless? ( http://hasso.linux.ee/stuff/patches/quagga/ht-20040304-classless-bgp.patch )
diff --git a/metadata/cache/net-misc/rdesktop-1.7.0 b/metadata/cache/net-misc/rdesktop-1.7.0
index 10352e15cf06..0cf81ee3cfd1 100644
--- a/metadata/cache/net-misc/rdesktop-1.7.0
+++ b/metadata/cache/net-misc/rdesktop-1.7.0
@@ -1,4 +1,4 @@
->=dev-libs/openssl-0.9.6b x11-libs/libX11 x11-libs/libXext x11-libs/libXau x11-libs/libXdmcp alsa? ( media-libs/alsa-lib ) ao? ( >=media-libs/libao-0.8.6 ) libsamplerate? ( media-libs/libsamplerate ) pcsc-lite? ( >=sys-apps/pcsc-lite-1.6.6 ) dev-util/pkgconfig x11-libs/libXt || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-libs/openssl-0.9.6b x11-libs/libX11 x11-libs/libXext x11-libs/libXau x11-libs/libXdmcp alsa? ( media-libs/alsa-lib ) ao? ( >=media-libs/libao-0.8.6 ) libsamplerate? ( media-libs/libsamplerate ) pcsc-lite? ( >=sys-apps/pcsc-lite-1.6.6 ) dev-util/pkgconfig x11-libs/libXt || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=dev-libs/openssl-0.9.6b x11-libs/libX11 x11-libs/libXext x11-libs/libXau x11-libs/libXdmcp alsa? ( media-libs/alsa-lib ) ao? ( >=media-libs/libao-0.8.6 ) libsamplerate? ( media-libs/libsamplerate ) pcsc-lite? ( >=sys-apps/pcsc-lite-1.6.6 )
 0
 mirror://sourceforge/rdesktop/rdesktop-1.7.0.tar.gz
diff --git a/metadata/cache/net-misc/rdesktop-1.7.0-r1 b/metadata/cache/net-misc/rdesktop-1.7.0-r1
index 14a196c5c7ec..164b8c23fd47 100644
--- a/metadata/cache/net-misc/rdesktop-1.7.0-r1
+++ b/metadata/cache/net-misc/rdesktop-1.7.0-r1
@@ -1,4 +1,4 @@
->=dev-libs/openssl-0.9.6b x11-libs/libX11 x11-libs/libXext x11-libs/libXau x11-libs/libXdmcp alsa? ( media-libs/alsa-lib ) ao? ( >=media-libs/libao-0.8.6 ) libsamplerate? ( media-libs/libsamplerate ) pcsc-lite? ( >=sys-apps/pcsc-lite-1.6.6 ) dev-util/pkgconfig x11-libs/libXt || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-libs/openssl-0.9.6b x11-libs/libX11 x11-libs/libXext x11-libs/libXau x11-libs/libXdmcp alsa? ( media-libs/alsa-lib ) ao? ( >=media-libs/libao-0.8.6 ) libsamplerate? ( media-libs/libsamplerate ) pcsc-lite? ( >=sys-apps/pcsc-lite-1.6.6 ) dev-util/pkgconfig x11-libs/libXt || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=dev-libs/openssl-0.9.6b x11-libs/libX11 x11-libs/libXext x11-libs/libXau x11-libs/libXdmcp alsa? ( media-libs/alsa-lib ) ao? ( >=media-libs/libao-0.8.6 ) libsamplerate? ( media-libs/libsamplerate ) pcsc-lite? ( >=sys-apps/pcsc-lite-1.6.6 )
 0
 mirror://sourceforge/rdesktop/rdesktop-1.7.0.tar.gz
diff --git a/metadata/cache/net-misc/rdesktop-1.7.1 b/metadata/cache/net-misc/rdesktop-1.7.1
index 2b4a5f7a17f1..7f244adaa6da 100644
--- a/metadata/cache/net-misc/rdesktop-1.7.1
+++ b/metadata/cache/net-misc/rdesktop-1.7.1
@@ -1,4 +1,4 @@
->=dev-libs/openssl-0.9.6b x11-libs/libX11 x11-libs/libXext x11-libs/libXau x11-libs/libXdmcp alsa? ( media-libs/alsa-lib ) ao? ( >=media-libs/libao-0.8.6 ) libsamplerate? ( media-libs/libsamplerate ) pcsc-lite? ( >=sys-apps/pcsc-lite-1.6.6 ) dev-util/pkgconfig x11-libs/libXt || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-libs/openssl-0.9.6b x11-libs/libX11 x11-libs/libXext x11-libs/libXau x11-libs/libXdmcp alsa? ( media-libs/alsa-lib ) ao? ( >=media-libs/libao-0.8.6 ) libsamplerate? ( media-libs/libsamplerate ) pcsc-lite? ( >=sys-apps/pcsc-lite-1.6.6 ) dev-util/pkgconfig x11-libs/libXt || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=dev-libs/openssl-0.9.6b x11-libs/libX11 x11-libs/libXext x11-libs/libXau x11-libs/libXdmcp alsa? ( media-libs/alsa-lib ) ao? ( >=media-libs/libao-0.8.6 ) libsamplerate? ( media-libs/libsamplerate ) pcsc-lite? ( >=sys-apps/pcsc-lite-1.6.6 )
 0
 mirror://sourceforge/rdesktop/rdesktop-1.7.1.tar.gz
diff --git a/metadata/cache/net-misc/remmina-plugins-9999 b/metadata/cache/net-misc/remmina-plugins-9999
index c816c1bdb38d..c4abec85969d 100644
--- a/metadata/cache/net-misc/remmina-plugins-9999
+++ b/metadata/cache/net-misc/remmina-plugins-9999
@@ -1,4 +1,4 @@
->=net-misc/remmina-0.8.0 nls? ( virtual/libintl ) nx? ( net-misc/nx ) rdesktop? ( =net-misc/freerdp-9999 ) xdmcp? ( x11-base/xorg-server[kdrive] ) ssh? ( net-libs/libssh[sftp] ) vnc? ( net-libs/libvncserver[jpeg,zlib] >=net-libs/gnutls-2.4.0 ) dev-util/intltool dev-util/pkgconfig nls? ( sys-devel/gettext ) telepathy? ( >=net-libs/telepathy-glib-0.9.0 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git >=sys-apps/sed-4
+>=net-misc/remmina-0.8.0 nls? ( virtual/libintl ) nx? ( net-misc/nx ) rdesktop? ( =net-misc/freerdp-9999 ) xdmcp? ( x11-base/xorg-server[kdrive] ) ssh? ( net-libs/libssh[sftp] ) vnc? ( net-libs/libvncserver[jpeg,zlib] >=net-libs/gnutls-2.4.0 ) dev-util/intltool dev-util/pkgconfig nls? ( sys-devel/gettext ) telepathy? ( >=net-libs/telepathy-glib-0.9.0 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git >=sys-apps/sed-4
 >=net-misc/remmina-0.8.0 nls? ( virtual/libintl ) nx? ( net-misc/nx ) rdesktop? ( =net-misc/freerdp-9999 ) xdmcp? ( x11-base/xorg-server[kdrive] ) ssh? ( net-libs/libssh[sftp] ) vnc? ( net-libs/libvncserver[jpeg,zlib] >=net-libs/gnutls-2.4.0 )
 0
 
diff --git a/metadata/cache/net-misc/ser2net-2.7 b/metadata/cache/net-misc/ser2net-2.7
index 82cc6e7a5b8b..be09450a23e7 100644
--- a/metadata/cache/net-misc/ser2net-2.7
+++ b/metadata/cache/net-misc/ser2net-2.7
@@ -1,4 +1,4 @@
-tcpd? ( sys-apps/tcp-wrappers ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+tcpd? ( sys-apps/tcp-wrappers ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 tcpd? ( sys-apps/tcp-wrappers )
 0
 mirror://sourceforge/ser2net/ser2net-2.7.tar.gz
diff --git a/metadata/cache/net-misc/siproxd-0.8.0-r2 b/metadata/cache/net-misc/siproxd-0.8.0-r2
index c97c3b6ee62c..b522a4f7be9e 100644
--- a/metadata/cache/net-misc/siproxd-0.8.0-r2
+++ b/metadata/cache/net-misc/siproxd-0.8.0-r2
@@ -1,4 +1,4 @@
->=net-libs/libosip-3.0.0 >=sys-devel/libtool-2.4 doc? ( app-text/docbook-sgml-utils app-text/docbook-sgml-dtd:4.2 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=net-libs/libosip-3.0.0 >=sys-devel/libtool-2.4 doc? ( app-text/docbook-sgml-utils app-text/docbook-sgml-dtd:4.2 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=net-libs/libosip-3.0.0
 0
 mirror://sourceforge/siproxd/siproxd-0.8.0.tar.gz
diff --git a/metadata/cache/net-misc/sitecopy-0.16.3_p17 b/metadata/cache/net-misc/sitecopy-0.16.3_p17
index 1a77180684fc..03e150d9d2b1 100644
--- a/metadata/cache/net-misc/sitecopy-0.16.3_p17
+++ b/metadata/cache/net-misc/sitecopy-0.16.3_p17
@@ -1,4 +1,4 @@
-rsh? ( net-misc/netkit-rsh ) >=net-libs/neon-0.24.6[zlib?,ssl?,expat?] xml? ( >=net-libs/neon-0.24.6[-expat] ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+rsh? ( net-misc/netkit-rsh ) >=net-libs/neon-0.24.6[zlib?,ssl?,expat?] xml? ( >=net-libs/neon-0.24.6[-expat] ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 rsh? ( net-misc/netkit-rsh ) >=net-libs/neon-0.24.6[zlib?,ssl?,expat?] xml? ( >=net-libs/neon-0.24.6[-expat] )
 0
 mirror://debian/pool/main/s/sitecopy/sitecopy_0.16.3.orig.tar.gz mirror://debian/pool/main/s/sitecopy/sitecopy_0.16.3-17.diff.gz
diff --git a/metadata/cache/net-misc/sitecopy-0.16.6_p3 b/metadata/cache/net-misc/sitecopy-0.16.6_p3
index 4e3fb9625607..985dc463e13f 100644
--- a/metadata/cache/net-misc/sitecopy-0.16.6_p3
+++ b/metadata/cache/net-misc/sitecopy-0.16.6_p3
@@ -1,4 +1,4 @@
-rsh? ( net-misc/netkit-rsh ) >=net-libs/neon-0.24.6[zlib?,ssl?,expat?] xml? ( >=net-libs/neon-0.24.6[-expat] ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+rsh? ( net-misc/netkit-rsh ) >=net-libs/neon-0.24.6[zlib?,ssl?,expat?] xml? ( >=net-libs/neon-0.24.6[-expat] ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 rsh? ( net-misc/netkit-rsh ) >=net-libs/neon-0.24.6[zlib?,ssl?,expat?] xml? ( >=net-libs/neon-0.24.6[-expat] )
 0
 mirror://debian/pool/main/s/sitecopy/sitecopy_0.16.6.orig.tar.gz mirror://debian/pool/main/s/sitecopy/sitecopy_0.16.6-3.diff.gz
diff --git a/metadata/cache/net-misc/smbc-1.2.2-r2 b/metadata/cache/net-misc/smbc-1.2.2-r2
index ae3835d81f2d..42fd160cbb68 100644
--- a/metadata/cache/net-misc/smbc-1.2.2-r2
+++ b/metadata/cache/net-misc/smbc-1.2.2-r2
@@ -1,4 +1,4 @@
-net-fs/samba sys-libs/ncurses dev-libs/popt nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+net-fs/samba sys-libs/ncurses dev-libs/popt nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 net-fs/samba sys-libs/ncurses dev-libs/popt nls? ( sys-devel/gettext )
 0
 mirror://sourceforge/smbc/smbc-1.2.2.tgz
diff --git a/metadata/cache/net-misc/socat-1.7.2.0 b/metadata/cache/net-misc/socat-1.7.2.0
index c1455a0b658a..69604555b244 100644
--- a/metadata/cache/net-misc/socat-1.7.2.0
+++ b/metadata/cache/net-misc/socat-1.7.2.0
@@ -1,4 +1,4 @@
-ssl? ( >=dev-libs/openssl-0.9.6 ) readline? ( >=sys-libs/ncurses-5.1 >=sys-libs/readline-4.1 ) tcpd? ( sys-apps/tcp-wrappers ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+ssl? ( >=dev-libs/openssl-0.9.6 ) readline? ( >=sys-libs/ncurses-5.1 >=sys-libs/readline-4.1 ) tcpd? ( sys-apps/tcp-wrappers ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 ssl? ( >=dev-libs/openssl-0.9.6 ) readline? ( >=sys-libs/ncurses-5.1 >=sys-libs/readline-4.1 ) tcpd? ( sys-apps/tcp-wrappers )
 0
 http://www.dest-unreach.org/socat/download/socat-1.7.2.0.tar.bz2
diff --git a/metadata/cache/net-misc/stunnel-4.33 b/metadata/cache/net-misc/stunnel-4.33
index d41198dfcac1..5ad8f1b9d1d4 100644
--- a/metadata/cache/net-misc/stunnel-4.33
+++ b/metadata/cache/net-misc/stunnel-4.33
@@ -1,4 +1,4 @@
-tcpd? ( sys-apps/tcp-wrappers ) >=dev-libs/openssl-0.9.8k || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool ssl? ( dev-libs/openssl )
+tcpd? ( sys-apps/tcp-wrappers ) >=dev-libs/openssl-0.9.8k || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool ssl? ( dev-libs/openssl )
 tcpd? ( sys-apps/tcp-wrappers ) >=dev-libs/openssl-0.9.8k selinux? ( sec-policy/selinux-stunnel )
 0
 http://www.stunnel.org/download/stunnel/src/stunnel-4.33.tar.gz
diff --git a/metadata/cache/net-misc/stunnel-4.35 b/metadata/cache/net-misc/stunnel-4.35
index a8b9d45f7f20..ea67fc0dee20 100644
--- a/metadata/cache/net-misc/stunnel-4.35
+++ b/metadata/cache/net-misc/stunnel-4.35
@@ -1,4 +1,4 @@
-tcpd? ( sys-apps/tcp-wrappers ) >=dev-libs/openssl-0.9.8k || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool ssl? ( dev-libs/openssl )
+tcpd? ( sys-apps/tcp-wrappers ) >=dev-libs/openssl-0.9.8k || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool ssl? ( dev-libs/openssl )
 tcpd? ( sys-apps/tcp-wrappers ) >=dev-libs/openssl-0.9.8k selinux? ( sec-policy/selinux-stunnel )
 0
 ftp://ftp.stunnel.org/stunnel/stunnel-4.35.tar.gz
diff --git a/metadata/cache/net-misc/stunnel-4.36 b/metadata/cache/net-misc/stunnel-4.36
index f96806002620..d8be1ce840bb 100644
--- a/metadata/cache/net-misc/stunnel-4.36
+++ b/metadata/cache/net-misc/stunnel-4.36
@@ -1,4 +1,4 @@
-tcpd? ( sys-apps/tcp-wrappers ) >=dev-libs/openssl-0.9.8k || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool ssl? ( dev-libs/openssl )
+tcpd? ( sys-apps/tcp-wrappers ) >=dev-libs/openssl-0.9.8k || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool ssl? ( dev-libs/openssl )
 tcpd? ( sys-apps/tcp-wrappers ) >=dev-libs/openssl-0.9.8k selinux? ( sec-policy/selinux-stunnel )
 0
 ftp://ftp.stunnel.org/stunnel/stunnel-4.36.tar.gz
diff --git a/metadata/cache/net-misc/stunnel-4.44 b/metadata/cache/net-misc/stunnel-4.44
index 66cea4a20e90..28d910799d22 100644
--- a/metadata/cache/net-misc/stunnel-4.44
+++ b/metadata/cache/net-misc/stunnel-4.44
@@ -1,4 +1,4 @@
-tcpd? ( sys-apps/tcp-wrappers ) >=dev-libs/openssl-0.9.8k || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool ssl? ( dev-libs/openssl )
+tcpd? ( sys-apps/tcp-wrappers ) >=dev-libs/openssl-0.9.8k || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool ssl? ( dev-libs/openssl )
 tcpd? ( sys-apps/tcp-wrappers ) >=dev-libs/openssl-0.9.8k selinux? ( sec-policy/selinux-stunnel )
 0
 ftp://ftp.stunnel.org/stunnel/stunnel-4.44.tar.gz
diff --git a/metadata/cache/net-misc/tigervnc-1.0.1_p20110618-r1 b/metadata/cache/net-misc/tigervnc-1.0.1_p20110618-r1
index 69a029d739f7..ed1cb3f7a981 100644
--- a/metadata/cache/net-misc/tigervnc-1.0.1_p20110618-r1
+++ b/metadata/cache/net-misc/tigervnc-1.0.1_p20110618-r1
@@ -1,4 +1,4 @@
-virtual/jpeg sys-libs/zlib media-libs/freetype x11-libs/libSM x11-libs/libXtst app-admin/eselect-opengl server? ( x11-libs/libXi x11-libs/libXfont x11-libs/libXmu x11-libs/libxkbfile x11-libs/libXrender x11-libs/pixman x11-apps/xauth x11-apps/xsetroot x11-misc/xkeyboard-config media-fonts/font-adobe-100dpi media-fonts/font-adobe-75dpi media-fonts/font-alias media-fonts/font-cursor-misc media-fonts/font-misc-misc xorgmodule? ( ~x11-base/xorg-server-1.10.4 ) ) !net-misc/vnc !net-misc/tightvnc !net-misc/xf4vnc amd64? ( dev-lang/nasm ) x86? ( dev-lang/nasm ) >=x11-proto/inputproto-1.5 >=x11-proto/xextproto-7.0.3 >=x11-proto/xproto-7.0.13 server? ( x11-misc/util-macros x11-proto/bigreqsproto x11-proto/compositeproto x11-proto/damageproto x11-proto/dri2proto x11-proto/fixesproto x11-proto/fontsproto >=x11-proto/randrproto-1.2.99 x11-proto/resourceproto x11-proto/scrnsaverproto x11-proto/trapproto x11-proto/videoproto x11-proto/xcmiscproto x11-proto/xineramaproto x11-proto/xf86bigfontproto x11-proto/xf86dgaproto x11-proto/xf86driproto x11-proto/xf86miscproto x11-proto/xf86vidmodeproto opengl? ( >=x11-proto/glproto-1.4.10 ) >=media-libs/mesa-7.1 >=x11-proto/renderproto-0.9.3 x11-libs/libpciaccess >=x11-libs/xtrans-1.2.2 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+virtual/jpeg sys-libs/zlib media-libs/freetype x11-libs/libSM x11-libs/libXtst app-admin/eselect-opengl server? ( x11-libs/libXi x11-libs/libXfont x11-libs/libXmu x11-libs/libxkbfile x11-libs/libXrender x11-libs/pixman x11-apps/xauth x11-apps/xsetroot x11-misc/xkeyboard-config media-fonts/font-adobe-100dpi media-fonts/font-adobe-75dpi media-fonts/font-alias media-fonts/font-cursor-misc media-fonts/font-misc-misc xorgmodule? ( ~x11-base/xorg-server-1.10.4 ) ) !net-misc/vnc !net-misc/tightvnc !net-misc/xf4vnc amd64? ( dev-lang/nasm ) x86? ( dev-lang/nasm ) >=x11-proto/inputproto-1.5 >=x11-proto/xextproto-7.0.3 >=x11-proto/xproto-7.0.13 server? ( x11-misc/util-macros x11-proto/bigreqsproto x11-proto/compositeproto x11-proto/damageproto x11-proto/dri2proto x11-proto/fixesproto x11-proto/fontsproto >=x11-proto/randrproto-1.2.99 x11-proto/resourceproto x11-proto/scrnsaverproto x11-proto/trapproto x11-proto/videoproto x11-proto/xcmiscproto x11-proto/xineramaproto x11-proto/xf86bigfontproto x11-proto/xf86dgaproto x11-proto/xf86driproto x11-proto/xf86miscproto x11-proto/xf86vidmodeproto opengl? ( >=x11-proto/glproto-1.4.10 ) >=media-libs/mesa-7.1 >=x11-proto/renderproto-0.9.3 x11-libs/libpciaccess >=x11-libs/xtrans-1.2.2 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 virtual/jpeg sys-libs/zlib media-libs/freetype x11-libs/libSM x11-libs/libXtst app-admin/eselect-opengl server? ( x11-libs/libXi x11-libs/libXfont x11-libs/libXmu x11-libs/libxkbfile x11-libs/libXrender x11-libs/pixman x11-apps/xauth x11-apps/xsetroot x11-misc/xkeyboard-config media-fonts/font-adobe-100dpi media-fonts/font-adobe-75dpi media-fonts/font-alias media-fonts/font-cursor-misc media-fonts/font-misc-misc xorgmodule? ( ~x11-base/xorg-server-1.10.4 ) ) !net-misc/vnc !net-misc/tightvnc !net-misc/xf4vnc
 0
 mirror://gentoo/tigervnc-1.0.1_p20110618.tar.bz2 http://dev.gentoo.org/~armin76/dist/tigervnc-1.0.1_p20110618.tar.bz2 mirror://gentoo/tigervnc.png server? ( ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-1.10.4.tar.bz2 )
diff --git a/metadata/cache/net-misc/tigervnc-1.1.0-r3 b/metadata/cache/net-misc/tigervnc-1.1.0-r3
index 786ae8b578e1..68f1d6c128b4 100644
--- a/metadata/cache/net-misc/tigervnc-1.1.0-r3
+++ b/metadata/cache/net-misc/tigervnc-1.1.0-r3
@@ -1,4 +1,4 @@
-virtual/jpeg sys-libs/zlib media-libs/freetype x11-libs/libSM x11-libs/libXtst app-admin/eselect-opengl server? ( x11-libs/libXi x11-libs/libXfont x11-libs/libXmu x11-libs/libxkbfile x11-libs/libXrender x11-libs/pixman x11-apps/xauth x11-apps/xsetroot x11-misc/xkeyboard-config media-fonts/font-adobe-100dpi media-fonts/font-adobe-75dpi media-fonts/font-alias media-fonts/font-cursor-misc media-fonts/font-misc-misc xorgmodule? ( ~x11-base/xorg-server-1.11.2 ) ) !net-misc/vnc !net-misc/tightvnc !net-misc/xf4vnc amd64? ( dev-lang/nasm ) x86? ( dev-lang/nasm ) >=x11-proto/inputproto-1.5 >=x11-proto/xextproto-7.0.3 >=x11-proto/xproto-7.0.13 server? ( dev-util/pkgconfig media-fonts/font-util x11-misc/util-macros x11-proto/bigreqsproto x11-proto/compositeproto x11-proto/damageproto x11-proto/dri2proto x11-proto/fixesproto x11-proto/fontsproto >=x11-proto/randrproto-1.2.99 x11-proto/resourceproto x11-proto/scrnsaverproto x11-proto/trapproto x11-proto/videoproto x11-proto/xcmiscproto x11-proto/xineramaproto x11-proto/xf86bigfontproto x11-proto/xf86dgaproto x11-proto/xf86driproto x11-proto/xf86miscproto x11-proto/xf86vidmodeproto opengl? ( >=x11-proto/glproto-1.4.10 ) >=media-libs/mesa-7.1 >=x11-proto/renderproto-0.9.3 x11-libs/libpciaccess >=x11-libs/xtrans-1.2.2 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+virtual/jpeg sys-libs/zlib media-libs/freetype x11-libs/libSM x11-libs/libXtst app-admin/eselect-opengl server? ( x11-libs/libXi x11-libs/libXfont x11-libs/libXmu x11-libs/libxkbfile x11-libs/libXrender x11-libs/pixman x11-apps/xauth x11-apps/xsetroot x11-misc/xkeyboard-config media-fonts/font-adobe-100dpi media-fonts/font-adobe-75dpi media-fonts/font-alias media-fonts/font-cursor-misc media-fonts/font-misc-misc xorgmodule? ( ~x11-base/xorg-server-1.11.2 ) ) !net-misc/vnc !net-misc/tightvnc !net-misc/xf4vnc amd64? ( dev-lang/nasm ) x86? ( dev-lang/nasm ) >=x11-proto/inputproto-1.5 >=x11-proto/xextproto-7.0.3 >=x11-proto/xproto-7.0.13 server? ( dev-util/pkgconfig media-fonts/font-util x11-misc/util-macros x11-proto/bigreqsproto x11-proto/compositeproto x11-proto/damageproto x11-proto/dri2proto x11-proto/fixesproto x11-proto/fontsproto >=x11-proto/randrproto-1.2.99 x11-proto/resourceproto x11-proto/scrnsaverproto x11-proto/trapproto x11-proto/videoproto x11-proto/xcmiscproto x11-proto/xineramaproto x11-proto/xf86bigfontproto x11-proto/xf86dgaproto x11-proto/xf86driproto x11-proto/xf86miscproto x11-proto/xf86vidmodeproto opengl? ( >=x11-proto/glproto-1.4.10 ) >=media-libs/mesa-7.1 >=x11-proto/renderproto-0.9.3 x11-libs/libpciaccess >=x11-libs/xtrans-1.2.2 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 virtual/jpeg sys-libs/zlib media-libs/freetype x11-libs/libSM x11-libs/libXtst app-admin/eselect-opengl server? ( x11-libs/libXi x11-libs/libXfont x11-libs/libXmu x11-libs/libxkbfile x11-libs/libXrender x11-libs/pixman x11-apps/xauth x11-apps/xsetroot x11-misc/xkeyboard-config media-fonts/font-adobe-100dpi media-fonts/font-adobe-75dpi media-fonts/font-alias media-fonts/font-cursor-misc media-fonts/font-misc-misc xorgmodule? ( ~x11-base/xorg-server-1.11.2 ) ) !net-misc/vnc !net-misc/tightvnc !net-misc/xf4vnc
 0
 mirror://sourceforge/tigervnc/tigervnc-1.1.0.tar.gz mirror://gentoo/tigervnc.png server? ( ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-1.11.2.tar.bz2 )
diff --git a/metadata/cache/net-misc/tor-0.2.1.32 b/metadata/cache/net-misc/tor-0.2.1.32
index 8633fffe3a78..d3c683917227 100644
--- a/metadata/cache/net-misc/tor-0.2.1.32
+++ b/metadata/cache/net-misc/tor-0.2.1.32
@@ -1,4 +1,4 @@
-dev-libs/openssl >=dev-libs/libevent-2.0 selinux? ( sec-policy/selinux-tor ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-libs/openssl >=dev-libs/libevent-2.0 selinux? ( sec-policy/selinux-tor ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-libs/openssl >=dev-libs/libevent-2.0 selinux? ( sec-policy/selinux-tor )
 0
 http://www.torproject.org/dist/tor-0.2.1.32.tar.gz
diff --git a/metadata/cache/net-misc/tor-0.2.2.35 b/metadata/cache/net-misc/tor-0.2.2.35
index df5584e613f3..a7a806852c7c 100644
--- a/metadata/cache/net-misc/tor-0.2.2.35
+++ b/metadata/cache/net-misc/tor-0.2.2.35
@@ -1,4 +1,4 @@
-dev-libs/openssl >=dev-libs/libevent-2.0 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-libs/openssl >=dev-libs/libevent-2.0 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-libs/openssl >=dev-libs/libevent-2.0
 0
 http://www.torproject.org/dist/tor-0.2.2.35.tar.gz
diff --git a/metadata/cache/net-misc/tor-0.2.2.35-r1 b/metadata/cache/net-misc/tor-0.2.2.35-r1
index 8f622ec6bf84..9b848538c64a 100644
--- a/metadata/cache/net-misc/tor-0.2.2.35-r1
+++ b/metadata/cache/net-misc/tor-0.2.2.35-r1
@@ -1,4 +1,4 @@
-dev-libs/openssl >=dev-libs/libevent-2.0 selinux? ( sec-policy/selinux-tor ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-libs/openssl >=dev-libs/libevent-2.0 selinux? ( sec-policy/selinux-tor ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-libs/openssl >=dev-libs/libevent-2.0 selinux? ( sec-policy/selinux-tor )
 0
 http://www.torproject.org/dist/tor-0.2.2.35.tar.gz
diff --git a/metadata/cache/net-misc/tsclient-2.0.1-r1 b/metadata/cache/net-misc/tsclient-2.0.1-r1
index 0eccf943fe1a..f42b3e35f055 100644
--- a/metadata/cache/net-misc/tsclient-2.0.1-r1
+++ b/metadata/cache/net-misc/tsclient-2.0.1-r1
@@ -1,4 +1,4 @@
-x11-libs/gtk+:2 dev-libs/glib:2 gnome-base/libglade:2.0 gnome-base/libgnome gnome-base/libgnomeui gnome-base/gnome-desktop:2 x11-libs/libnotify gnome-base/gconf >=dev-util/intltool-0.27 dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+x11-libs/gtk+:2 dev-libs/glib:2 gnome-base/libglade:2.0 gnome-base/libgnome gnome-base/libgnomeui gnome-base/gnome-desktop:2 x11-libs/libnotify gnome-base/gconf >=dev-util/intltool-0.27 dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 x11-libs/gtk+:2 dev-libs/glib:2 gnome-base/libglade:2.0 gnome-base/libgnome gnome-base/libgnomeui gnome-base/gnome-desktop:2 x11-libs/libnotify >=net-misc/rdesktop-1.3.0
 0
 mirror://sourceforge/tsclient/tsclient-2.0.1.tar.bz2
diff --git a/metadata/cache/net-misc/usbip-0.1.7 b/metadata/cache/net-misc/usbip-0.1.7
index 480c81513e79..13f00d217142 100644
--- a/metadata/cache/net-misc/usbip-0.1.7
+++ b/metadata/cache/net-misc/usbip-0.1.7
@@ -1,4 +1,4 @@
-sys-fs/sysfsutils sys-apps/tcp-wrappers dev-libs/glib dev-util/pkgconfig >=sys-devel/automake-1.9 sys-devel/libtool || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+sys-fs/sysfsutils sys-apps/tcp-wrappers dev-libs/glib dev-util/pkgconfig >=sys-devel/automake-1.9 sys-devel/libtool || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 sys-fs/sysfsutils sys-apps/tcp-wrappers dev-libs/glib
 0
 mirror://sourceforge/usbip/usbip-0.1.7.tar.gz
diff --git a/metadata/cache/net-misc/vinagre-3.2.1 b/metadata/cache/net-misc/vinagre-3.2.1
index 1ac205d32f2b..a1366a5a563c 100644
--- a/metadata/cache/net-misc/vinagre-3.2.1
+++ b/metadata/cache/net-misc/vinagre-3.2.1
@@ -1,4 +1,4 @@
->=dev-libs/glib-2.28.0:2 >=x11-libs/gtk+-3.0.3:3 >=gnome-base/gnome-keyring-1 >=dev-libs/libxml2-2.6.31:2 >=net-libs/gtk-vnc-0.4.3[gtk3] x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-themes/gnome-icon-theme avahi? ( >=net-dns/avahi-0.6.26[dbus,gtk3] ) ssh? ( >=x11-libs/vte-0.20:2.90 ) telepathy? ( dev-libs/dbus-glib >=net-libs/telepathy-glib-0.11.6 ) dev-lang/vala:0.12 gnome-base/gnome-common >=dev-lang/perl-5 >=dev-util/pkgconfig-0.16 >=dev-util/intltool-0.40 app-text/scrollkeeper app-text/gnome-doc-utils >=sys-devel/gettext-0.17 test? ( ~app-text/docbook-xml-dtd-4.3 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
+>=dev-libs/glib-2.28.0:2 >=x11-libs/gtk+-3.0.3:3 >=gnome-base/gnome-keyring-1 >=dev-libs/libxml2-2.6.31:2 >=net-libs/gtk-vnc-0.4.3[gtk3] x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-themes/gnome-icon-theme avahi? ( >=net-dns/avahi-0.6.26[dbus,gtk3] ) ssh? ( >=x11-libs/vte-0.20:2.90 ) telepathy? ( dev-libs/dbus-glib >=net-libs/telepathy-glib-0.11.6 ) dev-lang/vala:0.12 gnome-base/gnome-common >=dev-lang/perl-5 >=dev-util/pkgconfig-0.16 >=dev-util/intltool-0.40 app-text/scrollkeeper app-text/gnome-doc-utils >=sys-devel/gettext-0.17 test? ( ~app-text/docbook-xml-dtd-4.3 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
 >=dev-libs/glib-2.28.0:2 >=x11-libs/gtk+-3.0.3:3 >=gnome-base/gnome-keyring-1 >=dev-libs/libxml2-2.6.31:2 >=net-libs/gtk-vnc-0.4.3[gtk3] x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-themes/gnome-icon-theme avahi? ( >=net-dns/avahi-0.6.26[dbus,gtk3] ) ssh? ( >=x11-libs/vte-0.20:2.90 ) telepathy? ( dev-libs/dbus-glib >=net-libs/telepathy-glib-0.11.6 )
 0
 mirror://gnome/sources/vinagre/3.2/vinagre-3.2.1.tar.xz
diff --git a/metadata/cache/net-misc/vinagre-3.2.2 b/metadata/cache/net-misc/vinagre-3.2.2
index faa793931191..ef3a3fe621af 100644
--- a/metadata/cache/net-misc/vinagre-3.2.2
+++ b/metadata/cache/net-misc/vinagre-3.2.2
@@ -1,4 +1,4 @@
->=dev-libs/glib-2.28.0:2 >=x11-libs/gtk+-3.0.3:3 >=gnome-base/gnome-keyring-1 >=dev-libs/libxml2-2.6.31:2 >=net-libs/gtk-vnc-0.4.3[gtk3] x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-themes/gnome-icon-theme avahi? ( >=net-dns/avahi-0.6.26[dbus,gtk3] ) ssh? ( >=x11-libs/vte-0.20:2.90 ) telepathy? ( dev-libs/dbus-glib >=net-libs/telepathy-glib-0.11.6 ) dev-lang/vala:0.12 gnome-base/gnome-common >=dev-lang/perl-5 >=dev-util/pkgconfig-0.16 >=dev-util/intltool-0.40 app-text/scrollkeeper app-text/gnome-doc-utils >=sys-devel/gettext-0.17 test? ( ~app-text/docbook-xml-dtd-4.3 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
+>=dev-libs/glib-2.28.0:2 >=x11-libs/gtk+-3.0.3:3 >=gnome-base/gnome-keyring-1 >=dev-libs/libxml2-2.6.31:2 >=net-libs/gtk-vnc-0.4.3[gtk3] x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-themes/gnome-icon-theme avahi? ( >=net-dns/avahi-0.6.26[dbus,gtk3] ) ssh? ( >=x11-libs/vte-0.20:2.90 ) telepathy? ( dev-libs/dbus-glib >=net-libs/telepathy-glib-0.11.6 ) dev-lang/vala:0.12 gnome-base/gnome-common >=dev-lang/perl-5 >=dev-util/pkgconfig-0.16 >=dev-util/intltool-0.40 app-text/scrollkeeper app-text/gnome-doc-utils >=sys-devel/gettext-0.17 test? ( ~app-text/docbook-xml-dtd-4.3 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
 >=dev-libs/glib-2.28.0:2 >=x11-libs/gtk+-3.0.3:3 >=gnome-base/gnome-keyring-1 >=dev-libs/libxml2-2.6.31:2 >=net-libs/gtk-vnc-0.4.3[gtk3] x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-themes/gnome-icon-theme avahi? ( >=net-dns/avahi-0.6.26[dbus,gtk3] ) ssh? ( >=x11-libs/vte-0.20:2.90 ) telepathy? ( dev-libs/dbus-glib >=net-libs/telepathy-glib-0.11.6 )
 0
 mirror://gnome/sources/vinagre/3.2/vinagre-3.2.2.tar.xz http://dev.gentoo.org/~tetromino/distfiles/vinagre/vinagre-3.2.2-patches-0.tar.xz
diff --git a/metadata/cache/net-misc/vmpsd-1.4 b/metadata/cache/net-misc/vmpsd-1.4
index cfbb8be6959c..a3d199fda894 100644
--- a/metadata/cache/net-misc/vmpsd-1.4
+++ b/metadata/cache/net-misc/vmpsd-1.4
@@ -1,4 +1,4 @@
-net-analyzer/net-snmp dev-libs/openssl || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+net-analyzer/net-snmp dev-libs/openssl || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 mirror://sourceforge/vmps/vmpsd-1.4.tar.gz
diff --git a/metadata/cache/net-misc/wget-1.13.4-r1 b/metadata/cache/net-misc/wget-1.13.4-r1
index 2da3f79ed961..0f8abbbeec46 100644
--- a/metadata/cache/net-misc/wget-1.13.4-r1
+++ b/metadata/cache/net-misc/wget-1.13.4-r1
@@ -1,4 +1,4 @@
-!static? ( idn? ( net-dns/libidn ) ssl? ( gnutls? ( net-libs/gnutls ) !gnutls? ( >=dev-libs/openssl-0.9.6b ) ) ) app-arch/xz-utils dev-util/pkgconfig static? ( idn? ( net-dns/libidn[static-libs(+)] ) ssl? ( gnutls? ( net-libs/gnutls[static-libs(+)] ) !gnutls? ( >=dev-libs/openssl-0.9.6b[static-libs(+)] ) ) ) nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+!static? ( idn? ( net-dns/libidn ) ssl? ( gnutls? ( net-libs/gnutls ) !gnutls? ( >=dev-libs/openssl-0.9.6b ) ) ) app-arch/xz-utils dev-util/pkgconfig static? ( idn? ( net-dns/libidn[static-libs(+)] ) ssl? ( gnutls? ( net-libs/gnutls[static-libs(+)] ) !gnutls? ( >=dev-libs/openssl-0.9.6b[static-libs(+)] ) ) ) nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 !static? ( idn? ( net-dns/libidn ) ssl? ( gnutls? ( net-libs/gnutls ) !gnutls? ( >=dev-libs/openssl-0.9.6b ) ) )
 0
 mirror://gnu/wget/wget-1.13.4.tar.xz
diff --git a/metadata/cache/net-misc/wxdfast-0.6.0-r1 b/metadata/cache/net-misc/wxdfast-0.6.0-r1
index 96d08ac7f27d..72553aae502e 100644
--- a/metadata/cache/net-misc/wxdfast-0.6.0-r1
+++ b/metadata/cache/net-misc/wxdfast-0.6.0-r1
@@ -1,4 +1,4 @@
-x11-libs/wxGTK:2.8[X] || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+x11-libs/wxGTK:2.8[X] || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 x11-libs/wxGTK:2.8[X]
 0
 mirror://sourceforge/dfast/wxdfast_0.6.0.tar.gz
diff --git a/metadata/cache/net-misc/xsupplicant-2.2.0 b/metadata/cache/net-misc/xsupplicant-2.2.0
index f594f067770b..50c16ee6d72d 100644
--- a/metadata/cache/net-misc/xsupplicant-2.2.0
+++ b/metadata/cache/net-misc/xsupplicant-2.2.0
@@ -1,4 +1,4 @@
-dev-libs/libxml2 dev-libs/openssl net-wireless/wireless-tools sys-libs/zlib || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-libs/libxml2 dev-libs/openssl net-wireless/wireless-tools sys-libs/zlib || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-libs/libxml2 dev-libs/openssl net-wireless/wireless-tools sys-libs/zlib
 0
 mirror://sourceforge/open1x/XSupplicant-2.2.0-src.tar.gz
diff --git a/metadata/cache/net-misc/youtube-dl-2011.08.04 b/metadata/cache/net-misc/youtube-dl-2011.08.04
deleted file mode 100644
index 384edc666ee3..000000000000
--- a/metadata/cache/net-misc/youtube-dl-2011.08.04
+++ /dev/null
@@ -1,22 +0,0 @@
-|| ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
-|| ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
-0
-http://github.com/rg3/youtube-dl/tarball/2011.08.04 -> youtube-dl-2011.08.04.tar.gz
-
-http://rg3.github.com/youtube-dl/
-public-domain
-A small command-line program to download videos from YouTube.
-amd64 ~arm hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
-multilib python toolchain-funcs
-
-
-
-
-3
-
-install setup
-
-
-
-
-
diff --git a/metadata/cache/net-misc/youtube-dl-2011.11.23 b/metadata/cache/net-misc/youtube-dl-2011.11.23
deleted file mode 100644
index d25aa24e5e49..000000000000
--- a/metadata/cache/net-misc/youtube-dl-2011.11.23
+++ /dev/null
@@ -1,22 +0,0 @@
-|| ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
-|| ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
-0
-http://github.com/rg3/youtube-dl/tarball/2011.11.23 -> youtube-dl-2011.11.23.tar.gz
-
-http://rg3.github.com/youtube-dl/
-public-domain
-A small command-line program to download videos from YouTube.
-~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
-multilib python toolchain-funcs
-
-
-
-
-3
-
-install setup
-
-
-
-
-
diff --git a/metadata/cache/net-misc/youtube-dl-2011.12.18 b/metadata/cache/net-misc/youtube-dl-2012.02.27
similarity index 83%
rename from metadata/cache/net-misc/youtube-dl-2011.12.18
rename to metadata/cache/net-misc/youtube-dl-2012.02.27
index 0eb025412970..fea6efd0b1e4 100644
--- a/metadata/cache/net-misc/youtube-dl-2011.12.18
+++ b/metadata/cache/net-misc/youtube-dl-2012.02.27
@@ -1,7 +1,7 @@
 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
 0
-https://github.com/rg3/youtube-dl/tarball/2011.12.18 -> youtube-dl-2011.12.18.tar.gz
+https://github.com/rg3/youtube-dl/tarball/2012.02.27 -> youtube-dl-2012.02.27.tar.gz
 
 https://rg3.github.com/youtube-dl/
 public-domain
diff --git a/metadata/cache/net-misc/zsync-0.6.2 b/metadata/cache/net-misc/zsync-0.6.2
index 5eb3f778173d..76c3d8a5f12f 100644
--- a/metadata/cache/net-misc/zsync-0.6.2
+++ b/metadata/cache/net-misc/zsync-0.6.2
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 http://zsync.moria.org.uk/download/zsync-0.6.2.tar.bz2 http://www.gzip.org/zlib/zlib-1.2.3.tar.bz2 http://www.zlib.net/zlib-1.2.3.tar.bz2
diff --git a/metadata/cache/net-nds/openldap-2.3.43-r1 b/metadata/cache/net-nds/openldap-2.3.43-r1
index 0d00c0bcd242..4eb8bd165a87 100644
--- a/metadata/cache/net-nds/openldap-2.3.43-r1
+++ b/metadata/cache/net-nds/openldap-2.3.43-r1
@@ -1,4 +1,4 @@
-sys-libs/ncurses tcpd? ( sys-apps/tcp-wrappers ) ssl? ( dev-libs/openssl ) sasl? ( dev-libs/cyrus-sasl ) !minimal? ( odbc? ( dev-db/unixODBC ) slp? ( net-libs/openslp ) perl? ( dev-lang/perl[-build] ) samba? ( dev-libs/openssl ) kerberos? ( virtual/krb5 ) berkdb? ( || ( sys-libs/db:4.5 sys-libs/db:4.4 sys-libs/db:4.3 >=sys-libs/db-4.2.52_p2-r1:4.2 ) ) !berkdb? ( gdbm? ( sys-libs/gdbm ) !gdbm? ( || ( sys-libs/db:4.5 sys-libs/db:4.4 sys-libs/db:4.3 >=sys-libs/db-4.2.52_p2-r1:4.2 ) ) ) smbkrb5passwd? ( dev-libs/openssl app-crypt/heimdal ) ) selinux? ( sec-policy/selinux-openldap ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool ssl? ( dev-libs/openssl )
+sys-libs/ncurses tcpd? ( sys-apps/tcp-wrappers ) ssl? ( dev-libs/openssl ) sasl? ( dev-libs/cyrus-sasl ) !minimal? ( odbc? ( dev-db/unixODBC ) slp? ( net-libs/openslp ) perl? ( dev-lang/perl[-build] ) samba? ( dev-libs/openssl ) kerberos? ( virtual/krb5 ) berkdb? ( || ( sys-libs/db:4.5 sys-libs/db:4.4 sys-libs/db:4.3 >=sys-libs/db-4.2.52_p2-r1:4.2 ) ) !berkdb? ( gdbm? ( sys-libs/gdbm ) !gdbm? ( || ( sys-libs/db:4.5 sys-libs/db:4.4 sys-libs/db:4.3 >=sys-libs/db-4.2.52_p2-r1:4.2 ) ) ) smbkrb5passwd? ( dev-libs/openssl app-crypt/heimdal ) ) selinux? ( sec-policy/selinux-openldap ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool ssl? ( dev-libs/openssl )
 sys-libs/ncurses tcpd? ( sys-apps/tcp-wrappers ) ssl? ( dev-libs/openssl ) sasl? ( dev-libs/cyrus-sasl ) !minimal? ( odbc? ( dev-db/unixODBC ) slp? ( net-libs/openslp ) perl? ( dev-lang/perl[-build] ) samba? ( dev-libs/openssl ) kerberos? ( virtual/krb5 ) berkdb? ( || ( sys-libs/db:4.5 sys-libs/db:4.4 sys-libs/db:4.3 >=sys-libs/db-4.2.52_p2-r1:4.2 ) ) !berkdb? ( gdbm? ( sys-libs/gdbm ) !gdbm? ( || ( sys-libs/db:4.5 sys-libs/db:4.4 sys-libs/db:4.3 >=sys-libs/db-4.2.52_p2-r1:4.2 ) ) ) smbkrb5passwd? ( dev-libs/openssl app-crypt/heimdal ) ) selinux? ( sec-policy/selinux-openldap )
 0
 mirror://openldap/openldap-release/openldap-2.3.43.tgz
diff --git a/metadata/cache/net-nds/openldap-2.4.28-r1 b/metadata/cache/net-nds/openldap-2.4.28-r1
index 032979aa15f9..0cd23659a62c 100644
--- a/metadata/cache/net-nds/openldap-2.4.28-r1
+++ b/metadata/cache/net-nds/openldap-2.4.28-r1
@@ -1,4 +1,4 @@
-sys-libs/ncurses sys-devel/libtool icu? ( dev-libs/icu ) tcpd? ( sys-apps/tcp-wrappers ) ssl? ( !gnutls? ( dev-libs/openssl ) gnutls? ( net-libs/gnutls ) ) sasl? ( dev-libs/cyrus-sasl ) !minimal? ( odbc? ( !iodbc? ( dev-db/unixODBC ) iodbc? ( dev-db/libiodbc ) ) slp? ( net-libs/openslp ) perl? ( dev-lang/perl[-build] ) samba? ( dev-libs/openssl ) berkdb? ( sys-libs/db ) smbkrb5passwd? ( dev-libs/openssl app-crypt/heimdal ) kerberos? ( virtual/krb5 ) cxx? ( dev-libs/cyrus-sasl ) ) selinux? ( sec-policy/selinux-openldap ) sys-apps/groff ssl? ( dev-libs/openssl ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+sys-libs/ncurses sys-devel/libtool icu? ( dev-libs/icu ) tcpd? ( sys-apps/tcp-wrappers ) ssl? ( !gnutls? ( dev-libs/openssl ) gnutls? ( net-libs/gnutls ) ) sasl? ( dev-libs/cyrus-sasl ) !minimal? ( odbc? ( !iodbc? ( dev-db/unixODBC ) iodbc? ( dev-db/libiodbc ) ) slp? ( net-libs/openslp ) perl? ( dev-lang/perl[-build] ) samba? ( dev-libs/openssl ) berkdb? ( sys-libs/db ) smbkrb5passwd? ( dev-libs/openssl app-crypt/heimdal ) kerberos? ( virtual/krb5 ) cxx? ( dev-libs/cyrus-sasl ) ) selinux? ( sec-policy/selinux-openldap ) sys-apps/groff ssl? ( dev-libs/openssl ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 sys-libs/ncurses sys-devel/libtool icu? ( dev-libs/icu ) tcpd? ( sys-apps/tcp-wrappers ) ssl? ( !gnutls? ( dev-libs/openssl ) gnutls? ( net-libs/gnutls ) ) sasl? ( dev-libs/cyrus-sasl ) !minimal? ( odbc? ( !iodbc? ( dev-db/unixODBC ) iodbc? ( dev-db/libiodbc ) ) slp? ( net-libs/openslp ) perl? ( dev-lang/perl[-build] ) samba? ( dev-libs/openssl ) berkdb? ( sys-libs/db ) smbkrb5passwd? ( dev-libs/openssl app-crypt/heimdal ) kerberos? ( virtual/krb5 ) cxx? ( dev-libs/cyrus-sasl ) ) selinux? ( sec-policy/selinux-openldap )
 0
 mirror://openldap/openldap-release/openldap-2.4.28.tgz http://simon.kisikew.org/src/ldap/rfc2307bis.schema -> rfc2307bis.schema-20100722
diff --git a/metadata/cache/net-nds/openldap-2.4.30 b/metadata/cache/net-nds/openldap-2.4.30
index 35e1d381600f..c1ba573e02c5 100644
--- a/metadata/cache/net-nds/openldap-2.4.30
+++ b/metadata/cache/net-nds/openldap-2.4.30
@@ -1,4 +1,4 @@
-sys-libs/ncurses sys-devel/libtool icu? ( dev-libs/icu ) tcpd? ( sys-apps/tcp-wrappers ) ssl? ( !gnutls? ( dev-libs/openssl ) gnutls? ( net-libs/gnutls ) ) sasl? ( dev-libs/cyrus-sasl ) !minimal? ( odbc? ( !iodbc? ( dev-db/unixODBC ) iodbc? ( dev-db/libiodbc ) ) slp? ( net-libs/openslp ) perl? ( dev-lang/perl[-build] ) samba? ( dev-libs/openssl ) berkdb? ( sys-libs/db ) smbkrb5passwd? ( dev-libs/openssl app-crypt/heimdal ) kerberos? ( virtual/krb5 ) cxx? ( dev-libs/cyrus-sasl ) ) selinux? ( sec-policy/selinux-openldap ) sys-apps/groff ssl? ( dev-libs/openssl ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+sys-libs/ncurses sys-devel/libtool icu? ( dev-libs/icu ) tcpd? ( sys-apps/tcp-wrappers ) ssl? ( !gnutls? ( dev-libs/openssl ) gnutls? ( net-libs/gnutls ) ) sasl? ( dev-libs/cyrus-sasl ) !minimal? ( odbc? ( !iodbc? ( dev-db/unixODBC ) iodbc? ( dev-db/libiodbc ) ) slp? ( net-libs/openslp ) perl? ( dev-lang/perl[-build] ) samba? ( dev-libs/openssl ) berkdb? ( sys-libs/db ) smbkrb5passwd? ( dev-libs/openssl app-crypt/heimdal ) kerberos? ( virtual/krb5 ) cxx? ( dev-libs/cyrus-sasl ) ) selinux? ( sec-policy/selinux-openldap ) sys-apps/groff ssl? ( dev-libs/openssl ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 sys-libs/ncurses sys-devel/libtool icu? ( dev-libs/icu ) tcpd? ( sys-apps/tcp-wrappers ) ssl? ( !gnutls? ( dev-libs/openssl ) gnutls? ( net-libs/gnutls ) ) sasl? ( dev-libs/cyrus-sasl ) !minimal? ( odbc? ( !iodbc? ( dev-db/unixODBC ) iodbc? ( dev-db/libiodbc ) ) slp? ( net-libs/openslp ) perl? ( dev-lang/perl[-build] ) samba? ( dev-libs/openssl ) berkdb? ( sys-libs/db ) smbkrb5passwd? ( dev-libs/openssl app-crypt/heimdal ) kerberos? ( virtual/krb5 ) cxx? ( dev-libs/cyrus-sasl ) ) selinux? ( sec-policy/selinux-openldap )
 0
 mirror://openldap/openldap-release/openldap-2.4.30.tgz http://simon.kisikew.org/src/ldap/rfc2307bis.schema -> rfc2307bis.schema-20100722
diff --git a/metadata/cache/net-nds/rpcbind-0.2.0 b/metadata/cache/net-nds/rpcbind-0.2.0
index dee6f5d5b052..47b136985fe8 100644
--- a/metadata/cache/net-nds/rpcbind-0.2.0
+++ b/metadata/cache/net-nds/rpcbind-0.2.0
@@ -1,4 +1,4 @@
-net-libs/libtirpc selinux? ( sec-policy/selinux-rpcbind ) tcpd? ( sys-apps/tcp-wrappers ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+net-libs/libtirpc selinux? ( sec-policy/selinux-rpcbind ) tcpd? ( sys-apps/tcp-wrappers ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 net-libs/libtirpc selinux? ( sec-policy/selinux-rpcbind ) tcpd? ( sys-apps/tcp-wrappers )
 0
 mirror://sourceforge/rpcbind/rpcbind-0.2.0.tar.bz2
diff --git a/metadata/cache/net-nds/rpcbind-9999 b/metadata/cache/net-nds/rpcbind-9999
index c3087e7b6e3d..58b1b96fe22f 100644
--- a/metadata/cache/net-nds/rpcbind-9999
+++ b/metadata/cache/net-nds/rpcbind-9999
@@ -1,4 +1,4 @@
-net-libs/libtirpc selinux? ( sec-policy/selinux-rpcbind ) tcpd? ( sys-apps/tcp-wrappers ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
+net-libs/libtirpc selinux? ( sec-policy/selinux-rpcbind ) tcpd? ( sys-apps/tcp-wrappers ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
 net-libs/libtirpc selinux? ( sec-policy/selinux-rpcbind ) tcpd? ( sys-apps/tcp-wrappers )
 0
 
diff --git a/metadata/cache/net-nds/tac_plus-4.0.4.19-r2 b/metadata/cache/net-nds/tac_plus-4.0.4.19-r2
index 58fd9cdbd659..4faac19d6e28 100644
--- a/metadata/cache/net-nds/tac_plus-4.0.4.19-r2
+++ b/metadata/cache/net-nds/tac_plus-4.0.4.19-r2
@@ -1,4 +1,4 @@
-skey? ( >=sys-auth/skey-1.1.5-r1 ) tcpd? ( sys-apps/tcp-wrappers ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+skey? ( >=sys-auth/skey-1.1.5-r1 ) tcpd? ( sys-apps/tcp-wrappers ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 skey? ( >=sys-auth/skey-1.1.5-r1 ) tcpd? ( sys-apps/tcp-wrappers )
 0
 ftp://ftp.shrubbery.net/pub/tac_plus/tacacs+-F4.0.4.19.tar.gz
diff --git a/metadata/cache/net-nds/tac_plus-4.0.4.19-r3 b/metadata/cache/net-nds/tac_plus-4.0.4.19-r3
index 09cd3916c4e9..4bf688f80ce8 100644
--- a/metadata/cache/net-nds/tac_plus-4.0.4.19-r3
+++ b/metadata/cache/net-nds/tac_plus-4.0.4.19-r3
@@ -1,4 +1,4 @@
-skey? ( >=sys-auth/skey-1.1.5-r1 ) tcpd? ( sys-apps/tcp-wrappers ) sys-libs/pam || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+skey? ( >=sys-auth/skey-1.1.5-r1 ) tcpd? ( sys-apps/tcp-wrappers ) sys-libs/pam || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 skey? ( >=sys-auth/skey-1.1.5-r1 ) tcpd? ( sys-apps/tcp-wrappers ) sys-libs/pam
 0
 ftp://ftp.shrubbery.net/pub/tac_plus/tacacs+-F4.0.4.19.tar.gz
diff --git a/metadata/cache/net-nds/ypserv-2.22 b/metadata/cache/net-nds/ypserv-2.22
index aad91f84d2cb..0f92f9fa5dbc 100644
--- a/metadata/cache/net-nds/ypserv-2.22
+++ b/metadata/cache/net-nds/ypserv-2.22
@@ -1,4 +1,4 @@
->=sys-libs/gdbm-1.8.0 slp? ( net-libs/openslp ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=sys-libs/gdbm-1.8.0 slp? ( net-libs/openslp ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=sys-libs/gdbm-1.8.0 slp? ( net-libs/openslp ) || ( net-nds/rpcbind net-nds/portmap )
 0
 mirror://kernel/linux/utils/net/NIS/ypserv-2.22.tar.bz2
diff --git a/metadata/cache/net-nds/ypserv-2.23 b/metadata/cache/net-nds/ypserv-2.23
index 174b62499d12..774fa7694739 100644
--- a/metadata/cache/net-nds/ypserv-2.23
+++ b/metadata/cache/net-nds/ypserv-2.23
@@ -1,4 +1,4 @@
->=sys-libs/gdbm-1.8.0 slp? ( net-libs/openslp ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=sys-libs/gdbm-1.8.0 slp? ( net-libs/openslp ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=sys-libs/gdbm-1.8.0 slp? ( net-libs/openslp ) || ( net-nds/rpcbind net-nds/portmap )
 0
 mirror://kernel/linux/utils/net/NIS/ypserv-2.23.tar.bz2
diff --git a/metadata/cache/net-nds/ypserv-2.24 b/metadata/cache/net-nds/ypserv-2.24
index 4b94c1157538..84181671c071 100644
--- a/metadata/cache/net-nds/ypserv-2.24
+++ b/metadata/cache/net-nds/ypserv-2.24
@@ -1,4 +1,4 @@
->=sys-libs/gdbm-1.8.0 slp? ( net-libs/openslp ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=sys-libs/gdbm-1.8.0 slp? ( net-libs/openslp ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=sys-libs/gdbm-1.8.0 slp? ( net-libs/openslp ) || ( net-nds/rpcbind net-nds/portmap )
 0
 mirror://kernel/linux/utils/net/NIS/ypserv-2.24.tar.bz2
diff --git a/metadata/cache/net-nds/ypserv-2.25 b/metadata/cache/net-nds/ypserv-2.25
index d32c0a05b388..f91993d8079b 100644
--- a/metadata/cache/net-nds/ypserv-2.25
+++ b/metadata/cache/net-nds/ypserv-2.25
@@ -1,4 +1,4 @@
->=sys-libs/gdbm-1.8.0 slp? ( net-libs/openslp ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=sys-libs/gdbm-1.8.0 slp? ( net-libs/openslp ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=sys-libs/gdbm-1.8.0 slp? ( net-libs/openslp ) || ( net-nds/rpcbind net-nds/portmap )
 0
 mirror://kernel/linux/utils/net/NIS/ypserv-2.25.tar.bz2
diff --git a/metadata/cache/net-nds/ypserv-2.26 b/metadata/cache/net-nds/ypserv-2.26
index be100dbaedba..00f3da5bb827 100644
--- a/metadata/cache/net-nds/ypserv-2.26
+++ b/metadata/cache/net-nds/ypserv-2.26
@@ -1,4 +1,4 @@
->=sys-libs/gdbm-1.8.0 slp? ( net-libs/openslp ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=sys-libs/gdbm-1.8.0 slp? ( net-libs/openslp ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=sys-libs/gdbm-1.8.0 slp? ( net-libs/openslp ) || ( net-nds/rpcbind net-nds/portmap )
 0
 mirror://kernel/linux/utils/net/NIS/ypserv-2.26.tar.bz2
diff --git a/metadata/cache/net-news/liferea-1.6.5 b/metadata/cache/net-news/liferea-1.6.5
index cf2c8f630b30..60c11b1a78fe 100644
--- a/metadata/cache/net-news/liferea-1.6.5
+++ b/metadata/cache/net-news/liferea-1.6.5
@@ -1,4 +1,4 @@
->=x11-libs/gtk+-2.16.0:2 >=dev-libs/glib-2.16.0:2 >=x11-libs/pango-1.4.0 gnome-base/gconf:2 >=dev-libs/libxml2-2.6.27:2 >=dev-libs/libxslt-1.1.19 >=dev-db/sqlite-3.6.10:3 >=gnome-base/libglade-2:2.0 >=net-libs/libsoup-2.26.1:2.4 >=net-libs/webkit-gtk-1.1.15:2 libnotify? ( >=x11-libs/libnotify-0.4.5 ) lua? ( >=dev-lang/lua-5.1 ) dbus? ( >=dev-libs/dbus-glib-0.71 ) networkmanager? ( net-misc/networkmanager dev-libs/dbus-glib ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+>=x11-libs/gtk+-2.16.0:2 >=dev-libs/glib-2.16.0:2 >=x11-libs/pango-1.4.0 gnome-base/gconf:2 >=dev-libs/libxml2-2.6.27:2 >=dev-libs/libxslt-1.1.19 >=dev-db/sqlite-3.6.10:3 >=gnome-base/libglade-2:2.0 >=net-libs/libsoup-2.26.1:2.4 >=net-libs/webkit-gtk-1.1.15:2 libnotify? ( >=x11-libs/libnotify-0.4.5 ) lua? ( >=dev-lang/lua-5.1 ) dbus? ( >=dev-libs/dbus-glib-0.71 ) networkmanager? ( net-misc/networkmanager dev-libs/dbus-glib ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 >=x11-libs/gtk+-2.16.0:2 >=dev-libs/glib-2.16.0:2 >=x11-libs/pango-1.4.0 gnome-base/gconf:2 >=dev-libs/libxml2-2.6.27:2 >=dev-libs/libxslt-1.1.19 >=dev-db/sqlite-3.6.10:3 >=gnome-base/libglade-2:2.0 >=net-libs/libsoup-2.26.1:2.4 >=net-libs/webkit-gtk-1.1.15:2 libnotify? ( >=x11-libs/libnotify-0.4.5 ) lua? ( >=dev-lang/lua-5.1 ) dbus? ( >=dev-libs/dbus-glib-0.71 ) networkmanager? ( net-misc/networkmanager dev-libs/dbus-glib )
 0
 mirror://sourceforge/liferea/liferea-1.6.5.tar.gz
diff --git a/metadata/cache/net-news/liferea-1.6.6b b/metadata/cache/net-news/liferea-1.6.6b
index 4c209cd98115..4402b8b41450 100644
--- a/metadata/cache/net-news/liferea-1.6.6b
+++ b/metadata/cache/net-news/liferea-1.6.6b
@@ -1,4 +1,4 @@
->=x11-libs/gtk+-2.16.0:2 >=dev-libs/glib-2.16.0:2 >=x11-libs/pango-1.4.0 gnome-base/gconf:2 >=dev-libs/libxml2-2.6.27:2 >=dev-libs/libxslt-1.1.19 >=dev-db/sqlite-3.6.10:3 >=gnome-base/libglade-2:2.0 >=net-libs/libsoup-2.26.1:2.4 >=net-libs/webkit-gtk-1.1.15:2 libnotify? ( >=x11-libs/libnotify-0.4.5 ) lua? ( >=dev-lang/lua-5.1 ) dbus? ( >=dev-libs/dbus-glib-0.71 ) networkmanager? ( net-misc/networkmanager dev-libs/dbus-glib ) dev-util/pkgconfig dev-util/intltool || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+>=x11-libs/gtk+-2.16.0:2 >=dev-libs/glib-2.16.0:2 >=x11-libs/pango-1.4.0 gnome-base/gconf:2 >=dev-libs/libxml2-2.6.27:2 >=dev-libs/libxslt-1.1.19 >=dev-db/sqlite-3.6.10:3 >=gnome-base/libglade-2:2.0 >=net-libs/libsoup-2.26.1:2.4 >=net-libs/webkit-gtk-1.1.15:2 libnotify? ( >=x11-libs/libnotify-0.4.5 ) lua? ( >=dev-lang/lua-5.1 ) dbus? ( >=dev-libs/dbus-glib-0.71 ) networkmanager? ( net-misc/networkmanager dev-libs/dbus-glib ) dev-util/pkgconfig dev-util/intltool || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 >=x11-libs/gtk+-2.16.0:2 >=dev-libs/glib-2.16.0:2 >=x11-libs/pango-1.4.0 gnome-base/gconf:2 >=dev-libs/libxml2-2.6.27:2 >=dev-libs/libxslt-1.1.19 >=dev-db/sqlite-3.6.10:3 >=gnome-base/libglade-2:2.0 >=net-libs/libsoup-2.26.1:2.4 >=net-libs/webkit-gtk-1.1.15:2 libnotify? ( >=x11-libs/libnotify-0.4.5 ) lua? ( >=dev-lang/lua-5.1 ) dbus? ( >=dev-libs/dbus-glib-0.71 ) networkmanager? ( net-misc/networkmanager dev-libs/dbus-glib )
 0
 mirror://sourceforge/liferea/liferea-1.6.6b.tar.gz
diff --git a/metadata/cache/net-nntp/inn-2.5.2 b/metadata/cache/net-nntp/inn-2.5.2
index f27f3a45b6e9..cf31141bb53a 100644
--- a/metadata/cache/net-nntp/inn-2.5.2
+++ b/metadata/cache/net-nntp/inn-2.5.2
@@ -1,4 +1,4 @@
-virtual/mta dev-perl/MIME-tools kerberos? ( virtual/krb5 ) sasl? ( >=dev-libs/cyrus-sasl-2 ) ssl? ( dev-libs/openssl ) python? ( dev-lang/python ) berkdb? ( sys-libs/db ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 ssl? ( dev-libs/openssl )
+virtual/mta dev-perl/MIME-tools kerberos? ( virtual/krb5 ) sasl? ( >=dev-libs/cyrus-sasl-2 ) ssl? ( dev-libs/openssl ) python? ( dev-lang/python ) berkdb? ( sys-libs/db ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 ssl? ( dev-libs/openssl )
 virtual/mta dev-perl/MIME-tools kerberos? ( virtual/krb5 ) sasl? ( >=dev-libs/cyrus-sasl-2 ) ssl? ( dev-libs/openssl ) python? ( dev-lang/python ) berkdb? ( sys-libs/db )
 0
 ftp://ftp.isc.org/isc/inn/inn-2.5.2.tar.gz
diff --git a/metadata/cache/net-nntp/inn-2.5.2-r1 b/metadata/cache/net-nntp/inn-2.5.2-r1
index d27540ea7237..550f1b2b27e5 100644
--- a/metadata/cache/net-nntp/inn-2.5.2-r1
+++ b/metadata/cache/net-nntp/inn-2.5.2-r1
@@ -1,4 +1,4 @@
-virtual/mta dev-perl/MIME-tools kerberos? ( virtual/krb5 ) sasl? ( >=dev-libs/cyrus-sasl-2 ) ssl? ( dev-libs/openssl ) python? ( dev-lang/python ) berkdb? ( sys-libs/db ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool ssl? ( dev-libs/openssl )
+virtual/mta dev-perl/MIME-tools kerberos? ( virtual/krb5 ) sasl? ( >=dev-libs/cyrus-sasl-2 ) ssl? ( dev-libs/openssl ) python? ( dev-lang/python ) berkdb? ( sys-libs/db ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool ssl? ( dev-libs/openssl )
 virtual/mta dev-perl/MIME-tools kerberos? ( virtual/krb5 ) sasl? ( >=dev-libs/cyrus-sasl-2 ) ssl? ( dev-libs/openssl ) python? ( dev-lang/python ) berkdb? ( sys-libs/db )
 0
 ftp://ftp.isc.org/isc/inn/inn-2.5.2.tar.gz
diff --git a/metadata/cache/net-nntp/nzbget-0.7.0 b/metadata/cache/net-nntp/nzbget-0.7.0
index 080354c213ce..03cdb476330f 100644
--- a/metadata/cache/net-nntp/nzbget-0.7.0
+++ b/metadata/cache/net-nntp/nzbget-0.7.0
@@ -1,4 +1,4 @@
-dev-libs/libxml2 ssl? ( gnutls? ( net-libs/gnutls ) !gnutls? ( dev-libs/openssl ) ) ncurses? ( sys-libs/ncurses ) parcheck? ( app-arch/libpar2 dev-libs/libsigc++:2 ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-libs/libxml2 ssl? ( gnutls? ( net-libs/gnutls ) !gnutls? ( dev-libs/openssl ) ) ncurses? ( sys-libs/ncurses ) parcheck? ( app-arch/libpar2 dev-libs/libsigc++:2 ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-libs/libxml2 ssl? ( gnutls? ( net-libs/gnutls ) !gnutls? ( dev-libs/openssl ) ) ncurses? ( sys-libs/ncurses ) parcheck? ( app-arch/libpar2 dev-libs/libsigc++:2 )
 0
 mirror://sourceforge/nzbget/nzbget-0.7.0.tar.gz
diff --git a/metadata/cache/net-nntp/nzbget-0.8.0_pre394 b/metadata/cache/net-nntp/nzbget-0.8.0_pre394
index dd25991d1aa0..41eb593cb0d7 100644
--- a/metadata/cache/net-nntp/nzbget-0.8.0_pre394
+++ b/metadata/cache/net-nntp/nzbget-0.8.0_pre394
@@ -1,4 +1,4 @@
-dev-libs/libxml2 ssl? ( gnutls? ( net-libs/gnutls ) !gnutls? ( dev-libs/openssl ) ) ncurses? ( sys-libs/ncurses ) parcheck? ( app-arch/libpar2 dev-libs/libsigc++:2 ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-libs/libxml2 ssl? ( gnutls? ( net-libs/gnutls ) !gnutls? ( dev-libs/openssl ) ) ncurses? ( sys-libs/ncurses ) parcheck? ( app-arch/libpar2 dev-libs/libsigc++:2 ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-libs/libxml2 ssl? ( gnutls? ( net-libs/gnutls ) !gnutls? ( dev-libs/openssl ) ) ncurses? ( sys-libs/ncurses ) parcheck? ( app-arch/libpar2 dev-libs/libsigc++:2 )
 0
 mirror://sourceforge/nzbget/nzbget-0.8.0-testing-r394.tar.gz
diff --git a/metadata/cache/net-nntp/pan-9999 b/metadata/cache/net-nntp/pan-9999
index 490202a98ba2..32ab8fe53297 100644
--- a/metadata/cache/net-nntp/pan-9999
+++ b/metadata/cache/net-nntp/pan-9999
@@ -1,4 +1,4 @@
->=dev-libs/glib-2.14:2 >=x11-libs/gtk+-2.16:2 dev-libs/gmime:2.4 spell? ( >=app-text/gtkspell-2.0.7:2 ) >=dev-util/intltool-0.35.5 dev-util/pkgconfig sys-devel/gettext || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
+>=dev-libs/glib-2.14:2 >=x11-libs/gtk+-2.16:2 dev-libs/gmime:2.4 spell? ( >=app-text/gtkspell-2.0.7:2 ) >=dev-util/intltool-0.35.5 dev-util/pkgconfig sys-devel/gettext || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
 >=dev-libs/glib-2.14:2 >=x11-libs/gtk+-2.16:2 dev-libs/gmime:2.4 spell? ( >=app-text/gtkspell-2.0.7:2 )
 0
 
diff --git a/metadata/cache/net-p2p/bitstormlite-0.2p b/metadata/cache/net-p2p/bitstormlite-0.2p
index d5ccfe2166d5..577abe043fe4 100644
--- a/metadata/cache/net-p2p/bitstormlite-0.2p
+++ b/metadata/cache/net-p2p/bitstormlite-0.2p
@@ -1,4 +1,4 @@
-net-misc/curl >=x11-libs/gtk+-2.6:2 dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+net-misc/curl >=x11-libs/gtk+-2.6:2 dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 net-misc/curl >=x11-libs/gtk+-2.6:2
 0
 mirror://sourceforge/bbom/BitStormLite-0.2p.tar.gz
diff --git a/metadata/cache/net-p2p/dbhub-0.451 b/metadata/cache/net-p2p/dbhub-0.451
index 11841dee546a..1cfd31518dff 100644
--- a/metadata/cache/net-p2p/dbhub-0.451
+++ b/metadata/cache/net-p2p/dbhub-0.451
@@ -1,4 +1,4 @@
-perl? ( dev-lang/perl ) switch_user? ( sys-libs/libcap ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+perl? ( dev-lang/perl ) switch_user? ( sys-libs/libcap ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 perl? ( dev-lang/perl ) switch_user? ( sys-libs/libcap )
 0
 mirror://sourceforge/dbhub/dbhub-0.451.tbz2
diff --git a/metadata/cache/net-p2p/dbhub-0.451-r1 b/metadata/cache/net-p2p/dbhub-0.451-r1
index 11841dee546a..1cfd31518dff 100644
--- a/metadata/cache/net-p2p/dbhub-0.451-r1
+++ b/metadata/cache/net-p2p/dbhub-0.451-r1
@@ -1,4 +1,4 @@
-perl? ( dev-lang/perl ) switch_user? ( sys-libs/libcap ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+perl? ( dev-lang/perl ) switch_user? ( sys-libs/libcap ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 perl? ( dev-lang/perl ) switch_user? ( sys-libs/libcap )
 0
 mirror://sourceforge/dbhub/dbhub-0.451.tbz2
diff --git a/metadata/cache/net-p2p/dclib-0.3.23 b/metadata/cache/net-p2p/dclib-0.3.23
index 23cfa8c384b8..14f8c46a5c16 100644
--- a/metadata/cache/net-p2p/dclib-0.3.23
+++ b/metadata/cache/net-p2p/dclib-0.3.23
@@ -1,4 +1,4 @@
-app-arch/bzip2 sys-libs/zlib dev-libs/libxml2 socks5? ( net-proxy/dante ) ssl? ( dev-libs/openssl ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+app-arch/bzip2 sys-libs/zlib dev-libs/libxml2 socks5? ( net-proxy/dante ) ssl? ( dev-libs/openssl ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 app-arch/bzip2 sys-libs/zlib dev-libs/libxml2 socks5? ( net-proxy/dante ) ssl? ( dev-libs/openssl )
 0
 mirror://sourceforge/wxdcgui/dclib-0.3.23.tar.bz2
diff --git a/metadata/cache/net-p2p/giftui-0.4.1-r1 b/metadata/cache/net-p2p/giftui-0.4.1-r1
index 25f25ae7e2a1..9b02eec06d4d 100644
--- a/metadata/cache/net-p2p/giftui-0.4.1-r1
+++ b/metadata/cache/net-p2p/giftui-0.4.1-r1
@@ -1,4 +1,4 @@
->=x11-libs/gtk+-2.4.3:2 net-p2p/gift >=gnome-base/gconf-2.6.0:2 dev-util/pkgconfig >=sys-apps/sed-4 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=x11-libs/gtk+-2.4.3:2 net-p2p/gift >=gnome-base/gconf-2.6.0:2 dev-util/pkgconfig >=sys-apps/sed-4 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=x11-libs/gtk+-2.4.3:2 net-p2p/gift >=gnome-base/gconf-2.6.0:2
 0
 mirror://sourceforge/giftui/giftui-0.4.1.tar.bz2
diff --git a/metadata/cache/net-p2p/giftui-0.4.1-r2 b/metadata/cache/net-p2p/giftui-0.4.1-r2
index 1f2a23d609d0..288f9c9764fc 100644
--- a/metadata/cache/net-p2p/giftui-0.4.1-r2
+++ b/metadata/cache/net-p2p/giftui-0.4.1-r2
@@ -1,4 +1,4 @@
->=x11-libs/gtk+-2.4.3:2 net-p2p/gift >=gnome-base/gconf-2.6.0:2 dev-util/pkgconfig >=sys-apps/sed-4 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=x11-libs/gtk+-2.4.3:2 net-p2p/gift >=gnome-base/gconf-2.6.0:2 dev-util/pkgconfig >=sys-apps/sed-4 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=x11-libs/gtk+-2.4.3:2 net-p2p/gift >=gnome-base/gconf-2.6.0:2
 0
 mirror://sourceforge/giftui/giftui-0.4.1.tar.bz2
diff --git a/metadata/cache/net-p2p/gnunet-0.7.3-r1 b/metadata/cache/net-p2p/gnunet-0.7.3-r1
index 07dfc2d3cea2..b05e2bfdbf14 100644
--- a/metadata/cache/net-p2p/gnunet-0.7.3-r1
+++ b/metadata/cache/net-p2p/gnunet-0.7.3-r1
@@ -1,4 +1,4 @@
->=dev-libs/libgcrypt-1.2.0 >=media-libs/libextractor-0.5.18a >=dev-libs/gmp-4.0.0 gnome-base/libglade:2.0 sys-libs/zlib net-misc/curl gtk? ( >=x11-libs/gtk+-2.6.10:2 ) sys-apps/sed >=dev-scheme/guile-1.8.0 ncurses? ( sys-libs/ncurses ) mysql? ( >=virtual/mysql-4.0 ) sqlite? ( >=dev-db/sqlite-3.0.8:3 ) nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-libs/libgcrypt-1.2.0 >=media-libs/libextractor-0.5.18a >=dev-libs/gmp-4.0.0 gnome-base/libglade:2.0 sys-libs/zlib net-misc/curl gtk? ( >=x11-libs/gtk+-2.6.10:2 ) sys-apps/sed >=dev-scheme/guile-1.8.0 ncurses? ( sys-libs/ncurses ) mysql? ( >=virtual/mysql-4.0 ) sqlite? ( >=dev-db/sqlite-3.0.8:3 ) nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=dev-libs/libgcrypt-1.2.0 >=media-libs/libextractor-0.5.18a >=dev-libs/gmp-4.0.0 gnome-base/libglade:2.0 sys-libs/zlib net-misc/curl gtk? ( >=x11-libs/gtk+-2.6.10:2 ) sys-apps/sed >=dev-scheme/guile-1.8.0 ncurses? ( sys-libs/ncurses ) mysql? ( >=virtual/mysql-4.0 ) sqlite? ( >=dev-db/sqlite-3.0.8:3 ) nls? ( sys-devel/gettext )
 0
 http://gnunet.org/download/GNUnet-0.7.3.tar.bz2
diff --git a/metadata/cache/net-p2p/gnunet-0.8.1-r2 b/metadata/cache/net-p2p/gnunet-0.8.1-r2
index a2918022a14e..b1901f83dc3a 100644
--- a/metadata/cache/net-p2p/gnunet-0.8.1-r2
+++ b/metadata/cache/net-p2p/gnunet-0.8.1-r2
@@ -1,4 +1,4 @@
->=dev-libs/libgcrypt-1.2.0 >=media-libs/libextractor-0.5.18a >=dev-libs/gmp-4.0.0 net-misc/curl sys-libs/zlib sqlite? ( >=dev-db/sqlite-3.0.8:3 ) mysql? ( >=virtual/mysql-4.0 ) !sqlite? ( !mysql? ( >=dev-db/sqlite-3.0.8:3 ) ) setup? ( >=dev-scheme/guile-1.8.0 ncurses? ( >=dev-util/dialog-1.1.20080819-r1[-minimal] ) gtk? ( >=x11-libs/gtk+-2.6.10:2 gnome-base/libglade:2.0 ) qt4? ( x11-libs/qt-gui ) ) adns? ( net-libs/adns ) ares? ( net-dns/c-ares ) smtp? ( net-libs/libesmtp ) !ppc? ( !ppc64? ( !sparc? ( microhttpd? ( net-libs/libmicrohttpd ) ) ) ) nls? ( sys-devel/gettext ) sys-apps/sed dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-libs/libgcrypt-1.2.0 >=media-libs/libextractor-0.5.18a >=dev-libs/gmp-4.0.0 net-misc/curl sys-libs/zlib sqlite? ( >=dev-db/sqlite-3.0.8:3 ) mysql? ( >=virtual/mysql-4.0 ) !sqlite? ( !mysql? ( >=dev-db/sqlite-3.0.8:3 ) ) setup? ( >=dev-scheme/guile-1.8.0 ncurses? ( >=dev-util/dialog-1.1.20080819-r1[-minimal] ) gtk? ( >=x11-libs/gtk+-2.6.10:2 gnome-base/libglade:2.0 ) qt4? ( x11-libs/qt-gui ) ) adns? ( net-libs/adns ) ares? ( net-dns/c-ares ) smtp? ( net-libs/libesmtp ) !ppc? ( !ppc64? ( !sparc? ( microhttpd? ( net-libs/libmicrohttpd ) ) ) ) nls? ( sys-devel/gettext ) sys-apps/sed dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=dev-libs/libgcrypt-1.2.0 >=media-libs/libextractor-0.5.18a >=dev-libs/gmp-4.0.0 net-misc/curl sys-libs/zlib sqlite? ( >=dev-db/sqlite-3.0.8:3 ) mysql? ( >=virtual/mysql-4.0 ) !sqlite? ( !mysql? ( >=dev-db/sqlite-3.0.8:3 ) ) setup? ( >=dev-scheme/guile-1.8.0 ncurses? ( >=dev-util/dialog-1.1.20080819-r1[-minimal] ) gtk? ( >=x11-libs/gtk+-2.6.10:2 gnome-base/libglade:2.0 ) qt4? ( x11-libs/qt-gui ) ) adns? ( net-libs/adns ) ares? ( net-dns/c-ares ) smtp? ( net-libs/libesmtp ) !ppc? ( !ppc64? ( !sparc? ( microhttpd? ( net-libs/libmicrohttpd ) ) ) ) nls? ( sys-devel/gettext )
 0
 http://gnunet.org/download/GNUnet-0.8.1.tar.gz
diff --git a/metadata/cache/net-p2p/mldonkey-3.0.5 b/metadata/cache/net-p2p/mldonkey-3.0.5
index 4a01198c7cac..9b0646337712 100644
--- a/metadata/cache/net-p2p/mldonkey-3.0.5
+++ b/metadata/cache/net-p2p/mldonkey-3.0.5
@@ -1,4 +1,4 @@
-dev-lang/perl guionly? ( >=gnome-base/librsvg-2.4.0 >=dev-ml/lablgtk-2.6 ) gtk? ( >=gnome-base/librsvg-2.4.0 >=dev-ml/lablgtk-2.6[svg] ) gd? ( >=media-libs/gd-2.0.28[truetype] ) magic? ( sys-apps/file ) >=dev-lang/ocaml-3.10.2[ocamlopt?] || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-lang/perl guionly? ( >=gnome-base/librsvg-2.4.0 >=dev-ml/lablgtk-2.6 ) gtk? ( >=gnome-base/librsvg-2.4.0 >=dev-ml/lablgtk-2.6[svg] ) gd? ( >=media-libs/gd-2.0.28[truetype] ) magic? ( sys-apps/file ) >=dev-lang/ocaml-3.10.2[ocamlopt?] || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-lang/perl guionly? ( >=gnome-base/librsvg-2.4.0 >=dev-ml/lablgtk-2.6 ) gtk? ( >=gnome-base/librsvg-2.4.0 >=dev-ml/lablgtk-2.6[svg] ) gd? ( >=media-libs/gd-2.0.28[truetype] ) magic? ( sys-apps/file )
 0
 mirror://sourceforge/mldonkey/mldonkey-3.0.5.tar.bz2
diff --git a/metadata/cache/net-p2p/mldonkey-3.0.7 b/metadata/cache/net-p2p/mldonkey-3.0.7
index 93afa24519e8..a25cb715dff8 100644
--- a/metadata/cache/net-p2p/mldonkey-3.0.7
+++ b/metadata/cache/net-p2p/mldonkey-3.0.7
@@ -1,4 +1,4 @@
-dev-lang/perl guionly? ( >=gnome-base/librsvg-2.4.0 >=dev-ml/lablgtk-2.6 ) gtk? ( >=gnome-base/librsvg-2.4.0 >=dev-ml/lablgtk-2.6[svg] ) gd? ( >=media-libs/gd-2.0.28[truetype] ) magic? ( sys-apps/file ) >=dev-lang/ocaml-3.10.2[ocamlopt?] || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-lang/perl guionly? ( >=gnome-base/librsvg-2.4.0 >=dev-ml/lablgtk-2.6 ) gtk? ( >=gnome-base/librsvg-2.4.0 >=dev-ml/lablgtk-2.6[svg] ) gd? ( >=media-libs/gd-2.0.28[truetype] ) magic? ( sys-apps/file ) >=dev-lang/ocaml-3.10.2[ocamlopt?] || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-lang/perl guionly? ( >=gnome-base/librsvg-2.4.0 >=dev-ml/lablgtk-2.6 ) gtk? ( >=gnome-base/librsvg-2.4.0 >=dev-ml/lablgtk-2.6[svg] ) gd? ( >=media-libs/gd-2.0.28[truetype] ) magic? ( sys-apps/file )
 0
 mirror://sourceforge/mldonkey/mldonkey-3.0.7.tar.bz2
diff --git a/metadata/cache/net-p2p/mldonkey-3.1.0 b/metadata/cache/net-p2p/mldonkey-3.1.0
index 05d0ca787e38..0be0ecb2c3c0 100644
--- a/metadata/cache/net-p2p/mldonkey-3.1.0
+++ b/metadata/cache/net-p2p/mldonkey-3.1.0
@@ -1,4 +1,4 @@
-dev-lang/perl guionly? ( >=gnome-base/librsvg-2.4.0 >=dev-ml/lablgtk-2.6 ) gtk? ( >=gnome-base/librsvg-2.4.0 >=dev-ml/lablgtk-2.6[svg] ) gd? ( >=media-libs/gd-2.0.28[truetype] ) magic? ( sys-apps/file ) >=dev-lang/ocaml-3.10.2[ocamlopt?] || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-lang/perl guionly? ( >=gnome-base/librsvg-2.4.0 >=dev-ml/lablgtk-2.6 ) gtk? ( >=gnome-base/librsvg-2.4.0 >=dev-ml/lablgtk-2.6[svg] ) gd? ( >=media-libs/gd-2.0.28[truetype] ) magic? ( sys-apps/file ) >=dev-lang/ocaml-3.10.2[ocamlopt?] || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-lang/perl guionly? ( >=gnome-base/librsvg-2.4.0 >=dev-ml/lablgtk-2.6 ) gtk? ( >=gnome-base/librsvg-2.4.0 >=dev-ml/lablgtk-2.6[svg] ) gd? ( >=media-libs/gd-2.0.28[truetype] ) magic? ( sys-apps/file )
 0
 mirror://sourceforge/mldonkey/mldonkey-3.1.0.tar.bz2
diff --git a/metadata/cache/net-p2p/ncdc-9999 b/metadata/cache/net-p2p/ncdc-9999
index 9712d8497f19..c02bb3c9ba02 100644
--- a/metadata/cache/net-p2p/ncdc-9999
+++ b/metadata/cache/net-p2p/ncdc-9999
@@ -1,4 +1,4 @@
-app-arch/bzip2 dev-db/sqlite:3 dev-lang/perl dev-libs/glib:2 dev-libs/libxml2:2 net-libs/glib-networking sys-libs/gdbm sys-libs/ncurses:5 dev-util/pkgconfig dev-util/makeheaders || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
+app-arch/bzip2 dev-db/sqlite:3 dev-lang/perl dev-libs/glib:2 dev-libs/libxml2:2 net-libs/glib-networking sys-libs/gdbm sys-libs/ncurses:5 dev-util/pkgconfig dev-util/makeheaders || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
 app-arch/bzip2 dev-db/sqlite:3 dev-lang/perl dev-libs/glib:2 dev-libs/libxml2:2 net-libs/glib-networking sys-libs/gdbm sys-libs/ncurses:5
 0
 
diff --git a/metadata/cache/net-p2p/opendchub-0.8.2 b/metadata/cache/net-p2p/opendchub-0.8.2
index 21dc579653d3..89c1ea4c051c 100644
--- a/metadata/cache/net-p2p/opendchub-0.8.2
+++ b/metadata/cache/net-p2p/opendchub-0.8.2
@@ -1,4 +1,4 @@
-perl? ( dev-lang/perl ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+perl? ( dev-lang/perl ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 perl? ( dev-lang/perl )
 0
 mirror://sourceforge/opendchub/opendchub-0.8.2.tar.gz
diff --git a/metadata/cache/net-p2p/syrep-0.9 b/metadata/cache/net-p2p/syrep-0.9
index 4c04cd80b024..e22e52bef850 100644
--- a/metadata/cache/net-p2p/syrep-0.9
+++ b/metadata/cache/net-p2p/syrep-0.9
@@ -1,4 +1,4 @@
-sys-libs/zlib >=sys-libs/db-4.3 doc? ( www-client/lynx ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+sys-libs/zlib >=sys-libs/db-4.3 doc? ( www-client/lynx ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 sys-libs/zlib >=sys-libs/db-4.3 doc? ( www-client/lynx )
 0
 http://0pointer.de/lennart/projects/syrep/syrep-0.9.tar.gz
diff --git a/metadata/cache/net-p2p/transmission-2.50-r1 b/metadata/cache/net-p2p/transmission-2.50-r1
index e644b260090c..94c7a9cf79eb 100644
--- a/metadata/cache/net-p2p/transmission-2.50-r1
+++ b/metadata/cache/net-p2p/transmission-2.50-r1
@@ -1,4 +1,4 @@
->=dev-libs/libevent-2.0.10 dev-libs/openssl:0 net-libs/libnatpmp >=net-libs/miniupnpc-1.6 >=net-misc/curl-7.16.3[ssl] sys-libs/zlib gtk? ( >=dev-libs/dbus-glib-0.98 >=dev-libs/glib-2.28 >=x11-libs/gtk+-3.2:3 ayatana? ( dev-libs/libappindicator:3 ) ) qt4? ( x11-libs/qt-core:4 x11-libs/qt-gui:4[dbus] ) dev-util/intltool dev-util/pkgconfig sys-devel/gettext virtual/os-headers xfs? ( sys-fs/xfsprogs ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+>=dev-libs/libevent-2.0.10 dev-libs/openssl:0 net-libs/libnatpmp >=net-libs/miniupnpc-1.6 >=net-misc/curl-7.16.3[ssl] sys-libs/zlib gtk? ( >=dev-libs/dbus-glib-0.98 >=dev-libs/glib-2.28 >=x11-libs/gtk+-3.2:3 ayatana? ( dev-libs/libappindicator:3 ) ) qt4? ( x11-libs/qt-core:4 x11-libs/qt-gui:4[dbus] ) dev-util/intltool dev-util/pkgconfig sys-devel/gettext virtual/os-headers xfs? ( sys-fs/xfsprogs ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 >=dev-libs/libevent-2.0.10 dev-libs/openssl:0 net-libs/libnatpmp >=net-libs/miniupnpc-1.6 >=net-misc/curl-7.16.3[ssl] sys-libs/zlib gtk? ( >=dev-libs/dbus-glib-0.98 >=dev-libs/glib-2.28 >=x11-libs/gtk+-3.2:3 ayatana? ( dev-libs/libappindicator:3 ) ) qt4? ( x11-libs/qt-core:4 x11-libs/qt-gui:4[dbus] )
 0
 http://download.transmissionbt.com/transmission/files/transmission-2.50.tar.xz
diff --git a/metadata/cache/net-p2p/transmission-9999 b/metadata/cache/net-p2p/transmission-9999
index fee20768be00..ffb4707e10cc 100644
--- a/metadata/cache/net-p2p/transmission-9999
+++ b/metadata/cache/net-p2p/transmission-9999
@@ -1,4 +1,4 @@
->=dev-libs/libevent-2.0.10 dev-libs/openssl:0 net-libs/libnatpmp >=net-libs/miniupnpc-1.6 >=net-misc/curl-7.16.3[ssl] sys-libs/zlib gtk? ( >=dev-libs/dbus-glib-0.98 >=dev-libs/glib-2.28 >=x11-libs/gtk+-3.2:3 ayatana? ( dev-libs/libappindicator:3 ) ) qt4? ( x11-libs/qt-core:4 x11-libs/qt-gui:4[dbus] ) dev-util/intltool dev-util/pkgconfig sys-devel/gettext virtual/os-headers xfs? ( sys-fs/xfsprogs ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 dev-vcs/subversion net-misc/rsync
+>=dev-libs/libevent-2.0.10 dev-libs/openssl:0 net-libs/libnatpmp >=net-libs/miniupnpc-1.6 >=net-misc/curl-7.16.3[ssl] sys-libs/zlib gtk? ( >=dev-libs/dbus-glib-0.98 >=dev-libs/glib-2.28 >=x11-libs/gtk+-3.2:3 ayatana? ( dev-libs/libappindicator:3 ) ) qt4? ( x11-libs/qt-core:4 x11-libs/qt-gui:4[dbus] ) dev-util/intltool dev-util/pkgconfig sys-devel/gettext virtual/os-headers xfs? ( sys-fs/xfsprogs ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 dev-vcs/subversion net-misc/rsync
 >=dev-libs/libevent-2.0.10 dev-libs/openssl:0 net-libs/libnatpmp >=net-libs/miniupnpc-1.6 >=net-misc/curl-7.16.3[ssl] sys-libs/zlib gtk? ( >=dev-libs/dbus-glib-0.98 >=dev-libs/glib-2.28 >=x11-libs/gtk+-3.2:3 ayatana? ( dev-libs/libappindicator:3 ) ) qt4? ( x11-libs/qt-core:4 x11-libs/qt-gui:4[dbus] )
 0
 
diff --git a/metadata/cache/net-print/cups-1.4.8-r1 b/metadata/cache/net-print/cups-1.4.8-r1
index 385fe1f83b1d..b1e485c7f7b9 100644
--- a/metadata/cache/net-print/cups-1.4.8-r1
+++ b/metadata/cache/net-print/cups-1.4.8-r1
@@ -1,4 +1,4 @@
-app-text/libpaper acl? ( kernel_linux? ( sys-apps/acl sys-apps/attr ) ) dbus? ( sys-apps/dbus ) java? ( >=virtual/jre-1.6 ) jpeg? ( virtual/jpeg:0 ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap[ssl?,gnutls?] ) pam? ( virtual/pam ) perl? ( dev-lang/perl ) php? ( dev-lang/php ) png? ( >=media-libs/libpng-1.4.3:0 ) slp? ( >=net-libs/openslp-1.0.4 ) ssl? ( gnutls? ( dev-libs/libgcrypt net-libs/gnutls ) !gnutls? ( >=dev-libs/openssl-0.9.8g ) ) tiff? ( >=media-libs/tiff-3.5.5:0 ) X? ( x11-misc/xdg-utils ) xinetd? ( sys-apps/xinetd ) !net-print/cupsddk dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-lang/perl[-build] python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) ) java? ( >=dev-java/java-config-2.1.9-r1 )
+app-text/libpaper acl? ( kernel_linux? ( sys-apps/acl sys-apps/attr ) ) dbus? ( sys-apps/dbus ) java? ( >=virtual/jre-1.6 ) jpeg? ( virtual/jpeg:0 ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap[ssl?,gnutls?] ) pam? ( virtual/pam ) perl? ( dev-lang/perl ) php? ( dev-lang/php ) png? ( >=media-libs/libpng-1.4.3:0 ) slp? ( >=net-libs/openslp-1.0.4 ) ssl? ( gnutls? ( dev-libs/libgcrypt net-libs/gnutls ) !gnutls? ( >=dev-libs/openssl-0.9.8g ) ) tiff? ( >=media-libs/tiff-3.5.5:0 ) X? ( x11-misc/xdg-utils ) xinetd? ( sys-apps/xinetd ) !net-print/cupsddk dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-lang/perl[-build] python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) ) java? ( >=dev-java/java-config-2.1.9-r1 )
 app-text/libpaper acl? ( kernel_linux? ( sys-apps/acl sys-apps/attr ) ) dbus? ( sys-apps/dbus ) java? ( >=virtual/jre-1.6 ) jpeg? ( virtual/jpeg:0 ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap[ssl?,gnutls?] ) pam? ( virtual/pam ) perl? ( dev-lang/perl ) php? ( dev-lang/php ) png? ( >=media-libs/libpng-1.4.3:0 ) slp? ( >=net-libs/openslp-1.0.4 ) ssl? ( gnutls? ( dev-libs/libgcrypt net-libs/gnutls ) !gnutls? ( >=dev-libs/openssl-0.9.8g ) ) tiff? ( >=media-libs/tiff-3.5.5:0 ) X? ( x11-misc/xdg-utils ) xinetd? ( sys-apps/xinetd ) !net-print/cupsddk dev-lang/perl[-build] python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) ) java? ( >=dev-java/java-config-2.1.9-r1 )
 0
 mirror://easysw/cups/1.4.8/cups-1.4.8-source.tar.bz2
diff --git a/metadata/cache/net-print/cups-1.4.8-r23 b/metadata/cache/net-print/cups-1.4.8-r23
index 97c930736b18..d17887130422 100644
--- a/metadata/cache/net-print/cups-1.4.8-r23
+++ b/metadata/cache/net-print/cups-1.4.8-r23
@@ -1,4 +1,4 @@
-app-text/libpaper acl? ( kernel_linux? ( sys-apps/acl sys-apps/attr ) ) dbus? ( sys-apps/dbus ) java? ( >=virtual/jre-1.6 ) jpeg? ( virtual/jpeg:0 ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap[ssl?,gnutls?] ) pam? ( virtual/pam ) perl? ( dev-lang/perl ) php? ( dev-lang/php ) png? ( >=media-libs/libpng-1.4.3:0 ) slp? ( >=net-libs/openslp-1.0.4 ) ssl? ( gnutls? ( dev-libs/libgcrypt net-libs/gnutls ) !gnutls? ( >=dev-libs/openssl-0.9.8g ) ) tiff? ( >=media-libs/tiff-3.5.5:0 ) usb? ( virtual/libusb:0 ) X? ( x11-misc/xdg-utils ) xinetd? ( sys-apps/xinetd ) !net-print/cupsddk dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 dev-lang/perl[-build] python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) ) java? ( >=dev-java/java-config-2.1.9-r1 )
+app-text/libpaper acl? ( kernel_linux? ( sys-apps/acl sys-apps/attr ) ) dbus? ( sys-apps/dbus ) java? ( >=virtual/jre-1.6 ) jpeg? ( virtual/jpeg:0 ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap[ssl?,gnutls?] ) pam? ( virtual/pam ) perl? ( dev-lang/perl ) php? ( dev-lang/php ) png? ( >=media-libs/libpng-1.4.3:0 ) slp? ( >=net-libs/openslp-1.0.4 ) ssl? ( gnutls? ( dev-libs/libgcrypt net-libs/gnutls ) !gnutls? ( >=dev-libs/openssl-0.9.8g ) ) tiff? ( >=media-libs/tiff-3.5.5:0 ) usb? ( virtual/libusb:0 ) X? ( x11-misc/xdg-utils ) xinetd? ( sys-apps/xinetd ) !net-print/cupsddk dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 dev-lang/perl[-build] python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) ) java? ( >=dev-java/java-config-2.1.9-r1 )
 app-text/libpaper acl? ( kernel_linux? ( sys-apps/acl sys-apps/attr ) ) dbus? ( sys-apps/dbus ) java? ( >=virtual/jre-1.6 ) jpeg? ( virtual/jpeg:0 ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap[ssl?,gnutls?] ) pam? ( virtual/pam ) perl? ( dev-lang/perl ) php? ( dev-lang/php ) png? ( >=media-libs/libpng-1.4.3:0 ) slp? ( >=net-libs/openslp-1.0.4 ) ssl? ( gnutls? ( dev-libs/libgcrypt net-libs/gnutls ) !gnutls? ( >=dev-libs/openssl-0.9.8g ) ) tiff? ( >=media-libs/tiff-3.5.5:0 ) usb? ( virtual/libusb:0 ) X? ( x11-misc/xdg-utils ) xinetd? ( sys-apps/xinetd ) !net-print/cupsddk dev-lang/perl[-build] python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) ) java? ( >=dev-java/java-config-2.1.9-r1 )
 0
 mirror://easysw/cups/1.4.8/cups-1.4.8-source.tar.bz2
diff --git a/metadata/cache/net-print/cups-1.5.0-r4 b/metadata/cache/net-print/cups-1.5.0-r4
index dd97ac892825..6f2e014a56f9 100644
--- a/metadata/cache/net-print/cups-1.5.0-r4
+++ b/metadata/cache/net-print/cups-1.5.0-r4
@@ -1,4 +1,4 @@
-app-text/libpaper acl? ( kernel_linux? ( sys-apps/acl sys-apps/attr ) ) dbus? ( sys-apps/dbus ) java? ( >=virtual/jre-1.6 ) jpeg? ( virtual/jpeg:0 ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap[ssl?,gnutls?] ) pam? ( virtual/pam ) perl? ( dev-lang/perl ) php? ( dev-lang/php ) png? ( >=media-libs/libpng-1.4.3:0 ) slp? ( >=net-libs/openslp-1.0.4 ) ssl? ( gnutls? ( dev-libs/libgcrypt net-libs/gnutls ) !gnutls? ( >=dev-libs/openssl-0.9.8g ) ) tiff? ( >=media-libs/tiff-3.5.5:0 ) usb? ( virtual/libusb:0 ) X? ( x11-misc/xdg-utils ) xinetd? ( sys-apps/xinetd ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 dev-lang/perl[-build] python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) ) java? ( >=dev-java/java-config-2.1.9-r1 )
+app-text/libpaper acl? ( kernel_linux? ( sys-apps/acl sys-apps/attr ) ) dbus? ( sys-apps/dbus ) java? ( >=virtual/jre-1.6 ) jpeg? ( virtual/jpeg:0 ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap[ssl?,gnutls?] ) pam? ( virtual/pam ) perl? ( dev-lang/perl ) php? ( dev-lang/php ) png? ( >=media-libs/libpng-1.4.3:0 ) slp? ( >=net-libs/openslp-1.0.4 ) ssl? ( gnutls? ( dev-libs/libgcrypt net-libs/gnutls ) !gnutls? ( >=dev-libs/openssl-0.9.8g ) ) tiff? ( >=media-libs/tiff-3.5.5:0 ) usb? ( virtual/libusb:0 ) X? ( x11-misc/xdg-utils ) xinetd? ( sys-apps/xinetd ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 dev-lang/perl[-build] python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) ) java? ( >=dev-java/java-config-2.1.9-r1 )
 app-text/libpaper acl? ( kernel_linux? ( sys-apps/acl sys-apps/attr ) ) dbus? ( sys-apps/dbus ) java? ( >=virtual/jre-1.6 ) jpeg? ( virtual/jpeg:0 ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap[ssl?,gnutls?] ) pam? ( virtual/pam ) perl? ( dev-lang/perl ) php? ( dev-lang/php ) png? ( >=media-libs/libpng-1.4.3:0 ) slp? ( >=net-libs/openslp-1.0.4 ) ssl? ( gnutls? ( dev-libs/libgcrypt net-libs/gnutls ) !gnutls? ( >=dev-libs/openssl-0.9.8g ) ) tiff? ( >=media-libs/tiff-3.5.5:0 ) usb? ( virtual/libusb:0 ) X? ( x11-misc/xdg-utils ) xinetd? ( sys-apps/xinetd ) dev-lang/perl[-build] python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) ) java? ( >=dev-java/java-config-2.1.9-r1 )
 0
 mirror://easysw/cups/1.5.0/cups-1.5.0-source.tar.bz2
diff --git a/metadata/cache/net-print/cups-1.5.2-r1 b/metadata/cache/net-print/cups-1.5.2-r1
index d0f6062a2178..a3d9e75c50a9 100644
--- a/metadata/cache/net-print/cups-1.5.2-r1
+++ b/metadata/cache/net-print/cups-1.5.2-r1
@@ -1,4 +1,4 @@
-app-text/libpaper acl? ( kernel_linux? ( sys-apps/acl sys-apps/attr ) ) dbus? ( sys-apps/dbus ) java? ( >=virtual/jre-1.6 ) jpeg? ( virtual/jpeg:0 ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap[ssl?,gnutls?] ) pam? ( virtual/pam ) perl? ( dev-lang/perl ) png? ( >=media-libs/libpng-1.4.3:0 ) slp? ( >=net-libs/openslp-1.0.4 ) ssl? ( gnutls? ( dev-libs/libgcrypt net-libs/gnutls ) !gnutls? ( >=dev-libs/openssl-0.9.8g ) ) tiff? ( >=media-libs/tiff-3.5.5:0 ) usb? ( virtual/libusb:0 ) X? ( x11-misc/xdg-utils ) xinetd? ( sys-apps/xinetd ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 dev-lang/perl[-build] python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) ) java? ( >=dev-java/java-config-2.1.9-r1 )
+app-text/libpaper acl? ( kernel_linux? ( sys-apps/acl sys-apps/attr ) ) dbus? ( sys-apps/dbus ) java? ( >=virtual/jre-1.6 ) jpeg? ( virtual/jpeg:0 ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap[ssl?,gnutls?] ) pam? ( virtual/pam ) perl? ( dev-lang/perl ) png? ( >=media-libs/libpng-1.4.3:0 ) slp? ( >=net-libs/openslp-1.0.4 ) ssl? ( gnutls? ( dev-libs/libgcrypt net-libs/gnutls ) !gnutls? ( >=dev-libs/openssl-0.9.8g ) ) tiff? ( >=media-libs/tiff-3.5.5:0 ) usb? ( virtual/libusb:0 ) X? ( x11-misc/xdg-utils ) xinetd? ( sys-apps/xinetd ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 dev-lang/perl[-build] python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) ) java? ( >=dev-java/java-config-2.1.9-r1 )
 app-text/libpaper acl? ( kernel_linux? ( sys-apps/acl sys-apps/attr ) ) dbus? ( sys-apps/dbus ) java? ( >=virtual/jre-1.6 ) jpeg? ( virtual/jpeg:0 ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap[ssl?,gnutls?] ) pam? ( virtual/pam ) perl? ( dev-lang/perl ) png? ( >=media-libs/libpng-1.4.3:0 ) slp? ( >=net-libs/openslp-1.0.4 ) ssl? ( gnutls? ( dev-libs/libgcrypt net-libs/gnutls ) !gnutls? ( >=dev-libs/openssl-0.9.8g ) ) tiff? ( >=media-libs/tiff-3.5.5:0 ) usb? ( virtual/libusb:0 ) X? ( x11-misc/xdg-utils ) xinetd? ( sys-apps/xinetd ) dev-lang/perl[-build] python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) ) java? ( >=dev-java/java-config-2.1.9-r1 )
 0
 mirror://easysw/cups/1.5.2/cups-1.5.2-source.tar.bz2 http://dev.gentoo.org/~dilfridge/distfiles/cups-1.5.2-ipp-r8950.patch.bz2
diff --git a/metadata/cache/net-print/foomatic-filters-4.0.12 b/metadata/cache/net-print/foomatic-filters-4.0.12
index c147fae293ba..085d3c044f3e 100644
--- a/metadata/cache/net-print/foomatic-filters-4.0.12
+++ b/metadata/cache/net-print/foomatic-filters-4.0.12
@@ -1,4 +1,4 @@
-dev-lang/perl app-text/ghostscript-gpl cups? ( >=net-print/cups-1.1.19 ) !cups? ( || ( app-text/enscript app-text/a2ps app-text/mpage ) ) dbus? ( sys-apps/dbus ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-lang/perl app-text/ghostscript-gpl cups? ( >=net-print/cups-1.1.19 ) !cups? ( || ( app-text/enscript app-text/a2ps app-text/mpage ) ) dbus? ( sys-apps/dbus ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-lang/perl app-text/ghostscript-gpl cups? ( >=net-print/cups-1.1.19 ) !cups? ( || ( app-text/enscript app-text/a2ps app-text/mpage ) ) dbus? ( sys-apps/dbus )
 0
 http://www.openprinting.org/download/foomatic/foomatic-filters-4.0.12.tar.gz
diff --git a/metadata/cache/net-print/foomatic-filters-4.0.9 b/metadata/cache/net-print/foomatic-filters-4.0.9
index 66c2344d4d7a..c5af7245840c 100644
--- a/metadata/cache/net-print/foomatic-filters-4.0.9
+++ b/metadata/cache/net-print/foomatic-filters-4.0.9
@@ -1,4 +1,4 @@
-dev-lang/perl app-text/ghostscript-gpl cups? ( >=net-print/cups-1.1.19 ) !cups? ( || ( app-text/enscript app-text/a2ps app-text/mpage ) ) dbus? ( sys-apps/dbus ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-lang/perl app-text/ghostscript-gpl cups? ( >=net-print/cups-1.1.19 ) !cups? ( || ( app-text/enscript app-text/a2ps app-text/mpage ) ) dbus? ( sys-apps/dbus ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-lang/perl app-text/ghostscript-gpl cups? ( >=net-print/cups-1.1.19 ) !cups? ( || ( app-text/enscript app-text/a2ps app-text/mpage ) ) dbus? ( sys-apps/dbus )
 0
 http://www.openprinting.org/download/foomatic/foomatic-filters-4.0.9.tar.gz
diff --git a/metadata/cache/net-print/gtklp-1.2.8 b/metadata/cache/net-print/gtklp-1.2.8
index 8067ceb48339..4660984f5f37 100644
--- a/metadata/cache/net-print/gtklp-1.2.8
+++ b/metadata/cache/net-print/gtklp-1.2.8
@@ -1,4 +1,4 @@
-x11-libs/gtk+:2 >=net-print/cups-1.1.12 nls? ( sys-devel/gettext ) ssl? ( dev-libs/openssl ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+x11-libs/gtk+:2 >=net-print/cups-1.1.12 nls? ( sys-devel/gettext ) ssl? ( dev-libs/openssl ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 x11-libs/gtk+:2 >=net-print/cups-1.1.12 nls? ( sys-devel/gettext ) ssl? ( dev-libs/openssl )
 0
 mirror://sourceforge/gtklp/gtklp-1.2.8.src.tar.gz mirror://sourceforge/gtklp/logo.xpm.gz -> gtklp-logo.xpm.gz
diff --git a/metadata/cache/net-print/gutenprint-5.2.6 b/metadata/cache/net-print/gutenprint-5.2.6
index 58b489d17625..cb3790f9ba74 100644
--- a/metadata/cache/net-print/gutenprint-5.2.6
+++ b/metadata/cache/net-print/gutenprint-5.2.6
@@ -1,4 +1,4 @@
-cups? ( >=net-print/cups-1.1.14 ) app-text/ghostscript-gpl sys-libs/readline gtk? ( x11-libs/gtk+:2 ) gimp? ( >=media-gfx/gimp-2.2 x11-libs/gtk+:2 ) dev-lang/perl foomaticdb? ( net-print/foomatic-db-engine ) gtk? ( dev-util/pkgconfig ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+cups? ( >=net-print/cups-1.1.14 ) app-text/ghostscript-gpl sys-libs/readline gtk? ( x11-libs/gtk+:2 ) gimp? ( >=media-gfx/gimp-2.2 x11-libs/gtk+:2 ) dev-lang/perl foomaticdb? ( net-print/foomatic-db-engine ) gtk? ( dev-util/pkgconfig ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 cups? ( >=net-print/cups-1.1.14 ) app-text/ghostscript-gpl sys-libs/readline gtk? ( x11-libs/gtk+:2 ) gimp? ( >=media-gfx/gimp-2.2 x11-libs/gtk+:2 ) dev-lang/perl foomaticdb? ( net-print/foomatic-db-engine )
 0
 mirror://sourceforge/gimp-print/gutenprint-5.2.6.tar.bz2
diff --git a/metadata/cache/net-print/gutenprint-5.2.7-r1 b/metadata/cache/net-print/gutenprint-5.2.7-r1
index 0da72a9dda28..9e5abd0dfb91 100644
--- a/metadata/cache/net-print/gutenprint-5.2.7-r1
+++ b/metadata/cache/net-print/gutenprint-5.2.7-r1
@@ -1,4 +1,4 @@
-app-text/ghostscript-gpl dev-lang/perl sys-libs/readline cups? ( >=net-print/cups-1.1.14 ) foomaticdb? ( net-print/foomatic-db-engine ) gimp? ( >=media-gfx/gimp-2.2 x11-libs/gtk+:2 ) gtk? ( x11-libs/gtk+:2 ) nls? ( virtual/libintl ) gtk? ( dev-util/pkgconfig ) nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+app-text/ghostscript-gpl dev-lang/perl sys-libs/readline cups? ( >=net-print/cups-1.1.14 ) foomaticdb? ( net-print/foomatic-db-engine ) gimp? ( >=media-gfx/gimp-2.2 x11-libs/gtk+:2 ) gtk? ( x11-libs/gtk+:2 ) nls? ( virtual/libintl ) gtk? ( dev-util/pkgconfig ) nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 app-text/ghostscript-gpl dev-lang/perl sys-libs/readline cups? ( >=net-print/cups-1.1.14 ) foomaticdb? ( net-print/foomatic-db-engine ) gimp? ( >=media-gfx/gimp-2.2 x11-libs/gtk+:2 ) gtk? ( x11-libs/gtk+:2 ) nls? ( virtual/libintl )
 0
 mirror://sourceforge/gimp-print/gutenprint-5.2.7.tar.bz2
diff --git a/metadata/cache/net-print/hplip-3.11.10 b/metadata/cache/net-print/hplip-3.11.10
index 544e73a9e2d0..18c7c1faf288 100644
--- a/metadata/cache/net-print/hplip-3.11.10
+++ b/metadata/cache/net-print/hplip-3.11.10
@@ -1,4 +1,4 @@
-virtual/jpeg hpijs? ( >=net-print/foomatic-filters-3.0.20080507[cups] ) acl? ( || ( >=sys-auth/consolekit-0.4.5-r3[acl] >=sys-fs/udev-171-r5[acl] <sys-fs/udev-171-r5[extras] ) ) snmp? ( net-analyzer/net-snmp dev-libs/openssl ) !minimal? ( >=net-print/cups-1.4.0 virtual/libusb:0 scanner? ( >=media-gfx/sane-backends-1.0.19-r1 ) fax? ( sys-apps/dbus ) ) dev-util/pkgconfig !minimal? ( =dev-lang/python-2* ) !minimal? ( =dev-lang/python-2*[threads,xml] ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+virtual/jpeg hpijs? ( >=net-print/foomatic-filters-3.0.20080507[cups] ) acl? ( || ( >=sys-auth/consolekit-0.4.5-r3[acl] >=sys-fs/udev-171-r5[acl] <sys-fs/udev-171-r5[extras] ) ) snmp? ( net-analyzer/net-snmp dev-libs/openssl ) !minimal? ( >=net-print/cups-1.4.0 virtual/libusb:0 scanner? ( >=media-gfx/sane-backends-1.0.19-r1 ) fax? ( sys-apps/dbus ) ) dev-util/pkgconfig !minimal? ( =dev-lang/python-2* ) !minimal? ( =dev-lang/python-2*[threads,xml] ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 virtual/jpeg hpijs? ( >=net-print/foomatic-filters-3.0.20080507[cups] ) acl? ( || ( >=sys-auth/consolekit-0.4.5-r3[acl] >=sys-fs/udev-171-r5[acl] <sys-fs/udev-171-r5[extras] ) ) snmp? ( net-analyzer/net-snmp dev-libs/openssl ) !minimal? ( >=net-print/cups-1.4.0 virtual/libusb:0 scanner? ( >=media-gfx/sane-backends-1.0.19-r1 ) fax? ( sys-apps/dbus ) ) >=app-text/ghostscript-gpl-8.71-r3 !minimal? ( dev-python/pygobject:2 kernel_linux? ( >=sys-fs/udev-114 ) scanner? ( dev-python/imaging X? ( || ( kde? ( kde-misc/skanlite ) media-gfx/xsane media-gfx/sane-frontends ) ) ) fax? ( dev-python/reportlab dev-python/dbus-python ) qt4? ( dev-python/PyQt4[dbus,X] libnotify? ( dev-python/notify-python ) policykit? ( sys-auth/polkit ) ) ) !minimal? ( =dev-lang/python-2* ) !minimal? ( =dev-lang/python-2*[threads,xml] )
 0
 mirror://sourceforge/hplip/hplip-3.11.10.tar.gz
diff --git a/metadata/cache/net-print/hplip-3.11.5 b/metadata/cache/net-print/hplip-3.11.5
index 18eac64ac5e3..55838e860f50 100644
--- a/metadata/cache/net-print/hplip-3.11.5
+++ b/metadata/cache/net-print/hplip-3.11.5
@@ -1,4 +1,4 @@
-virtual/jpeg hpijs? ( >=net-print/foomatic-filters-3.0.20080507[cups] ) acl? ( || ( >=sys-auth/consolekit-0.4.5-r3[acl] >=sys-fs/udev-171-r5[acl] <sys-fs/udev-171-r5[extras] ) ) snmp? ( net-analyzer/net-snmp dev-libs/openssl ) !minimal? ( >=net-print/cups-1.4.0 virtual/libusb:0 scanner? ( >=media-gfx/sane-backends-1.0.19-r1 ) fax? ( sys-apps/dbus ) ) dev-util/pkgconfig !minimal? ( =dev-lang/python-2* ) !minimal? ( =dev-lang/python-2*[threads,xml] ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+virtual/jpeg hpijs? ( >=net-print/foomatic-filters-3.0.20080507[cups] ) acl? ( || ( >=sys-auth/consolekit-0.4.5-r3[acl] >=sys-fs/udev-171-r5[acl] <sys-fs/udev-171-r5[extras] ) ) snmp? ( net-analyzer/net-snmp dev-libs/openssl ) !minimal? ( >=net-print/cups-1.4.0 virtual/libusb:0 scanner? ( >=media-gfx/sane-backends-1.0.19-r1 ) fax? ( sys-apps/dbus ) ) dev-util/pkgconfig !minimal? ( =dev-lang/python-2* ) !minimal? ( =dev-lang/python-2*[threads,xml] ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 virtual/jpeg hpijs? ( >=net-print/foomatic-filters-3.0.20080507[cups] ) acl? ( || ( >=sys-auth/consolekit-0.4.5-r3[acl] >=sys-fs/udev-171-r5[acl] <sys-fs/udev-171-r5[extras] ) ) snmp? ( net-analyzer/net-snmp dev-libs/openssl ) !minimal? ( >=net-print/cups-1.4.0 virtual/libusb:0 scanner? ( >=media-gfx/sane-backends-1.0.19-r1 ) fax? ( sys-apps/dbus ) ) >=app-text/ghostscript-gpl-8.71-r3 !minimal? ( dev-python/pygobject:2 kernel_linux? ( >=sys-fs/udev-114 ) scanner? ( dev-python/imaging X? ( || ( kde? ( kde-misc/skanlite ) media-gfx/xsane media-gfx/sane-frontends ) ) ) fax? ( dev-python/reportlab dev-python/dbus-python ) qt4? ( dev-python/PyQt4[dbus,X] libnotify? ( dev-python/notify-python ) policykit? ( sys-auth/polkit ) ) ) !minimal? ( =dev-lang/python-2* ) !minimal? ( =dev-lang/python-2*[threads,xml] )
 0
 mirror://sourceforge/hplip/hplip-3.11.5.tar.gz
diff --git a/metadata/cache/net-print/hplip-3.12.2-r1 b/metadata/cache/net-print/hplip-3.12.2-r1
index 58b950a3c4e6..67aec587d523 100644
--- a/metadata/cache/net-print/hplip-3.12.2-r1
+++ b/metadata/cache/net-print/hplip-3.12.2-r1
@@ -1,4 +1,4 @@
-virtual/jpeg hpijs? ( >=net-print/foomatic-filters-3.0.20080507[cups] ) acl? ( || ( >=sys-auth/consolekit-0.4.5-r3[acl] >=sys-fs/udev-171-r5[acl] <sys-fs/udev-171-r5[extras] ) ) !minimal? ( >=net-print/cups-1.4.0 virtual/libusb:0 scanner? ( >=media-gfx/sane-backends-1.0.19-r1 ) fax? ( sys-apps/dbus ) snmp? ( net-analyzer/net-snmp dev-libs/openssl ) ) dev-util/pkgconfig !minimal? ( =dev-lang/python-2* ) !minimal? ( =dev-lang/python-2*[threads,xml] ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+virtual/jpeg hpijs? ( >=net-print/foomatic-filters-3.0.20080507[cups] ) acl? ( || ( >=sys-auth/consolekit-0.4.5-r3[acl] >=sys-fs/udev-171-r5[acl] <sys-fs/udev-171-r5[extras] ) ) !minimal? ( >=net-print/cups-1.4.0 virtual/libusb:0 scanner? ( >=media-gfx/sane-backends-1.0.19-r1 ) fax? ( sys-apps/dbus ) snmp? ( net-analyzer/net-snmp dev-libs/openssl ) ) dev-util/pkgconfig !minimal? ( =dev-lang/python-2* ) !minimal? ( =dev-lang/python-2*[threads,xml] ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 virtual/jpeg hpijs? ( >=net-print/foomatic-filters-3.0.20080507[cups] ) acl? ( || ( >=sys-auth/consolekit-0.4.5-r3[acl] >=sys-fs/udev-171-r5[acl] <sys-fs/udev-171-r5[extras] ) ) !minimal? ( >=net-print/cups-1.4.0 virtual/libusb:0 scanner? ( >=media-gfx/sane-backends-1.0.19-r1 ) fax? ( sys-apps/dbus ) snmp? ( net-analyzer/net-snmp dev-libs/openssl ) ) >=app-text/ghostscript-gpl-8.71-r3 policykit? ( sys-auth/polkit ) !minimal? ( dev-python/pygobject:2 kernel_linux? ( >=sys-fs/udev-114 ) scanner? ( dev-python/imaging X? ( || ( kde? ( kde-misc/skanlite ) media-gfx/xsane media-gfx/sane-frontends ) ) ) fax? ( dev-python/reportlab dev-python/dbus-python ) qt4? ( dev-python/PyQt4[dbus,X] libnotify? ( dev-python/notify-python ) ) ) !minimal? ( =dev-lang/python-2* ) !minimal? ( =dev-lang/python-2*[threads,xml] )
 0
 mirror://sourceforge/hplip/hplip-3.12.2.tar.gz
diff --git a/metadata/cache/net-print/hplip-3.12.2-r2 b/metadata/cache/net-print/hplip-3.12.2-r2
index 58b950a3c4e6..67aec587d523 100644
--- a/metadata/cache/net-print/hplip-3.12.2-r2
+++ b/metadata/cache/net-print/hplip-3.12.2-r2
@@ -1,4 +1,4 @@
-virtual/jpeg hpijs? ( >=net-print/foomatic-filters-3.0.20080507[cups] ) acl? ( || ( >=sys-auth/consolekit-0.4.5-r3[acl] >=sys-fs/udev-171-r5[acl] <sys-fs/udev-171-r5[extras] ) ) !minimal? ( >=net-print/cups-1.4.0 virtual/libusb:0 scanner? ( >=media-gfx/sane-backends-1.0.19-r1 ) fax? ( sys-apps/dbus ) snmp? ( net-analyzer/net-snmp dev-libs/openssl ) ) dev-util/pkgconfig !minimal? ( =dev-lang/python-2* ) !minimal? ( =dev-lang/python-2*[threads,xml] ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+virtual/jpeg hpijs? ( >=net-print/foomatic-filters-3.0.20080507[cups] ) acl? ( || ( >=sys-auth/consolekit-0.4.5-r3[acl] >=sys-fs/udev-171-r5[acl] <sys-fs/udev-171-r5[extras] ) ) !minimal? ( >=net-print/cups-1.4.0 virtual/libusb:0 scanner? ( >=media-gfx/sane-backends-1.0.19-r1 ) fax? ( sys-apps/dbus ) snmp? ( net-analyzer/net-snmp dev-libs/openssl ) ) dev-util/pkgconfig !minimal? ( =dev-lang/python-2* ) !minimal? ( =dev-lang/python-2*[threads,xml] ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 virtual/jpeg hpijs? ( >=net-print/foomatic-filters-3.0.20080507[cups] ) acl? ( || ( >=sys-auth/consolekit-0.4.5-r3[acl] >=sys-fs/udev-171-r5[acl] <sys-fs/udev-171-r5[extras] ) ) !minimal? ( >=net-print/cups-1.4.0 virtual/libusb:0 scanner? ( >=media-gfx/sane-backends-1.0.19-r1 ) fax? ( sys-apps/dbus ) snmp? ( net-analyzer/net-snmp dev-libs/openssl ) ) >=app-text/ghostscript-gpl-8.71-r3 policykit? ( sys-auth/polkit ) !minimal? ( dev-python/pygobject:2 kernel_linux? ( >=sys-fs/udev-114 ) scanner? ( dev-python/imaging X? ( || ( kde? ( kde-misc/skanlite ) media-gfx/xsane media-gfx/sane-frontends ) ) ) fax? ( dev-python/reportlab dev-python/dbus-python ) qt4? ( dev-python/PyQt4[dbus,X] libnotify? ( dev-python/notify-python ) ) ) !minimal? ( =dev-lang/python-2* ) !minimal? ( =dev-lang/python-2*[threads,xml] )
 0
 mirror://sourceforge/hplip/hplip-3.12.2.tar.gz
diff --git a/metadata/cache/net-print/libinklevel-0.8.0-r1 b/metadata/cache/net-print/libinklevel-0.8.0-r1
index 4bee24128de9..6313f2d5f4bf 100644
--- a/metadata/cache/net-print/libinklevel-0.8.0-r1
+++ b/metadata/cache/net-print/libinklevel-0.8.0-r1
@@ -1,4 +1,4 @@
->=sys-libs/libieee1284-0.2.11 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=sys-libs/libieee1284-0.2.11 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=sys-libs/libieee1284-0.2.11
 0
 mirror://sourceforge/libinklevel/libinklevel-0.8.0.tar.gz
diff --git a/metadata/cache/net-proxy/bfilter-1.1.4 b/metadata/cache/net-proxy/bfilter-1.1.4
index e2ab56a350d6..464efc863cb7 100644
--- a/metadata/cache/net-proxy/bfilter-1.1.4
+++ b/metadata/cache/net-proxy/bfilter-1.1.4
@@ -1,4 +1,4 @@
-sys-libs/zlib dev-libs/ace dev-libs/libsigc++:2 X? ( dev-cpp/gtkmm:2.4 ) dev-libs/boost dev-util/scons dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) sys-devel/libtool
+sys-libs/zlib dev-libs/ace dev-libs/libsigc++:2 X? ( dev-cpp/gtkmm:2.4 ) dev-libs/boost dev-util/scons dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) sys-devel/libtool
 sys-libs/zlib dev-libs/ace dev-libs/libsigc++:2 X? ( dev-cpp/gtkmm:2.4 ) dev-libs/boost
 0
 mirror://sourceforge/bfilter/bfilter-1.1.4.tar.gz
diff --git a/metadata/cache/net-proxy/bfilter-1.1.4-r1 b/metadata/cache/net-proxy/bfilter-1.1.4-r1
index 776e460360fa..ea11f7ed5e4d 100644
--- a/metadata/cache/net-proxy/bfilter-1.1.4-r1
+++ b/metadata/cache/net-proxy/bfilter-1.1.4-r1
@@ -1,4 +1,4 @@
-sys-libs/zlib dev-libs/ace dev-libs/libsigc++:2 X? ( dev-cpp/gtkmm:2.4 ) dev-libs/boost dev-util/scons dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+sys-libs/zlib dev-libs/ace dev-libs/libsigc++:2 X? ( dev-cpp/gtkmm:2.4 ) dev-libs/boost dev-util/scons dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 sys-libs/zlib dev-libs/ace dev-libs/libsigc++:2 X? ( dev-cpp/gtkmm:2.4 ) dev-libs/boost
 0
 mirror://sourceforge/bfilter/bfilter-1.1.4.tar.gz
diff --git a/metadata/cache/net-proxy/c-icap-0.1.6 b/metadata/cache/net-proxy/c-icap-0.1.6
index 6889e01ca1ce..0d1187238097 100644
--- a/metadata/cache/net-proxy/c-icap-0.1.6
+++ b/metadata/cache/net-proxy/c-icap-0.1.6
@@ -1,4 +1,4 @@
-berkdb? ( sys-libs/db ) ldap? ( net-nds/openldap ) sys-libs/zlib || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+berkdb? ( sys-libs/db ) ldap? ( net-nds/openldap ) sys-libs/zlib || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 berkdb? ( sys-libs/db ) ldap? ( net-nds/openldap ) sys-libs/zlib
 0
 mirror://sourceforge/c-icap/c_icap-0.1.6.tar.gz
diff --git a/metadata/cache/net-proxy/c-icap-0.1.7 b/metadata/cache/net-proxy/c-icap-0.1.7
index 2ee476d1ea8a..93ebee05eb47 100644
--- a/metadata/cache/net-proxy/c-icap-0.1.7
+++ b/metadata/cache/net-proxy/c-icap-0.1.7
@@ -1,4 +1,4 @@
-berkdb? ( sys-libs/db ) ldap? ( net-nds/openldap ) sys-libs/zlib || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+berkdb? ( sys-libs/db ) ldap? ( net-nds/openldap ) sys-libs/zlib || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 berkdb? ( sys-libs/db ) ldap? ( net-nds/openldap ) sys-libs/zlib
 0
 mirror://sourceforge/c-icap/c_icap-0.1.7.tar.gz
diff --git a/metadata/cache/net-proxy/c-icap-0.1.7-r1 b/metadata/cache/net-proxy/c-icap-0.1.7-r1
index 6c4399b1772e..7d77eef63f85 100644
--- a/metadata/cache/net-proxy/c-icap-0.1.7-r1
+++ b/metadata/cache/net-proxy/c-icap-0.1.7-r1
@@ -1,4 +1,4 @@
-berkdb? ( sys-libs/db ) ldap? ( net-nds/openldap ) sys-libs/zlib || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+berkdb? ( sys-libs/db ) ldap? ( net-nds/openldap ) sys-libs/zlib || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 berkdb? ( sys-libs/db ) ldap? ( net-nds/openldap ) sys-libs/zlib sys-apps/openrc
 0
 mirror://sourceforge/c-icap/c_icap-0.1.7.tar.gz
diff --git a/metadata/cache/net-proxy/dante-1.3.1-r1 b/metadata/cache/net-proxy/dante-1.3.1-r1
index 68657a39b20c..892710bcfe75 100644
--- a/metadata/cache/net-proxy/dante-1.3.1-r1
+++ b/metadata/cache/net-proxy/dante-1.3.1-r1
@@ -1,4 +1,4 @@
-pam? ( virtual/pam ) kerberos? ( virtual/krb5 ) selinux? ( sec-policy/selinux-dante ) tcpd? ( sys-apps/tcp-wrappers ) userland_GNU? ( virtual/shadow ) sys-devel/flex sys-devel/bison || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+pam? ( virtual/pam ) kerberos? ( virtual/krb5 ) selinux? ( sec-policy/selinux-dante ) tcpd? ( sys-apps/tcp-wrappers ) userland_GNU? ( virtual/shadow ) sys-devel/flex sys-devel/bison || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 pam? ( virtual/pam ) kerberos? ( virtual/krb5 ) selinux? ( sec-policy/selinux-dante ) tcpd? ( sys-apps/tcp-wrappers ) userland_GNU? ( virtual/shadow )
 0
 ftp://ftp.inet.no/pub/socks/dante-1.3.1.tar.gz
diff --git a/metadata/cache/net-proxy/dante-1.3.2 b/metadata/cache/net-proxy/dante-1.3.2
index 95586f7bf54c..de37743703a4 100644
--- a/metadata/cache/net-proxy/dante-1.3.2
+++ b/metadata/cache/net-proxy/dante-1.3.2
@@ -1,4 +1,4 @@
-pam? ( virtual/pam ) kerberos? ( virtual/krb5 ) selinux? ( sec-policy/selinux-dante ) tcpd? ( sys-apps/tcp-wrappers ) userland_GNU? ( virtual/shadow ) sys-devel/flex sys-devel/bison || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+pam? ( virtual/pam ) kerberos? ( virtual/krb5 ) selinux? ( sec-policy/selinux-dante ) tcpd? ( sys-apps/tcp-wrappers ) userland_GNU? ( virtual/shadow ) sys-devel/flex sys-devel/bison || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 pam? ( virtual/pam ) kerberos? ( virtual/krb5 ) selinux? ( sec-policy/selinux-dante ) tcpd? ( sys-apps/tcp-wrappers ) userland_GNU? ( virtual/shadow )
 0
 ftp://ftp.inet.no/pub/socks/dante-1.3.2.tar.gz
diff --git a/metadata/cache/net-proxy/oops-1.5.24_pre20050503-r4 b/metadata/cache/net-proxy/oops-1.5.24_pre20050503-r4
index 131f5ea8222c..f35791b1498f 100644
--- a/metadata/cache/net-proxy/oops-1.5.24_pre20050503-r4
+++ b/metadata/cache/net-proxy/oops-1.5.24_pre20050503-r4
@@ -1,4 +1,4 @@
-dev-libs/libpcre >=sys-libs/db-3 sys-devel/flex || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-libs/libpcre >=sys-libs/db-3 sys-devel/flex || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-libs/libpcre >=sys-libs/db-3
 0
 http://zipper.paco.net/~igor/oops/oops-1.5.23.tar.gz mirror://gentoo/oops-1.5.24_pre20050503.patch.gz
diff --git a/metadata/cache/net-proxy/privoxy-3.0.12 b/metadata/cache/net-proxy/privoxy-3.0.12
index 27ffcb7baf31..442dd024ab94 100644
--- a/metadata/cache/net-proxy/privoxy-3.0.12
+++ b/metadata/cache/net-proxy/privoxy-3.0.12
@@ -1,4 +1,4 @@
-dev-libs/libpcre zlib? ( sys-libs/zlib ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-libs/libpcre zlib? ( sys-libs/zlib ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-libs/libpcre zlib? ( sys-libs/zlib ) selinux? ( sec-policy/selinux-privoxy )
 0
 mirror://sourceforge/ijbswa/privoxy-3.0.12-stable-src.tar.gz ipv6? ( mirror://gentoo/privoxy-3.0.12-ipv6-1.diff.gz )
diff --git a/metadata/cache/net-proxy/privoxy-3.0.13_beta b/metadata/cache/net-proxy/privoxy-3.0.13_beta
index 07117852ebf4..dac6b2e09084 100644
--- a/metadata/cache/net-proxy/privoxy-3.0.13_beta
+++ b/metadata/cache/net-proxy/privoxy-3.0.13_beta
@@ -1,4 +1,4 @@
-dev-libs/libpcre zlib? ( sys-libs/zlib ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-libs/libpcre zlib? ( sys-libs/zlib ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-libs/libpcre zlib? ( sys-libs/zlib ) selinux? ( sec-policy/selinux-privoxy )
 0
 mirror://sourceforge/ijbswa/privoxy-3.0.13-beta-src.tar.gz
diff --git a/metadata/cache/net-proxy/privoxy-3.0.14_beta b/metadata/cache/net-proxy/privoxy-3.0.14_beta
index b4d0728af615..54ced4339e48 100644
--- a/metadata/cache/net-proxy/privoxy-3.0.14_beta
+++ b/metadata/cache/net-proxy/privoxy-3.0.14_beta
@@ -1,4 +1,4 @@
-dev-libs/libpcre zlib? ( sys-libs/zlib ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-libs/libpcre zlib? ( sys-libs/zlib ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-libs/libpcre zlib? ( sys-libs/zlib ) selinux? ( sec-policy/selinux-privoxy )
 0
 mirror://sourceforge/ijbswa/privoxy-3.0.14-beta-src.tar.gz
diff --git a/metadata/cache/net-proxy/privoxy-3.0.15_beta b/metadata/cache/net-proxy/privoxy-3.0.15_beta
index 4f8725bf28ba..add0c7c6c981 100644
--- a/metadata/cache/net-proxy/privoxy-3.0.15_beta
+++ b/metadata/cache/net-proxy/privoxy-3.0.15_beta
@@ -1,4 +1,4 @@
-dev-libs/libpcre zlib? ( sys-libs/zlib ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-libs/libpcre zlib? ( sys-libs/zlib ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-libs/libpcre zlib? ( sys-libs/zlib ) selinux? ( sec-policy/selinux-privoxy )
 0
 mirror://sourceforge/ijbswa/privoxy-3.0.15-beta-src.tar.gz
diff --git a/metadata/cache/net-proxy/privoxy-3.0.16 b/metadata/cache/net-proxy/privoxy-3.0.16
index ddabb6a203e3..d7bd3355d9f9 100644
--- a/metadata/cache/net-proxy/privoxy-3.0.16
+++ b/metadata/cache/net-proxy/privoxy-3.0.16
@@ -1,4 +1,4 @@
-dev-libs/libpcre zlib? ( sys-libs/zlib ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-libs/libpcre zlib? ( sys-libs/zlib ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-libs/libpcre zlib? ( sys-libs/zlib ) selinux? ( sec-policy/selinux-privoxy )
 0
 mirror://sourceforge/ijbswa/privoxy-3.0.16-stable-src.tar.gz
diff --git a/metadata/cache/net-proxy/privoxy-3.0.17 b/metadata/cache/net-proxy/privoxy-3.0.17
index 2eaf527db02d..9d5505e9bc6c 100644
--- a/metadata/cache/net-proxy/privoxy-3.0.17
+++ b/metadata/cache/net-proxy/privoxy-3.0.17
@@ -1,4 +1,4 @@
-dev-libs/libpcre zlib? ( sys-libs/zlib ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-libs/libpcre zlib? ( sys-libs/zlib ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-libs/libpcre zlib? ( sys-libs/zlib ) selinux? ( sec-policy/selinux-privoxy )
 0
 mirror://sourceforge/ijbswa/privoxy-3.0.17-stable-src.tar.gz
diff --git a/metadata/cache/net-proxy/privoxy-3.0.19 b/metadata/cache/net-proxy/privoxy-3.0.19
index e4458b35a428..b8e722ae9c73 100644
--- a/metadata/cache/net-proxy/privoxy-3.0.19
+++ b/metadata/cache/net-proxy/privoxy-3.0.19
@@ -1,4 +1,4 @@
-dev-libs/libpcre zlib? ( sys-libs/zlib ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-libs/libpcre zlib? ( sys-libs/zlib ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-libs/libpcre zlib? ( sys-libs/zlib ) selinux? ( sec-policy/selinux-privoxy )
 0
 mirror://sourceforge/ijbswa/privoxy-3.0.19-stable-src.tar.gz
diff --git a/metadata/cache/net-proxy/squid-2.7.9 b/metadata/cache/net-proxy/squid-2.7.9
index 3d060f53a5b7..d0f22d1a6945 100644
--- a/metadata/cache/net-proxy/squid-2.7.9
+++ b/metadata/cache/net-proxy/squid-2.7.9
@@ -1,4 +1,4 @@
-caps? ( >=sys-libs/libcap-2.16 ) pam? ( virtual/pam ) ldap? ( net-nds/openldap ) kerberos? ( virtual/krb5 ) ssl? ( dev-libs/openssl ) sasl? ( dev-libs/cyrus-sasl ) selinux? ( sec-policy/selinux-squid ) !x86-fbsd? ( logrotate? ( app-admin/logrotate ) ) >=sys-libs/db-4 dev-lang/perl || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+caps? ( >=sys-libs/libcap-2.16 ) pam? ( virtual/pam ) ldap? ( net-nds/openldap ) kerberos? ( virtual/krb5 ) ssl? ( dev-libs/openssl ) sasl? ( dev-libs/cyrus-sasl ) selinux? ( sec-policy/selinux-squid ) !x86-fbsd? ( logrotate? ( app-admin/logrotate ) ) >=sys-libs/db-4 dev-lang/perl || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 caps? ( >=sys-libs/libcap-2.16 ) pam? ( virtual/pam ) ldap? ( net-nds/openldap ) kerberos? ( virtual/krb5 ) ssl? ( dev-libs/openssl ) sasl? ( dev-libs/cyrus-sasl ) selinux? ( sec-policy/selinux-squid ) !x86-fbsd? ( logrotate? ( app-admin/logrotate ) ) >=sys-libs/db-4 dev-lang/perl samba? ( net-fs/samba ) mysql? ( dev-perl/DBD-mysql ) postgres? ( dev-perl/DBD-Pg ) sqlite? ( dev-perl/DBD-SQLite )
 0
 http://www.squid-cache.org/Versions/v2/2.7/squid-2.7.STABLE9.tar.gz
diff --git a/metadata/cache/net-proxy/squid-3.1.15 b/metadata/cache/net-proxy/squid-3.1.15
index 75271aae505d..0c1418572b7c 100644
--- a/metadata/cache/net-proxy/squid-3.1.15
+++ b/metadata/cache/net-proxy/squid-3.1.15
@@ -1,4 +1,4 @@
-caps? ( >=sys-libs/libcap-2.16 ) pam? ( virtual/pam ) ldap? ( net-nds/openldap ) kerberos? ( virtual/krb5 ) ssl? ( dev-libs/openssl ) sasl? ( dev-libs/cyrus-sasl ) ecap? ( net-libs/libecap ) selinux? ( sec-policy/selinux-squid ) !x86-fbsd? ( logrotate? ( app-admin/logrotate ) ) >=sys-libs/db-4 dev-lang/perl sys-apps/ed test? ( dev-util/cppunit ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+caps? ( >=sys-libs/libcap-2.16 ) pam? ( virtual/pam ) ldap? ( net-nds/openldap ) kerberos? ( virtual/krb5 ) ssl? ( dev-libs/openssl ) sasl? ( dev-libs/cyrus-sasl ) ecap? ( net-libs/libecap ) selinux? ( sec-policy/selinux-squid ) !x86-fbsd? ( logrotate? ( app-admin/logrotate ) ) >=sys-libs/db-4 dev-lang/perl sys-apps/ed test? ( dev-util/cppunit ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 caps? ( >=sys-libs/libcap-2.16 ) pam? ( virtual/pam ) ldap? ( net-nds/openldap ) kerberos? ( virtual/krb5 ) ssl? ( dev-libs/openssl ) sasl? ( dev-libs/cyrus-sasl ) ecap? ( net-libs/libecap ) selinux? ( sec-policy/selinux-squid ) !x86-fbsd? ( logrotate? ( app-admin/logrotate ) ) >=sys-libs/db-4 dev-lang/perl samba? ( net-fs/samba ) mysql? ( dev-perl/DBD-mysql ) postgres? ( dev-perl/DBD-Pg ) sqlite? ( dev-perl/DBD-SQLite )
 0
 http://www.squid-cache.org/Versions/v3/3.1/squid-3.1.15.tar.gz
diff --git a/metadata/cache/net-proxy/squid-3.1.16 b/metadata/cache/net-proxy/squid-3.1.16
index 70e04d920b28..c708cf60df14 100644
--- a/metadata/cache/net-proxy/squid-3.1.16
+++ b/metadata/cache/net-proxy/squid-3.1.16
@@ -1,4 +1,4 @@
-caps? ( >=sys-libs/libcap-2.16 ) pam? ( virtual/pam ) ldap? ( net-nds/openldap ) kerberos? ( virtual/krb5 ) ssl? ( dev-libs/openssl ) sasl? ( dev-libs/cyrus-sasl ) ecap? ( net-libs/libecap ) selinux? ( sec-policy/selinux-squid ) !x86-fbsd? ( logrotate? ( app-admin/logrotate ) ) >=sys-libs/db-4 dev-lang/perl sys-apps/ed test? ( dev-util/cppunit ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+caps? ( >=sys-libs/libcap-2.16 ) pam? ( virtual/pam ) ldap? ( net-nds/openldap ) kerberos? ( virtual/krb5 ) ssl? ( dev-libs/openssl ) sasl? ( dev-libs/cyrus-sasl ) ecap? ( net-libs/libecap ) selinux? ( sec-policy/selinux-squid ) !x86-fbsd? ( logrotate? ( app-admin/logrotate ) ) >=sys-libs/db-4 dev-lang/perl sys-apps/ed test? ( dev-util/cppunit ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 caps? ( >=sys-libs/libcap-2.16 ) pam? ( virtual/pam ) ldap? ( net-nds/openldap ) kerberos? ( virtual/krb5 ) ssl? ( dev-libs/openssl ) sasl? ( dev-libs/cyrus-sasl ) ecap? ( net-libs/libecap ) selinux? ( sec-policy/selinux-squid ) !x86-fbsd? ( logrotate? ( app-admin/logrotate ) ) >=sys-libs/db-4 dev-lang/perl samba? ( net-fs/samba ) mysql? ( dev-perl/DBD-mysql ) postgres? ( dev-perl/DBD-Pg ) sqlite? ( dev-perl/DBD-SQLite )
 0
 http://www.squid-cache.org/Versions/v3/3.1/squid-3.1.16.tar.gz
diff --git a/metadata/cache/net-proxy/squid-3.1.18 b/metadata/cache/net-proxy/squid-3.1.18
index 7fc0d5f76882..c4372e576bc7 100644
--- a/metadata/cache/net-proxy/squid-3.1.18
+++ b/metadata/cache/net-proxy/squid-3.1.18
@@ -1,4 +1,4 @@
-caps? ( >=sys-libs/libcap-2.16 ) pam? ( virtual/pam ) ldap? ( net-nds/openldap ) kerberos? ( virtual/krb5 ) ssl? ( dev-libs/openssl ) sasl? ( dev-libs/cyrus-sasl ) ecap? ( net-libs/libecap ) selinux? ( sec-policy/selinux-squid ) !x86-fbsd? ( logrotate? ( app-admin/logrotate ) ) >=sys-libs/db-4 dev-lang/perl sys-apps/ed test? ( dev-util/cppunit ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+caps? ( >=sys-libs/libcap-2.16 ) pam? ( virtual/pam ) ldap? ( net-nds/openldap ) kerberos? ( virtual/krb5 ) ssl? ( dev-libs/openssl ) sasl? ( dev-libs/cyrus-sasl ) ecap? ( net-libs/libecap ) selinux? ( sec-policy/selinux-squid ) !x86-fbsd? ( logrotate? ( app-admin/logrotate ) ) >=sys-libs/db-4 dev-lang/perl sys-apps/ed test? ( dev-util/cppunit ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 caps? ( >=sys-libs/libcap-2.16 ) pam? ( virtual/pam ) ldap? ( net-nds/openldap ) kerberos? ( virtual/krb5 ) ssl? ( dev-libs/openssl ) sasl? ( dev-libs/cyrus-sasl ) ecap? ( net-libs/libecap ) selinux? ( sec-policy/selinux-squid ) !x86-fbsd? ( logrotate? ( app-admin/logrotate ) ) >=sys-libs/db-4 dev-lang/perl samba? ( net-fs/samba ) mysql? ( dev-perl/DBD-mysql ) postgres? ( dev-perl/DBD-Pg ) sqlite? ( dev-perl/DBD-SQLite )
 0
 http://www.squid-cache.org/Versions/v3/3.1/squid-3.1.18.tar.gz
diff --git a/metadata/cache/net-proxy/squid-3.1.19 b/metadata/cache/net-proxy/squid-3.1.19
index 06e0b8fe5f6b..4ac82f00aab7 100644
--- a/metadata/cache/net-proxy/squid-3.1.19
+++ b/metadata/cache/net-proxy/squid-3.1.19
@@ -1,4 +1,4 @@
-caps? ( >=sys-libs/libcap-2.16 ) pam? ( virtual/pam ) ldap? ( net-nds/openldap ) kerberos? ( virtual/krb5 ) ssl? ( dev-libs/openssl ) sasl? ( dev-libs/cyrus-sasl ) ecap? ( net-libs/libecap ) selinux? ( sec-policy/selinux-squid ) !x86-fbsd? ( logrotate? ( app-admin/logrotate ) ) >=sys-libs/db-4 dev-lang/perl sys-apps/ed test? ( dev-util/cppunit ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+caps? ( >=sys-libs/libcap-2.16 ) pam? ( virtual/pam ) ldap? ( net-nds/openldap ) kerberos? ( virtual/krb5 ) ssl? ( dev-libs/openssl ) sasl? ( dev-libs/cyrus-sasl ) ecap? ( net-libs/libecap ) selinux? ( sec-policy/selinux-squid ) !x86-fbsd? ( logrotate? ( app-admin/logrotate ) ) >=sys-libs/db-4 dev-lang/perl sys-apps/ed test? ( dev-util/cppunit ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 caps? ( >=sys-libs/libcap-2.16 ) pam? ( virtual/pam ) ldap? ( net-nds/openldap ) kerberos? ( virtual/krb5 ) ssl? ( dev-libs/openssl ) sasl? ( dev-libs/cyrus-sasl ) ecap? ( net-libs/libecap ) selinux? ( sec-policy/selinux-squid ) !x86-fbsd? ( logrotate? ( app-admin/logrotate ) ) >=sys-libs/db-4 dev-lang/perl samba? ( net-fs/samba ) mysql? ( dev-perl/DBD-mysql ) postgres? ( dev-perl/DBD-Pg ) sqlite? ( dev-perl/DBD-SQLite )
 0
 http://www.squid-cache.org/Versions/v3/3.1/squid-3.1.19.tar.gz
diff --git a/metadata/cache/net-proxy/squidclamav-6.4 b/metadata/cache/net-proxy/squidclamav-6.4
index 3cbaec1e5f73..a9ee3ef5cb7e 100644
--- a/metadata/cache/net-proxy/squidclamav-6.4
+++ b/metadata/cache/net-proxy/squidclamav-6.4
@@ -1,4 +1,4 @@
-net-proxy/c-icap || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+net-proxy/c-icap || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 net-proxy/c-icap
 0
 mirror://sourceforge/squidclamav/squidclamav-6.4.tar.gz
diff --git a/metadata/cache/net-proxy/squidclamav-6.5 b/metadata/cache/net-proxy/squidclamav-6.5
index 187e059d0aa9..7e7e6237eb34 100644
--- a/metadata/cache/net-proxy/squidclamav-6.5
+++ b/metadata/cache/net-proxy/squidclamav-6.5
@@ -1,4 +1,4 @@
-net-proxy/c-icap || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+net-proxy/c-icap || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 net-proxy/c-icap
 0
 mirror://sourceforge/squidclamav/squidclamav-6.5.tar.gz
diff --git a/metadata/cache/net-proxy/tayga-0.9.2 b/metadata/cache/net-proxy/tayga-0.9.2
index 1e5aec55467c..297da9f29950 100644
--- a/metadata/cache/net-proxy/tayga-0.9.2
+++ b/metadata/cache/net-proxy/tayga-0.9.2
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 http://www.litech.org/tayga/tayga-0.9.2.tar.bz2
diff --git a/metadata/cache/net-proxy/tinyproxy-1.8.3 b/metadata/cache/net-proxy/tinyproxy-1.8.3
index 1c4d6b787995..a0c2bdcf34b5 100644
--- a/metadata/cache/net-proxy/tinyproxy-1.8.3
+++ b/metadata/cache/net-proxy/tinyproxy-1.8.3
@@ -1,4 +1,4 @@
-!minimal? ( app-text/asciidoc ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+!minimal? ( app-text/asciidoc ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 http://www.banu.com/pub/tinyproxy/1.8/tinyproxy-1.8.3.tar.bz2
diff --git a/metadata/cache/net-proxy/torsocks-1.2-r2 b/metadata/cache/net-proxy/torsocks-1.2-r2
index 21e6870a539b..31786b174258 100644
--- a/metadata/cache/net-proxy/torsocks-1.2-r2
+++ b/metadata/cache/net-proxy/torsocks-1.2-r2
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 http://torsocks.googlecode.com/files/torsocks-1.2.tar.gz
diff --git a/metadata/cache/net-proxy/tsocks-1.8_beta5-r5 b/metadata/cache/net-proxy/tsocks-1.8_beta5-r5
index 6a708c6deb71..7f1a420d8cba 100644
--- a/metadata/cache/net-proxy/tsocks-1.8_beta5-r5
+++ b/metadata/cache/net-proxy/tsocks-1.8_beta5-r5
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 mirror://sourceforge/tsocks/tsocks-1.8beta5.tar.gz tordns? ( mirror://gentoo/tsocks-1.8b5-tordns1-gentoo-r1.patch.gz )
diff --git a/metadata/cache/net-proxy/tsocks-1.8_beta5-r6 b/metadata/cache/net-proxy/tsocks-1.8_beta5-r6
index 010a936c7887..237ec3efeebf 100644
--- a/metadata/cache/net-proxy/tsocks-1.8_beta5-r6
+++ b/metadata/cache/net-proxy/tsocks-1.8_beta5-r6
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 mirror://sourceforge/tsocks/tsocks-1.8beta5.tar.gz tordns? ( http://dev.gentoo.org/~naota/patch/tsocks-1.8b5-tordns1-gentoo-r2.patch.gz )
diff --git a/metadata/cache/net-proxy/ziproxy-3.1.3 b/metadata/cache/net-proxy/ziproxy-3.1.3
index 021e9f7dbad6..397a32472673 100644
--- a/metadata/cache/net-proxy/ziproxy-3.1.3
+++ b/metadata/cache/net-proxy/ziproxy-3.1.3
@@ -1,4 +1,4 @@
-media-libs/giflib media-libs/libpng virtual/jpeg sys-libs/zlib jpeg2k? ( media-libs/jasper ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+media-libs/giflib media-libs/libpng virtual/jpeg sys-libs/zlib jpeg2k? ( media-libs/jasper ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 media-libs/giflib media-libs/libpng virtual/jpeg sys-libs/zlib jpeg2k? ( media-libs/jasper ) xinetd? ( virtual/inetd )
 0
 mirror://sourceforge/ziproxy/ziproxy-3.1.3.tar.bz2
diff --git a/metadata/cache/net-voip/linphone-3.1.1 b/metadata/cache/net-voip/linphone-3.1.1
index 8fe435abb513..2295ec520422 100644
--- a/metadata/cache/net-voip/linphone-3.1.1
+++ b/metadata/cache/net-voip/linphone-3.1.1
@@ -1,4 +1,4 @@
->=media-libs/mediastreamer-2.2.3_p1[video?] >=net-libs/libeXosip-3.0.2 >=net-libs/libosip-3.0.0 >=net-libs/ortp-0.15.0_p1 gtk? ( dev-libs/glib:2 >=gnome-base/libglade-2.4.0:2.0 >=x11-libs/gtk+-2.4.0:2 ) ncurses? ( sys-libs/readline sys-libs/ncurses ) dev-util/pkgconfig doc? ( app-text/sgmltools-lite ) nls? ( dev-util/intltool sys-devel/gettext ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=media-libs/mediastreamer-2.2.3_p1[video?] >=net-libs/libeXosip-3.0.2 >=net-libs/libosip-3.0.0 >=net-libs/ortp-0.15.0_p1 gtk? ( dev-libs/glib:2 >=gnome-base/libglade-2.4.0:2.0 >=x11-libs/gtk+-2.4.0:2 ) ncurses? ( sys-libs/readline sys-libs/ncurses ) dev-util/pkgconfig doc? ( app-text/sgmltools-lite ) nls? ( dev-util/intltool sys-devel/gettext ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=media-libs/mediastreamer-2.2.3_p1[video?] >=net-libs/libeXosip-3.0.2 >=net-libs/libosip-3.0.0 >=net-libs/ortp-0.15.0_p1 gtk? ( dev-libs/glib:2 >=gnome-base/libglade-2.4.0:2.0 >=x11-libs/gtk+-2.4.0:2 ) ncurses? ( sys-libs/readline sys-libs/ncurses )
 0
 http://download.savannah.nongnu.org/releases/linphone/stable/sources/linphone-3.1.1.tar.gz
diff --git a/metadata/cache/net-voip/linphone-3.2.1-r2 b/metadata/cache/net-voip/linphone-3.2.1-r2
index e421248362dc..b9cdc805383c 100644
--- a/metadata/cache/net-voip/linphone-3.2.1-r2
+++ b/metadata/cache/net-voip/linphone-3.2.1-r2
@@ -1,4 +1,4 @@
->=media-libs/mediastreamer-2.3.0[video?] >=net-libs/libeXosip-3.0.2 >=net-libs/libosip-3.0.0 >=net-libs/ortp-0.16.1 gtk? ( dev-libs/glib:2 >=gnome-base/libglade-2.4.0:2.0 >=x11-libs/gtk+-2.4.0:2 ) ncurses? ( sys-libs/readline sys-libs/ncurses ) dev-util/pkgconfig doc? ( app-text/sgmltools-lite ) nls? ( dev-util/intltool sys-devel/gettext ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=media-libs/mediastreamer-2.3.0[video?] >=net-libs/libeXosip-3.0.2 >=net-libs/libosip-3.0.0 >=net-libs/ortp-0.16.1 gtk? ( dev-libs/glib:2 >=gnome-base/libglade-2.4.0:2.0 >=x11-libs/gtk+-2.4.0:2 ) ncurses? ( sys-libs/readline sys-libs/ncurses ) dev-util/pkgconfig doc? ( app-text/sgmltools-lite ) nls? ( dev-util/intltool sys-devel/gettext ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=media-libs/mediastreamer-2.3.0[video?] >=net-libs/libeXosip-3.0.2 >=net-libs/libosip-3.0.0 >=net-libs/ortp-0.16.1 gtk? ( dev-libs/glib:2 >=gnome-base/libglade-2.4.0:2.0 >=x11-libs/gtk+-2.4.0:2 ) ncurses? ( sys-libs/readline sys-libs/ncurses )
 0
 http://download.savannah.nongnu.org/releases/linphone/stable/sources/linphone-3.2.1.tar.gz
diff --git a/metadata/cache/net-voip/linphone-3.3.2 b/metadata/cache/net-voip/linphone-3.3.2
index e0f03a961976..1e37b70c7ad7 100644
--- a/metadata/cache/net-voip/linphone-3.3.2
+++ b/metadata/cache/net-voip/linphone-3.3.2
@@ -1,4 +1,4 @@
->=media-libs/mediastreamer-2.6.0[video?] >=net-libs/libeXosip-3.0.2 >=net-libs/libosip-3.0.0 >=net-libs/ortp-0.16.2 gtk? ( dev-libs/glib:2 >=gnome-base/libglade-2.4.0:2.0 >=x11-libs/gtk+-2.4.0:2 ) ncurses? ( sys-libs/readline sys-libs/ncurses ) dev-util/pkgconfig doc? ( app-text/sgmltools-lite ) nls? ( dev-util/intltool sys-devel/gettext ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=media-libs/mediastreamer-2.6.0[video?] >=net-libs/libeXosip-3.0.2 >=net-libs/libosip-3.0.0 >=net-libs/ortp-0.16.2 gtk? ( dev-libs/glib:2 >=gnome-base/libglade-2.4.0:2.0 >=x11-libs/gtk+-2.4.0:2 ) ncurses? ( sys-libs/readline sys-libs/ncurses ) dev-util/pkgconfig doc? ( app-text/sgmltools-lite ) nls? ( dev-util/intltool sys-devel/gettext ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=media-libs/mediastreamer-2.6.0[video?] >=net-libs/libeXosip-3.0.2 >=net-libs/libosip-3.0.0 >=net-libs/ortp-0.16.2 gtk? ( dev-libs/glib:2 >=gnome-base/libglade-2.4.0:2.0 >=x11-libs/gtk+-2.4.0:2 ) ncurses? ( sys-libs/readline sys-libs/ncurses )
 0
 http://download.savannah.nongnu.org/releases-noredirect/linphone/3.3.x/sources/linphone-3.3.2.tar.gz
diff --git a/metadata/cache/net-voip/linphone-3.4.3 b/metadata/cache/net-voip/linphone-3.4.3
index 107e472256a7..357cab09f8c8 100644
--- a/metadata/cache/net-voip/linphone-3.4.3
+++ b/metadata/cache/net-voip/linphone-3.4.3
@@ -1,4 +1,4 @@
->=media-libs/mediastreamer-2.7.3[video?,ipv6?] >=net-libs/libeXosip-3.0.2 >=net-libs/libosip-3.0.0 >=net-libs/ortp-0.16.3 gtk? ( dev-libs/glib:2 >=gnome-base/libglade-2.4.0:2.0 >=x11-libs/gtk+-2.4.0:2 ) ncurses? ( sys-libs/readline sys-libs/ncurses ) dev-util/pkgconfig doc? ( app-text/sgmltools-lite ) nls? ( dev-util/intltool sys-devel/gettext ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=media-libs/mediastreamer-2.7.3[video?,ipv6?] >=net-libs/libeXosip-3.0.2 >=net-libs/libosip-3.0.0 >=net-libs/ortp-0.16.3 gtk? ( dev-libs/glib:2 >=gnome-base/libglade-2.4.0:2.0 >=x11-libs/gtk+-2.4.0:2 ) ncurses? ( sys-libs/readline sys-libs/ncurses ) dev-util/pkgconfig doc? ( app-text/sgmltools-lite ) nls? ( dev-util/intltool sys-devel/gettext ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=media-libs/mediastreamer-2.7.3[video?,ipv6?] >=net-libs/libeXosip-3.0.2 >=net-libs/libosip-3.0.0 >=net-libs/ortp-0.16.3 gtk? ( dev-libs/glib:2 >=gnome-base/libglade-2.4.0:2.0 >=x11-libs/gtk+-2.4.0:2 ) ncurses? ( sys-libs/readline sys-libs/ncurses )
 0
 http://download.savannah.nongnu.org/releases-noredirect/linphone/3.4.x/sources/linphone-3.4.3.tar.gz
diff --git a/metadata/cache/net-voip/linphone-3.4.3-r1 b/metadata/cache/net-voip/linphone-3.4.3-r1
index fcaf1c60ed58..db68608c5785 100644
--- a/metadata/cache/net-voip/linphone-3.4.3-r1
+++ b/metadata/cache/net-voip/linphone-3.4.3-r1
@@ -1,4 +1,4 @@
->=media-libs/mediastreamer-2.7.3[video?,ipv6?] >=net-libs/libeXosip-3.0.2 >=net-libs/libosip-3.0.0 >=net-libs/ortp-0.16.3 gtk? ( dev-libs/glib:2 >=gnome-base/libglade-2.4.0:2.0 >=x11-libs/gtk+-2.4.0:2 ) ncurses? ( sys-libs/readline sys-libs/ncurses ) dev-util/pkgconfig doc? ( app-text/sgmltools-lite ) nls? ( dev-util/intltool sys-devel/gettext ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=media-libs/mediastreamer-2.7.3[video?,ipv6?] >=net-libs/libeXosip-3.0.2 >=net-libs/libosip-3.0.0 >=net-libs/ortp-0.16.3 gtk? ( dev-libs/glib:2 >=gnome-base/libglade-2.4.0:2.0 >=x11-libs/gtk+-2.4.0:2 ) ncurses? ( sys-libs/readline sys-libs/ncurses ) dev-util/pkgconfig doc? ( app-text/sgmltools-lite ) nls? ( dev-util/intltool sys-devel/gettext ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=media-libs/mediastreamer-2.7.3[video?,ipv6?] >=net-libs/libeXosip-3.0.2 >=net-libs/libosip-3.0.0 >=net-libs/ortp-0.16.3 gtk? ( dev-libs/glib:2 >=gnome-base/libglade-2.4.0:2.0 >=x11-libs/gtk+-2.4.0:2 ) ncurses? ( sys-libs/readline sys-libs/ncurses )
 0
 http://download.savannah.nongnu.org/releases-noredirect/linphone/3.4.x/sources/linphone-3.4.3.tar.gz
diff --git a/metadata/cache/net-voip/sflphone-0.9.8.4 b/metadata/cache/net-voip/sflphone-0.9.8.4
index 14e7f3474029..4ba46ac794a9 100644
--- a/metadata/cache/net-voip/sflphone-0.9.8.4
+++ b/metadata/cache/net-voip/sflphone-0.9.8.4
@@ -1,4 +1,4 @@
-media-sound/pulseaudio media-libs/libsamplerate net-libs/ccrtp net-libs/libzrtpcpp net-libs/pjsip dev-cpp/commoncpp2 sys-apps/dbus dev-libs/openssl dev-libs/expat media-libs/alsa-lib media-libs/celt dev-libs/libpcre gsm? ( media-sound/gsm ) speex? ( media-libs/speex ) networkmanager? ( net-misc/networkmanager ) iax? ( net-libs/iax ) gnome? ( dev-libs/atk dev-libs/check dev-libs/log4c gnome-base/libgnomeui gnome-base/orbit:2 gnome-extra/evolution-data-server media-libs/libart_lgpl media-libs/freetype media-libs/fontconfig net-libs/libsoup:2.4 x11-libs/cairo x11-libs/libnotify x11-libs/libICE x11-libs/libSM ) gnome? ( app-text/gnome-doc-utils ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+media-sound/pulseaudio media-libs/libsamplerate net-libs/ccrtp net-libs/libzrtpcpp net-libs/pjsip dev-cpp/commoncpp2 sys-apps/dbus dev-libs/openssl dev-libs/expat media-libs/alsa-lib media-libs/celt dev-libs/libpcre gsm? ( media-sound/gsm ) speex? ( media-libs/speex ) networkmanager? ( net-misc/networkmanager ) iax? ( net-libs/iax ) gnome? ( dev-libs/atk dev-libs/check dev-libs/log4c gnome-base/libgnomeui gnome-base/orbit:2 gnome-extra/evolution-data-server media-libs/libart_lgpl media-libs/freetype media-libs/fontconfig net-libs/libsoup:2.4 x11-libs/cairo x11-libs/libnotify x11-libs/libICE x11-libs/libSM ) gnome? ( app-text/gnome-doc-utils ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 media-sound/pulseaudio media-libs/libsamplerate net-libs/ccrtp net-libs/libzrtpcpp net-libs/pjsip dev-cpp/commoncpp2 sys-apps/dbus dev-libs/openssl dev-libs/expat media-libs/alsa-lib media-libs/celt dev-libs/libpcre gsm? ( media-sound/gsm ) speex? ( media-libs/speex ) networkmanager? ( net-misc/networkmanager ) iax? ( net-libs/iax ) gnome? ( dev-libs/atk dev-libs/check dev-libs/log4c gnome-base/libgnomeui gnome-base/orbit:2 gnome-extra/evolution-data-server media-libs/libart_lgpl media-libs/freetype media-libs/fontconfig net-libs/libsoup:2.4 x11-libs/cairo x11-libs/libnotify x11-libs/libICE x11-libs/libSM )
 0
 http://www.elvanor.net/files/gentoo/sflphone-0.9.8.4.tar.gz
diff --git a/metadata/cache/net-voip/sflphone-1.0.1 b/metadata/cache/net-voip/sflphone-1.0.1
index 1bff6bbcf941..03094deb13e0 100644
--- a/metadata/cache/net-voip/sflphone-1.0.1
+++ b/metadata/cache/net-voip/sflphone-1.0.1
@@ -1,4 +1,4 @@
-dev-cpp/commoncpp2 dev-libs/dbus-c++ dev-libs/expat dev-libs/openssl dev-libs/libpcre dev-libs/libyaml media-libs/alsa-lib media-libs/celt media-libs/libsamplerate media-sound/pulseaudio net-libs/ccrtp net-libs/iax net-libs/libzrtpcpp >=net-libs/pjsip-1.8.10 sys-apps/dbus gsm? ( media-sound/gsm ) speex? ( media-libs/speex ) networkmanager? ( net-misc/networkmanager ) gnome? ( dev-libs/atk dev-libs/check dev-libs/log4c gnome-base/libgnomeui gnome-base/orbit:2 gnome-extra/evolution-data-server media-libs/fontconfig media-libs/freetype media-libs/libart_lgpl net-libs/libsoup:2.4 net-libs/webkit-gtk:3 x11-libs/cairo x11-libs/libICE x11-libs/libnotify x11-libs/libSM ) >=dev-util/astyle-1.24 doxygen? ( app-doc/doxygen ) gnome? ( app-text/gnome-doc-utils ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+dev-cpp/commoncpp2 dev-libs/dbus-c++ dev-libs/expat dev-libs/openssl dev-libs/libpcre dev-libs/libyaml media-libs/alsa-lib media-libs/celt media-libs/libsamplerate media-sound/pulseaudio net-libs/ccrtp net-libs/iax net-libs/libzrtpcpp >=net-libs/pjsip-1.8.10 sys-apps/dbus gsm? ( media-sound/gsm ) speex? ( media-libs/speex ) networkmanager? ( net-misc/networkmanager ) gnome? ( dev-libs/atk dev-libs/check dev-libs/log4c gnome-base/libgnomeui gnome-base/orbit:2 gnome-extra/evolution-data-server media-libs/fontconfig media-libs/freetype media-libs/libart_lgpl net-libs/libsoup:2.4 net-libs/webkit-gtk:3 x11-libs/cairo x11-libs/libICE x11-libs/libnotify x11-libs/libSM ) >=dev-util/astyle-1.24 doxygen? ( app-doc/doxygen ) gnome? ( app-text/gnome-doc-utils ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 dev-cpp/commoncpp2 dev-libs/dbus-c++ dev-libs/expat dev-libs/openssl dev-libs/libpcre dev-libs/libyaml media-libs/alsa-lib media-libs/celt media-libs/libsamplerate media-sound/pulseaudio net-libs/ccrtp net-libs/iax net-libs/libzrtpcpp >=net-libs/pjsip-1.8.10 sys-apps/dbus gsm? ( media-sound/gsm ) speex? ( media-libs/speex ) networkmanager? ( net-misc/networkmanager ) gnome? ( dev-libs/atk dev-libs/check dev-libs/log4c gnome-base/libgnomeui gnome-base/orbit:2 gnome-extra/evolution-data-server media-libs/fontconfig media-libs/freetype media-libs/libart_lgpl net-libs/libsoup:2.4 net-libs/webkit-gtk:3 x11-libs/cairo x11-libs/libICE x11-libs/libnotify x11-libs/libSM )
 0
 http://www.elvanor.net/files/gentoo/sflphone-1.0.1.tar.gz
diff --git a/metadata/cache/net-voip/yate-2.0.0 b/metadata/cache/net-voip/yate-2.0.0
index 7f57ba48a1ab..11fa2e714446 100644
--- a/metadata/cache/net-voip/yate-2.0.0
+++ b/metadata/cache/net-voip/yate-2.0.0
@@ -1,4 +1,4 @@
-sys-libs/glibc alsa? ( media-libs/alsa-lib ) gsm? ( media-sound/gsm ) h323? ( dev-libs/pwlib net-libs/openh323 ) ilbc? ( dev-libs/ilbc-rfc3951 ) mysql? ( virtual/mysql ) oss? ( sys-kernel/linux-headers ) postgres? ( dev-db/postgresql-base ) qt4? ( x11-libs/qt-core:4 x11-libs/qt-gui:4 ) spandsp? ( >=media-libs/spandsp-0.0.3 ) speex? ( media-libs/speex ) ssl? ( dev-libs/openssl ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+sys-libs/glibc alsa? ( media-libs/alsa-lib ) gsm? ( media-sound/gsm ) h323? ( dev-libs/pwlib net-libs/openh323 ) ilbc? ( dev-libs/ilbc-rfc3951 ) mysql? ( virtual/mysql ) oss? ( sys-kernel/linux-headers ) postgres? ( dev-db/postgresql-base ) qt4? ( x11-libs/qt-core:4 x11-libs/qt-gui:4 ) spandsp? ( >=media-libs/spandsp-0.0.3 ) speex? ( media-libs/speex ) ssl? ( dev-libs/openssl ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 sys-libs/glibc alsa? ( media-libs/alsa-lib ) gsm? ( media-sound/gsm ) h323? ( dev-libs/pwlib net-libs/openh323 ) ilbc? ( dev-libs/ilbc-rfc3951 ) mysql? ( virtual/mysql ) oss? ( sys-kernel/linux-headers ) postgres? ( dev-db/postgresql-base ) qt4? ( x11-libs/qt-core:4 x11-libs/qt-gui:4 ) spandsp? ( >=media-libs/spandsp-0.0.3 ) speex? ( media-libs/speex ) ssl? ( dev-libs/openssl )
 0
 http://yate.null.ro/tarballs/yate2/yate-2.0.0-1.tar.gz
diff --git a/metadata/cache/net-wireless/gnome-bluetooth-2.32.0 b/metadata/cache/net-wireless/gnome-bluetooth-2.32.0
index 7d00a6205196..a6132e6eee13 100644
--- a/metadata/cache/net-wireless/gnome-bluetooth-2.32.0
+++ b/metadata/cache/net-wireless/gnome-bluetooth-2.32.0
@@ -1,4 +1,4 @@
->=dev-libs/glib-2.26.1-r1:2 >=x11-libs/gtk+-2.19.1:2 >=x11-libs/libnotify-0.4.3 >=gnome-base/gconf-2.6:2 >=dev-libs/dbus-glib-0.74 dev-libs/libunique:1 nautilus? ( >=gnome-extra/nautilus-sendto-2.31.7 ) !!net-wireless/bluez-gnome app-text/docbook-xml-dtd:4.1.2 app-text/gnome-doc-utils app-text/scrollkeeper dev-libs/libxml2 dev-util/intltool dev-util/pkgconfig sys-devel/gettext x11-libs/libX11 x11-libs/libXi x11-proto/xproto doc? ( >=dev-util/gtk-doc-1.9 ) gnome-base/gnome-common dev-util/gtk-doc-am >=sys-apps/sed-4 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-libs/glib-2.26.1-r1:2 >=x11-libs/gtk+-2.19.1:2 >=x11-libs/libnotify-0.4.3 >=gnome-base/gconf-2.6:2 >=dev-libs/dbus-glib-0.74 dev-libs/libunique:1 nautilus? ( >=gnome-extra/nautilus-sendto-2.31.7 ) !!net-wireless/bluez-gnome app-text/docbook-xml-dtd:4.1.2 app-text/gnome-doc-utils app-text/scrollkeeper dev-libs/libxml2 dev-util/intltool dev-util/pkgconfig sys-devel/gettext x11-libs/libX11 x11-libs/libXi x11-proto/xproto doc? ( >=dev-util/gtk-doc-1.9 ) gnome-base/gnome-common dev-util/gtk-doc-am >=sys-apps/sed-4 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=dev-libs/glib-2.26.1-r1:2 >=x11-libs/gtk+-2.19.1:2 >=x11-libs/libnotify-0.4.3 >=gnome-base/gconf-2.6:2 >=dev-libs/dbus-glib-0.74 dev-libs/libunique:1 nautilus? ( >=gnome-extra/nautilus-sendto-2.31.7 ) >=net-wireless/bluez-4.34 app-mobilephone/obexd sys-fs/udev introspection? ( >=dev-libs/gobject-introspection-0.6.7 )
 2
 mirror://gnome/sources/gnome-bluetooth/2.32/gnome-bluetooth-2.32.0.tar.bz2 mirror://gentoo/introspection.m4.bz2
diff --git a/metadata/cache/net-wireless/gnome-bluetooth-2.32.0-r1 b/metadata/cache/net-wireless/gnome-bluetooth-2.32.0-r1
index 4a6b6987212f..b13deb8884a1 100644
--- a/metadata/cache/net-wireless/gnome-bluetooth-2.32.0-r1
+++ b/metadata/cache/net-wireless/gnome-bluetooth-2.32.0-r1
@@ -1,4 +1,4 @@
->=dev-libs/glib-2.26.1-r1:2 >=x11-libs/gtk+-2.19.1:2 >=x11-libs/libnotify-0.4.3 >=gnome-base/gconf-2.6:2 >=dev-libs/dbus-glib-0.74 dev-libs/libunique:1 nautilus? ( >=gnome-extra/nautilus-sendto-2.31.7 ) !!net-wireless/bluez-gnome app-text/docbook-xml-dtd:4.1.2 app-text/gnome-doc-utils app-text/scrollkeeper dev-libs/libxml2 dev-util/intltool dev-util/pkgconfig sys-devel/gettext x11-libs/libX11 x11-libs/libXi x11-proto/xproto doc? ( >=dev-util/gtk-doc-1.9 ) gnome-base/gnome-common dev-util/gtk-doc-am >=sys-apps/sed-4 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-libs/glib-2.26.1-r1:2 >=x11-libs/gtk+-2.19.1:2 >=x11-libs/libnotify-0.4.3 >=gnome-base/gconf-2.6:2 >=dev-libs/dbus-glib-0.74 dev-libs/libunique:1 nautilus? ( >=gnome-extra/nautilus-sendto-2.31.7 ) !!net-wireless/bluez-gnome app-text/docbook-xml-dtd:4.1.2 app-text/gnome-doc-utils app-text/scrollkeeper dev-libs/libxml2 dev-util/intltool dev-util/pkgconfig sys-devel/gettext x11-libs/libX11 x11-libs/libXi x11-proto/xproto doc? ( >=dev-util/gtk-doc-1.9 ) gnome-base/gnome-common dev-util/gtk-doc-am >=sys-apps/sed-4 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=dev-libs/glib-2.26.1-r1:2 >=x11-libs/gtk+-2.19.1:2 >=x11-libs/libnotify-0.4.3 >=gnome-base/gconf-2.6:2 >=dev-libs/dbus-glib-0.74 dev-libs/libunique:1 nautilus? ( >=gnome-extra/nautilus-sendto-2.31.7 ) >=net-wireless/bluez-4.34 app-mobilephone/obexd sys-fs/udev introspection? ( >=dev-libs/gobject-introspection-0.6.7 )
 2
 mirror://gnome/sources/gnome-bluetooth/2.32/gnome-bluetooth-2.32.0.tar.bz2 mirror://gentoo/introspection.m4.bz2
diff --git a/metadata/cache/net-wireless/madwimax-0.1.1 b/metadata/cache/net-wireless/madwimax-0.1.1
index 0b46da61e205..437affba2571 100644
--- a/metadata/cache/net-wireless/madwimax-0.1.1
+++ b/metadata/cache/net-wireless/madwimax-0.1.1
@@ -1,4 +1,4 @@
-virtual/libusb:1 dev-util/pkgconfig doc? ( app-text/asciidoc app-text/docbook2X ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+virtual/libusb:1 dev-util/pkgconfig doc? ( app-text/asciidoc app-text/docbook2X ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 virtual/libusb:1
 0
 http://madwimax.googlecode.com/files/madwimax-0.1.1.tar.gz
diff --git a/metadata/cache/net-wireless/wavemon-0.6.7 b/metadata/cache/net-wireless/wavemon-0.6.7
index b1ecde1e17b8..9615c4c263c3 100644
--- a/metadata/cache/net-wireless/wavemon-0.6.7
+++ b/metadata/cache/net-wireless/wavemon-0.6.7
@@ -1,4 +1,4 @@
-sys-libs/ncurses || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+sys-libs/ncurses || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 sys-libs/ncurses
 0
 http://eden-feed.erg.abdn.ac.uk/wavemon/stable-releases/wavemon-0.6.7.tar.bz2
diff --git a/metadata/cache/net-wireless/wavemon-0.7.1 b/metadata/cache/net-wireless/wavemon-0.7.1
index 8424ec73f09c..ccd9252911cb 100644
--- a/metadata/cache/net-wireless/wavemon-0.7.1
+++ b/metadata/cache/net-wireless/wavemon-0.7.1
@@ -1,4 +1,4 @@
-sys-libs/ncurses || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+sys-libs/ncurses || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 sys-libs/ncurses
 0
 http://eden-feed.erg.abdn.ac.uk/wavemon/stable-releases/wavemon-0.7.1.tar.bz2
diff --git a/metadata/cache/net-wireless/wavemon-0.7.2 b/metadata/cache/net-wireless/wavemon-0.7.2
index 44d3d7f03c99..b7710b5f9b57 100644
--- a/metadata/cache/net-wireless/wavemon-0.7.2
+++ b/metadata/cache/net-wireless/wavemon-0.7.2
@@ -1,4 +1,4 @@
-sys-libs/ncurses || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+sys-libs/ncurses || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 sys-libs/ncurses
 0
 http://eden-feed.erg.abdn.ac.uk/wavemon/stable-releases/wavemon-0.7.2.tar.bz2
diff --git a/metadata/cache/net-wireless/wifiscanner-1.0.1-r2 b/metadata/cache/net-wireless/wifiscanner-1.0.1-r2
index f1773ce2e7a3..5884e837b505 100644
--- a/metadata/cache/net-wireless/wifiscanner-1.0.1-r2
+++ b/metadata/cache/net-wireless/wifiscanner-1.0.1-r2
@@ -1,4 +1,4 @@
-wireshark? ( net-analyzer/wireshark ) ncurses? ( sys-libs/ncurses ) net-libs/libpcap dev-libs/glib || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+wireshark? ( net-analyzer/wireshark ) ncurses? ( sys-libs/ncurses ) net-libs/libpcap dev-libs/glib || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 wireshark? ( net-analyzer/wireshark ) ncurses? ( sys-libs/ncurses ) net-libs/libpcap dev-libs/glib
 0
 mirror://sourceforge/wifiscanner/WifiScanner-1.0.1.tar.gz
diff --git a/metadata/cache/net-wireless/wimax-1.5.2 b/metadata/cache/net-wireless/wimax-1.5.2
index 1d735ec7cb6b..95be6ae2b6d2 100644
--- a/metadata/cache/net-wireless/wimax-1.5.2
+++ b/metadata/cache/net-wireless/wimax-1.5.2
@@ -1,4 +1,4 @@
-dev-libs/libnl:1.1 >=sys-kernel/linux-headers-2.6.34 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-libs/libnl:1.1 >=sys-kernel/linux-headers-2.6.34 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-libs/libnl:1.1 >=sys-kernel/linux-headers-2.6.34 net-wireless/wimax-tools net-wireless/wpa_supplicant[wimax]
 0
 http://www.linuxwimax.org/Download?action=AttachFile&do=get&target=wimax-1.5.2.tar.gz -> wimax-1.5.2.tar.gz
diff --git a/metadata/cache/rox-base/pager-1.1-r2 b/metadata/cache/rox-base/pager-1.1-r2
index a4e1fd3a3b50..db7e85bd8437 100644
--- a/metadata/cache/rox-base/pager-1.1-r2
+++ b/metadata/cache/rox-base/pager-1.1-r2
@@ -1,4 +1,4 @@
->=x11-libs/libwnck-2.4.0:1 >=dev-util/pkgconfig-0.20 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=rox-base/rox-clib-2.1.9-r2 >=dev-util/pkgconfig-0.20 >=rox-base/zeroinstall-injector-0.31
+>=x11-libs/libwnck-2.4.0:1 >=dev-util/pkgconfig-0.20 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=rox-base/rox-clib-2.1.9-r2 >=dev-util/pkgconfig-0.20 >=rox-base/zeroinstall-injector-0.31
 >=x11-libs/libwnck-2.4.0:1 >=rox-base/rox-2.1.0 >=rox-base/rox-clib-2.1.9-r2
 0
 mirror://sourceforge/rox/pager-1.1.tar.bz2
diff --git a/metadata/cache/rox-base/rox-media-0.0.3 b/metadata/cache/rox-base/rox-media-0.0.3
index f9d8b32e421b..e7b1e511c2d2 100644
--- a/metadata/cache/rox-base/rox-media-0.0.3
+++ b/metadata/cache/rox-base/rox-media-0.0.3
@@ -1,4 +1,4 @@
-x11-libs/libX11 gnome-base/gconf:2 sys-apps/gnome-disk-utility x11-libs/gtk+:2 dev-util/scons || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+x11-libs/libX11 gnome-base/gconf:2 sys-apps/gnome-disk-utility x11-libs/gtk+:2 dev-util/scons || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 x11-libs/libX11 gnome-base/gconf:2 sys-apps/gnome-disk-utility x11-libs/gtk+:2 >=rox-base/rox-2.1.0
 0
 mirror://gentoo/Media-0.0.3.tar.bz2
diff --git a/metadata/cache/rox-base/rox-media-0.0.3-r1 b/metadata/cache/rox-base/rox-media-0.0.3-r1
index 18de9aeab13f..1b9a9c9e303d 100644
--- a/metadata/cache/rox-base/rox-media-0.0.3-r1
+++ b/metadata/cache/rox-base/rox-media-0.0.3-r1
@@ -1,4 +1,4 @@
-x11-libs/libX11 gnome-base/gconf:2 sys-apps/gnome-disk-utility x11-libs/gtk+:2 dev-util/scons || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+x11-libs/libX11 gnome-base/gconf:2 sys-apps/gnome-disk-utility x11-libs/gtk+:2 dev-util/scons || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 x11-libs/libX11 gnome-base/gconf:2 sys-apps/gnome-disk-utility x11-libs/gtk+:2 >=rox-base/rox-2.1.0
 0
 mirror://gentoo/Media-0.0.3.tar.bz2
diff --git a/metadata/cache/rox-base/tasklist-0.5 b/metadata/cache/rox-base/tasklist-0.5
index 0b6ed6203e59..89c5fad440f4 100644
--- a/metadata/cache/rox-base/tasklist-0.5
+++ b/metadata/cache/rox-base/tasklist-0.5
@@ -1,4 +1,4 @@
-x11-libs/libwnck:1 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=rox-base/rox-clib-2.1.10 >=dev-util/pkgconfig-0.20 >=rox-base/zeroinstall-injector-0.31
+x11-libs/libwnck:1 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=rox-base/rox-clib-2.1.10 >=dev-util/pkgconfig-0.20 >=rox-base/zeroinstall-injector-0.31
 x11-libs/libwnck:1 >=rox-base/rox-2.1.0 >=rox-base/rox-clib-2.1.10
 0
 ftp://ftp.berlios.de/pub/rox4debian/apps/Tasklist-0.5.tgz
diff --git a/metadata/cache/rox-extra/memo-2.1 b/metadata/cache/rox-extra/memo-2.1
index 28ef34e4a82f..a338d14c254c 100644
--- a/metadata/cache/rox-extra/memo-2.1
+++ b/metadata/cache/rox-extra/memo-2.1
@@ -1,4 +1,4 @@
-=dev-lang/python-2* =dev-lang/python-2*[xml] || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+=dev-lang/python-2* =dev-lang/python-2*[xml] || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 libnotify? ( >=dev-python/dbus-python-0.71 x11-libs/libnotify ) =dev-lang/python-2* =dev-lang/python-2*[xml] >=rox-base/rox-2.1.0 >=rox-base/rox-lib-1.9.8
 0
 mirror://sourceforge/rox/memo-2.1.tar.bz2
diff --git a/metadata/cache/sci-astronomy/celestia-1.6.1 b/metadata/cache/sci-astronomy/celestia-1.6.1
index 0a3a1cf7d69e..f04fef7f0efa 100644
--- a/metadata/cache/sci-astronomy/celestia-1.6.1
+++ b/metadata/cache/sci-astronomy/celestia-1.6.1
@@ -1,4 +1,4 @@
-virtual/opengl virtual/jpeg media-libs/libpng >=dev-lang/lua-5.0 gtk? ( !gnome? ( x11-libs/gtk+:2 >=x11-libs/gtkglext-1.0 ) ) gnome? ( x11-libs/gtk+:2 >=x11-libs/gtkglext-1.0 >=gnome-base/libgnomeui-2.0 ) !gtk? ( !gnome? ( media-libs/freeglut ) ) cairo? ( x11-libs/cairo ) theora? ( media-libs/libtheora ) dev-util/pkgconfig >=sys-apps/sed-4 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+virtual/opengl virtual/jpeg media-libs/libpng >=dev-lang/lua-5.0 gtk? ( !gnome? ( x11-libs/gtk+:2 >=x11-libs/gtkglext-1.0 ) ) gnome? ( x11-libs/gtk+:2 >=x11-libs/gtkglext-1.0 >=gnome-base/libgnomeui-2.0 ) !gtk? ( !gnome? ( media-libs/freeglut ) ) cairo? ( x11-libs/cairo ) theora? ( media-libs/libtheora ) dev-util/pkgconfig >=sys-apps/sed-4 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 virtual/opengl virtual/jpeg media-libs/libpng >=dev-lang/lua-5.0 gtk? ( !gnome? ( x11-libs/gtk+:2 >=x11-libs/gtkglext-1.0 ) ) gnome? ( x11-libs/gtk+:2 >=x11-libs/gtkglext-1.0 >=gnome-base/libgnomeui-2.0 ) !gtk? ( !gnome? ( media-libs/freeglut ) ) cairo? ( x11-libs/cairo ) theora? ( media-libs/libtheora )
 0
 mirror://sourceforge/celestia/celestia-1.6.1.tar.gz
diff --git a/metadata/cache/sci-astronomy/esorex-3.8.3-r1 b/metadata/cache/sci-astronomy/esorex-3.8.3-r1
index b598cccd2b43..93d9b4b89f48 100644
--- a/metadata/cache/sci-astronomy/esorex-3.8.3-r1
+++ b/metadata/cache/sci-astronomy/esorex-3.8.3-r1
@@ -1,4 +1,4 @@
->=sci-astronomy/cpl-5.2 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=sci-astronomy/cpl-5.2 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=sci-astronomy/cpl-5.2
 0
 ftp://ftp.eso.org/pub/cpl/esorex-3.8.3.tar.gz
diff --git a/metadata/cache/sci-astronomy/sextractor-2.8.6 b/metadata/cache/sci-astronomy/sextractor-2.8.6
index ad6002e3b1a7..5b196bd1d014 100644
--- a/metadata/cache/sci-astronomy/sextractor-2.8.6
+++ b/metadata/cache/sci-astronomy/sextractor-2.8.6
@@ -1,4 +1,4 @@
-virtual/cblas >=sci-libs/lapack-atlas-3.8.0 sci-libs/fftw:3.0 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+virtual/cblas >=sci-libs/lapack-atlas-3.8.0 sci-libs/fftw:3.0 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 virtual/cblas >=sci-libs/lapack-atlas-3.8.0 sci-libs/fftw:3.0
 0
 ftp://ftp.iap.fr/pub/from_users/bertin/sextractor/sextractor-2.8.6.tar.gz
diff --git a/metadata/cache/sci-astronomy/skycat-3.1.2-r1 b/metadata/cache/sci-astronomy/skycat-3.1.2-r1
index 0510238057d7..cec3d8fef155 100644
--- a/metadata/cache/sci-astronomy/skycat-3.1.2-r1
+++ b/metadata/cache/sci-astronomy/skycat-3.1.2-r1
@@ -1,4 +1,4 @@
-x11-libs/libXext >=dev-tcltk/tclx-2.4 >=dev-tcltk/blt-2.4 >=dev-tcltk/itcl-3.3 >=dev-tcltk/iwidgets-4.0.1 >=dev-tcltk/tkimg-1.3 sci-libs/cfitsio sci-astronomy/wcstools || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+x11-libs/libXext >=dev-tcltk/tclx-2.4 >=dev-tcltk/blt-2.4 >=dev-tcltk/itcl-3.3 >=dev-tcltk/iwidgets-4.0.1 >=dev-tcltk/tkimg-1.3 sci-libs/cfitsio sci-astronomy/wcstools || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 x11-libs/libXext >=dev-tcltk/tclx-2.4 >=dev-tcltk/blt-2.4 >=dev-tcltk/itcl-3.3 >=dev-tcltk/iwidgets-4.0.1 >=dev-tcltk/tkimg-1.3 sci-libs/cfitsio sci-astronomy/wcstools
 0
 http://archive.eso.org/cms/tools-documentation/skycat-download/skycat-3.1.2.tar.gz
diff --git a/metadata/cache/sci-astronomy/swarp-2.17.6 b/metadata/cache/sci-astronomy/swarp-2.17.6
index 95968320ab76..ab47d8612988 100644
--- a/metadata/cache/sci-astronomy/swarp-2.17.6
+++ b/metadata/cache/sci-astronomy/swarp-2.17.6
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 ftp://ftp.iap.fr/pub/from_users/bertin/swarp/swarp-2.17.6.tar.gz
diff --git a/metadata/cache/sci-astronomy/swarp-2.19.1 b/metadata/cache/sci-astronomy/swarp-2.19.1
index 105c1c4ca3f1..a4b174084a61 100644
--- a/metadata/cache/sci-astronomy/swarp-2.19.1
+++ b/metadata/cache/sci-astronomy/swarp-2.19.1
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 ftp://ftp.iap.fr/pub/from_users/bertin/swarp/swarp-2.19.1.tar.gz
diff --git a/metadata/cache/sci-astronomy/wcstools-3.8.4 b/metadata/cache/sci-astronomy/wcstools-3.8.4
index 6c70d5d51664..8dc93a2b44f1 100644
--- a/metadata/cache/sci-astronomy/wcstools-3.8.4
+++ b/metadata/cache/sci-astronomy/wcstools-3.8.4
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 http://tdc-www.harvard.edu/software/wcstools/wcstools-3.8.4.tar.gz
diff --git a/metadata/cache/sci-biology/abyss-1.2.7 b/metadata/cache/sci-biology/abyss-1.2.7
index b4f1f8f365d3..6b20f7f50bdb 100644
--- a/metadata/cache/sci-biology/abyss-1.2.7
+++ b/metadata/cache/sci-biology/abyss-1.2.7
@@ -1,4 +1,4 @@
-dev-cpp/sparsehash mpi? ( virtual/mpi ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-cpp/sparsehash mpi? ( virtual/mpi ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-cpp/sparsehash mpi? ( virtual/mpi )
 0
 http://www.bcgsc.ca/downloads/abyss/abyss-1.2.7.tar.gz
diff --git a/metadata/cache/sci-biology/abyss-1.3.0 b/metadata/cache/sci-biology/abyss-1.3.0
index 54ee70cc8271..625fdb7ea822 100644
--- a/metadata/cache/sci-biology/abyss-1.3.0
+++ b/metadata/cache/sci-biology/abyss-1.3.0
@@ -1,4 +1,4 @@
-dev-cpp/sparsehash mpi? ( virtual/mpi ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-cpp/sparsehash mpi? ( virtual/mpi ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-cpp/sparsehash mpi? ( virtual/mpi )
 0
 http://www.bcgsc.ca/downloads/abyss/abyss-1.3.0.tar.gz
diff --git a/metadata/cache/sci-biology/allpathslg-37578 b/metadata/cache/sci-biology/allpathslg-37578
index a47781c4e1c9..8222d18a595b 100644
--- a/metadata/cache/sci-biology/allpathslg-37578
+++ b/metadata/cache/sci-biology/allpathslg-37578
@@ -1,4 +1,4 @@
-dev-libs/boost >=sys-devel/gcc-4.3.3 sci-biology/vaal || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-libs/boost >=sys-devel/gcc-4.3.3 sci-biology/vaal || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 ftp://ftp.broadinstitute.org/pub/crd/ALLPATHS/Release-LG/latest_source_code/allpathslg-37578.tar.gz
diff --git a/metadata/cache/sci-biology/allpathslg-38573 b/metadata/cache/sci-biology/allpathslg-38573
index cec16d5eb7e4..63613512ff94 100644
--- a/metadata/cache/sci-biology/allpathslg-38573
+++ b/metadata/cache/sci-biology/allpathslg-38573
@@ -1,4 +1,4 @@
-dev-libs/boost >=sys-devel/gcc-4.3.3 sci-biology/vaal || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-libs/boost >=sys-devel/gcc-4.3.3 sci-biology/vaal || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 ftp://ftp.broadinstitute.org/pub/crd/ALLPATHS/Release-LG/latest_source_code/allpathslg-38573.tar.gz
diff --git a/metadata/cache/sci-biology/allpathslg-40063 b/metadata/cache/sci-biology/allpathslg-40063
index 11122a449942..72b88f3924e8 100644
--- a/metadata/cache/sci-biology/allpathslg-40063
+++ b/metadata/cache/sci-biology/allpathslg-40063
@@ -1,4 +1,4 @@
-dev-libs/boost >=sys-devel/gcc-4.3.3 sci-biology/vaal || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-libs/boost >=sys-devel/gcc-4.3.3 sci-biology/vaal || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 ftp://ftp.broadinstitute.org/pub/crd/ALLPATHS/Release-LG/latest_source_code/allpathslg-40063.tar.gz
diff --git a/metadata/cache/sci-biology/bfast-0.6.5a b/metadata/cache/sci-biology/bfast-0.6.5a
index 9d1cf558a57e..6303822b8234 100644
--- a/metadata/cache/sci-biology/bfast-0.6.5a
+++ b/metadata/cache/sci-biology/bfast-0.6.5a
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-perl/XML-Simple
 0
 mirror://sourceforge/bfast/bfast-0.6.5a.tar.gz
diff --git a/metadata/cache/sci-biology/bfast-0.6.5a-r1 b/metadata/cache/sci-biology/bfast-0.6.5a-r1
index 8b42e0596ceb..5e41947696e1 100644
--- a/metadata/cache/sci-biology/bfast-0.6.5a-r1
+++ b/metadata/cache/sci-biology/bfast-0.6.5a-r1
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-perl/XML-Simple
 0
 mirror://sourceforge/bfast/bfast-0.6.5a.tar.gz
diff --git a/metadata/cache/sci-biology/bfast-0.7.0a b/metadata/cache/sci-biology/bfast-0.7.0a
index 6a4f61c28ea5..4591f7f2e364 100644
--- a/metadata/cache/sci-biology/bfast-0.7.0a
+++ b/metadata/cache/sci-biology/bfast-0.7.0a
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-perl/XML-Simple
 0
 mirror://sourceforge/bfast/bfast-0.7.0a.tar.gz
diff --git a/metadata/cache/sci-biology/blossoc-1.4.0 b/metadata/cache/sci-biology/blossoc-1.4.0
index 9b2842e20290..d0596f35a5d9 100644
--- a/metadata/cache/sci-biology/blossoc-1.4.0
+++ b/metadata/cache/sci-biology/blossoc-1.4.0
@@ -1,4 +1,4 @@
-sci-libs/gsl dev-libs/boost sci-biology/snpfile || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+sci-libs/gsl dev-libs/boost sci-biology/snpfile || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 sci-libs/gsl dev-libs/boost sci-biology/snpfile
 0
 http://www.daimi.au.dk/~mailund/Blossoc/download/blossoc-1.4.0.tar.gz
diff --git a/metadata/cache/sci-biology/cufflinks-1.3.0 b/metadata/cache/sci-biology/cufflinks-1.3.0
index 9e23c7b18cea..7a9694997918 100644
--- a/metadata/cache/sci-biology/cufflinks-1.3.0
+++ b/metadata/cache/sci-biology/cufflinks-1.3.0
@@ -1,4 +1,4 @@
-sci-biology/samtools dev-libs/boost:1.46 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+sci-biology/samtools dev-libs/boost:1.46 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 sci-biology/samtools dev-libs/boost:1.46
 0
 http://cufflinks.cbcb.umd.edu/downloads/cufflinks-1.3.0.tar.gz
diff --git a/metadata/cache/sci-biology/emboss-6.3.1_p4 b/metadata/cache/sci-biology/emboss-6.3.1_p4
index 0a2c0bfd574f..f8c4f34c2bcc 100644
--- a/metadata/cache/sci-biology/emboss-6.3.1_p4
+++ b/metadata/cache/sci-biology/emboss-6.3.1_p4
@@ -1,4 +1,4 @@
-dev-libs/expat dev-libs/libpcre:3 sci-libs/plplot sys-libs/zlib mysql? ( dev-db/mysql ) pdf? ( media-libs/libharu ) png? ( sys-libs/zlib media-libs/libpng media-libs/gd ) postgres? ( dev-db/postgresql-base ) !minimal? ( sci-biology/primer3 sci-biology/clustalw ) X? ( x11-libs/libXt ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-libs/expat dev-libs/libpcre:3 sci-libs/plplot sys-libs/zlib mysql? ( dev-db/mysql ) pdf? ( media-libs/libharu ) png? ( sys-libs/zlib media-libs/libpng media-libs/gd ) postgres? ( dev-db/postgresql-base ) !minimal? ( sci-biology/primer3 sci-biology/clustalw ) X? ( x11-libs/libXt ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-libs/expat dev-libs/libpcre:3 sci-libs/plplot sys-libs/zlib mysql? ( dev-db/mysql ) pdf? ( media-libs/libharu ) png? ( sys-libs/zlib media-libs/libpng media-libs/gd ) postgres? ( dev-db/postgresql-base ) !minimal? ( sci-biology/primer3 sci-biology/clustalw ) X? ( x11-libs/libXt ) !sys-devel/cons
 0
 ftp://emboss.open-bio.org/pub/EMBOSS/old/6.3.1_p4/EMBOSS-6.3.1.tar.gz ftp://emboss.open-bio.org/pub/EMBOSS/old/6.3.1_p4/fixes/patches/patch-1-4.gz -> emboss-6.3.1_p4.patch.gz
diff --git a/metadata/cache/sci-biology/eugene-3.5g b/metadata/cache/sci-biology/eugene-3.5g
index 92a9a97e6804..29e606bd0c47 100644
--- a/metadata/cache/sci-biology/eugene-3.5g
+++ b/metadata/cache/sci-biology/eugene-3.5g
@@ -1,4 +1,4 @@
-media-libs/gd[png] media-libs/libpng doc? ( dev-lang/tcl dev-texlive/texlive-latex dev-texlive/texlive-latexrecommended dev-texlive/texlive-latexextra ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+media-libs/gd[png] media-libs/libpng doc? ( dev-lang/tcl dev-texlive/texlive-latex dev-texlive/texlive-latexrecommended dev-texlive/texlive-latexextra ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 media-libs/gd[png] media-libs/libpng doc? ( dev-lang/tcl dev-texlive/texlive-latex dev-texlive/texlive-latexrecommended dev-texlive/texlive-latexextra )
 0
 mirror://gentoo/eugene-3.5g.tar.gz
diff --git a/metadata/cache/sci-biology/eugene-3.6-r1 b/metadata/cache/sci-biology/eugene-3.6-r1
index ba1d42eb6926..709c6ed1d5e0 100644
--- a/metadata/cache/sci-biology/eugene-3.6-r1
+++ b/metadata/cache/sci-biology/eugene-3.6-r1
@@ -1,4 +1,4 @@
-media-libs/gd[png] media-libs/libpng doc? ( dev-lang/tcl dev-texlive/texlive-latex dev-texlive/texlive-latexrecommended dev-texlive/texlive-latexextra ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+media-libs/gd[png] media-libs/libpng doc? ( dev-lang/tcl dev-texlive/texlive-latex dev-texlive/texlive-latexrecommended dev-texlive/texlive-latexextra ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 media-libs/gd[png] media-libs/libpng doc? ( dev-lang/tcl dev-texlive/texlive-latex dev-texlive/texlive-latexrecommended dev-texlive/texlive-latexextra )
 0
 mirror://gentoo/eugene-3.6.tar.gz
diff --git a/metadata/cache/sci-biology/exonerate-2.2.0-r1 b/metadata/cache/sci-biology/exonerate-2.2.0-r1
index 1ee70bf78513..7373dd9a50d1 100644
--- a/metadata/cache/sci-biology/exonerate-2.2.0-r1
+++ b/metadata/cache/sci-biology/exonerate-2.2.0-r1
@@ -1,4 +1,4 @@
-dev-libs/glib:2 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-libs/glib:2 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-libs/glib:2
 0
 http://www.ebi.ac.uk/~guy/exonerate/exonerate-2.2.0.tar.gz
diff --git a/metadata/cache/sci-biology/gibbs-3.1 b/metadata/cache/sci-biology/gibbs-3.1
index df7e62317bd3..92d8b102c30d 100644
--- a/metadata/cache/sci-biology/gibbs-3.1
+++ b/metadata/cache/sci-biology/gibbs-3.1
@@ -1,4 +1,4 @@
-mpi? ( virtual/mpi sys-cluster/mpe2 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+mpi? ( virtual/mpi sys-cluster/mpe2 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 mpi? ( virtual/mpi sys-cluster/mpe2 )
 0
 mirror://gentoo/gibbs-3.1.tar.gz
diff --git a/metadata/cache/sci-biology/goby-cpp-1.9.7.3 b/metadata/cache/sci-biology/goby-cpp-1.9.7.3
index 317398bafde1..d96d5626e709 100644
--- a/metadata/cache/sci-biology/goby-cpp-1.9.7.3
+++ b/metadata/cache/sci-biology/goby-cpp-1.9.7.3
@@ -1,4 +1,4 @@
->=dev-libs/protobuf-2.4.1 >=dev-libs/libpcre-8.12 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-libs/protobuf-2.4.1 >=dev-libs/libpcre-8.12 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=dev-libs/protobuf-2.4.1 >=dev-libs/libpcre-8.12
 0
 http://chagall.med.cornell.edu/goby/releases/archive/release-goby_1.9.7.3/goby_1.9.7.3-cpp.zip
diff --git a/metadata/cache/sci-biology/goby-cpp-1.9.8.1 b/metadata/cache/sci-biology/goby-cpp-1.9.8.1
index 8cc02964f8be..3753fa1f4683 100644
--- a/metadata/cache/sci-biology/goby-cpp-1.9.8.1
+++ b/metadata/cache/sci-biology/goby-cpp-1.9.8.1
@@ -1,4 +1,4 @@
->=dev-libs/protobuf-2.4.1 >=dev-libs/libpcre-8.12 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-libs/protobuf-2.4.1 >=dev-libs/libpcre-8.12 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=dev-libs/protobuf-2.4.1 >=dev-libs/libpcre-8.12
 0
 http://chagall.med.cornell.edu/goby/releases/archive/release-goby_1.9.8.1/goby_1.9.8.1-cpp.zip
diff --git a/metadata/cache/sci-biology/maq-0.7.1-r1 b/metadata/cache/sci-biology/maq-0.7.1-r1
index 08fe6c8a449a..4ec562208212 100644
--- a/metadata/cache/sci-biology/maq-0.7.1-r1
+++ b/metadata/cache/sci-biology/maq-0.7.1-r1
@@ -1,4 +1,4 @@
-sys-libs/zlib || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+sys-libs/zlib || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 sys-libs/zlib
 0
 mirror://sourceforge/maq/maq-0.7.1.tar.bz2 mirror://sourceforge/maq/calib-36.dat.gz
diff --git a/metadata/cache/sci-biology/maqview-0.2.5-r1 b/metadata/cache/sci-biology/maqview-0.2.5-r1
index 194ea0396acd..dd9a18761db8 100644
--- a/metadata/cache/sci-biology/maqview-0.2.5-r1
+++ b/metadata/cache/sci-biology/maqview-0.2.5-r1
@@ -1,4 +1,4 @@
-media-libs/freeglut sys-libs/zlib || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+media-libs/freeglut sys-libs/zlib || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 media-libs/freeglut sys-libs/zlib sci-biology/maq
 0
 mirror://sourceforge/maq/maqview-0.2.5.tar.gz
diff --git a/metadata/cache/sci-biology/mauvealigner-9999 b/metadata/cache/sci-biology/mauvealigner-9999
index faed665658cc..4b2eee0adada 100644
--- a/metadata/cache/sci-biology/mauvealigner-9999
+++ b/metadata/cache/sci-biology/mauvealigner-9999
@@ -1,4 +1,4 @@
-sci-libs/libgenome sci-libs/libmuscle sci-libs/libmems doc? ( app-doc/doxygen ) dev-vcs/subversion net-misc/rsync || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+sci-libs/libgenome sci-libs/libmuscle sci-libs/libmems doc? ( app-doc/doxygen ) dev-vcs/subversion net-misc/rsync || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 sci-libs/libgenome sci-libs/libmuscle sci-libs/libmems
 0
 
diff --git a/metadata/cache/sci-biology/meme-4.3.0 b/metadata/cache/sci-biology/meme-4.3.0
index 5700e15b303c..0b4bddac5f10 100644
--- a/metadata/cache/sci-biology/meme-4.3.0
+++ b/metadata/cache/sci-biology/meme-4.3.0
@@ -1,4 +1,4 @@
-dev-libs/libxml2:2 dev-libs/libxslt app-shells/tcsh mpi? ( virtual/mpi ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-libs/libxml2:2 dev-libs/libxslt app-shells/tcsh mpi? ( virtual/mpi ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-libs/libxml2:2 dev-libs/libxslt app-shells/tcsh mpi? ( virtual/mpi )
 0
 http://meme.nbcr.net/downloads/meme_4.3.0.tar.gz
diff --git a/metadata/cache/sci-biology/meme-4.3.0-r1 b/metadata/cache/sci-biology/meme-4.3.0-r1
index a33a17279d7e..7b1dbaba5e9c 100644
--- a/metadata/cache/sci-biology/meme-4.3.0-r1
+++ b/metadata/cache/sci-biology/meme-4.3.0-r1
@@ -1,4 +1,4 @@
-dev-libs/libxml2:2 dev-libs/libxslt app-shells/tcsh mpi? ( virtual/mpi ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-libs/libxml2:2 dev-libs/libxslt app-shells/tcsh mpi? ( virtual/mpi ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-libs/libxml2:2 dev-libs/libxslt app-shells/tcsh mpi? ( virtual/mpi )
 0
 http://meme.nbcr.net/downloads/meme_4.3.0.tar.gz
diff --git a/metadata/cache/sci-biology/meme-4.4.0 b/metadata/cache/sci-biology/meme-4.4.0
index b38e27327537..6555bc7ae2ed 100644
--- a/metadata/cache/sci-biology/meme-4.4.0
+++ b/metadata/cache/sci-biology/meme-4.4.0
@@ -1,4 +1,4 @@
-dev-libs/libxml2:2 dev-libs/libxslt app-shells/tcsh mpi? ( virtual/mpi ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-libs/libxml2:2 dev-libs/libxslt app-shells/tcsh mpi? ( virtual/mpi ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-libs/libxml2:2 dev-libs/libxslt app-shells/tcsh mpi? ( virtual/mpi )
 0
 http://meme.nbcr.net/downloads/meme_4.4.0.tar.gz
diff --git a/metadata/cache/sci-biology/mira-3.0.5 b/metadata/cache/sci-biology/mira-3.0.5
index 54275ed3ab21..f54b687f0d44 100644
--- a/metadata/cache/sci-biology/mira-3.0.5
+++ b/metadata/cache/sci-biology/mira-3.0.5
@@ -1,4 +1,4 @@
->=dev-libs/boost-1.35.0 dev-libs/expat doc? ( >=app-text/texlive-core-2009 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-libs/boost-1.35.0 dev-libs/expat doc? ( >=app-text/texlive-core-2009 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=dev-libs/boost-1.35.0
 0
 mirror://sourceforge/mira-assembler/mira-3.0.5.tar.bz2 mirror://sourceforge/mira-assembler/mira_3rdparty_17-04-2010.tar.bz2
diff --git a/metadata/cache/sci-biology/mira-3.2.0 b/metadata/cache/sci-biology/mira-3.2.0
index 6b7787718ace..d4ebc465b9be 100644
--- a/metadata/cache/sci-biology/mira-3.2.0
+++ b/metadata/cache/sci-biology/mira-3.2.0
@@ -1,4 +1,4 @@
->=dev-libs/boost-1.41.0-r3 dev-libs/expat || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-libs/boost-1.41.0-r3 dev-libs/expat || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=dev-libs/boost-1.41.0-r3
 0
 mirror://sourceforge/mira-assembler/mira-3.2.0.tar.bz2 mirror://sourceforge/mira-assembler/mira_3rdparty_17-04-2010.tar.bz2
diff --git a/metadata/cache/sci-biology/mira-3.2.1 b/metadata/cache/sci-biology/mira-3.2.1
index f1fdebfaec0b..90cdc6736b93 100644
--- a/metadata/cache/sci-biology/mira-3.2.1
+++ b/metadata/cache/sci-biology/mira-3.2.1
@@ -1,4 +1,4 @@
->=dev-libs/boost-1.41.0-r3 dev-util/google-perftools dev-libs/expat || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-libs/boost-1.41.0-r3 dev-util/google-perftools dev-libs/expat || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=dev-libs/boost-1.41.0-r3 dev-util/google-perftools
 0
 mirror://sourceforge/mira-assembler/mira-3.2.1.tar.bz2 mirror://sourceforge/mira-assembler/mira_3rdparty_17-04-2010.tar.bz2
diff --git a/metadata/cache/sci-biology/snpfile-2.0.1-r1 b/metadata/cache/sci-biology/snpfile-2.0.1-r1
index 5b9b49a191c2..1780535839e0 100644
--- a/metadata/cache/sci-biology/snpfile-2.0.1-r1
+++ b/metadata/cache/sci-biology/snpfile-2.0.1-r1
@@ -1,4 +1,4 @@
-dev-libs/boost || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-libs/boost || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-libs/boost
 0
 http://www.birc.au.dk/~mailund/SNPFile/download/snpfile-2.0.1.tar.gz
diff --git a/metadata/cache/sci-biology/tophat-1.0.12 b/metadata/cache/sci-biology/tophat-1.0.12
index 3fbe9b31cbed..53d7794ed94a 100644
--- a/metadata/cache/sci-biology/tophat-1.0.12
+++ b/metadata/cache/sci-biology/tophat-1.0.12
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 sci-biology/bowtie
 0
 http://tophat.cbcb.umd.edu/downloads/tophat-1.0.12.tar.gz
diff --git a/metadata/cache/sci-biology/tophat-1.4.1 b/metadata/cache/sci-biology/tophat-1.4.1
index d20354ab426b..ec790786d3b9 100644
--- a/metadata/cache/sci-biology/tophat-1.4.1
+++ b/metadata/cache/sci-biology/tophat-1.4.1
@@ -1,4 +1,4 @@
-bam? ( sci-biology/samtools ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+bam? ( sci-biology/samtools ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 bam? ( sci-biology/samtools ) sci-biology/bowtie
 0
 http://tophat.cbcb.umd.edu/downloads/tophat-1.4.1.tar.gz
diff --git a/metadata/cache/sci-biology/vaal-1.6 b/metadata/cache/sci-biology/vaal-1.6
index 9338ce069319..1447c47c39b4 100644
--- a/metadata/cache/sci-biology/vaal-1.6
+++ b/metadata/cache/sci-biology/vaal-1.6
@@ -1,4 +1,4 @@
->=dev-libs/boost-1.41.0-r3 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-libs/boost-1.41.0-r3 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=dev-libs/boost-1.41.0-r3
 0
 ftp://ftp.broad.mit.edu/pub/crd/VAAL/VAAL.1.6.tgz ftp://ftp.broad.mit.edu/pub/crd/VAAL/VAAL_manual.doc
diff --git a/metadata/cache/sci-biology/vienna-rna-1.8.4-r1 b/metadata/cache/sci-biology/vienna-rna-1.8.4-r1
index 39d346b56325..ea6c14abaf2c 100644
--- a/metadata/cache/sci-biology/vienna-rna-1.8.4-r1
+++ b/metadata/cache/sci-biology/vienna-rna-1.8.4-r1
@@ -1,4 +1,4 @@
-dev-lang/perl media-libs/gd || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-lang/perl[-build]
+dev-lang/perl media-libs/gd || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-lang/perl[-build]
 dev-lang/perl media-libs/gd dev-lang/perl[-build]
 0
 http://www.tbi.univie.ac.at/~ivo/RNA/ViennaRNA-1.8.4.tar.gz
diff --git a/metadata/cache/sci-biology/vienna-rna-1.8.4-r2 b/metadata/cache/sci-biology/vienna-rna-1.8.4-r2
index 7975fbf7ac6f..4ed19aaceb96 100644
--- a/metadata/cache/sci-biology/vienna-rna-1.8.4-r2
+++ b/metadata/cache/sci-biology/vienna-rna-1.8.4-r2
@@ -1,4 +1,4 @@
-dev-lang/perl media-libs/gd || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-lang/perl[-build]
+dev-lang/perl media-libs/gd || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-lang/perl[-build]
 dev-lang/perl media-libs/gd dev-lang/perl[-build]
 0
 http://www.tbi.univie.ac.at/~ivo/RNA/ViennaRNA-1.8.4.tar.gz
diff --git a/metadata/cache/sci-biology/vienna-rna-1.8.5 b/metadata/cache/sci-biology/vienna-rna-1.8.5
index 8b082222514e..32dde8e1c789 100644
--- a/metadata/cache/sci-biology/vienna-rna-1.8.5
+++ b/metadata/cache/sci-biology/vienna-rna-1.8.5
@@ -1,4 +1,4 @@
-dev-lang/perl media-libs/gd python? ( dev-lang/swig ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( =dev-lang/python-2* ) dev-lang/perl[-build]
+dev-lang/perl media-libs/gd python? ( dev-lang/swig ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( =dev-lang/python-2* ) dev-lang/perl[-build]
 dev-lang/perl media-libs/gd python? ( dev-lang/swig ) python? ( =dev-lang/python-2* ) dev-lang/perl[-build]
 0
 http://www.tbi.univie.ac.at/~ivo/RNA/ViennaRNA-1.8.5.tar.gz
diff --git a/metadata/cache/sci-biology/yass-1.14-r1 b/metadata/cache/sci-biology/yass-1.14-r1
index 94da2ba7eb4e..d94603bc2ff6 100644
--- a/metadata/cache/sci-biology/yass-1.14-r1
+++ b/metadata/cache/sci-biology/yass-1.14-r1
@@ -1,4 +1,4 @@
-dmalloc? ( dev-libs/dmalloc ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dmalloc? ( dev-libs/dmalloc ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dmalloc? ( dev-libs/dmalloc )
 0
 http://bioinfo.lifl.fr/yass/files/yass-1.14.tar.gz
diff --git a/metadata/cache/sci-calculators/calculator-1.6.36 b/metadata/cache/sci-calculators/calculator-1.6.36
index e247fa3efe90..81046594f891 100644
--- a/metadata/cache/sci-calculators/calculator-1.6.36
+++ b/metadata/cache/sci-calculators/calculator-1.6.36
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-util/reswrap >=sys-apps/sed-4
+|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-util/reswrap >=sys-apps/sed-4
 x11-libs/fox:1.6
 0
 ftp://ftp.fox-toolkit.org/pub/fox-1.6.36.tar.gz
diff --git a/metadata/cache/sci-calculators/calculator-1.6.43 b/metadata/cache/sci-calculators/calculator-1.6.43
index 631353f16323..e5b79f0aa1c5 100644
--- a/metadata/cache/sci-calculators/calculator-1.6.43
+++ b/metadata/cache/sci-calculators/calculator-1.6.43
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-util/reswrap >=sys-apps/sed-4
+|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-util/reswrap >=sys-apps/sed-4
 x11-libs/fox:1.6
 0
 ftp://ftp.fox-toolkit.org/pub/fox-1.6.43.tar.gz
diff --git a/metadata/cache/sci-calculators/calculator-1.7.32 b/metadata/cache/sci-calculators/calculator-1.7.32
index 70b499aefa2b..33a4321db28d 100644
--- a/metadata/cache/sci-calculators/calculator-1.7.32
+++ b/metadata/cache/sci-calculators/calculator-1.7.32
@@ -1,4 +1,4 @@
-~x11-libs/fox-1.7.32 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-util/reswrap >=sys-apps/sed-4
+~x11-libs/fox-1.7.32 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-util/reswrap >=sys-apps/sed-4
 ~x11-libs/fox-1.7.32
 0
 ftp://ftp.fox-toolkit.org/pub/fox-1.7.32.tar.gz
diff --git a/metadata/cache/sci-calculators/orpie-1.5.1-r1 b/metadata/cache/sci-calculators/orpie-1.5.1-r1
index 61ad05b4da40..e97358e27763 100644
--- a/metadata/cache/sci-calculators/orpie-1.5.1-r1
+++ b/metadata/cache/sci-calculators/orpie-1.5.1-r1
@@ -1,4 +1,4 @@
-dev-ml/ocamlgsl sys-libs/ncurses || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-ml/ocamlgsl sys-libs/ncurses || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-ml/ocamlgsl sys-libs/ncurses
 0
 http://pessimization.com/software/orpie/orpie-1.5.1.tar.gz
diff --git a/metadata/cache/sci-calculators/qalculate-bases-0.9.4-r2 b/metadata/cache/sci-calculators/qalculate-bases-0.9.4-r2
index c3d70129ebc5..24410a4dc5a7 100644
--- a/metadata/cache/sci-calculators/qalculate-bases-0.9.4-r2
+++ b/metadata/cache/sci-calculators/qalculate-bases-0.9.4-r2
@@ -1,4 +1,4 @@
->=sci-libs/libqalculate-0.9.6-r1 x11-libs/gtk+:2 nls? ( sys-devel/gettext ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=sci-libs/libqalculate-0.9.6-r1 x11-libs/gtk+:2 nls? ( sys-devel/gettext ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=sci-libs/libqalculate-0.9.6-r1 x11-libs/gtk+:2 nls? ( sys-devel/gettext )
 0
 mirror://sourceforge/qalculate/qalculate-bases-0.9.4.tar.gz
diff --git a/metadata/cache/sci-calculators/qalculate-currency-0.9.4-r2 b/metadata/cache/sci-calculators/qalculate-currency-0.9.4-r2
index 313241cb2d56..13b80e3b7d71 100644
--- a/metadata/cache/sci-calculators/qalculate-currency-0.9.4-r2
+++ b/metadata/cache/sci-calculators/qalculate-currency-0.9.4-r2
@@ -1,4 +1,4 @@
->=sci-libs/libqalculate-0.9.6-r1 x11-libs/gtk+:2 nls? ( sys-devel/gettext ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=sci-libs/libqalculate-0.9.6-r1 x11-libs/gtk+:2 nls? ( sys-devel/gettext ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=sci-libs/libqalculate-0.9.6-r1 x11-libs/gtk+:2 nls? ( sys-devel/gettext )
 0
 mirror://sourceforge/qalculate/qalculate-currency-0.9.4.tar.gz
diff --git a/metadata/cache/sci-calculators/qalculate-units-0.9.4-r2 b/metadata/cache/sci-calculators/qalculate-units-0.9.4-r2
index 557aa2b011ab..cd790cff4277 100644
--- a/metadata/cache/sci-calculators/qalculate-units-0.9.4-r2
+++ b/metadata/cache/sci-calculators/qalculate-units-0.9.4-r2
@@ -1,4 +1,4 @@
->=sci-libs/libqalculate-0.9.6-r1 x11-libs/gtk+:2 nls? ( sys-devel/gettext ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=sci-libs/libqalculate-0.9.6-r1 x11-libs/gtk+:2 nls? ( sys-devel/gettext ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=sci-libs/libqalculate-0.9.6-r1 x11-libs/gtk+:2 nls? ( sys-devel/gettext )
 0
 mirror://sourceforge/qalculate/qalculate-units-0.9.4.tar.gz
diff --git a/metadata/cache/sci-chemistry/apbs-1.2.1b-r4 b/metadata/cache/sci-chemistry/apbs-1.2.1b-r4
index 0ce8b679f93e..623493a61e35 100644
--- a/metadata/cache/sci-chemistry/apbs-1.2.1b-r4
+++ b/metadata/cache/sci-chemistry/apbs-1.2.1b-r4
@@ -1,4 +1,4 @@
-dev-libs/maloc[mpi=] virtual/blas sys-libs/readline virtual/fortran arpack? ( sci-libs/arpack ) tools? ( !sci-libs/gts ) mpi? ( virtual/mpi ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( =dev-lang/python-2* )
+dev-libs/maloc[mpi=] virtual/blas sys-libs/readline virtual/fortran arpack? ( sci-libs/arpack ) tools? ( !sci-libs/gts ) mpi? ( virtual/mpi ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( =dev-lang/python-2* )
 dev-libs/maloc[mpi=] virtual/blas sys-libs/readline virtual/fortran arpack? ( sci-libs/arpack ) tools? ( !sci-libs/gts ) mpi? ( virtual/mpi ) python? ( =dev-lang/python-2* )
 0
 mirror://sourceforge/apbs/apbs-1.2.1b-source.tar.gz
diff --git a/metadata/cache/sci-chemistry/apbs-1.3 b/metadata/cache/sci-chemistry/apbs-1.3
index 553d37af8526..33ba1db0cd8c 100644
--- a/metadata/cache/sci-chemistry/apbs-1.3
+++ b/metadata/cache/sci-chemistry/apbs-1.3
@@ -1,4 +1,4 @@
-dev-libs/maloc[mpi=] virtual/blas sys-libs/readline virtual/fortran arpack? ( sci-libs/arpack ) tools? ( !sci-libs/gts ) fetk? ( sci-libs/fetk sci-libs/amd sci-libs/umfpack sci-libs/superlu ) mpi? ( virtual/mpi ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( =dev-lang/python-2* )
+dev-libs/maloc[mpi=] virtual/blas sys-libs/readline virtual/fortran arpack? ( sci-libs/arpack ) tools? ( !sci-libs/gts ) fetk? ( sci-libs/fetk sci-libs/amd sci-libs/umfpack sci-libs/superlu ) mpi? ( virtual/mpi ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( =dev-lang/python-2* )
 dev-libs/maloc[mpi=] virtual/blas sys-libs/readline virtual/fortran arpack? ( sci-libs/arpack ) tools? ( !sci-libs/gts ) fetk? ( sci-libs/fetk sci-libs/amd sci-libs/umfpack sci-libs/superlu ) mpi? ( virtual/mpi ) python? ( =dev-lang/python-2* )
 0
 mirror://sourceforge/apbs/apbs-1.3-source.tar.gz
diff --git a/metadata/cache/sci-chemistry/apbs-1.3-r1 b/metadata/cache/sci-chemistry/apbs-1.3-r1
index 10b9c8bf407c..eed21b3217ff 100644
--- a/metadata/cache/sci-chemistry/apbs-1.3-r1
+++ b/metadata/cache/sci-chemistry/apbs-1.3-r1
@@ -1,4 +1,4 @@
-dev-libs/maloc[mpi=] virtual/blas sys-libs/readline virtual/fortran arpack? ( sci-libs/arpack ) tools? ( !sci-libs/gts !sci-chemistry/ccpn ) fetk? ( sci-libs/fetk sci-libs/amd sci-libs/umfpack sci-libs/superlu ) mpi? ( virtual/mpi ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( =dev-lang/python-2* )
+dev-libs/maloc[mpi=] virtual/blas sys-libs/readline virtual/fortran arpack? ( sci-libs/arpack ) tools? ( !sci-libs/gts !sci-chemistry/ccpn ) fetk? ( sci-libs/fetk sci-libs/amd sci-libs/umfpack sci-libs/superlu ) mpi? ( virtual/mpi ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( =dev-lang/python-2* )
 dev-libs/maloc[mpi=] virtual/blas sys-libs/readline virtual/fortran arpack? ( sci-libs/arpack ) tools? ( !sci-libs/gts !sci-chemistry/ccpn ) fetk? ( sci-libs/fetk sci-libs/amd sci-libs/umfpack sci-libs/superlu ) mpi? ( virtual/mpi ) python? ( =dev-lang/python-2* )
 0
 mirror://sourceforge/apbs/apbs-1.3-source.tar.gz
diff --git a/metadata/cache/sci-chemistry/aria-2.3.2-r3 b/metadata/cache/sci-chemistry/aria-2.3.2-r3
new file mode 100644
index 000000000000..971d40d824a7
--- /dev/null
+++ b/metadata/cache/sci-chemistry/aria-2.3.2-r3
@@ -0,0 +1,22 @@
+sci-chemistry/clashlist sci-chemistry/procheck sci-libs/clashscore-db dev-python/numpy dev-python/matplotlib[tk] >=sci-chemistry/cns-1.2.1-r7[aria,openmp] >=dev-lang/tk-8.3 >=sci-chemistry/ccpn-2.0.5 >=dev-tcltk/tix-8.1.4 =dev-lang/python-2* =dev-lang/python-2*[tk]
+sci-chemistry/clashlist sci-chemistry/procheck sci-libs/clashscore-db dev-python/numpy dev-python/matplotlib[tk] >=sci-chemistry/cns-1.2.1-r7[aria,openmp] >=dev-lang/tk-8.3 >=sci-chemistry/ccpn-2.0.5 >=dev-tcltk/tix-8.1.4 =dev-lang/python-2* =dev-lang/python-2*[tk]
+0
+http://aria.pasteur.fr/archives/aria2.3.2.tar.gz
+fetch
+http://aria.pasteur.fr/
+cns
+Automated NOE assignment and NMR structure calculation
+~amd64 ~x86 ~amd64-linux ~x86-linux
+base eutils multilib python toolchain-funcs user versionator
+examples
+
+
+
+3
+
+compile configure install nofetch postinst postrm prepare setup test unpack
+
+
+
+
+
diff --git a/metadata/cache/sci-chemistry/autodock-4.2.3-r1 b/metadata/cache/sci-chemistry/autodock-4.2.3-r1
index 3597f1561878..6d73a80cf6ea 100644
--- a/metadata/cache/sci-chemistry/autodock-4.2.3-r1
+++ b/metadata/cache/sci-chemistry/autodock-4.2.3-r1
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool test? ( =dev-lang/python-2* )
+|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool test? ( =dev-lang/python-2* )
 test? ( =dev-lang/python-2* )
 0
 mirror://gentoo/autodocksuite/autodocksuite-4.2.3-src.tar.gz
diff --git a/metadata/cache/sci-chemistry/burrow-owl-1.4-r1 b/metadata/cache/sci-chemistry/burrow-owl-1.4-r1
index 99727c688d25..0d28a994ddf0 100644
--- a/metadata/cache/sci-chemistry/burrow-owl-1.4-r1
+++ b/metadata/cache/sci-chemistry/burrow-owl-1.4-r1
@@ -1,4 +1,4 @@
-dev-scheme/guile[networking,regex] dev-scheme/guile-gnome-platform >=dev-scheme/guile-cairo-1.4 >=sci-libs/starparse-1.0 x11-libs/gtk+:2 dev-util/indent dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+dev-scheme/guile[networking,regex] dev-scheme/guile-gnome-platform >=dev-scheme/guile-cairo-1.4 >=sci-libs/starparse-1.0 x11-libs/gtk+:2 dev-util/indent dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 dev-scheme/guile[networking,regex] dev-scheme/guile-gnome-platform >=dev-scheme/guile-cairo-1.4 >=sci-libs/starparse-1.0 x11-libs/gtk+:2
 0
 examples? ( mirror://sourceforge/burrow-owl/burrow-demos.tar ) mirror://sourceforge/burrow-owl/burrow-owl-1.4.tar.gz
diff --git a/metadata/cache/sci-chemistry/burrow-owl-1.5 b/metadata/cache/sci-chemistry/burrow-owl-1.5
index 3542c3f3bcf2..b906765bd88e 100644
--- a/metadata/cache/sci-chemistry/burrow-owl-1.5
+++ b/metadata/cache/sci-chemistry/burrow-owl-1.5
@@ -1,4 +1,4 @@
-dev-libs/g-wrap dev-libs/glib:2 dev-scheme/guile[networking,regex] dev-scheme/guile-cairo dev-scheme/guile-gnome-platform sci-libs/starparse x11-libs/gtk+:2 dev-util/indent dev-util/pkgconfig doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-libs/g-wrap dev-libs/glib:2 dev-scheme/guile[networking,regex] dev-scheme/guile-cairo dev-scheme/guile-gnome-platform sci-libs/starparse x11-libs/gtk+:2 dev-util/indent dev-util/pkgconfig doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-libs/g-wrap dev-libs/glib:2 dev-scheme/guile[networking,regex] dev-scheme/guile-cairo dev-scheme/guile-gnome-platform sci-libs/starparse x11-libs/gtk+:2
 0
 mirror://sourceforge/burrow-owl/burrow-owl-1.5.tar.gz examples? ( mirror://sourceforge/burrow-owl/burrow-demos.tar )
diff --git a/metadata/cache/sci-chemistry/ccp4-apps-6.1.3-r10 b/metadata/cache/sci-chemistry/ccp4-apps-6.1.3-r10
index fcce7db1a35e..bbfa174003e9 100644
--- a/metadata/cache/sci-chemistry/ccp4-apps-6.1.3-r10
+++ b/metadata/cache/sci-chemistry/ccp4-apps-6.1.3-r10
@@ -1,4 +1,4 @@
->=dev-lang/tk-8.3 >=dev-tcltk/blt-2.4 dev-tcltk/iwidgets dev-tcltk/itcl dev-tcltk/itk >=dev-tcltk/tdom-0.8 dev-tcltk/tktreectrl ~sci-libs/ccp4-libs-6.1.3 >=sci-libs/ccp4-libs-6.1.3-r7 sci-libs/clipper sci-libs/fftw:2.1 sci-libs/mmdb sci-libs/ssm virtual/blas virtual/lapack app-shells/tcsh dev-python/pyxml dev-libs/libxml2:2 dev-libs/libjwc_c dev-libs/libjwc_f dev-libs/boehm-gc virtual/fortran !app-office/sc !<sci-chemistry/ccp4-6.1.3 X? ( x11-libs/libX11 x11-libs/libXaw x11-libs/libXt x11-libs/libxdl_view ) X? ( x11-misc/imake x11-proto/inputproto x11-proto/xextproto ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool sys-devel/gnuconfig =dev-lang/python-2*
+>=dev-lang/tk-8.3 >=dev-tcltk/blt-2.4 dev-tcltk/iwidgets dev-tcltk/itcl dev-tcltk/itk >=dev-tcltk/tdom-0.8 dev-tcltk/tktreectrl ~sci-libs/ccp4-libs-6.1.3 >=sci-libs/ccp4-libs-6.1.3-r7 sci-libs/clipper sci-libs/fftw:2.1 sci-libs/mmdb sci-libs/ssm virtual/blas virtual/lapack app-shells/tcsh dev-python/pyxml dev-libs/libxml2:2 dev-libs/libjwc_c dev-libs/libjwc_f dev-libs/boehm-gc virtual/fortran !app-office/sc !<sci-chemistry/ccp4-6.1.3 X? ( x11-libs/libX11 x11-libs/libXaw x11-libs/libXt x11-libs/libxdl_view ) X? ( x11-misc/imake x11-proto/inputproto x11-proto/xextproto ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool sys-devel/gnuconfig =dev-lang/python-2*
 >=dev-lang/tk-8.3 >=dev-tcltk/blt-2.4 dev-tcltk/iwidgets dev-tcltk/itcl dev-tcltk/itk >=dev-tcltk/tdom-0.8 dev-tcltk/tktreectrl ~sci-libs/ccp4-libs-6.1.3 >=sci-libs/ccp4-libs-6.1.3-r7 sci-libs/clipper sci-libs/fftw:2.1 sci-libs/mmdb sci-libs/ssm virtual/blas virtual/lapack app-shells/tcsh dev-python/pyxml dev-libs/libxml2:2 dev-libs/libjwc_c dev-libs/libjwc_f dev-libs/boehm-gc virtual/fortran !app-office/sc !<sci-chemistry/ccp4-6.1.3 X? ( x11-libs/libX11 x11-libs/libXaw x11-libs/libXt x11-libs/libxdl_view ) =dev-lang/python-2*
 0
 ftp://ftp.ccp4.ac.uk/ccp4/6.1.3/ccp4-6.1.3-core-src.tar.gz http://dev.gentooexperimental.org/~jlec/distfiles/6.1.3-oasis4.0.patch.bz2
diff --git a/metadata/cache/sci-chemistry/ccp4-apps-6.1.3-r9 b/metadata/cache/sci-chemistry/ccp4-apps-6.1.3-r9
index aa07c91b7dd3..a85523446307 100644
--- a/metadata/cache/sci-chemistry/ccp4-apps-6.1.3-r9
+++ b/metadata/cache/sci-chemistry/ccp4-apps-6.1.3-r9
@@ -1,4 +1,4 @@
->=dev-lang/tk-8.3 >=dev-tcltk/blt-2.4 dev-tcltk/iwidgets dev-tcltk/itcl dev-tcltk/itk >=dev-tcltk/tdom-0.8 dev-tcltk/tktreectrl ~sci-libs/ccp4-libs-6.1.3 >=sci-libs/ccp4-libs-6.1.3-r7 sci-libs/clipper sci-libs/fftw:2.1 sci-libs/mmdb virtual/blas virtual/lapack app-shells/tcsh dev-python/pyxml dev-libs/libxml2:2 dev-libs/libjwc_c dev-libs/libjwc_f dev-libs/boehm-gc virtual/fortran !app-office/sc !<sci-chemistry/ccp4-6.1.3 X? ( x11-libs/libX11 x11-libs/libXaw x11-libs/libXt x11-libs/libxdl_view ) X? ( x11-misc/imake x11-proto/inputproto x11-proto/xextproto ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool sys-devel/gnuconfig =dev-lang/python-2*
+>=dev-lang/tk-8.3 >=dev-tcltk/blt-2.4 dev-tcltk/iwidgets dev-tcltk/itcl dev-tcltk/itk >=dev-tcltk/tdom-0.8 dev-tcltk/tktreectrl ~sci-libs/ccp4-libs-6.1.3 >=sci-libs/ccp4-libs-6.1.3-r7 sci-libs/clipper sci-libs/fftw:2.1 sci-libs/mmdb virtual/blas virtual/lapack app-shells/tcsh dev-python/pyxml dev-libs/libxml2:2 dev-libs/libjwc_c dev-libs/libjwc_f dev-libs/boehm-gc virtual/fortran !app-office/sc !<sci-chemistry/ccp4-6.1.3 X? ( x11-libs/libX11 x11-libs/libXaw x11-libs/libXt x11-libs/libxdl_view ) X? ( x11-misc/imake x11-proto/inputproto x11-proto/xextproto ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool sys-devel/gnuconfig =dev-lang/python-2*
 >=dev-lang/tk-8.3 >=dev-tcltk/blt-2.4 dev-tcltk/iwidgets dev-tcltk/itcl dev-tcltk/itk >=dev-tcltk/tdom-0.8 dev-tcltk/tktreectrl ~sci-libs/ccp4-libs-6.1.3 >=sci-libs/ccp4-libs-6.1.3-r7 sci-libs/clipper sci-libs/fftw:2.1 sci-libs/mmdb virtual/blas virtual/lapack app-shells/tcsh dev-python/pyxml dev-libs/libxml2:2 dev-libs/libjwc_c dev-libs/libjwc_f dev-libs/boehm-gc virtual/fortran !app-office/sc !<sci-chemistry/ccp4-6.1.3 X? ( x11-libs/libX11 x11-libs/libXaw x11-libs/libXt x11-libs/libxdl_view ) =dev-lang/python-2*
 0
 ftp://ftp.ccp4.ac.uk/ccp4/6.1.3/ccp4-6.1.3-core-src.tar.gz http://dev.gentooexperimental.org/~jlec/distfiles/6.1.3-oasis4.0.patch.bz2
diff --git a/metadata/cache/sci-chemistry/chemtool-1.6.12-r1 b/metadata/cache/sci-chemistry/chemtool-1.6.12-r1
index 55581b04cf2e..1a0757e6c338 100644
--- a/metadata/cache/sci-chemistry/chemtool-1.6.12-r1
+++ b/metadata/cache/sci-chemistry/chemtool-1.6.12-r1
@@ -1,4 +1,4 @@
-dev-libs/glib:2 media-gfx/transfig x11-libs/gtk+:2 x11-libs/libX11 x11-libs/pango emf? ( media-libs/libemf ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-libs/glib:2 media-gfx/transfig x11-libs/gtk+:2 x11-libs/libX11 x11-libs/pango emf? ( media-libs/libemf ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-libs/glib:2 media-gfx/transfig x11-libs/gtk+:2 x11-libs/libX11 x11-libs/pango emf? ( media-libs/libemf )
 0
 http://ruby.chemie.uni-freiburg.de/~martin/chemtool/chemtool-1.6.12.tar.gz
diff --git a/metadata/cache/sci-chemistry/chemtool-1.6.13 b/metadata/cache/sci-chemistry/chemtool-1.6.13
index 1ccb4cb1442d..2ba2aced6b47 100644
--- a/metadata/cache/sci-chemistry/chemtool-1.6.13
+++ b/metadata/cache/sci-chemistry/chemtool-1.6.13
@@ -1,4 +1,4 @@
-dev-libs/glib:2 media-gfx/transfig x11-libs/gtk+:2 x11-libs/libX11 x11-libs/pango emf? ( media-libs/libemf ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-libs/glib:2 media-gfx/transfig x11-libs/gtk+:2 x11-libs/libX11 x11-libs/pango emf? ( media-libs/libemf ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-libs/glib:2 media-gfx/transfig x11-libs/gtk+:2 x11-libs/libX11 x11-libs/pango emf? ( media-libs/libemf )
 0
 http://ruby.chemie.uni-freiburg.de/~martin/chemtool/chemtool-1.6.13.tar.gz
diff --git a/metadata/cache/sci-chemistry/coot-0.6.2 b/metadata/cache/sci-chemistry/coot-0.6.2
index d12e9054e75c..2ee6b08880c8 100644
--- a/metadata/cache/sci-chemistry/coot-0.6.2
+++ b/metadata/cache/sci-chemistry/coot-0.6.2
@@ -1,4 +1,4 @@
->=sci-libs/ccp4-libs-6.1 >=sci-libs/clipper-20090520 >=sci-libs/coot-data-2 >=sci-libs/gsl-1.3 >=sci-libs/mmdb-1.23 sci-libs/ssm <sci-libs/monomer-db-1 sci-chemistry/reduce <sci-chemistry/refmac-5.6 sci-chemistry/probe gnome-base/libgnomecanvas gnome-base/librsvg:2 media-libs/libpng media-libs/freeglut x11-libs/gtk+:2 x11-libs/gtkglext dev-scheme/net-http dev-scheme/guile-gui >=dev-scheme/guile-lib-0.1.6 dev-scheme/guile-www >=x11-libs/guile-gtk-2.1 dev-python/pygtk:2 >=dev-libs/gmp-4.2.2-r2 >=net-misc/curl-7.19.6 net-dns/libidn dev-lang/swig sys-devel/bc test? ( dev-scheme/greg ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool =dev-lang/python-2*
+>=sci-libs/ccp4-libs-6.1 >=sci-libs/clipper-20090520 >=sci-libs/coot-data-2 >=sci-libs/gsl-1.3 >=sci-libs/mmdb-1.23 sci-libs/ssm <sci-libs/monomer-db-1 sci-chemistry/reduce <sci-chemistry/refmac-5.6 sci-chemistry/probe gnome-base/libgnomecanvas gnome-base/librsvg:2 media-libs/libpng media-libs/freeglut x11-libs/gtk+:2 x11-libs/gtkglext dev-scheme/net-http dev-scheme/guile-gui >=dev-scheme/guile-lib-0.1.6 dev-scheme/guile-www >=x11-libs/guile-gtk-2.1 dev-python/pygtk:2 >=dev-libs/gmp-4.2.2-r2 >=net-misc/curl-7.19.6 net-dns/libidn dev-lang/swig sys-devel/bc test? ( dev-scheme/greg ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool =dev-lang/python-2*
 >=sci-libs/ccp4-libs-6.1 >=sci-libs/clipper-20090520 >=sci-libs/coot-data-2 >=sci-libs/gsl-1.3 >=sci-libs/mmdb-1.23 sci-libs/ssm <sci-libs/monomer-db-1 sci-chemistry/reduce <sci-chemistry/refmac-5.6 sci-chemistry/probe gnome-base/libgnomecanvas gnome-base/librsvg:2 media-libs/libpng media-libs/freeglut x11-libs/gtk+:2 x11-libs/gtkglext dev-scheme/net-http dev-scheme/guile-gui >=dev-scheme/guile-lib-0.1.6 dev-scheme/guile-www >=x11-libs/guile-gtk-2.1 dev-python/pygtk:2 >=dev-libs/gmp-4.2.2-r2 >=net-misc/curl-7.19.6 net-dns/libidn =dev-lang/python-2*
 0
 http://www.biop.ox.ac.uk/coot/software/source/releases/coot-0.6.2.tar.gz test? ( http://dev.gentoo.org/~jlec/distfiles/greg-data-0.6.2.tar.gz )
diff --git a/metadata/cache/sci-chemistry/coot-0.6.2-r1 b/metadata/cache/sci-chemistry/coot-0.6.2-r1
index e563fc8ae278..10f0ac11a9e6 100644
--- a/metadata/cache/sci-chemistry/coot-0.6.2-r1
+++ b/metadata/cache/sci-chemistry/coot-0.6.2-r1
@@ -1,4 +1,4 @@
->=sci-libs/ccp4-libs-6.1 >=sci-libs/clipper-20090520 >=sci-libs/coot-data-2 >=sci-libs/gsl-1.3 >=sci-libs/mmdb-1.23 sci-libs/ssm <sci-libs/monomer-db-1 sci-chemistry/reduce <sci-chemistry/refmac-5.6 sci-chemistry/probe gnome-base/libgnomecanvas gnome-base/librsvg:2 media-libs/libpng media-libs/freeglut x11-libs/gtk+:2 x11-libs/gtkglext dev-scheme/net-http dev-scheme/guile-gui >=dev-scheme/guile-lib-0.1.6 dev-scheme/guile-www >=x11-libs/guile-gtk-2.1 dev-python/pygtk:2 >=dev-libs/gmp-4.2.2-r2 >=net-misc/curl-7.19.6 net-dns/libidn dev-lang/swig sys-devel/bc test? ( dev-scheme/greg ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool =dev-lang/python-2*
+>=sci-libs/ccp4-libs-6.1 >=sci-libs/clipper-20090520 >=sci-libs/coot-data-2 >=sci-libs/gsl-1.3 >=sci-libs/mmdb-1.23 sci-libs/ssm <sci-libs/monomer-db-1 sci-chemistry/reduce <sci-chemistry/refmac-5.6 sci-chemistry/probe gnome-base/libgnomecanvas gnome-base/librsvg:2 media-libs/libpng media-libs/freeglut x11-libs/gtk+:2 x11-libs/gtkglext dev-scheme/net-http dev-scheme/guile-gui >=dev-scheme/guile-lib-0.1.6 dev-scheme/guile-www >=x11-libs/guile-gtk-2.1 dev-python/pygtk:2 >=dev-libs/gmp-4.2.2-r2 >=net-misc/curl-7.19.6 net-dns/libidn dev-lang/swig sys-devel/bc test? ( dev-scheme/greg ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool =dev-lang/python-2*
 >=sci-libs/ccp4-libs-6.1 >=sci-libs/clipper-20090520 >=sci-libs/coot-data-2 >=sci-libs/gsl-1.3 >=sci-libs/mmdb-1.23 sci-libs/ssm <sci-libs/monomer-db-1 sci-chemistry/reduce <sci-chemistry/refmac-5.6 sci-chemistry/probe gnome-base/libgnomecanvas gnome-base/librsvg:2 media-libs/libpng media-libs/freeglut x11-libs/gtk+:2 x11-libs/gtkglext dev-scheme/net-http dev-scheme/guile-gui >=dev-scheme/guile-lib-0.1.6 dev-scheme/guile-www >=x11-libs/guile-gtk-2.1 dev-python/pygtk:2 >=dev-libs/gmp-4.2.2-r2 >=net-misc/curl-7.19.6 net-dns/libidn =dev-lang/python-2*
 0
 http://www.biop.ox.ac.uk/coot/software/source/releases/coot-0.6.2.tar.gz test? ( http://dev.gentoo.org/~jlec/distfiles/greg-data-0.6.2.tar.gz )
diff --git a/metadata/cache/sci-chemistry/coot-0.7_pre4040 b/metadata/cache/sci-chemistry/coot-0.7_pre4040
index 61a842c7c68f..85a5aa985191 100644
--- a/metadata/cache/sci-chemistry/coot-0.7_pre4040
+++ b/metadata/cache/sci-chemistry/coot-0.7_pre4040
@@ -1,4 +1,4 @@
->=sci-libs/ccp4-libs-6.1 >=sci-libs/clipper-20090520 >=sci-libs/coot-data-2 >=sci-libs/gsl-1.3 >=sci-libs/mmdb-1.23 sci-libs/ssm <sci-libs/monomer-db-1 sci-chemistry/reduce <sci-chemistry/refmac-5.6 sci-chemistry/probe gnome-base/libgnomecanvas gnome-base/librsvg:2 media-libs/libpng media-libs/freeglut x11-libs/gtk+:2 x11-libs/goocanvas:0 x11-libs/gtkglext dev-scheme/net-http dev-scheme/guile-gui >=dev-scheme/guile-lib-0.1.6 dev-scheme/guile-www >=x11-libs/guile-gtk-2.1 dev-python/pygtk:2 >=dev-libs/gmp-4.2.2-r2 >=net-misc/curl-7.19.6 net-dns/libidn >=sys-devel/libtool-2.4-r2 dev-lang/swig sys-devel/bc test? ( dev-scheme/greg ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool =dev-lang/python-2*
+>=sci-libs/ccp4-libs-6.1 >=sci-libs/clipper-20090520 >=sci-libs/coot-data-2 >=sci-libs/gsl-1.3 >=sci-libs/mmdb-1.23 sci-libs/ssm <sci-libs/monomer-db-1 sci-chemistry/reduce <sci-chemistry/refmac-5.6 sci-chemistry/probe gnome-base/libgnomecanvas gnome-base/librsvg:2 media-libs/libpng media-libs/freeglut x11-libs/gtk+:2 x11-libs/goocanvas:0 x11-libs/gtkglext dev-scheme/net-http dev-scheme/guile-gui >=dev-scheme/guile-lib-0.1.6 dev-scheme/guile-www >=x11-libs/guile-gtk-2.1 dev-python/pygtk:2 >=dev-libs/gmp-4.2.2-r2 >=net-misc/curl-7.19.6 net-dns/libidn >=sys-devel/libtool-2.4-r2 dev-lang/swig sys-devel/bc test? ( dev-scheme/greg ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool =dev-lang/python-2*
 >=sci-libs/ccp4-libs-6.1 >=sci-libs/clipper-20090520 >=sci-libs/coot-data-2 >=sci-libs/gsl-1.3 >=sci-libs/mmdb-1.23 sci-libs/ssm <sci-libs/monomer-db-1 sci-chemistry/reduce <sci-chemistry/refmac-5.6 sci-chemistry/probe gnome-base/libgnomecanvas gnome-base/librsvg:2 media-libs/libpng media-libs/freeglut x11-libs/gtk+:2 x11-libs/goocanvas:0 x11-libs/gtkglext dev-scheme/net-http dev-scheme/guile-gui >=dev-scheme/guile-lib-0.1.6 dev-scheme/guile-www >=x11-libs/guile-gtk-2.1 dev-python/pygtk:2 >=dev-libs/gmp-4.2.2-r2 >=net-misc/curl-7.19.6 net-dns/libidn =dev-lang/python-2*
 0
 http://dev.gentoo.org/~jlec/distfiles/coot-0.7_pre4040.tar.xz test? ( http://dev.gentoo.org/~jlec/distfiles/greg-data-0.7_pre4040.tar.gz )
diff --git a/metadata/cache/sci-chemistry/gchemutils-0.10.12 b/metadata/cache/sci-chemistry/gchemutils-0.10.12
index 159928354892..3b02e6a248bc 100644
--- a/metadata/cache/sci-chemistry/gchemutils-0.10.12
+++ b/metadata/cache/sci-chemistry/gchemutils-0.10.12
@@ -1,4 +1,4 @@
-gnome-base/libglade:2.0 gnome-base/libgnomeprintui:2.2 >=gnome-extra/libgsf-1.14 x11-libs/goffice:0.8 x11-libs/gtkglext app-text/gnome-doc-utils >=sci-chemistry/openbabel-2.1.1 sci-chemistry/bodr sci-chemistry/chemical-mime-data dev-util/pkgconfig app-text/rarian dev-util/intltool || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+gnome-base/libglade:2.0 gnome-base/libgnomeprintui:2.2 >=gnome-extra/libgsf-1.14 x11-libs/goffice:0.8 x11-libs/gtkglext app-text/gnome-doc-utils >=sci-chemistry/openbabel-2.1.1 sci-chemistry/bodr sci-chemistry/chemical-mime-data dev-util/pkgconfig app-text/rarian dev-util/intltool || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 gnome-base/libglade:2.0 gnome-base/libgnomeprintui:2.2 >=gnome-extra/libgsf-1.14 x11-libs/goffice:0.8 x11-libs/gtkglext app-text/gnome-doc-utils >=sci-chemistry/openbabel-2.1.1 sci-chemistry/bodr sci-chemistry/chemical-mime-data
 0
 http://savannah.nongnu.org/download/gchemutils/0.10/gnome-chemistry-utils-0.10.12.tar.bz2
diff --git a/metadata/cache/sci-chemistry/ghemical-2.99.2-r2 b/metadata/cache/sci-chemistry/ghemical-2.99.2-r2
index 110a32a2ef99..a4b376179923 100644
--- a/metadata/cache/sci-chemistry/ghemical-2.99.2-r2
+++ b/metadata/cache/sci-chemistry/ghemical-2.99.2-r2
@@ -1,4 +1,4 @@
-dev-libs/glib:2 gnome-base/libglade:2.0 sci-chemistry/mpqc >=sci-libs/libghemical-2.99 >=x11-libs/liboglappth-0.98 virtual/opengl x11-libs/pango x11-libs/gtk+:2 x11-libs/gtkglext openbabel? ( sci-chemistry/openbabel ) >=dev-util/pkgconfig-0.15 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-libs/glib:2 gnome-base/libglade:2.0 sci-chemistry/mpqc >=sci-libs/libghemical-2.99 >=x11-libs/liboglappth-0.98 virtual/opengl x11-libs/pango x11-libs/gtk+:2 x11-libs/gtkglext openbabel? ( sci-chemistry/openbabel ) >=dev-util/pkgconfig-0.15 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-libs/glib:2 gnome-base/libglade:2.0 sci-chemistry/mpqc >=sci-libs/libghemical-2.99 >=x11-libs/liboglappth-0.98 virtual/opengl x11-libs/pango x11-libs/gtk+:2 x11-libs/gtkglext openbabel? ( sci-chemistry/openbabel )
 0
 http://bioinformatics.org/ghemical/download/current/ghemical-2.99.2.tar.gz
diff --git a/metadata/cache/sci-chemistry/mm-align-20120321 b/metadata/cache/sci-chemistry/mm-align-20120321
new file mode 100644
index 000000000000..a2aa4a427f9f
--- /dev/null
+++ b/metadata/cache/sci-chemistry/mm-align-20120321
@@ -0,0 +1,22 @@
+>=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
+
+0
+http://dev.gentoo.org/~jlec/distfiles/MM-align-20120321.tar.xz
+
+http://zhanglab.ccmb.med.umich.edu/MM-align/
+as-is
+Protein Complex Structural Alignment
+~amd64 ~x86 ~amd64-linux ~x86-linux
+base cmake-utils eutils flag-o-matic fortran-2 multilib toolchain-funcs user
+
+
+
+
+4
+
+compile configure install prepare setup test unpack
+
+
+
+
+
diff --git a/metadata/cache/sci-chemistry/mmtk-2.7.5 b/metadata/cache/sci-chemistry/mmtk-2.7.5
new file mode 100644
index 000000000000..5a0f5f30b9a4
--- /dev/null
+++ b/metadata/cache/sci-chemistry/mmtk-2.7.5
@@ -0,0 +1,22 @@
+dev-python/numpy dev-python/scientificpython =dev-lang/python-2*
+dev-python/numpy dev-python/scientificpython =dev-lang/python-2*
+0
+https://sourcesup.cru.fr/frs/download.php/3794/MMTK-2.7.5.tar.gz
+
+http://dirac.cnrs-orleans.fr/MMTK/
+CeCILL-2
+The Molecular Modelling Toolkit
+~amd64 ~x86 ~amd64-linux ~x86-linux
+distutils multilib python toolchain-funcs
+
+
+
+
+4
+
+compile install postinst postrm prepare setup
+
+
+
+
+
diff --git a/metadata/cache/sci-chemistry/mopac7-1.15 b/metadata/cache/sci-chemistry/mopac7-1.15
index 185c0d6dada0..4ae15a6ffc55 100644
--- a/metadata/cache/sci-chemistry/mopac7-1.15
+++ b/metadata/cache/sci-chemistry/mopac7-1.15
@@ -1,4 +1,4 @@
-virtual/fortran dev-libs/libf2c || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+virtual/fortran dev-libs/libf2c || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 virtual/fortran dev-libs/libf2c
 0
 http://www.bioinformatics.org/ghemical/download/current/mopac7-1.15.tar.gz http://wwwuser.gwdg.de/~ggroenh/qmmm/mopac/dcart.f http://wwwuser.gwdg.de/~ggroenh/qmmm/mopac/gmxmop.f
diff --git a/metadata/cache/sci-chemistry/mpqc-2.3.1-r2 b/metadata/cache/sci-chemistry/mpqc-2.3.1-r2
index 0fbe1f1eea93..2dc1439ae0ce 100644
--- a/metadata/cache/sci-chemistry/mpqc-2.3.1-r2
+++ b/metadata/cache/sci-chemistry/mpqc-2.3.1-r2
@@ -1,4 +1,4 @@
-virtual/blas virtual/lapack mpi? ( virtual/mpi[cxx] ) tk? ( dev-lang/tk ) dev-lang/perl sys-devel/flex sys-apps/sed doc? ( app-doc/doxygen media-gfx/graphviz ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+virtual/blas virtual/lapack mpi? ( virtual/mpi[cxx] ) tk? ( dev-lang/tk ) dev-lang/perl sys-devel/flex sys-apps/sed doc? ( app-doc/doxygen media-gfx/graphviz ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 virtual/blas virtual/lapack mpi? ( virtual/mpi[cxx] ) tk? ( dev-lang/tk )
 0
 mirror://sourceforge/mpqc/mpqc-2.3.1.tar.bz2
diff --git a/metadata/cache/sci-chemistry/mpqc-2.3.1-r3 b/metadata/cache/sci-chemistry/mpqc-2.3.1-r3
index a416903e9ccf..e1afa987564d 100644
--- a/metadata/cache/sci-chemistry/mpqc-2.3.1-r3
+++ b/metadata/cache/sci-chemistry/mpqc-2.3.1-r3
@@ -1,4 +1,4 @@
-virtual/blas virtual/lapack mpi? ( virtual/mpi[cxx] ) tk? ( dev-lang/tk ) dev-lang/perl sys-devel/flex sys-apps/sed doc? ( app-doc/doxygen media-gfx/graphviz ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+virtual/blas virtual/lapack mpi? ( virtual/mpi[cxx] ) tk? ( dev-lang/tk ) dev-lang/perl sys-devel/flex sys-apps/sed doc? ( app-doc/doxygen media-gfx/graphviz ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 virtual/blas virtual/lapack mpi? ( virtual/mpi[cxx] ) tk? ( dev-lang/tk )
 0
 mirror://sourceforge/mpqc/mpqc-2.3.1.tar.bz2
diff --git a/metadata/cache/sci-chemistry/pdb2pqr-1.5.0-r2 b/metadata/cache/sci-chemistry/pdb2pqr-1.5.0-r2
index 6057ddb3df68..21fd7c7e02c3 100644
--- a/metadata/cache/sci-chemistry/pdb2pqr-1.5.0-r2
+++ b/metadata/cache/sci-chemistry/pdb2pqr-1.5.0-r2
@@ -1,4 +1,4 @@
-virtual/fortran dev-python/numpy sci-chemistry/openbabel opal? ( dev-python/zsi ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
+virtual/fortran dev-python/numpy sci-chemistry/openbabel opal? ( dev-python/zsi ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
 virtual/fortran dev-python/numpy sci-chemistry/openbabel opal? ( dev-python/zsi ) || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
 0
 mirror://sourceforge/pdb2pqr/pdb2pqr-1.5.tar.gz
diff --git a/metadata/cache/sci-chemistry/pdb2pqr-1.7.0 b/metadata/cache/sci-chemistry/pdb2pqr-1.7.0
index 64a2678e902e..575599aa542f 100644
--- a/metadata/cache/sci-chemistry/pdb2pqr-1.7.0
+++ b/metadata/cache/sci-chemistry/pdb2pqr-1.7.0
@@ -1,4 +1,4 @@
-virtual/fortran dev-python/numpy sci-chemistry/openbabel opal? ( dev-python/zsi ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
+virtual/fortran dev-python/numpy sci-chemistry/openbabel opal? ( dev-python/zsi ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
 virtual/fortran dev-python/numpy sci-chemistry/openbabel opal? ( dev-python/zsi ) || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
 0
 mirror://sourceforge/pdb2pqr/pdb2pqr-1.7.tar.gz
diff --git a/metadata/cache/sci-chemistry/pdb2pqr-1.7.0-r1 b/metadata/cache/sci-chemistry/pdb2pqr-1.7.0-r1
index b274472fb812..28fb796b0072 100644
--- a/metadata/cache/sci-chemistry/pdb2pqr-1.7.0-r1
+++ b/metadata/cache/sci-chemistry/pdb2pqr-1.7.0-r1
@@ -1,4 +1,4 @@
-virtual/fortran dev-python/numpy sci-chemistry/openbabel opal? ( dev-python/zsi ) pdb2pka? ( sci-chemistry/apbs[python,-mpi] ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
+virtual/fortran dev-python/numpy sci-chemistry/openbabel opal? ( dev-python/zsi ) pdb2pka? ( sci-chemistry/apbs[python,-mpi] ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
 virtual/fortran dev-python/numpy sci-chemistry/openbabel opal? ( dev-python/zsi ) pdb2pka? ( sci-chemistry/apbs[python,-mpi] ) || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
 0
 mirror://sourceforge/pdb2pqr/pdb2pqr-1.7.tar.gz
diff --git a/metadata/cache/sci-chemistry/pdbmat-3.89 b/metadata/cache/sci-chemistry/pdbmat-3.89
new file mode 100644
index 000000000000..45f46cae6adb
--- /dev/null
+++ b/metadata/cache/sci-chemistry/pdbmat-3.89
@@ -0,0 +1,22 @@
+>=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
+
+0
+http://ecole.modelisation.free.fr/enm2011.tar.gz -> pdbmat-3.89.tar.gz
+
+http://ecole.modelisation.free.fr/modes.html
+as-is
+Calculate Tirion's model from pdb structures
+~amd64 ~x86 ~amd64-linux ~x86-linux
+base cmake-utils eutils flag-o-matic fortran-2 multilib toolchain-funcs user
+examples
+
+
+
+4
+
+compile configure install prepare setup test unpack
+
+
+
+
+
diff --git a/metadata/cache/sci-chemistry/pymol-plugins-psico-3.0 b/metadata/cache/sci-chemistry/pymol-plugins-psico-3.0
new file mode 100644
index 000000000000..706314ffa732
--- /dev/null
+++ b/metadata/cache/sci-chemistry/pymol-plugins-psico-3.0
@@ -0,0 +1,22 @@
+=dev-lang/python-2*
+dev-python/numpy sci-biology/biopython sci-chemistry/mmtk !minimal? ( media-libs/qhull media-video/mplayer sci-biology/stride sci-chemistry/dssp sci-chemistry/mm-align sci-chemistry/pdbmat sci-chemistry/theseus sci-chemistry/tm-align sci-mathematics/diagrtb ) =dev-lang/python-2*
+0
+https://github.com/speleo3/pymol-psico/tarball/3.0 -> pymol-plugins-psico-3.0.tar.gz
+
+https://github.com/speleo3/pymol-psico/
+BSD-2
+Pymol ScrIpt COllection
+
+distutils multilib python toolchain-funcs vcs-snapshot
+minimal
+
+
+
+4
+
+compile install postinst postrm prepare setup unpack
+
+
+
+
+
diff --git a/metadata/cache/sci-chemistry/scala-3.3.18-r1 b/metadata/cache/sci-chemistry/scala-3.3.18-r1
index 19dba689a64c..7c7a98789f4e 100644
--- a/metadata/cache/sci-chemistry/scala-3.3.18-r1
+++ b/metadata/cache/sci-chemistry/scala-3.3.18-r1
@@ -1,4 +1,4 @@
-virtual/fortran sci-libs/ccp4-libs virtual/lapack !<sci-chemistry/ccp4-6.1.2 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+virtual/fortran sci-libs/ccp4-libs virtual/lapack !<sci-chemistry/ccp4-6.1.2 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 virtual/fortran sci-libs/ccp4-libs virtual/lapack !<sci-chemistry/ccp4-6.1.2
 0
 ftp://ftp.mrc-lmb.cam.ac.uk/pub/pre/scala-3.3.18.tar.gz
diff --git a/metadata/cache/sci-chemistry/scala-3.3.18-r2 b/metadata/cache/sci-chemistry/scala-3.3.18-r2
index f8964667f7bf..5519738923fe 100644
--- a/metadata/cache/sci-chemistry/scala-3.3.18-r2
+++ b/metadata/cache/sci-chemistry/scala-3.3.18-r2
@@ -1,4 +1,4 @@
-virtual/fortran sci-libs/ccp4-libs virtual/lapack !<sci-chemistry/ccp4-6.1.2 dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+virtual/fortran sci-libs/ccp4-libs virtual/lapack !<sci-chemistry/ccp4-6.1.2 dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 virtual/fortran sci-libs/ccp4-libs virtual/lapack !<sci-chemistry/ccp4-6.1.2
 0
 ftp://ftp.mrc-lmb.cam.ac.uk/pub/pre/scala-3.3.18.tar.gz
diff --git a/metadata/cache/sci-chemistry/scala-3.3.20 b/metadata/cache/sci-chemistry/scala-3.3.20
index a61b1507d0eb..1e9a9d970724 100644
--- a/metadata/cache/sci-chemistry/scala-3.3.20
+++ b/metadata/cache/sci-chemistry/scala-3.3.20
@@ -1,4 +1,4 @@
-!<sci-chemistry/ccp4-6.1.2 sci-libs/ccp4-libs virtual/fortran virtual/lapack dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+!<sci-chemistry/ccp4-6.1.2 sci-libs/ccp4-libs virtual/fortran virtual/lapack dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 !<sci-chemistry/ccp4-6.1.2 sci-libs/ccp4-libs virtual/fortran virtual/lapack
 0
 ftp://ftp.mrc-lmb.cam.ac.uk/pub/pre/scala-3.3.20.tar.gz
diff --git a/metadata/cache/sci-chemistry/theseus-1.6.2-r1 b/metadata/cache/sci-chemistry/theseus-1.6.2-r1
new file mode 100644
index 000000000000..1b7c54f89ca2
--- /dev/null
+++ b/metadata/cache/sci-chemistry/theseus-1.6.2-r1
@@ -0,0 +1,22 @@
+sci-libs/gsl || ( sci-biology/probcons sci-biology/mafft sci-biology/t-coffee sci-biology/kalign sci-biology/clustalw sci-biology/muscle ) dev-util/pkgconfig
+sci-libs/gsl || ( sci-biology/probcons sci-biology/mafft sci-biology/t-coffee sci-biology/kalign sci-biology/clustalw sci-biology/muscle )
+0
+http://www.theseus3d.org/src/theseus_1.6.2.tar.gz
+
+http://www.theseus3d.org/
+GPL-3
+maximum likelihood superpositioning and analysis of macromolecular structures
+~amd64 ~x86 ~amd64-linux ~x86-linux
+multilib toolchain-funcs
+examples
+
+
+
+4
+
+install prepare
+
+
+
+
+
diff --git a/metadata/cache/sci-chemistry/tm-align-20120124 b/metadata/cache/sci-chemistry/tm-align-20120124
new file mode 100644
index 000000000000..5c9b3e621392
--- /dev/null
+++ b/metadata/cache/sci-chemistry/tm-align-20120124
@@ -0,0 +1,22 @@
+>=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
+
+0
+http://zhanglab.ccmb.med.umich.edu/TM-align/TMtools20120124.tar.gz
+
+http://zhanglab.ccmb.med.umich.edu/TM-align/
+as-is
+Quick & Accurate Structural Alignment
+~amd64 ~x86 ~amd64-linux ~x86-linux
+base cmake-utils eutils flag-o-matic fortran-2 multilib toolchain-funcs user
+static custom-cflags
+
+
+
+4
+
+compile configure install prepare setup test unpack
+
+
+
+
+
diff --git a/metadata/cache/sci-chemistry/wxmacmolplt-7.4.2 b/metadata/cache/sci-chemistry/wxmacmolplt-7.4.2
index dcc0a50dc45e..a2bf256e66d6 100644
--- a/metadata/cache/sci-chemistry/wxmacmolplt-7.4.2
+++ b/metadata/cache/sci-chemistry/wxmacmolplt-7.4.2
@@ -1,4 +1,4 @@
->=media-libs/glew-1.5.3 media-libs/mesa x11-libs/wxGTK:2.8[X,opengl] flash? ( media-libs/ming ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=media-libs/glew-1.5.3 media-libs/mesa x11-libs/wxGTK:2.8[X,opengl] flash? ( media-libs/ming ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=media-libs/glew-1.5.3 media-libs/mesa x11-libs/wxGTK:2.8[X,opengl] flash? ( media-libs/ming )
 0
 http://www.scl.ameslab.gov/MacMolPlt/download/wxmacmolplt-7.4.2.tar.gz
diff --git a/metadata/cache/sci-electronics/balsa-4.0 b/metadata/cache/sci-electronics/balsa-4.0
index af965cef829e..74b65631702d 100644
--- a/metadata/cache/sci-electronics/balsa-4.0
+++ b/metadata/cache/sci-electronics/balsa-4.0
@@ -1,4 +1,4 @@
-dev-lang/perl dev-libs/gmp sci-electronics/gplcver sci-electronics/iverilog x11-libs/gtk+:2 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-lang/perl dev-libs/gmp sci-electronics/gplcver sci-electronics/iverilog x11-libs/gtk+:2 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-lang/perl dev-libs/gmp sci-electronics/gplcver sci-electronics/iverilog x11-libs/gtk+:2 dev-scheme/guile media-gfx/graphviz sci-electronics/espresso-ab sci-electronics/gtkwave
 0
 ftp://ftp.cs.man.ac.uk/pub/amulet/balsa/4.0/balsa-4.0.tar.gz ftp://ftp.cs.man.ac.uk/pub/amulet/balsa/4.0/balsa-sim-verilog-4.0.tar.gz ftp://ftp.cs.man.ac.uk/pub/amulet/balsa/4.0/balsa-tech-example-4.0.tar.gz ftp://ftp.cs.man.ac.uk/pub/amulet/balsa/4.0/balsa-tech-xilinx-4.0.tar.gz
diff --git a/metadata/cache/sci-electronics/geda-xgsch2pcb-0.1.3-r2 b/metadata/cache/sci-electronics/geda-xgsch2pcb-0.1.3-r2
index 6449263dedc2..a82de497e9dc 100644
--- a/metadata/cache/sci-electronics/geda-xgsch2pcb-0.1.3-r2
+++ b/metadata/cache/sci-electronics/geda-xgsch2pcb-0.1.3-r2
@@ -1,4 +1,4 @@
-dev-python/pygtk:2 dev-python/pygobject:2 dev-python/dbus-python sci-electronics/pcb[dbus] sci-electronics/geda nls? ( virtual/libintl ) dev-util/intltool dev-lang/perl nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 =dev-lang/python-2*
+dev-python/pygtk:2 dev-python/pygobject:2 dev-python/dbus-python sci-electronics/pcb[dbus] sci-electronics/geda nls? ( virtual/libintl ) dev-util/intltool dev-lang/perl nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 =dev-lang/python-2*
 dev-python/pygtk:2 dev-python/pygobject:2 dev-python/dbus-python sci-electronics/pcb[dbus] sci-electronics/geda nls? ( virtual/libintl ) sci-electronics/electronics-menu gnome? ( dev-python/gnome-vfs-python ) =dev-lang/python-2*
 0
 http://geda.seul.org/dist/geda-xgsch2pcb-0.1.3.tar.gz
diff --git a/metadata/cache/sci-electronics/gsmc-1.1-r1 b/metadata/cache/sci-electronics/gsmc-1.1-r1
index 52c4ca358787..c70793c6525b 100644
--- a/metadata/cache/sci-electronics/gsmc-1.1-r1
+++ b/metadata/cache/sci-electronics/gsmc-1.1-r1
@@ -1,4 +1,4 @@
-dev-libs/glib:2 x11-libs/gtk+:2 dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-libs/glib:2 x11-libs/gtk+:2 dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-libs/glib:2 x11-libs/gtk+:2
 0
 http://www.qsl.net/ik5nax/gsmc-1.1.tar.gz
diff --git a/metadata/cache/sci-electronics/gspeakers-0.11 b/metadata/cache/sci-electronics/gspeakers-0.11
index 1c601ba32c07..29279f12c281 100644
--- a/metadata/cache/sci-electronics/gspeakers-0.11
+++ b/metadata/cache/sci-electronics/gspeakers-0.11
@@ -1,4 +1,4 @@
-dev-cpp/gtkmm:2.4 dev-libs/libxml2:2 dev-util/pkgconfig >=sys-apps/sed-4 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-cpp/gtkmm:2.4 dev-libs/libxml2:2 dev-util/pkgconfig >=sys-apps/sed-4 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-cpp/gtkmm:2.4 dev-libs/libxml2:2 || ( >=sci-electronics/gnucap-0.34 sci-electronics/ngspice sci-electronics/spice )
 0
 mirror://sourceforge/gspeakers/gspeakers-0.11.tar.gz
diff --git a/metadata/cache/sci-electronics/gspeakers-0.11-r1 b/metadata/cache/sci-electronics/gspeakers-0.11-r1
index d9f37748af79..a36f5c9b6720 100644
--- a/metadata/cache/sci-electronics/gspeakers-0.11-r1
+++ b/metadata/cache/sci-electronics/gspeakers-0.11-r1
@@ -1,4 +1,4 @@
-dev-cpp/gtkmm:2.4 dev-libs/libxml2:2 dev-util/pkgconfig >=sys-apps/sed-4 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-cpp/gtkmm:2.4 dev-libs/libxml2:2 dev-util/pkgconfig >=sys-apps/sed-4 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-cpp/gtkmm:2.4 dev-libs/libxml2:2 || ( sci-electronics/gnucap sci-electronics/ngspice sci-electronics/spice )
 0
 mirror://sourceforge/gspeakers/gspeakers-0.11.tar.gz
diff --git a/metadata/cache/sci-electronics/gwave-20090213-r1 b/metadata/cache/sci-electronics/gwave-20090213-r1
index ab938e7bd995..e08c3eb13300 100644
--- a/metadata/cache/sci-electronics/gwave-20090213-r1
+++ b/metadata/cache/sci-electronics/gwave-20090213-r1
@@ -1,4 +1,4 @@
-=dev-scheme/guile-1.8*[networking] =dev-scheme/guile-gnome-platform-2.16* || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+=dev-scheme/guile-1.8*[networking] =dev-scheme/guile-gnome-platform-2.16* || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 =dev-scheme/guile-1.8*[networking] =dev-scheme/guile-gnome-platform-2.16* sci-electronics/electronics-menu gnuplot? ( sci-visualization/gnuplot ) plotutils? ( media-libs/plotutils )
 0
 mirror://sourceforge/gwave/gwave2-20090213.tar.gz
diff --git a/metadata/cache/sci-electronics/linsmith-0.99.12 b/metadata/cache/sci-electronics/linsmith-0.99.12
index 2a4959378628..2642c166de5c 100644
--- a/metadata/cache/sci-electronics/linsmith-0.99.12
+++ b/metadata/cache/sci-electronics/linsmith-0.99.12
@@ -1,4 +1,4 @@
-x11-libs/gtk+:2 dev-libs/libxml2:2 dev-libs/glib:2 dev-libs/atk gnome-base/libgnome gnome-base/libgnomecanvas gnome-base/libgnomeprint:2.2 gnome-base/libgnomeui dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+x11-libs/gtk+:2 dev-libs/libxml2:2 dev-libs/glib:2 dev-libs/atk gnome-base/libgnome gnome-base/libgnomecanvas gnome-base/libgnomeprint:2.2 gnome-base/libgnomeui dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 x11-libs/gtk+:2 dev-libs/libxml2:2 dev-libs/glib:2 dev-libs/atk gnome-base/libgnome gnome-base/libgnomecanvas gnome-base/libgnomeprint:2.2 gnome-base/libgnomeui
 0
 mirror://sourceforge/linsmith/linsmith-0.99.12.tar.gz
diff --git a/metadata/cache/sci-electronics/linsmith-0.99.21 b/metadata/cache/sci-electronics/linsmith-0.99.21
index 55df6cbf1bfd..37843b965159 100644
--- a/metadata/cache/sci-electronics/linsmith-0.99.21
+++ b/metadata/cache/sci-electronics/linsmith-0.99.21
@@ -1,4 +1,4 @@
-x11-libs/gtk+:2 dev-libs/libxml2:2 dev-libs/glib:2 dev-libs/atk gnome-base/libgnome gnome-base/libgnomecanvas gnome-base/libgnomeui dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+x11-libs/gtk+:2 dev-libs/libxml2:2 dev-libs/glib:2 dev-libs/atk gnome-base/libgnome gnome-base/libgnomecanvas gnome-base/libgnomeui dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 x11-libs/gtk+:2 dev-libs/libxml2:2 dev-libs/glib:2 dev-libs/atk gnome-base/libgnome gnome-base/libgnomecanvas gnome-base/libgnomeui
 0
 mirror://sourceforge/linsmith/linsmith-0.99.21.tar.gz
diff --git a/metadata/cache/sci-electronics/linsmith-0.99.22 b/metadata/cache/sci-electronics/linsmith-0.99.22
index e3ff6d25282d..0ceff6158368 100644
--- a/metadata/cache/sci-electronics/linsmith-0.99.22
+++ b/metadata/cache/sci-electronics/linsmith-0.99.22
@@ -1,4 +1,4 @@
-x11-libs/gtk+:2 dev-libs/libxml2:2 dev-libs/glib:2 dev-libs/atk gnome-base/libgnome gnome-base/libgnomecanvas gnome-base/libgnomeui dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+x11-libs/gtk+:2 dev-libs/libxml2:2 dev-libs/glib:2 dev-libs/atk gnome-base/libgnome gnome-base/libgnomecanvas gnome-base/libgnomeui dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 x11-libs/gtk+:2 dev-libs/libxml2:2 dev-libs/glib:2 dev-libs/atk gnome-base/libgnome gnome-base/libgnomecanvas gnome-base/libgnomeui
 0
 mirror://sourceforge/linsmith/linsmith-0.99.22.tar.gz
diff --git a/metadata/cache/sci-electronics/magic-7.5.202 b/metadata/cache/sci-electronics/magic-7.5.202
index 57def30363b2..18a2464ed6f6 100644
--- a/metadata/cache/sci-electronics/magic-7.5.202
+++ b/metadata/cache/sci-electronics/magic-7.5.202
@@ -1,4 +1,4 @@
-sys-libs/ncurses sys-libs/readline dev-lang/tcl dev-lang/tk dev-tcltk/blt app-shells/tcsh || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+sys-libs/ncurses sys-libs/readline dev-lang/tcl dev-lang/tk dev-tcltk/blt app-shells/tcsh || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 sys-libs/ncurses sys-libs/readline dev-lang/tcl dev-lang/tk dev-tcltk/blt
 0
 http://www.opencircuitdesign.com/magic/archive/magic-7.5.202.tgz ftp://ftp.mosis.edu/pub/sondeen/magic/new/beta/2002a.tar.gz
diff --git a/metadata/cache/sci-electronics/ngspice-23 b/metadata/cache/sci-electronics/ngspice-23
index 5f07a5f18fe4..7e739cf4d9b2 100644
--- a/metadata/cache/sci-electronics/ngspice-23
+++ b/metadata/cache/sci-electronics/ngspice-23
@@ -1,4 +1,4 @@
-readline? ( >=sys-libs/readline-5.0 ) X? ( x11-libs/libXaw x11-libs/libXt x11-libs/libX11 sci-visualization/xgraph ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+readline? ( >=sys-libs/readline-5.0 ) X? ( x11-libs/libXaw x11-libs/libXt x11-libs/libX11 sci-visualization/xgraph ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 readline? ( >=sys-libs/readline-5.0 ) X? ( x11-libs/libXaw x11-libs/libXt x11-libs/libX11 sci-visualization/xgraph )
 0
 mirror://sourceforge/ngspice/ngspice-23.tar.gz mirror://sourceforge/ngspice/ngspice23-manual.pdf.gz
diff --git a/metadata/cache/sci-electronics/pcb-20110918 b/metadata/cache/sci-electronics/pcb-20110918
index a05c9244325a..36fe90efd3da 100644
--- a/metadata/cache/sci-electronics/pcb-20110918
+++ b/metadata/cache/sci-electronics/pcb-20110918
@@ -1,4 +1,4 @@
-gif? ( >=media-libs/gd-2.0.23 ) gtk? ( x11-libs/gtk+:2 x11-libs/pango x11-libs/gtkglext dbus? ( sys-apps/dbus ) ) jpeg? ( >=media-libs/gd-2.0.23[jpeg] ) motif? ( !gtk? ( >=x11-libs/openmotif-2.3:0 dbus? ( sys-apps/dbus ) xrender? ( >=x11-libs/libXrender-0.9 ) ) ) nelma? ( >=media-libs/gd-2.0.23 ) opengl? ( virtual/opengl ) gcode? ( >=media-libs/gd-2.0.23 ) virtual/libintl png? ( >=media-libs/gd-2.0.23[png] ) m4lib-png? ( >=media-libs/gd-2.0.23[png] ) tk? ( >=dev-lang/tk-8 ) test? ( || ( media-gfx/graphicsmagick[imagemagick] media-gfx/imagemagick ) sci-electronics/gerbv ) >=dev-util/intltool-0.35 dev-util/pkgconfig sys-devel/gettext || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+gif? ( >=media-libs/gd-2.0.23 ) gtk? ( x11-libs/gtk+:2 x11-libs/pango x11-libs/gtkglext dbus? ( sys-apps/dbus ) ) jpeg? ( >=media-libs/gd-2.0.23[jpeg] ) motif? ( !gtk? ( >=x11-libs/openmotif-2.3:0 dbus? ( sys-apps/dbus ) xrender? ( >=x11-libs/libXrender-0.9 ) ) ) nelma? ( >=media-libs/gd-2.0.23 ) opengl? ( virtual/opengl ) gcode? ( >=media-libs/gd-2.0.23 ) virtual/libintl png? ( >=media-libs/gd-2.0.23[png] ) m4lib-png? ( >=media-libs/gd-2.0.23[png] ) tk? ( >=dev-lang/tk-8 ) test? ( || ( media-gfx/graphicsmagick[imagemagick] media-gfx/imagemagick ) sci-electronics/gerbv ) >=dev-util/intltool-0.35 dev-util/pkgconfig sys-devel/gettext || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 gif? ( >=media-libs/gd-2.0.23 ) gtk? ( x11-libs/gtk+:2 x11-libs/pango x11-libs/gtkglext dbus? ( sys-apps/dbus ) ) jpeg? ( >=media-libs/gd-2.0.23[jpeg] ) motif? ( !gtk? ( >=x11-libs/openmotif-2.3:0 dbus? ( sys-apps/dbus ) xrender? ( >=x11-libs/libXrender-0.9 ) ) ) nelma? ( >=media-libs/gd-2.0.23 ) opengl? ( virtual/opengl ) gcode? ( >=media-libs/gd-2.0.23 ) virtual/libintl png? ( >=media-libs/gd-2.0.23[png] ) m4lib-png? ( >=media-libs/gd-2.0.23[png] ) tk? ( >=dev-lang/tk-8 ) sci-electronics/electronics-menu
 0
 mirror://sourceforge/pcb/pcb/pcb-20110918/pcb-20110918.tar.gz
diff --git a/metadata/cache/sci-electronics/xcircuit-3.4.30 b/metadata/cache/sci-electronics/xcircuit-3.4.30
index 5ed34c98c892..71a8506b1a76 100644
--- a/metadata/cache/sci-electronics/xcircuit-3.4.30
+++ b/metadata/cache/sci-electronics/xcircuit-3.4.30
@@ -1,4 +1,4 @@
-app-text/ghostscript-gpl dev-lang/tk x11-libs/libXt || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+app-text/ghostscript-gpl dev-lang/tk x11-libs/libXt || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 app-text/ghostscript-gpl dev-lang/tk x11-libs/libXt
 0
 http://opencircuitdesign.com/xcircuit/archive/xcircuit-3.4.30.tgz
diff --git a/metadata/cache/sci-electronics/xcircuit-3.6.165 b/metadata/cache/sci-electronics/xcircuit-3.6.165
index c4f859f5babb..008025a9a4db 100644
--- a/metadata/cache/sci-electronics/xcircuit-3.6.165
+++ b/metadata/cache/sci-electronics/xcircuit-3.6.165
@@ -1,4 +1,4 @@
-x11-libs/libX11 x11-libs/libXt x11-libs/libXpm x11-libs/libSM x11-libs/libICE sys-libs/zlib app-text/ghostscript-gpl dev-lang/tcl dev-lang/tk || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+x11-libs/libX11 x11-libs/libXt x11-libs/libXpm x11-libs/libSM x11-libs/libICE sys-libs/zlib app-text/ghostscript-gpl dev-lang/tcl dev-lang/tk || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 x11-libs/libX11 x11-libs/libXt x11-libs/libXpm x11-libs/libSM x11-libs/libICE sys-libs/zlib app-text/ghostscript-gpl dev-lang/tcl dev-lang/tk
 0
 http://opencircuitdesign.com/xcircuit/archive/xcircuit-3.6.165.tgz
diff --git a/metadata/cache/sci-electronics/xnec2c-1.4 b/metadata/cache/sci-electronics/xnec2c-1.4
index 2efced46e598..fa2352acc54c 100644
--- a/metadata/cache/sci-electronics/xnec2c-1.4
+++ b/metadata/cache/sci-electronics/xnec2c-1.4
@@ -1,4 +1,4 @@
-dev-libs/glib:2 x11-libs/gtk+:2 sys-devel/gettext || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-libs/glib:2 x11-libs/gtk+:2 sys-devel/gettext || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-libs/glib:2 x11-libs/gtk+:2
 0
 http://5b4az.chronos.org.uk/pkg/nec2/xnec2c/xnec2c-1.4.tar.bz2
diff --git a/metadata/cache/sci-electronics/xnec2c-1.5 b/metadata/cache/sci-electronics/xnec2c-1.5
index e6428eba2466..4b7fe429c070 100644
--- a/metadata/cache/sci-electronics/xnec2c-1.5
+++ b/metadata/cache/sci-electronics/xnec2c-1.5
@@ -1,4 +1,4 @@
-dev-libs/glib:2 x11-libs/gtk+:2 sys-devel/gettext || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-libs/glib:2 x11-libs/gtk+:2 sys-devel/gettext || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-libs/glib:2 x11-libs/gtk+:2
 0
 http://www.qsl.net/5b4az/pkg/nec2/xnec2c/xnec2c-1.5.tar.bz2
diff --git a/metadata/cache/sci-geosciences/gmt-4.5.6 b/metadata/cache/sci-geosciences/gmt-4.5.6
index e099d76d79c1..a197257dfc38 100644
--- a/metadata/cache/sci-geosciences/gmt-4.5.6
+++ b/metadata/cache/sci-geosciences/gmt-4.5.6
@@ -1,4 +1,4 @@
-!sci-biology/probcons netcdf? ( >=sci-libs/netcdf-4.1 ) octave? ( sci-mathematics/octave ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+!sci-biology/probcons netcdf? ( >=sci-libs/netcdf-4.1 ) octave? ( sci-mathematics/octave ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 !sci-biology/probcons netcdf? ( >=sci-libs/netcdf-4.1 ) octave? ( sci-mathematics/octave )
 0
 mirror://gmt/GMT4.5.6_src.tar.bz2 mirror://gmt/GMT4.5.6_share.tar.bz2 mirror://gmt/GSHHS2.1.1_coast.tar.bz2 mirror://gmt/GMT4.5.6_suppl.tar.bz2 doc? ( mirror://gmt/GMT4.5.6_doc.tar.bz2 ) gmtfull? ( mirror://gmt/GSHHS2.1.1_full.tar.bz2 ) gmthigh? ( mirror://gmt/GSHHS2.1.1_high.tar.bz2 ) gmttria? ( mirror://gmt/GMT4.5.6_triangle.tar.bz2 )
diff --git a/metadata/cache/sci-geosciences/gpsbabel-1.4.2 b/metadata/cache/sci-geosciences/gpsbabel-1.4.2
index 95812bd46388..f34864048ad2 100644
--- a/metadata/cache/sci-geosciences/gpsbabel-1.4.2
+++ b/metadata/cache/sci-geosciences/gpsbabel-1.4.2
@@ -1,4 +1,4 @@
-dev-libs/expat sci-libs/shapelib virtual/libusb qt4? ( x11-libs/qt-gui:4 x11-libs/qt-webkit:4 ) doc? ( dev-lang/perl dev-libs/libxslt app-text/docbook-xml-dtd:4.1.2 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-libs/expat sci-libs/shapelib virtual/libusb qt4? ( x11-libs/qt-gui:4 x11-libs/qt-webkit:4 ) doc? ( dev-lang/perl dev-libs/libxslt app-text/docbook-xml-dtd:4.1.2 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-libs/expat sci-libs/shapelib virtual/libusb qt4? ( x11-libs/qt-gui:4 x11-libs/qt-webkit:4 )
 0
 mirror://gentoo/gpsbabel-1.4.2.tar.gz doc? ( http://www.gpsbabel.org/style3.css -> gpsbabel.org-style3.css )
diff --git a/metadata/cache/sci-geosciences/gpsd-2.95-r1 b/metadata/cache/sci-geosciences/gpsd-2.95-r1
index 204b743c80d4..e306212d9875 100644
--- a/metadata/cache/sci-geosciences/gpsd-2.95-r1
+++ b/metadata/cache/sci-geosciences/gpsd-2.95-r1
@@ -1,4 +1,4 @@
-dev-python/pygtk:2 sys-libs/ncurses virtual/libusb:1 dbus? ( sys-apps/dbus dev-libs/dbus-glib ) ntp? ( net-misc/ntp ) qt4? ( x11-libs/qt-gui ) app-text/xmlto =app-text/docbook-xml-dtd-4.1* || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-python/pygtk:2 sys-libs/ncurses virtual/libusb:1 dbus? ( sys-apps/dbus dev-libs/dbus-glib ) ntp? ( net-misc/ntp ) qt4? ( x11-libs/qt-gui ) app-text/xmlto =app-text/docbook-xml-dtd-4.1* || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-python/pygtk:2 sys-libs/ncurses virtual/libusb:1 dbus? ( sys-apps/dbus dev-libs/dbus-glib ) ntp? ( net-misc/ntp ) qt4? ( x11-libs/qt-gui ) || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
 0
 mirror://berlios/gpsd/gpsd-2.95.tar.gz
diff --git a/metadata/cache/sci-geosciences/gpsd-2.96-r1 b/metadata/cache/sci-geosciences/gpsd-2.96-r1
index 3d674e8e8043..8e8519cf654a 100644
--- a/metadata/cache/sci-geosciences/gpsd-2.96-r1
+++ b/metadata/cache/sci-geosciences/gpsd-2.96-r1
@@ -1,4 +1,4 @@
-dev-python/pygtk:2 sys-libs/ncurses virtual/libusb:1 dbus? ( sys-apps/dbus dev-libs/dbus-glib ) ntp? ( net-misc/ntp ) qt4? ( x11-libs/qt-gui ) app-text/xmlto =app-text/docbook-xml-dtd-4.1* test? ( sys-devel/bc ) || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-python/pygtk:2 sys-libs/ncurses virtual/libusb:1 dbus? ( sys-apps/dbus dev-libs/dbus-glib ) ntp? ( net-misc/ntp ) qt4? ( x11-libs/qt-gui ) app-text/xmlto =app-text/docbook-xml-dtd-4.1* test? ( sys-devel/bc ) || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-python/pygtk:2 sys-libs/ncurses virtual/libusb:1 dbus? ( sys-apps/dbus dev-libs/dbus-glib ) ntp? ( net-misc/ntp ) qt4? ( x11-libs/qt-gui ) || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
 0
 mirror://berlios/gpsd/gpsd-2.96bis.tar.gz
diff --git a/metadata/cache/sci-geosciences/gpxviewer-0.2.0 b/metadata/cache/sci-geosciences/gpxviewer-0.2.0
index 7e8eec43a68a..70f48ea962e4 100644
--- a/metadata/cache/sci-geosciences/gpxviewer-0.2.0
+++ b/metadata/cache/sci-geosciences/gpxviewer-0.2.0
@@ -1,4 +1,4 @@
-dev-lang/vala:0.12 dev-libs/gdl:1 dev-libs/glib:2 dev-libs/libunique:1 dev-libs/libxml2:2 media-libs/libchamplain:0.6[gtk] x11-libs/gtk+:2 >=dev-util/intltool-0.21 dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-lang/vala:0.12 dev-libs/gdl:1 dev-libs/glib:2 dev-libs/libunique:1 dev-libs/libxml2:2 media-libs/libchamplain:0.6[gtk] x11-libs/gtk+:2 >=dev-util/intltool-0.21 dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-lang/vala:0.12 dev-libs/gdl:1 dev-libs/glib:2 dev-libs/libunique:1 dev-libs/libxml2:2 media-libs/libchamplain:0.6[gtk] x11-libs/gtk+:2
 0
 http://edge.launchpad.net/gpx-viewer/trunk/0.2.0/+download/gpx-viewer-0.2.0.tar.gz
diff --git a/metadata/cache/sci-geosciences/mapserver-6.0.1 b/metadata/cache/sci-geosciences/mapserver-6.0.1
index d50cccc2203b..019a3ca9c8db 100644
--- a/metadata/cache/sci-geosciences/mapserver-6.0.1
+++ b/metadata/cache/sci-geosciences/mapserver-6.0.1
@@ -1,4 +1,4 @@
-!sci-geosciences/mapserver:6.0.1 dev-libs/expat dev-libs/fcgi >=media-libs/gd-2.0.12[truetype,jpeg,png,zlib] media-libs/giflib net-misc/curl virtual/jpeg virtual/libiconv x11-libs/agg bidi? ( dev-libs/fribidi ) cairo? ( x11-libs/cairo ) gdal? ( >=sci-libs/gdal-1.8.0 ) geos? ( sci-libs/geos ) mysql? ( virtual/mysql ) opengl? ( media-libs/ftgl media-libs/mesa ) perl? ( dev-lang/perl ) postgis? ( dev-db/postgis ) proj? ( sci-libs/proj net-misc/curl ) tiff? ( media-libs/tiff sci-libs/libgeotiff ) xml? ( dev-libs/libxml2:2 ) xslt? ( dev-libs/libxslt[crypt] ) perl? ( >=dev-lang/swig-2.0 ) python? ( >=dev-lang/swig-2.0 ) =www-servers/apache-2* || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=app-admin/webapp-config-1.50.15 python? ( =dev-lang/python-2* ) dev-lang/perl[-build] >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php? ( php_targets_php5-3? ( dev-lang/php:5.3 ) )
+!sci-geosciences/mapserver:6.0.1 dev-libs/expat dev-libs/fcgi >=media-libs/gd-2.0.12[truetype,jpeg,png,zlib] media-libs/giflib net-misc/curl virtual/jpeg virtual/libiconv x11-libs/agg bidi? ( dev-libs/fribidi ) cairo? ( x11-libs/cairo ) gdal? ( >=sci-libs/gdal-1.8.0 ) geos? ( sci-libs/geos ) mysql? ( virtual/mysql ) opengl? ( media-libs/ftgl media-libs/mesa ) perl? ( dev-lang/perl ) postgis? ( dev-db/postgis ) proj? ( sci-libs/proj net-misc/curl ) tiff? ( media-libs/tiff sci-libs/libgeotiff ) xml? ( dev-libs/libxml2:2 ) xslt? ( dev-libs/libxslt[crypt] ) perl? ( >=dev-lang/swig-2.0 ) python? ( >=dev-lang/swig-2.0 ) =www-servers/apache-2* || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=app-admin/webapp-config-1.50.15 python? ( =dev-lang/python-2* ) dev-lang/perl[-build] >=sys-devel/m4-1.4.3 >=sys-devel/libtool-1.5.18 php? ( php_targets_php5-3? ( dev-lang/php:5.3 ) )
 !sci-geosciences/mapserver:6.0.1 dev-libs/expat dev-libs/fcgi >=media-libs/gd-2.0.12[truetype,jpeg,png,zlib] media-libs/giflib net-misc/curl virtual/jpeg virtual/libiconv x11-libs/agg bidi? ( dev-libs/fribidi ) cairo? ( x11-libs/cairo ) gdal? ( >=sci-libs/gdal-1.8.0 ) geos? ( sci-libs/geos ) mysql? ( virtual/mysql ) opengl? ( media-libs/ftgl media-libs/mesa ) perl? ( dev-lang/perl ) postgis? ( dev-db/postgis ) proj? ( sci-libs/proj net-misc/curl ) tiff? ( media-libs/tiff sci-libs/libgeotiff ) xml? ( dev-libs/libxml2:2 ) xslt? ( dev-libs/libxslt[crypt] ) =www-servers/apache-2* >=app-admin/webapp-config-1.50.15 python? ( =dev-lang/python-2* ) dev-lang/perl[-build] php? ( || ( =sci-geosciences/mapserver-6.0.1[php_targets_php5-3] ) php_targets_php5-3? ( dev-lang/php:5.3 ) )
 0
 http://download.osgeo.org/mapserver/mapserver-6.0.1.tar.gz
diff --git a/metadata/cache/sci-geosciences/osm2pgsql-20100413 b/metadata/cache/sci-geosciences/osm2pgsql-20100413
index bad0a82278d4..a37fb3bdf2b0 100644
--- a/metadata/cache/sci-geosciences/osm2pgsql-20100413
+++ b/metadata/cache/sci-geosciences/osm2pgsql-20100413
@@ -1,4 +1,4 @@
-app-arch/bzip2 dev-libs/libxml2:2 sci-libs/geos sci-libs/proj sys-libs/zlib dev-db/postgresql-base || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+app-arch/bzip2 dev-libs/libxml2:2 sci-libs/geos sci-libs/proj sys-libs/zlib dev-db/postgresql-base || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 app-arch/bzip2 dev-libs/libxml2:2 sci-libs/geos sci-libs/proj sys-libs/zlib dev-db/postgresql-base
 0
 http://gentoo.ccss.cz/osm2pgsql-20100413svn.tar.bz2
diff --git a/metadata/cache/sci-geosciences/osm2pgsql-99999999 b/metadata/cache/sci-geosciences/osm2pgsql-99999999
index 7c956dd6aed5..204e1ed0f060 100644
--- a/metadata/cache/sci-geosciences/osm2pgsql-99999999
+++ b/metadata/cache/sci-geosciences/osm2pgsql-99999999
@@ -1,4 +1,4 @@
-app-arch/bzip2 dev-libs/libxml2:2 sci-libs/geos sci-libs/proj sys-libs/zlib dev-db/postgresql-base || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/subversion net-misc/rsync
+app-arch/bzip2 dev-libs/libxml2:2 sci-libs/geos sci-libs/proj sys-libs/zlib dev-db/postgresql-base || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/subversion net-misc/rsync
 app-arch/bzip2 dev-libs/libxml2:2 sci-libs/geos sci-libs/proj sys-libs/zlib dev-db/postgresql-base
 0
 
diff --git a/metadata/cache/sci-geosciences/qlandkarte-0.7.4 b/metadata/cache/sci-geosciences/qlandkarte-0.7.4
index 4b2b3ccbda62..8fb4977d721c 100644
--- a/metadata/cache/sci-geosciences/qlandkarte-0.7.4
+++ b/metadata/cache/sci-geosciences/qlandkarte-0.7.4
@@ -1,4 +1,4 @@
-x11-libs/qt-core:4 x11-libs/qt-gui:4 sci-libs/proj dev-libs/libusb || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+x11-libs/qt-core:4 x11-libs/qt-gui:4 sci-libs/proj dev-libs/libusb || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 x11-libs/qt-core:4 x11-libs/qt-gui:4 sci-libs/proj dev-libs/libusb
 0
 mirror://sourceforge/qlandkarte/QLandkarte_final.tar.gz
diff --git a/metadata/cache/sci-geosciences/viking-1.2.2 b/metadata/cache/sci-geosciences/viking-1.2.2
index 140ebd54e060..1bd1ecccf5ce 100644
--- a/metadata/cache/sci-geosciences/viking-1.2.2
+++ b/metadata/cache/sci-geosciences/viking-1.2.2
@@ -1,4 +1,4 @@
-dev-libs/expat dev-libs/glib:2 net-misc/curl sys-libs/zlib x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 gps? ( >=sci-geosciences/gpsd-2.96 ) app-text/gnome-doc-utils dev-util/intltool dev-util/gtk-doc-am app-text/rarian dev-libs/libxslt dev-util/pkgconfig sys-devel/gettext || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-libs/expat dev-libs/glib:2 net-misc/curl sys-libs/zlib x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 gps? ( >=sci-geosciences/gpsd-2.96 ) app-text/gnome-doc-utils dev-util/intltool dev-util/gtk-doc-am app-text/rarian dev-libs/libxslt dev-util/pkgconfig sys-devel/gettext || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-libs/expat dev-libs/glib:2 net-misc/curl sys-libs/zlib x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 gps? ( >=sci-geosciences/gpsd-2.96 ) sci-geosciences/gpsbabel
 0
 mirror://sourceforge/viking/viking-1.2.2.tar.gz
diff --git a/metadata/cache/sci-libs/amd-2.2.1 b/metadata/cache/sci-libs/amd-2.2.1
index b7e01c3f2d2a..06f0e7b85c39 100644
--- a/metadata/cache/sci-libs/amd-2.2.1
+++ b/metadata/cache/sci-libs/amd-2.2.1
@@ -1,4 +1,4 @@
-virtual/fortran sci-libs/ufconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+virtual/fortran sci-libs/ufconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 virtual/fortran sci-libs/ufconfig
 0
 http://www.cise.ufl.edu/research/sparse/amd/AMD-2.2.1.tar.gz
diff --git a/metadata/cache/sci-libs/amd-2.2.2 b/metadata/cache/sci-libs/amd-2.2.2
index 37b61cc16b10..de92b8dffbae 100644
--- a/metadata/cache/sci-libs/amd-2.2.2
+++ b/metadata/cache/sci-libs/amd-2.2.2
@@ -1,4 +1,4 @@
-virtual/fortran sci-libs/ufconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+virtual/fortran sci-libs/ufconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 virtual/fortran sci-libs/ufconfig
 0
 http://www.cise.ufl.edu/research/sparse/amd/AMD-2.2.2.tar.gz
diff --git a/metadata/cache/sci-libs/amd-2.2.3 b/metadata/cache/sci-libs/amd-2.2.3
index fbc4715d0c96..8dd3d03d1de0 100644
--- a/metadata/cache/sci-libs/amd-2.2.3
+++ b/metadata/cache/sci-libs/amd-2.2.3
@@ -1,4 +1,4 @@
-virtual/fortran sci-libs/ufconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+virtual/fortran sci-libs/ufconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 virtual/fortran sci-libs/ufconfig
 0
 http://www.cise.ufl.edu/research/sparse/amd/AMD-2.2.3.tar.gz
diff --git a/metadata/cache/sci-libs/arpack-3.0.2 b/metadata/cache/sci-libs/arpack-3.0.2
index 0f7433db42c3..48b7856dd6e9 100644
--- a/metadata/cache/sci-libs/arpack-3.0.2
+++ b/metadata/cache/sci-libs/arpack-3.0.2
@@ -1,4 +1,4 @@
-virtual/fortran virtual/blas virtual/lapack mpi? ( virtual/mpi[fortran] ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+virtual/fortran virtual/blas virtual/lapack mpi? ( virtual/mpi[fortran] ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 virtual/fortran virtual/blas virtual/lapack mpi? ( virtual/mpi[fortran] )
 0
 http://forge.scilab.org/upload/arpack-ng/files/arpack_3.0.2.tar.gz doc? ( http://www.caam.rice.edu/software/ARPACK/SRC/ug.ps.gz http://www.caam.rice.edu/software/ARPACK/DOCS/tutorial.ps.gz )
diff --git a/metadata/cache/sci-libs/arpack-96-r2 b/metadata/cache/sci-libs/arpack-96-r2
index cfbbbc3753f2..c1df39046828 100644
--- a/metadata/cache/sci-libs/arpack-96-r2
+++ b/metadata/cache/sci-libs/arpack-96-r2
@@ -1,4 +1,4 @@
-virtual/fortran virtual/blas virtual/lapack mpi? ( virtual/mpi[fortran] ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+virtual/fortran virtual/blas virtual/lapack mpi? ( virtual/mpi[fortran] ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 virtual/fortran virtual/blas virtual/lapack mpi? ( virtual/mpi[fortran] )
 0
 http://www.caam.rice.edu/software/ARPACK/SRC/arpack96.tar.gz http://www.caam.rice.edu/software/ARPACK/SRC/parpack96.tar.gz http://dev.gentoo.org/~bicatali/arpack-96-patches.tar.bz2 doc? ( http://www.caam.rice.edu/software/ARPACK/SRC/ug.ps.gz http://www.caam.rice.edu/software/ARPACK/DOCS/tutorial.ps.gz )
diff --git a/metadata/cache/sci-libs/arpack-96-r3 b/metadata/cache/sci-libs/arpack-96-r3
index 8dee9ec5234f..6bbf1207b2d1 100644
--- a/metadata/cache/sci-libs/arpack-96-r3
+++ b/metadata/cache/sci-libs/arpack-96-r3
@@ -1,4 +1,4 @@
-virtual/fortran virtual/blas virtual/lapack mpi? ( virtual/mpi[fortran] ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+virtual/fortran virtual/blas virtual/lapack mpi? ( virtual/mpi[fortran] ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 virtual/fortran virtual/blas virtual/lapack mpi? ( virtual/mpi[fortran] )
 0
 http://www.caam.rice.edu/software/ARPACK/SRC/arpack96.tar.gz http://www.caam.rice.edu/software/ARPACK/SRC/parpack96.tar.gz http://dev.gentoo.org/~bicatali/arpack-96-patches-2.tar.bz2 doc? ( http://www.caam.rice.edu/software/ARPACK/SRC/ug.ps.gz http://www.caam.rice.edu/software/ARPACK/DOCS/tutorial.ps.gz )
diff --git a/metadata/cache/sci-libs/arprec-2.2.10 b/metadata/cache/sci-libs/arprec-2.2.10
index 6c302e85b55b..cb8e94019793 100644
--- a/metadata/cache/sci-libs/arprec-2.2.10
+++ b/metadata/cache/sci-libs/arprec-2.2.10
@@ -1,4 +1,4 @@
-fortran? ( virtual/fortran ) qd? ( sci-libs/qd[fortran=] ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+fortran? ( virtual/fortran ) qd? ( sci-libs/qd[fortran=] ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 fortran? ( virtual/fortran ) qd? ( sci-libs/qd[fortran=] )
 0
 http://crd.lbl.gov/~dhbailey/mpdist/arprec-2.2.10.tar.gz
diff --git a/metadata/cache/sci-libs/arprec-2.2.9 b/metadata/cache/sci-libs/arprec-2.2.9
index bd897555d012..6506a219550b 100644
--- a/metadata/cache/sci-libs/arprec-2.2.9
+++ b/metadata/cache/sci-libs/arprec-2.2.9
@@ -1,4 +1,4 @@
-fortran? ( virtual/fortran ) qd? ( sci-libs/qd[fortran=] ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+fortran? ( virtual/fortran ) qd? ( sci-libs/qd[fortran=] ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 fortran? ( virtual/fortran ) qd? ( sci-libs/qd[fortran=] )
 0
 http://crd.lbl.gov/~dhbailey/mpdist/arprec-2.2.9.tar.gz
diff --git a/metadata/cache/sci-libs/blas-reference-20070226-r1 b/metadata/cache/sci-libs/blas-reference-20070226-r1
index 916f7d61ec97..dfca7534ca62 100644
--- a/metadata/cache/sci-libs/blas-reference-20070226-r1
+++ b/metadata/cache/sci-libs/blas-reference-20070226-r1
@@ -1,4 +1,4 @@
-virtual/fortran app-admin/eselect-blas || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+virtual/fortran app-admin/eselect-blas || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 virtual/fortran app-admin/eselect-blas doc? ( app-doc/blas-docs )
 0
 http://www.netlib.org/lapack/lapack-lite-3.1.1.tgz
diff --git a/metadata/cache/sci-libs/blas-reference-20070226-r2 b/metadata/cache/sci-libs/blas-reference-20070226-r2
index 038f125163cb..79568a8e716a 100644
--- a/metadata/cache/sci-libs/blas-reference-20070226-r2
+++ b/metadata/cache/sci-libs/blas-reference-20070226-r2
@@ -1,4 +1,4 @@
-virtual/fortran app-admin/eselect-blas || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+virtual/fortran app-admin/eselect-blas || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 virtual/fortran app-admin/eselect-blas doc? ( app-doc/blas-docs )
 0
 http://www.netlib.org/lapack/lapack-lite-3.1.1.tgz
diff --git a/metadata/cache/sci-libs/btf-1.1.0 b/metadata/cache/sci-libs/btf-1.1.0
index 50f1724cc441..a88cadb4dbd9 100644
--- a/metadata/cache/sci-libs/btf-1.1.0
+++ b/metadata/cache/sci-libs/btf-1.1.0
@@ -1,4 +1,4 @@
-sci-libs/ufconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+sci-libs/ufconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 http://www.cise.ufl.edu/research/sparse/btf/BTF-1.1.0.tar.gz
diff --git a/metadata/cache/sci-libs/btf-1.1.2 b/metadata/cache/sci-libs/btf-1.1.2
index 08ae67706d0c..d3c634f6f7e3 100644
--- a/metadata/cache/sci-libs/btf-1.1.2
+++ b/metadata/cache/sci-libs/btf-1.1.2
@@ -1,4 +1,4 @@
-sci-libs/ufconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+sci-libs/ufconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 http://www.cise.ufl.edu/research/sparse/btf/BTF-1.1.2.tar.gz
diff --git a/metadata/cache/sci-libs/btf-1.1.3 b/metadata/cache/sci-libs/btf-1.1.3
index 5e228b32fc87..b49d6aff1f30 100644
--- a/metadata/cache/sci-libs/btf-1.1.3
+++ b/metadata/cache/sci-libs/btf-1.1.3
@@ -1,4 +1,4 @@
-sci-libs/ufconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+sci-libs/ufconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 http://www.cise.ufl.edu/research/sparse/btf/BTF-1.1.3.tar.gz
diff --git a/metadata/cache/sci-libs/camd-2.2.2 b/metadata/cache/sci-libs/camd-2.2.2
index c2898b27c11d..487988660ca7 100644
--- a/metadata/cache/sci-libs/camd-2.2.2
+++ b/metadata/cache/sci-libs/camd-2.2.2
@@ -1,4 +1,4 @@
-sci-libs/ufconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+sci-libs/ufconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 sci-libs/ufconfig
 0
 http://www.cise.ufl.edu/research/sparse/camd/CAMD-2.2.2.tar.gz
diff --git a/metadata/cache/sci-libs/camd-2.2.3 b/metadata/cache/sci-libs/camd-2.2.3
index fab70416d002..be557b99105d 100644
--- a/metadata/cache/sci-libs/camd-2.2.3
+++ b/metadata/cache/sci-libs/camd-2.2.3
@@ -1,4 +1,4 @@
-sci-libs/ufconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+sci-libs/ufconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 sci-libs/ufconfig
 0
 http://www.cise.ufl.edu/research/sparse/camd/CAMD-2.2.3.tar.gz
diff --git a/metadata/cache/sci-libs/cblas-reference-20030223-r5 b/metadata/cache/sci-libs/cblas-reference-20030223-r5
index 99b1c7c0795f..6ffadee7c99f 100644
--- a/metadata/cache/sci-libs/cblas-reference-20030223-r5
+++ b/metadata/cache/sci-libs/cblas-reference-20030223-r5
@@ -1,4 +1,4 @@
-virtual/fortran virtual/blas app-admin/eselect-cblas dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+virtual/fortran virtual/blas app-admin/eselect-cblas dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 virtual/fortran virtual/blas app-admin/eselect-cblas
 0
 http://www.netlib.org/blas/blast-forum/cblas.tgz
diff --git a/metadata/cache/sci-libs/ccfits-2.4 b/metadata/cache/sci-libs/ccfits-2.4
index 1b252c972c99..cd6c2f1afefb 100644
--- a/metadata/cache/sci-libs/ccfits-2.4
+++ b/metadata/cache/sci-libs/ccfits-2.4
@@ -1,4 +1,4 @@
->=sci-libs/cfitsio-3.080 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=sci-libs/cfitsio-3.080 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=sci-libs/cfitsio-3.080
 0
 http://heasarc.gsfc.nasa.gov/fitsio/CCfits//CCfits-2.4.tar.gz
diff --git a/metadata/cache/sci-libs/ccolamd-2.7.1 b/metadata/cache/sci-libs/ccolamd-2.7.1
index bc421244fb71..9393ee190292 100644
--- a/metadata/cache/sci-libs/ccolamd-2.7.1
+++ b/metadata/cache/sci-libs/ccolamd-2.7.1
@@ -1,4 +1,4 @@
-sci-libs/ufconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+sci-libs/ufconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 sci-libs/ufconfig
 0
 http://www.cise.ufl.edu/research/sparse/ccolamd/CCOLAMD-2.7.1.tar.gz
diff --git a/metadata/cache/sci-libs/ccolamd-2.7.3 b/metadata/cache/sci-libs/ccolamd-2.7.3
index f4066ab8e5b6..a5726c1f8e24 100644
--- a/metadata/cache/sci-libs/ccolamd-2.7.3
+++ b/metadata/cache/sci-libs/ccolamd-2.7.3
@@ -1,4 +1,4 @@
-sci-libs/ufconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+sci-libs/ufconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 sci-libs/ufconfig
 0
 http://www.cise.ufl.edu/research/sparse/ccolamd/CCOLAMD-2.7.3.tar.gz
diff --git a/metadata/cache/sci-libs/ccolamd-2.7.4 b/metadata/cache/sci-libs/ccolamd-2.7.4
index 5b002f89ef6a..47a49dc06fa2 100644
--- a/metadata/cache/sci-libs/ccolamd-2.7.4
+++ b/metadata/cache/sci-libs/ccolamd-2.7.4
@@ -1,4 +1,4 @@
-sci-libs/ufconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+sci-libs/ufconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 sci-libs/ufconfig
 0
 http://www.cise.ufl.edu/research/sparse/ccolamd/CCOLAMD-2.7.4.tar.gz
diff --git a/metadata/cache/sci-libs/ccp4-libs-6.1.3-r10 b/metadata/cache/sci-libs/ccp4-libs-6.1.3-r10
index 9d5024c7f0e3..c39dc2f27ca5 100644
--- a/metadata/cache/sci-libs/ccp4-libs-6.1.3-r10
+++ b/metadata/cache/sci-libs/ccp4-libs-6.1.3-r10
@@ -1,4 +1,4 @@
-!<sci-chemistry/ccp4-6.1.3 !<sci-chemistry/ccp4-apps-6.1.3-r10 app-shells/tcsh dev-lang/tcl <sci-libs/cbflib-0.9.2.2 sci-libs/fftw:2.1 sci-libs/mmdb sci-libs/monomer-db sci-libs/ssm virtual/fortran virtual/jpeg virtual/lapack virtual/blas || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool sys-devel/gnuconfig =dev-lang/python-2*
+!<sci-chemistry/ccp4-6.1.3 !<sci-chemistry/ccp4-apps-6.1.3-r10 app-shells/tcsh dev-lang/tcl <sci-libs/cbflib-0.9.2.2 sci-libs/fftw:2.1 sci-libs/mmdb sci-libs/monomer-db sci-libs/ssm virtual/fortran virtual/jpeg virtual/lapack virtual/blas || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool sys-devel/gnuconfig =dev-lang/python-2*
 !<sci-chemistry/ccp4-6.1.3 !<sci-chemistry/ccp4-apps-6.1.3-r10 app-shells/tcsh dev-lang/tcl <sci-libs/cbflib-0.9.2.2 sci-libs/fftw:2.1 sci-libs/mmdb sci-libs/monomer-db sci-libs/ssm virtual/fortran virtual/jpeg virtual/lapack virtual/blas =dev-lang/python-2*
 0
 ftp://ftp.ccp4.ac.uk/ccp4/6.1.3/ccp4-6.1.3-core-src.tar.gz
diff --git a/metadata/cache/sci-libs/ccp4-libs-6.1.3-r11 b/metadata/cache/sci-libs/ccp4-libs-6.1.3-r11
index efd6516164cd..ababc664ddbe 100644
--- a/metadata/cache/sci-libs/ccp4-libs-6.1.3-r11
+++ b/metadata/cache/sci-libs/ccp4-libs-6.1.3-r11
@@ -1,4 +1,4 @@
-!<sci-chemistry/ccp4-6.1.3 !<sci-chemistry/ccp4-apps-6.1.3-r10 app-shells/tcsh dev-lang/tcl >=sci-libs/cbflib-0.9.2.2 sci-libs/fftw:2.1 sci-libs/mmdb sci-libs/monomer-db sci-libs/ssm virtual/fortran virtual/jpeg virtual/lapack virtual/blas || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool sys-devel/gnuconfig =dev-lang/python-2*
+!<sci-chemistry/ccp4-6.1.3 !<sci-chemistry/ccp4-apps-6.1.3-r10 app-shells/tcsh dev-lang/tcl >=sci-libs/cbflib-0.9.2.2 sci-libs/fftw:2.1 sci-libs/mmdb sci-libs/monomer-db sci-libs/ssm virtual/fortran virtual/jpeg virtual/lapack virtual/blas || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool sys-devel/gnuconfig =dev-lang/python-2*
 !<sci-chemistry/ccp4-6.1.3 !<sci-chemistry/ccp4-apps-6.1.3-r10 app-shells/tcsh dev-lang/tcl >=sci-libs/cbflib-0.9.2.2 sci-libs/fftw:2.1 sci-libs/mmdb sci-libs/monomer-db sci-libs/ssm virtual/fortran virtual/jpeg virtual/lapack virtual/blas =dev-lang/python-2*
 0
 ftp://ftp.ccp4.ac.uk/ccp4/6.1.3/ccp4-6.1.3-core-src.tar.gz
diff --git a/metadata/cache/sci-libs/ccp4-libs-6.1.3-r9 b/metadata/cache/sci-libs/ccp4-libs-6.1.3-r9
index a2629930e8b3..68406b6e9a27 100644
--- a/metadata/cache/sci-libs/ccp4-libs-6.1.3-r9
+++ b/metadata/cache/sci-libs/ccp4-libs-6.1.3-r9
@@ -1,4 +1,4 @@
-!<sci-chemistry/ccp4-6.1.3 !<sci-chemistry/ccp4-apps-6.1.3-r9 !sci-libs/ssm app-shells/tcsh dev-lang/tcl sci-libs/cbflib sci-libs/fftw:2.1 sci-libs/mmdb sci-libs/monomer-db virtual/fortran virtual/jpeg virtual/lapack virtual/blas || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool sys-devel/gnuconfig =dev-lang/python-2*
+!<sci-chemistry/ccp4-6.1.3 !<sci-chemistry/ccp4-apps-6.1.3-r9 !sci-libs/ssm app-shells/tcsh dev-lang/tcl sci-libs/cbflib sci-libs/fftw:2.1 sci-libs/mmdb sci-libs/monomer-db virtual/fortran virtual/jpeg virtual/lapack virtual/blas || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool sys-devel/gnuconfig =dev-lang/python-2*
 !<sci-chemistry/ccp4-6.1.3 !<sci-chemistry/ccp4-apps-6.1.3-r9 !sci-libs/ssm app-shells/tcsh dev-lang/tcl sci-libs/cbflib sci-libs/fftw:2.1 sci-libs/mmdb sci-libs/monomer-db virtual/fortran virtual/jpeg virtual/lapack virtual/blas =dev-lang/python-2*
 0
 ftp://ftp.ccp4.ac.uk/ccp4/6.1.3/ccp4-6.1.3-core-src.tar.gz
diff --git a/metadata/cache/sci-libs/cfitsio-3.140 b/metadata/cache/sci-libs/cfitsio-3.140
index ae8b3c1ec3c7..9ee45cb74323 100644
--- a/metadata/cache/sci-libs/cfitsio-3.140
+++ b/metadata/cache/sci-libs/cfitsio-3.140
@@ -1,4 +1,4 @@
-fortran? ( dev-lang/cfortran ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+fortran? ( dev-lang/cfortran ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 ftp://heasarc.gsfc.nasa.gov/software/fitsio/c/cfitsio3140.tar.gz
diff --git a/metadata/cache/sci-libs/cholmod-1.7.4 b/metadata/cache/sci-libs/cholmod-1.7.4
index a1db11528623..72c529f292fc 100644
--- a/metadata/cache/sci-libs/cholmod-1.7.4
+++ b/metadata/cache/sci-libs/cholmod-1.7.4
@@ -1,4 +1,4 @@
-sci-libs/amd sci-libs/colamd metis? ( sci-libs/camd sci-libs/ccolamd || ( sci-libs/metis sci-libs/parmetis ) ) supernodal? ( virtual/lapack ) supernodal? ( dev-util/pkgconfig ) metis? ( dev-util/pkgconfig ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+sci-libs/amd sci-libs/colamd metis? ( sci-libs/camd sci-libs/ccolamd || ( sci-libs/metis sci-libs/parmetis ) ) supernodal? ( virtual/lapack ) supernodal? ( dev-util/pkgconfig ) metis? ( dev-util/pkgconfig ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 sci-libs/amd sci-libs/colamd metis? ( sci-libs/camd sci-libs/ccolamd || ( sci-libs/metis sci-libs/parmetis ) ) supernodal? ( virtual/lapack )
 0
 http://www.cise.ufl.edu/research/sparse/cholmod/CHOLMOD-1.7.4.tar.gz mirror://gentoo/cholmod-1.7.0-autotools.patch.bz2
diff --git a/metadata/cache/sci-libs/clipper-20100511-r1 b/metadata/cache/sci-libs/clipper-20100511-r1
index 68ed9e1ad50b..2abc2b8bcf65 100644
--- a/metadata/cache/sci-libs/clipper-20100511-r1
+++ b/metadata/cache/sci-libs/clipper-20100511-r1
@@ -1,4 +1,4 @@
-sci-libs/ccp4-libs sci-libs/fftw sci-libs/mmdb || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+sci-libs/ccp4-libs sci-libs/fftw sci-libs/mmdb || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 sci-libs/ccp4-libs sci-libs/fftw sci-libs/mmdb
 0
 http://www.ysbl.york.ac.uk/~cowtan/clipper/clipper-2.1-100511-ac.tar.gz
diff --git a/metadata/cache/sci-libs/colamd-2.7.1 b/metadata/cache/sci-libs/colamd-2.7.1
index 0f40d4bed840..9b7b771bbfe0 100644
--- a/metadata/cache/sci-libs/colamd-2.7.1
+++ b/metadata/cache/sci-libs/colamd-2.7.1
@@ -1,4 +1,4 @@
-sci-libs/ufconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+sci-libs/ufconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 sci-libs/ufconfig
 0
 http://www.cise.ufl.edu/research/sparse/colamd/COLAMD-2.7.1.tar.gz
diff --git a/metadata/cache/sci-libs/colamd-2.7.4 b/metadata/cache/sci-libs/colamd-2.7.4
index 77b4ebe787bc..6557db5080d5 100644
--- a/metadata/cache/sci-libs/colamd-2.7.4
+++ b/metadata/cache/sci-libs/colamd-2.7.4
@@ -1,4 +1,4 @@
-sci-libs/ufconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+sci-libs/ufconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 sci-libs/ufconfig
 0
 http://www.cise.ufl.edu/research/sparse/colamd/COLAMD-2.7.4.tar.gz
diff --git a/metadata/cache/sci-libs/cxsparse-2.2.3 b/metadata/cache/sci-libs/cxsparse-2.2.3
index 8f842365fa10..baa532bf96d1 100644
--- a/metadata/cache/sci-libs/cxsparse-2.2.3
+++ b/metadata/cache/sci-libs/cxsparse-2.2.3
@@ -1,4 +1,4 @@
-sci-libs/ufconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+sci-libs/ufconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 http://www.cise.ufl.edu/research/sparse/CXSparse/versions/CXSparse-2.2.3.tar.gz
diff --git a/metadata/cache/sci-libs/cxsparse-2.2.5 b/metadata/cache/sci-libs/cxsparse-2.2.5
index eefb30f776e6..551f2bbac6f9 100644
--- a/metadata/cache/sci-libs/cxsparse-2.2.5
+++ b/metadata/cache/sci-libs/cxsparse-2.2.5
@@ -1,4 +1,4 @@
-sci-libs/ufconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+sci-libs/ufconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 http://www.cise.ufl.edu/research/sparse/CXSparse/versions/CXSparse-2.2.5.tar.gz
diff --git a/metadata/cache/sci-libs/cxsparse-2.2.6 b/metadata/cache/sci-libs/cxsparse-2.2.6
index df1efe47209e..9a22da49888e 100644
--- a/metadata/cache/sci-libs/cxsparse-2.2.6
+++ b/metadata/cache/sci-libs/cxsparse-2.2.6
@@ -1,4 +1,4 @@
-sci-libs/ufconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+sci-libs/ufconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 http://www.cise.ufl.edu/research/sparse/CXSparse/versions/CXSparse-2.2.6.tar.gz
diff --git a/metadata/cache/sci-libs/fftw-2.1.5-r8 b/metadata/cache/sci-libs/fftw-2.1.5-r8
index 49f142cc4ab3..79f81cde42ad 100644
--- a/metadata/cache/sci-libs/fftw-2.1.5-r8
+++ b/metadata/cache/sci-libs/fftw-2.1.5-r8
@@ -1,4 +1,4 @@
-fortran? ( virtual/fortran ) mpi? ( virtual/mpi ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+fortran? ( virtual/fortran ) mpi? ( virtual/mpi ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 fortran? ( virtual/fortran ) mpi? ( virtual/mpi )
 2.1
 http://www.fftw.org/fftw-2.1.5.tar.gz
diff --git a/metadata/cache/sci-libs/fftw-3.2.2 b/metadata/cache/sci-libs/fftw-3.2.2
index e17b2d4abdcc..94a33c7934d1 100644
--- a/metadata/cache/sci-libs/fftw-3.2.2
+++ b/metadata/cache/sci-libs/fftw-3.2.2
@@ -1,4 +1,4 @@
-fortran? ( virtual/fortran ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+fortran? ( virtual/fortran ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 fortran? ( virtual/fortran )
 3.0
 http://www.fftw.org/fftw-3.2.2.tar.gz
diff --git a/metadata/cache/sci-libs/fftw-3.2.2-r1 b/metadata/cache/sci-libs/fftw-3.2.2-r1
index 290f2be4ddf8..6809961b761a 100644
--- a/metadata/cache/sci-libs/fftw-3.2.2-r1
+++ b/metadata/cache/sci-libs/fftw-3.2.2-r1
@@ -1,4 +1,4 @@
-fortran? ( virtual/fortran ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+fortran? ( virtual/fortran ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 fortran? ( virtual/fortran )
 3.0
 http://www.fftw.org/fftw-3.2.2.tar.gz
diff --git a/metadata/cache/sci-libs/fftw-3.2.2-r2 b/metadata/cache/sci-libs/fftw-3.2.2-r2
index 727ec070f903..4776e49c8bb4 100644
--- a/metadata/cache/sci-libs/fftw-3.2.2-r2
+++ b/metadata/cache/sci-libs/fftw-3.2.2-r2
@@ -1,4 +1,4 @@
-fortran? ( virtual/fortran ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+fortran? ( virtual/fortran ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 fortran? ( virtual/fortran )
 3.0
 http://www.fftw.org/fftw-3.2.2.tar.gz
diff --git a/metadata/cache/sci-libs/fftw-3.3-r1 b/metadata/cache/sci-libs/fftw-3.3-r1
index 4c2c7f68a8db..88e29d29ac57 100644
--- a/metadata/cache/sci-libs/fftw-3.3-r1
+++ b/metadata/cache/sci-libs/fftw-3.3-r1
@@ -1,4 +1,4 @@
-fortran? ( virtual/fortran ) mpi? ( virtual/mpi ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+fortran? ( virtual/fortran ) mpi? ( virtual/mpi ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 fortran? ( virtual/fortran ) mpi? ( virtual/mpi )
 3.0
 http://www.fftw.org/fftw-3.3.tar.gz
diff --git a/metadata/cache/sci-libs/gamer-1.4 b/metadata/cache/sci-libs/gamer-1.4
index 7084ccf0afd6..5ca4054451c8 100644
--- a/metadata/cache/sci-libs/gamer-1.4
+++ b/metadata/cache/sci-libs/gamer-1.4
@@ -1,4 +1,4 @@
->=dev-libs/maloc-1.4 doc? ( media-gfx/graphviz app-doc/doxygen ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-libs/maloc-1.4 doc? ( media-gfx/graphviz app-doc/doxygen ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=dev-libs/maloc-1.4
 0
 http://www.fetk.org/codes/download/gamer-1.4.tar.gz
diff --git a/metadata/cache/sci-libs/gamer-1.5 b/metadata/cache/sci-libs/gamer-1.5
index 2a5ea2ba798b..04802ec95616 100644
--- a/metadata/cache/sci-libs/gamer-1.5
+++ b/metadata/cache/sci-libs/gamer-1.5
@@ -1,4 +1,4 @@
->=dev-libs/maloc-1.4 doc? ( media-gfx/graphviz app-doc/doxygen ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-libs/maloc-1.4 doc? ( media-gfx/graphviz app-doc/doxygen ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=dev-libs/maloc-1.4
 0
 http://www.fetk.org/codes/download/gamer-1.5.tar.gz
diff --git a/metadata/cache/sci-libs/gaul-devel-0.1849-r2 b/metadata/cache/sci-libs/gaul-devel-0.1849-r2
index 52707aca351d..c8f5f4ed4e0e 100644
--- a/metadata/cache/sci-libs/gaul-devel-0.1849-r2
+++ b/metadata/cache/sci-libs/gaul-devel-0.1849-r2
@@ -1,4 +1,4 @@
-sys-apps/sed slang? ( sys-libs/slang ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+sys-apps/sed slang? ( sys-libs/slang ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 sys-apps/sed slang? ( sys-libs/slang )
 0
 mirror://sourceforge/gaul/gaul-devel-0.1849-0.tar.bz2
diff --git a/metadata/cache/sci-libs/gdal-1.6.3-r1 b/metadata/cache/sci-libs/gdal-1.6.3-r1
index da1bb5bd7a8d..4ee26dccbb89 100644
--- a/metadata/cache/sci-libs/gdal-1.6.3-r1
+++ b/metadata/cache/sci-libs/gdal-1.6.3-r1
@@ -1,4 +1,4 @@
-dev-libs/expat media-libs/tiff sci-libs/libgeotiff sys-libs/zlib curl? ( net-misc/curl ) jpeg? ( virtual/jpeg ) gif? ( media-libs/giflib ) png? ( media-libs/libpng ) perl? ( dev-lang/perl ) python? ( dev-python/numpy ) ruby? ( >=dev-lang/ruby-1.8.4.20060226 ) fits? ( sci-libs/cfitsio ) ogdi? ( sci-libs/ogdi ) gml? ( >=dev-libs/xerces-c-3 ) hdf5? ( >=sci-libs/hdf5-1.6.4 ) postgres? ( dev-db/postgresql-base ) || ( netcdf? ( sci-libs/netcdf ) hdf? ( sci-libs/hdf ) ) || ( jpeg2k? ( media-libs/jasper ) ecwj2k? ( sci-libs/libecwj2 ) ) mysql? ( virtual/mysql ) odbc? ( dev-db/unixODBC ) geos? ( >=sci-libs/geos-2.2.1 ) sqlite? ( >=dev-db/sqlite-3 ) perl? ( >=dev-lang/swig-1.3.32 ) python? ( >=dev-lang/swig-1.3.32 ) ruby? ( >=dev-lang/swig-1.3.32 ) doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-lang/perl[-build] python? ( =dev-lang/python-2* )
+dev-libs/expat media-libs/tiff sci-libs/libgeotiff sys-libs/zlib curl? ( net-misc/curl ) jpeg? ( virtual/jpeg ) gif? ( media-libs/giflib ) png? ( media-libs/libpng ) perl? ( dev-lang/perl ) python? ( dev-python/numpy ) ruby? ( >=dev-lang/ruby-1.8.4.20060226 ) fits? ( sci-libs/cfitsio ) ogdi? ( sci-libs/ogdi ) gml? ( >=dev-libs/xerces-c-3 ) hdf5? ( >=sci-libs/hdf5-1.6.4 ) postgres? ( dev-db/postgresql-base ) || ( netcdf? ( sci-libs/netcdf ) hdf? ( sci-libs/hdf ) ) || ( jpeg2k? ( media-libs/jasper ) ecwj2k? ( sci-libs/libecwj2 ) ) mysql? ( virtual/mysql ) odbc? ( dev-db/unixODBC ) geos? ( >=sci-libs/geos-2.2.1 ) sqlite? ( >=dev-db/sqlite-3 ) perl? ( >=dev-lang/swig-1.3.32 ) python? ( >=dev-lang/swig-1.3.32 ) ruby? ( >=dev-lang/swig-1.3.32 ) doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-lang/perl[-build] python? ( =dev-lang/python-2* )
 dev-libs/expat media-libs/tiff sci-libs/libgeotiff sys-libs/zlib curl? ( net-misc/curl ) jpeg? ( virtual/jpeg ) gif? ( media-libs/giflib ) png? ( media-libs/libpng ) perl? ( dev-lang/perl ) python? ( dev-python/numpy ) ruby? ( >=dev-lang/ruby-1.8.4.20060226 ) fits? ( sci-libs/cfitsio ) ogdi? ( sci-libs/ogdi ) gml? ( >=dev-libs/xerces-c-3 ) hdf5? ( >=sci-libs/hdf5-1.6.4 ) postgres? ( dev-db/postgresql-base ) || ( netcdf? ( sci-libs/netcdf ) hdf? ( sci-libs/hdf ) ) || ( jpeg2k? ( media-libs/jasper ) ecwj2k? ( sci-libs/libecwj2 ) ) mysql? ( virtual/mysql ) odbc? ( dev-db/unixODBC ) geos? ( >=sci-libs/geos-2.2.1 ) sqlite? ( >=dev-db/sqlite-3 ) dev-lang/perl[-build] python? ( =dev-lang/python-2* )
 0
 http://download.osgeo.org/gdal/gdal-1.6.3.tar.gz
diff --git a/metadata/cache/sci-libs/gdal-1.8.1 b/metadata/cache/sci-libs/gdal-1.8.1
index 246885fb0d56..3d141bd31d1d 100644
--- a/metadata/cache/sci-libs/gdal-1.8.1
+++ b/metadata/cache/sci-libs/gdal-1.8.1
@@ -1,4 +1,4 @@
-dev-libs/expat media-libs/tiff sci-libs/libgeotiff sys-libs/zlib curl? ( net-misc/curl ) ecwj2k? ( sci-libs/libecwj2 ) fits? ( sci-libs/cfitsio ) geos? ( >=sci-libs/geos-2.2.1 ) gif? ( media-libs/giflib ) gml? ( >=dev-libs/xerces-c-3 ) hdf5? ( >=sci-libs/hdf5-1.6.4[szip] ) jpeg? ( virtual/jpeg ) jpeg2k? ( media-libs/jasper ) mysql? ( virtual/mysql ) netcdf? ( sci-libs/netcdf ) odbc? ( dev-db/unixODBC ) ogdi? ( sci-libs/ogdi ) pdf? ( app-text/poppler ) perl? ( dev-lang/perl ) png? ( media-libs/libpng ) postgres? ( >=dev-db/postgresql-base-8.4 ) python? ( dev-python/numpy ) ruby? ( dev-lang/ruby:1.8 ) sqlite? ( >=dev-db/sqlite-3 ) doc? ( app-doc/doxygen ) perl? ( >=dev-lang/swig-2.0.2 ) python? ( >=dev-lang/swig-2.0.2 ) ruby? ( >=dev-lang/swig-2.0.2 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-lang/perl[-build] python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) )
+dev-libs/expat media-libs/tiff sci-libs/libgeotiff sys-libs/zlib curl? ( net-misc/curl ) ecwj2k? ( sci-libs/libecwj2 ) fits? ( sci-libs/cfitsio ) geos? ( >=sci-libs/geos-2.2.1 ) gif? ( media-libs/giflib ) gml? ( >=dev-libs/xerces-c-3 ) hdf5? ( >=sci-libs/hdf5-1.6.4[szip] ) jpeg? ( virtual/jpeg ) jpeg2k? ( media-libs/jasper ) mysql? ( virtual/mysql ) netcdf? ( sci-libs/netcdf ) odbc? ( dev-db/unixODBC ) ogdi? ( sci-libs/ogdi ) pdf? ( app-text/poppler ) perl? ( dev-lang/perl ) png? ( media-libs/libpng ) postgres? ( >=dev-db/postgresql-base-8.4 ) python? ( dev-python/numpy ) ruby? ( dev-lang/ruby:1.8 ) sqlite? ( >=dev-db/sqlite-3 ) doc? ( app-doc/doxygen ) perl? ( >=dev-lang/swig-2.0.2 ) python? ( >=dev-lang/swig-2.0.2 ) ruby? ( >=dev-lang/swig-2.0.2 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-lang/perl[-build] python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) )
 dev-libs/expat media-libs/tiff sci-libs/libgeotiff sys-libs/zlib curl? ( net-misc/curl ) ecwj2k? ( sci-libs/libecwj2 ) fits? ( sci-libs/cfitsio ) geos? ( >=sci-libs/geos-2.2.1 ) gif? ( media-libs/giflib ) gml? ( >=dev-libs/xerces-c-3 ) hdf5? ( >=sci-libs/hdf5-1.6.4[szip] ) jpeg? ( virtual/jpeg ) jpeg2k? ( media-libs/jasper ) mysql? ( virtual/mysql ) netcdf? ( sci-libs/netcdf ) odbc? ( dev-db/unixODBC ) ogdi? ( sci-libs/ogdi ) pdf? ( app-text/poppler ) perl? ( dev-lang/perl ) png? ( media-libs/libpng ) postgres? ( >=dev-db/postgresql-base-8.4 ) python? ( dev-python/numpy ) ruby? ( dev-lang/ruby:1.8 ) sqlite? ( >=dev-db/sqlite-3 ) dev-lang/perl[-build] python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) )
 0
 http://download.osgeo.org/gdal/gdal-1.8.1.tar.gz
diff --git a/metadata/cache/sci-libs/gdal-1.8.1-r1 b/metadata/cache/sci-libs/gdal-1.8.1-r1
index 5f6156860246..10865f82b200 100644
--- a/metadata/cache/sci-libs/gdal-1.8.1-r1
+++ b/metadata/cache/sci-libs/gdal-1.8.1-r1
@@ -1,4 +1,4 @@
-dev-libs/expat media-libs/tiff sci-libs/libgeotiff ( || ( <sys-libs/zlib-1.2.5.1-r1 >=sys-libs/zlib-1.2.5.1-r2[minizip] ) ) curl? ( net-misc/curl ) ecwj2k? ( sci-libs/libecwj2 ) fits? ( sci-libs/cfitsio ) geos? ( >=sci-libs/geos-2.2.1 ) gif? ( media-libs/giflib ) gml? ( >=dev-libs/xerces-c-3 ) hdf5? ( >=sci-libs/hdf5-1.6.4[szip] ) jpeg? ( virtual/jpeg ) jpeg2k? ( media-libs/jasper ) mysql? ( virtual/mysql ) netcdf? ( sci-libs/netcdf ) odbc? ( dev-db/unixODBC ) ogdi? ( sci-libs/ogdi ) pdf? ( app-text/poppler ) perl? ( dev-lang/perl ) png? ( media-libs/libpng ) postgres? ( >=dev-db/postgresql-base-8.4 ) python? ( dev-python/numpy ) ruby? ( dev-lang/ruby:1.8 ) sqlite? ( >=dev-db/sqlite-3 ) doc? ( app-doc/doxygen ) perl? ( >=dev-lang/swig-2.0.2 ) python? ( >=dev-lang/swig-2.0.2 ) ruby? ( >=dev-lang/swig-2.0.2 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-lang/perl[-build] python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) )
+dev-libs/expat media-libs/tiff sci-libs/libgeotiff ( || ( <sys-libs/zlib-1.2.5.1-r1 >=sys-libs/zlib-1.2.5.1-r2[minizip] ) ) curl? ( net-misc/curl ) ecwj2k? ( sci-libs/libecwj2 ) fits? ( sci-libs/cfitsio ) geos? ( >=sci-libs/geos-2.2.1 ) gif? ( media-libs/giflib ) gml? ( >=dev-libs/xerces-c-3 ) hdf5? ( >=sci-libs/hdf5-1.6.4[szip] ) jpeg? ( virtual/jpeg ) jpeg2k? ( media-libs/jasper ) mysql? ( virtual/mysql ) netcdf? ( sci-libs/netcdf ) odbc? ( dev-db/unixODBC ) ogdi? ( sci-libs/ogdi ) pdf? ( app-text/poppler ) perl? ( dev-lang/perl ) png? ( media-libs/libpng ) postgres? ( >=dev-db/postgresql-base-8.4 ) python? ( dev-python/numpy ) ruby? ( dev-lang/ruby:1.8 ) sqlite? ( >=dev-db/sqlite-3 ) doc? ( app-doc/doxygen ) perl? ( >=dev-lang/swig-2.0.2 ) python? ( >=dev-lang/swig-2.0.2 ) ruby? ( >=dev-lang/swig-2.0.2 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-lang/perl[-build] python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) )
 dev-libs/expat media-libs/tiff sci-libs/libgeotiff ( || ( <sys-libs/zlib-1.2.5.1-r1 >=sys-libs/zlib-1.2.5.1-r2[minizip] ) ) curl? ( net-misc/curl ) ecwj2k? ( sci-libs/libecwj2 ) fits? ( sci-libs/cfitsio ) geos? ( >=sci-libs/geos-2.2.1 ) gif? ( media-libs/giflib ) gml? ( >=dev-libs/xerces-c-3 ) hdf5? ( >=sci-libs/hdf5-1.6.4[szip] ) jpeg? ( virtual/jpeg ) jpeg2k? ( media-libs/jasper ) mysql? ( virtual/mysql ) netcdf? ( sci-libs/netcdf ) odbc? ( dev-db/unixODBC ) ogdi? ( sci-libs/ogdi ) pdf? ( app-text/poppler ) perl? ( dev-lang/perl ) png? ( media-libs/libpng ) postgres? ( >=dev-db/postgresql-base-8.4 ) python? ( dev-python/numpy ) ruby? ( dev-lang/ruby:1.8 ) sqlite? ( >=dev-db/sqlite-3 ) dev-lang/perl[-build] python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) )
 0
 http://download.osgeo.org/gdal/gdal-1.8.1.tar.gz
diff --git a/metadata/cache/sci-libs/geos-3.2.2 b/metadata/cache/sci-libs/geos-3.2.2
index b2098a396bbb..88bbde1d66a3 100644
--- a/metadata/cache/sci-libs/geos-3.2.2
+++ b/metadata/cache/sci-libs/geos-3.2.2
@@ -1,4 +1,4 @@
-ruby? ( dev-lang/ruby:1.8 ) doc? ( app-doc/doxygen ) ruby? ( dev-lang/swig ) python? ( dev-lang/swig ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( =dev-lang/python-2* )
+ruby? ( dev-lang/ruby:1.8 ) doc? ( app-doc/doxygen ) ruby? ( dev-lang/swig ) python? ( dev-lang/swig ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( =dev-lang/python-2* )
 ruby? ( dev-lang/ruby:1.8 ) python? ( =dev-lang/python-2* )
 0
 http://download.osgeo.org/geos/geos-3.2.2.tar.bz2
diff --git a/metadata/cache/sci-libs/geos-3.3.2 b/metadata/cache/sci-libs/geos-3.3.2
index 60d764884608..5242e44403a6 100644
--- a/metadata/cache/sci-libs/geos-3.3.2
+++ b/metadata/cache/sci-libs/geos-3.3.2
@@ -1,4 +1,4 @@
-php? ( dev-lang/php:5.3 ) ruby? ( dev-lang/ruby ) doc? ( app-doc/doxygen ) php? ( dev-lang/swig ) python? ( dev-lang/swig ) ruby? ( dev-lang/swig ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( =dev-lang/python-2* )
+php? ( dev-lang/php:5.3 ) ruby? ( dev-lang/ruby ) doc? ( app-doc/doxygen ) php? ( dev-lang/swig ) python? ( dev-lang/swig ) ruby? ( dev-lang/swig ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( =dev-lang/python-2* )
 php? ( dev-lang/php:5.3 ) ruby? ( dev-lang/ruby ) python? ( =dev-lang/python-2* )
 0
 http://download.osgeo.org/geos/geos-3.3.2.tar.bz2
diff --git a/metadata/cache/sci-libs/gerris-20100519 b/metadata/cache/sci-libs/gerris-20100519
index ef1f84a0b5b0..5006414ace3b 100644
--- a/metadata/cache/sci-libs/gerris-20100519
+++ b/metadata/cache/sci-libs/gerris-20100519
@@ -1,4 +1,4 @@
-dev-libs/glib:2 sci-libs/netcdf sci-libs/gsl sci-libs/gts sci-libs/proj mpi? ( virtual/mpi ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-libs/glib:2 sci-libs/netcdf sci-libs/gsl sci-libs/gts sci-libs/proj mpi? ( virtual/mpi ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-libs/glib:2 sci-libs/netcdf sci-libs/gsl sci-libs/gts sci-libs/proj mpi? ( virtual/mpi )
 0
 mirror://sourceforge/gfs/gerris-20100519.tar.gz
diff --git a/metadata/cache/sci-libs/gerris-20111123 b/metadata/cache/sci-libs/gerris-20111123
index b680bec7a92b..4be0dee3801f 100644
--- a/metadata/cache/sci-libs/gerris-20111123
+++ b/metadata/cache/sci-libs/gerris-20111123
@@ -1,4 +1,4 @@
-dev-libs/glib:2 dev-games/ode sci-libs/netcdf sci-libs/gsl sci-libs/gts sci-libs/hypre sci-libs/lis sci-libs/proj >=sci-libs/fftw-3 virtual/lapack mpi? ( virtual/mpi ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-libs/glib:2 dev-games/ode sci-libs/netcdf sci-libs/gsl sci-libs/gts sci-libs/hypre sci-libs/lis sci-libs/proj >=sci-libs/fftw-3 virtual/lapack mpi? ( virtual/mpi ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-libs/glib:2 dev-games/ode sci-libs/netcdf sci-libs/gsl sci-libs/gts sci-libs/hypre sci-libs/lis sci-libs/proj >=sci-libs/fftw-3 virtual/lapack mpi? ( virtual/mpi )
 0
 http://dev.gentoo.org/~bicatali/distfiles/gerris-20111123.tar.gz
diff --git a/metadata/cache/sci-libs/getdata-0.6.3-r1 b/metadata/cache/sci-libs/getdata-0.6.3-r1
index 0b8894e67dcd..467766bf7ed5 100644
--- a/metadata/cache/sci-libs/getdata-0.6.3-r1
+++ b/metadata/cache/sci-libs/getdata-0.6.3-r1
@@ -1,4 +1,4 @@
-bzip2? ( app-arch/bzip2 ) lzma? ( app-arch/xz-utils ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( =dev-lang/python-2* )
+bzip2? ( app-arch/bzip2 ) lzma? ( app-arch/xz-utils ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( =dev-lang/python-2* )
 bzip2? ( app-arch/bzip2 ) lzma? ( app-arch/xz-utils ) python? ( =dev-lang/python-2* )
 0
 mirror://sourceforge/project/getdata/getdata/0.6.3/getdata-0.6.3.tar.bz2
diff --git a/metadata/cache/sci-libs/getdata-0.7.3 b/metadata/cache/sci-libs/getdata-0.7.3
index 7fba5f244765..6dab5f407aa9 100644
--- a/metadata/cache/sci-libs/getdata-0.7.3
+++ b/metadata/cache/sci-libs/getdata-0.7.3
@@ -1,4 +1,4 @@
-bzip2? ( app-arch/bzip2 ) lzma? ( app-arch/xz-utils ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( =dev-lang/python-2* )
+bzip2? ( app-arch/bzip2 ) lzma? ( app-arch/xz-utils ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( =dev-lang/python-2* )
 bzip2? ( app-arch/bzip2 ) lzma? ( app-arch/xz-utils ) python? ( =dev-lang/python-2* )
 0
 mirror://sourceforge/project/getdata/getdata/0.7.3/getdata-0.7.3.tar.bz2
diff --git a/metadata/cache/sci-libs/grib_api-1.9.5-r1 b/metadata/cache/sci-libs/grib_api-1.9.5-r1
index 1e7bad8911e3..5a1c7ced6267 100644
--- a/metadata/cache/sci-libs/grib_api-1.9.5-r1
+++ b/metadata/cache/sci-libs/grib_api-1.9.5-r1
@@ -1,4 +1,4 @@
-fortran? ( virtual/fortran ) jpeg2k? ( || ( media-libs/jasper media-libs/openjpeg ) ) png? ( media-libs/libpng ) python? ( dev-python/numpy ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+fortran? ( virtual/fortran ) jpeg2k? ( || ( media-libs/jasper media-libs/openjpeg ) ) png? ( media-libs/libpng ) python? ( dev-python/numpy ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 fortran? ( virtual/fortran ) jpeg2k? ( || ( media-libs/jasper media-libs/openjpeg ) ) png? ( media-libs/libpng ) python? ( dev-python/numpy )
 0
 http://www.ecmwf.int/products/data/software/download/software_files/grib_api-1.9.5.tar.gz
diff --git a/metadata/cache/sci-libs/grib_api-1.9.9-r1 b/metadata/cache/sci-libs/grib_api-1.9.9-r1
index d280db154f2d..56369532a7fe 100644
--- a/metadata/cache/sci-libs/grib_api-1.9.9-r1
+++ b/metadata/cache/sci-libs/grib_api-1.9.9-r1
@@ -1,4 +1,4 @@
-jpeg2k? ( || ( media-libs/jasper media-libs/openjpeg ) ) netcdf? ( sci-libs/netcdf ) png? ( media-libs/libpng ) python? ( dev-python/numpy ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+jpeg2k? ( || ( media-libs/jasper media-libs/openjpeg ) ) netcdf? ( sci-libs/netcdf ) png? ( media-libs/libpng ) python? ( dev-python/numpy ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 jpeg2k? ( || ( media-libs/jasper media-libs/openjpeg ) ) netcdf? ( sci-libs/netcdf ) png? ( media-libs/libpng ) python? ( dev-python/numpy )
 0
 http://www.ecmwf.int/products/data/software/download/software_files/grib_api-1.9.9.tar.gz
diff --git a/metadata/cache/sci-libs/gsl-1.13-r1 b/metadata/cache/sci-libs/gsl-1.13-r1
index 6ed6d72d861d..8676e7431528 100644
--- a/metadata/cache/sci-libs/gsl-1.13-r1
+++ b/metadata/cache/sci-libs/gsl-1.13-r1
@@ -1,4 +1,4 @@
-cblas-external? ( virtual/cblas ) app-admin/eselect-cblas dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+cblas-external? ( virtual/cblas ) app-admin/eselect-cblas dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 cblas-external? ( virtual/cblas )
 0
 mirror://gnu/gsl/gsl-1.13.tar.gz
diff --git a/metadata/cache/sci-libs/gsl-1.13-r2 b/metadata/cache/sci-libs/gsl-1.13-r2
index 173254089003..d1735d28904b 100644
--- a/metadata/cache/sci-libs/gsl-1.13-r2
+++ b/metadata/cache/sci-libs/gsl-1.13-r2
@@ -1,4 +1,4 @@
-cblas-external? ( virtual/cblas ) app-admin/eselect-cblas dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+cblas-external? ( virtual/cblas ) app-admin/eselect-cblas dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 cblas-external? ( virtual/cblas )
 0
 mirror://gnu/gsl/gsl-1.13.tar.gz
diff --git a/metadata/cache/sci-libs/gsl-1.14 b/metadata/cache/sci-libs/gsl-1.14
index b074b14165c7..8ec54ecd2a34 100644
--- a/metadata/cache/sci-libs/gsl-1.14
+++ b/metadata/cache/sci-libs/gsl-1.14
@@ -1,4 +1,4 @@
-cblas-external? ( virtual/cblas ) app-admin/eselect-cblas dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+cblas-external? ( virtual/cblas ) app-admin/eselect-cblas dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 cblas-external? ( virtual/cblas )
 0
 mirror://gnu/gsl/gsl-1.14.tar.gz
diff --git a/metadata/cache/sci-libs/gsl-1.14-r1 b/metadata/cache/sci-libs/gsl-1.14-r1
index da3cc265e666..045050203f8e 100644
--- a/metadata/cache/sci-libs/gsl-1.14-r1
+++ b/metadata/cache/sci-libs/gsl-1.14-r1
@@ -1,4 +1,4 @@
-cblas-external? ( virtual/cblas ) app-admin/eselect-cblas dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+cblas-external? ( virtual/cblas ) app-admin/eselect-cblas dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 cblas-external? ( virtual/cblas )
 0
 mirror://gnu/gsl/gsl-1.14.tar.gz
diff --git a/metadata/cache/sci-libs/gsl-1.15 b/metadata/cache/sci-libs/gsl-1.15
index d6112baf408c..c3de082eb194 100644
--- a/metadata/cache/sci-libs/gsl-1.15
+++ b/metadata/cache/sci-libs/gsl-1.15
@@ -1,4 +1,4 @@
-cblas-external? ( virtual/cblas ) app-admin/eselect-cblas dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+cblas-external? ( virtual/cblas ) app-admin/eselect-cblas dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 cblas-external? ( virtual/cblas )
 0
 mirror://gnu/gsl/gsl-1.15.tar.gz
diff --git a/metadata/cache/sci-libs/gts-20100321-r3 b/metadata/cache/sci-libs/gts-20100321-r3
index acb3d983fcea..1b2d83ffec9d 100644
--- a/metadata/cache/sci-libs/gts-20100321-r3
+++ b/metadata/cache/sci-libs/gts-20100321-r3
@@ -1,4 +1,4 @@
-virtual/fortran dev-libs/glib:2 !<=sci-chemistry/ccp4-apps-6.1.3-r2 dev-util/pkgconfig test? ( media-libs/netpbm ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+virtual/fortran dev-libs/glib:2 !<=sci-chemistry/ccp4-apps-6.1.3-r2 dev-util/pkgconfig test? ( media-libs/netpbm ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 virtual/fortran dev-libs/glib:2 !<=sci-chemistry/ccp4-apps-6.1.3-r2
 0
 mirror://gentoo/gts-20100321.tar.gz
diff --git a/metadata/cache/sci-libs/gts-20111025-r1 b/metadata/cache/sci-libs/gts-20111025-r1
index e06468299b1b..da01f23e59b7 100644
--- a/metadata/cache/sci-libs/gts-20111025-r1
+++ b/metadata/cache/sci-libs/gts-20111025-r1
@@ -1,4 +1,4 @@
-virtual/fortran dev-libs/glib:2 dev-util/pkgconfig test? ( media-libs/netpbm ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+virtual/fortran dev-libs/glib:2 dev-util/pkgconfig test? ( media-libs/netpbm ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 virtual/fortran dev-libs/glib:2
 0
 http://dev.gentoo.org/~bicatali/distfiles/gts-20111025.tar.gz
diff --git a/metadata/cache/sci-libs/hdf-4.2.6 b/metadata/cache/sci-libs/hdf-4.2.6
index de498cfa9b93..6de668d56d6d 100644
--- a/metadata/cache/sci-libs/hdf-4.2.6
+++ b/metadata/cache/sci-libs/hdf-4.2.6
@@ -1,4 +1,4 @@
-virtual/jpeg sys-libs/zlib fortran? ( virtual/jpeg ) szip? ( >=sci-libs/szip-2 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+virtual/jpeg sys-libs/zlib fortran? ( virtual/jpeg ) szip? ( >=sci-libs/szip-2 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 virtual/jpeg sys-libs/zlib fortran? ( virtual/jpeg ) szip? ( >=sci-libs/szip-2 )
 0
 ftp://ftp.hdfgroup.org/HDF/HDF_Current/src/hdf-4.2.6.tar.bz2
diff --git a/metadata/cache/sci-libs/hdf-4.2_p4 b/metadata/cache/sci-libs/hdf-4.2_p4
index 3bf5fc60df1d..ed5f35e1e8a4 100644
--- a/metadata/cache/sci-libs/hdf-4.2_p4
+++ b/metadata/cache/sci-libs/hdf-4.2_p4
@@ -1,4 +1,4 @@
-fortran? ( virtual/fortran ) sys-libs/zlib virtual/jpeg szip? ( >=sci-libs/szip-2 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+fortran? ( virtual/fortran ) sys-libs/zlib virtual/jpeg szip? ( >=sci-libs/szip-2 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 fortran? ( virtual/fortran ) sys-libs/zlib virtual/jpeg szip? ( >=sci-libs/szip-2 )
 0
 ftp://ftp.hdfgroup.org/HDF/HDF_Current/src/HDF4.2r4.tar.gz mirror://gentoo/hdf-4.2_p4-patches.tar.bz2
diff --git a/metadata/cache/sci-libs/hdf5-1.8.4-r1 b/metadata/cache/sci-libs/hdf5-1.8.4-r1
index 36c5f85ad768..b6fe06664813 100644
--- a/metadata/cache/sci-libs/hdf5-1.8.4-r1
+++ b/metadata/cache/sci-libs/hdf5-1.8.4-r1
@@ -1,4 +1,4 @@
-fortran? ( virtual/fortran ) mpi? ( || ( sys-cluster/openmpi[romio] sys-cluster/mpich2[romio] ) ) szip? ( >=sci-libs/szip-2.1 ) zlib? ( sys-libs/zlib ) sys-devel/libtool:2 sys-process/time || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+fortran? ( virtual/fortran ) mpi? ( || ( sys-cluster/openmpi[romio] sys-cluster/mpich2[romio] ) ) szip? ( >=sci-libs/szip-2.1 ) zlib? ( sys-libs/zlib ) sys-devel/libtool:2 sys-process/time || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 fortran? ( virtual/fortran ) mpi? ( || ( sys-cluster/openmpi[romio] sys-cluster/mpich2[romio] ) ) szip? ( >=sci-libs/szip-2.1 ) zlib? ( sys-libs/zlib )
 0
 http://www.hdfgroup.org/ftp/HDF5/prev-releases/hdf5-1.8.4/src/hdf5-1.8.4.tar.gz
diff --git a/metadata/cache/sci-libs/hdf5-1.8.7 b/metadata/cache/sci-libs/hdf5-1.8.7
index 8f2cc0dcfc24..a829aa3a0821 100644
--- a/metadata/cache/sci-libs/hdf5-1.8.7
+++ b/metadata/cache/sci-libs/hdf5-1.8.7
@@ -1,4 +1,4 @@
-fortran? ( virtual/fortran ) mpi? ( virtual/mpi[romio] ) szip? ( >=sci-libs/szip-2.1 ) zlib? ( sys-libs/zlib ) sys-devel/libtool:2 sys-process/time || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+fortran? ( virtual/fortran ) mpi? ( virtual/mpi[romio] ) szip? ( >=sci-libs/szip-2.1 ) zlib? ( sys-libs/zlib ) sys-devel/libtool:2 sys-process/time || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 fortran? ( virtual/fortran ) mpi? ( virtual/mpi[romio] ) szip? ( >=sci-libs/szip-2.1 ) zlib? ( sys-libs/zlib )
 0
 http://www.hdfgroup.org/ftp/HDF5/current/src/hdf5-1.8.7.tar.bz2
diff --git a/metadata/cache/sci-libs/hdf5-1.8.8 b/metadata/cache/sci-libs/hdf5-1.8.8
index b34baee521fb..01384c3ab42b 100644
--- a/metadata/cache/sci-libs/hdf5-1.8.8
+++ b/metadata/cache/sci-libs/hdf5-1.8.8
@@ -1,4 +1,4 @@
-fortran? ( virtual/fortran ) mpi? ( virtual/mpi[romio] ) szip? ( >=sci-libs/szip-2.1 ) zlib? ( sys-libs/zlib ) sys-devel/libtool:2 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+fortran? ( virtual/fortran ) mpi? ( virtual/mpi[romio] ) szip? ( >=sci-libs/szip-2.1 ) zlib? ( sys-libs/zlib ) sys-devel/libtool:2 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 fortran? ( virtual/fortran ) mpi? ( virtual/mpi[romio] ) szip? ( >=sci-libs/szip-2.1 ) zlib? ( sys-libs/zlib )
 0
 http://www.hdfgroup.org/ftp/HDF5/releases/hdf5-1.8.8/src/hdf5-1.8.8.tar.bz2
diff --git a/metadata/cache/sci-libs/klu-1.1.1 b/metadata/cache/sci-libs/klu-1.1.1
index 8e3856e00225..67e5bea8bd4d 100644
--- a/metadata/cache/sci-libs/klu-1.1.1
+++ b/metadata/cache/sci-libs/klu-1.1.1
@@ -1,4 +1,4 @@
-sci-libs/amd sci-libs/btf sci-libs/colamd || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+sci-libs/amd sci-libs/btf sci-libs/colamd || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 sci-libs/amd sci-libs/btf sci-libs/colamd
 0
 http://www.cise.ufl.edu/research/sparse/klu/KLU-1.1.1.tar.gz
diff --git a/metadata/cache/sci-libs/klu-1.1.2 b/metadata/cache/sci-libs/klu-1.1.2
index 9103248a536c..601b0a45e41d 100644
--- a/metadata/cache/sci-libs/klu-1.1.2
+++ b/metadata/cache/sci-libs/klu-1.1.2
@@ -1,4 +1,4 @@
-sci-libs/amd sci-libs/btf sci-libs/colamd || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+sci-libs/amd sci-libs/btf sci-libs/colamd || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 sci-libs/amd sci-libs/btf sci-libs/colamd
 0
 http://www.cise.ufl.edu/research/sparse/klu/KLU-1.1.2.tar.gz
diff --git a/metadata/cache/sci-libs/klu-1.1.3 b/metadata/cache/sci-libs/klu-1.1.3
index 4c128ec3ea45..7637e3f4a449 100644
--- a/metadata/cache/sci-libs/klu-1.1.3
+++ b/metadata/cache/sci-libs/klu-1.1.3
@@ -1,4 +1,4 @@
-sci-libs/amd sci-libs/btf sci-libs/colamd || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+sci-libs/amd sci-libs/btf sci-libs/colamd || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 sci-libs/amd sci-libs/btf sci-libs/colamd
 0
 http://www.cise.ufl.edu/research/sparse/klu/KLU-1.1.3.tar.gz
diff --git a/metadata/cache/sci-libs/lapack-atlas-3.9.23-r2 b/metadata/cache/sci-libs/lapack-atlas-3.9.23-r2
index 1b5285af6324..b49861de0d40 100644
--- a/metadata/cache/sci-libs/lapack-atlas-3.9.23-r2
+++ b/metadata/cache/sci-libs/lapack-atlas-3.9.23-r2
@@ -1,4 +1,4 @@
-virtual/fortran virtual/blas virtual/cblas app-admin/eselect-lapack ~sci-libs/blas-atlas-3.9.23 dev-util/pkgconfig >=sys-devel/libtool-1.5 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+virtual/fortran virtual/blas virtual/cblas app-admin/eselect-lapack ~sci-libs/blas-atlas-3.9.23 dev-util/pkgconfig >=sys-devel/libtool-1.5 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 virtual/fortran virtual/blas virtual/cblas app-admin/eselect-lapack ~sci-libs/blas-atlas-3.9.23 doc? ( app-doc/lapack-docs )
 0
 mirror://sourceforge/math-atlas/atlas3.9.23.tar.bz2 http://www.netlib.org/lapack/lapack-lite-3.1.1.tgz mirror://gentoo/atlas-3.9.21-shared-libs.2.patch.bz2 mirror://gentoo/lapack-reference-3.1.1-autotools.patch.bz2
diff --git a/metadata/cache/sci-libs/lapack-atlas-3.9.23-r3 b/metadata/cache/sci-libs/lapack-atlas-3.9.23-r3
index 1b5285af6324..b49861de0d40 100644
--- a/metadata/cache/sci-libs/lapack-atlas-3.9.23-r3
+++ b/metadata/cache/sci-libs/lapack-atlas-3.9.23-r3
@@ -1,4 +1,4 @@
-virtual/fortran virtual/blas virtual/cblas app-admin/eselect-lapack ~sci-libs/blas-atlas-3.9.23 dev-util/pkgconfig >=sys-devel/libtool-1.5 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+virtual/fortran virtual/blas virtual/cblas app-admin/eselect-lapack ~sci-libs/blas-atlas-3.9.23 dev-util/pkgconfig >=sys-devel/libtool-1.5 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 virtual/fortran virtual/blas virtual/cblas app-admin/eselect-lapack ~sci-libs/blas-atlas-3.9.23 doc? ( app-doc/lapack-docs )
 0
 mirror://sourceforge/math-atlas/atlas3.9.23.tar.bz2 http://www.netlib.org/lapack/lapack-lite-3.1.1.tgz mirror://gentoo/atlas-3.9.21-shared-libs.2.patch.bz2 mirror://gentoo/lapack-reference-3.1.1-autotools.patch.bz2
diff --git a/metadata/cache/sci-libs/lapack-reference-3.2.1-r1 b/metadata/cache/sci-libs/lapack-reference-3.2.1-r1
index 1f04edddbbcc..4d1f1ac5c848 100644
--- a/metadata/cache/sci-libs/lapack-reference-3.2.1-r1
+++ b/metadata/cache/sci-libs/lapack-reference-3.2.1-r1
@@ -1,4 +1,4 @@
-virtual/fortran app-admin/eselect-lapack virtual/blas dev-util/pkgconfig doc? ( app-doc/lapack-docs ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+virtual/fortran app-admin/eselect-lapack virtual/blas dev-util/pkgconfig doc? ( app-doc/lapack-docs ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 virtual/fortran app-admin/eselect-lapack virtual/blas
 0
 mirror://gentoo/lapack-3.2.1.tgz mirror://gentoo/lapack-reference-3.2.1-autotools.patch.bz2
diff --git a/metadata/cache/sci-libs/ldl-2.0.3-r1 b/metadata/cache/sci-libs/ldl-2.0.3-r1
index 09297e00d9fa..5918805acce3 100644
--- a/metadata/cache/sci-libs/ldl-2.0.3-r1
+++ b/metadata/cache/sci-libs/ldl-2.0.3-r1
@@ -1,4 +1,4 @@
-sci-libs/ufconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+sci-libs/ufconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 sci-libs/ufconfig
 0
 http://www.cise.ufl.edu/research/sparse/ldl/LDL-2.0.3.tar.gz
diff --git a/metadata/cache/sci-libs/ldl-2.0.4 b/metadata/cache/sci-libs/ldl-2.0.4
index 975cf4bfac71..90149241e71e 100644
--- a/metadata/cache/sci-libs/ldl-2.0.4
+++ b/metadata/cache/sci-libs/ldl-2.0.4
@@ -1,4 +1,4 @@
-sci-libs/ufconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+sci-libs/ufconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 http://www.cise.ufl.edu/research/sparse/ldl/LDL-2.0.4.tar.gz
diff --git a/metadata/cache/sci-libs/libcmatrix-3.2.1 b/metadata/cache/sci-libs/libcmatrix-3.2.1
index 4a4537e64656..ef85f53b9ff2 100644
--- a/metadata/cache/sci-libs/libcmatrix-3.2.1
+++ b/metadata/cache/sci-libs/libcmatrix-3.2.1
@@ -1,4 +1,4 @@
-sci-libs/minuit atlas? ( sci-libs/blas-atlas ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+sci-libs/minuit atlas? ( sci-libs/blas-atlas ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 sci-libs/minuit atlas? ( sci-libs/blas-atlas )
 0
 http://dev.gentooexperimental.org/~jlec/distfiles/libcmatrix-3.2.1.tar.gz
diff --git a/metadata/cache/sci-libs/libcmatrix-3.9.0 b/metadata/cache/sci-libs/libcmatrix-3.9.0
index 2f8aaece368b..05e27ae6e54e 100644
--- a/metadata/cache/sci-libs/libcmatrix-3.9.0
+++ b/metadata/cache/sci-libs/libcmatrix-3.9.0
@@ -1,4 +1,4 @@
-sci-libs/minuit atlas? ( || ( sci-libs/blas-atlas sci-libs/atlas ) ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+sci-libs/minuit atlas? ( || ( sci-libs/blas-atlas sci-libs/atlas ) ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 sci-libs/minuit atlas? ( || ( sci-libs/blas-atlas sci-libs/atlas ) )
 0
 http://dev.gentoo.org/~jlec/distfiles/libcmatrix-3.9.0.tar.gz
diff --git a/metadata/cache/sci-libs/libecwj2-3.3-r1 b/metadata/cache/sci-libs/libecwj2-3.3-r1
index 1924e45e0d5f..e8f338e8c98e 100644
--- a/metadata/cache/sci-libs/libecwj2-3.3-r1
+++ b/metadata/cache/sci-libs/libecwj2-3.3-r1
@@ -1,4 +1,4 @@
-=media-libs/lcms-1* app-arch/unzip || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+=media-libs/lcms-1* app-arch/unzip || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 =media-libs/lcms-1*
 0
 mirror://gentoo/libecwj2-3.3-2006-09-06.zip
diff --git a/metadata/cache/sci-libs/libgenome-1.3-r1 b/metadata/cache/sci-libs/libgenome-1.3-r1
index 260219935ce5..e7774f18b848 100644
--- a/metadata/cache/sci-libs/libgenome-1.3-r1
+++ b/metadata/cache/sci-libs/libgenome-1.3-r1
@@ -1,4 +1,4 @@
-doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 mirror://gentoo/libgenome-1.3-r1.tar.bz2
diff --git a/metadata/cache/sci-libs/libgenome-9999 b/metadata/cache/sci-libs/libgenome-9999
index 769c2e4c9036..90d4c86f8040 100644
--- a/metadata/cache/sci-libs/libgenome-9999
+++ b/metadata/cache/sci-libs/libgenome-9999
@@ -1,4 +1,4 @@
-doc? ( app-doc/doxygen ) dev-vcs/subversion net-misc/rsync || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+doc? ( app-doc/doxygen ) dev-vcs/subversion net-misc/rsync || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 
diff --git a/metadata/cache/sci-libs/libghemical-2.99.1 b/metadata/cache/sci-libs/libghemical-2.99.1
index 37568e337660..a733fc2bdf7b 100644
--- a/metadata/cache/sci-libs/libghemical-2.99.1
+++ b/metadata/cache/sci-libs/libghemical-2.99.1
@@ -1,4 +1,4 @@
-mopac7? ( >=sci-chemistry/mopac7-1.13-r1 ) mpqc? ( >=sci-chemistry/mpqc-2.3.1-r1 virtual/blas virtual/lapack ) >=dev-util/pkgconfig-0.15 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+mopac7? ( >=sci-chemistry/mopac7-1.13-r1 ) mpqc? ( >=sci-chemistry/mpqc-2.3.1-r1 virtual/blas virtual/lapack ) >=dev-util/pkgconfig-0.15 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 mopac7? ( >=sci-chemistry/mopac7-1.13-r1 ) mpqc? ( >=sci-chemistry/mpqc-2.3.1-r1 virtual/blas virtual/lapack )
 0
 http://www.bioinformatics.org/ghemical/download/current/libghemical-2.99.1.tar.gz
diff --git a/metadata/cache/sci-libs/libmems-1.6 b/metadata/cache/sci-libs/libmems-1.6
index 3946f20da515..49e05df3c20a 100644
--- a/metadata/cache/sci-libs/libmems-1.6
+++ b/metadata/cache/sci-libs/libmems-1.6
@@ -1,4 +1,4 @@
->=sci-libs/libgenome-1.3 >=sci-libs/libmuscle-3.7 <dev-libs/boost-1.42 doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=sci-libs/libgenome-1.3 >=sci-libs/libmuscle-3.7 <dev-libs/boost-1.42 doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=sci-libs/libgenome-1.3 >=sci-libs/libmuscle-3.7 <dev-libs/boost-1.42
 0
 mirror://gentoo/libmems-1.6.tar.bz2
diff --git a/metadata/cache/sci-libs/libmems-9999 b/metadata/cache/sci-libs/libmems-9999
index 1be5390f0f39..bafe8c05e1df 100644
--- a/metadata/cache/sci-libs/libmems-9999
+++ b/metadata/cache/sci-libs/libmems-9999
@@ -1,4 +1,4 @@
->=sci-libs/libgenome-1.3 >=sci-libs/libmuscle-3.7 dev-libs/boost doc? ( app-doc/doxygen ) dev-vcs/subversion net-misc/rsync || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=sci-libs/libgenome-1.3 >=sci-libs/libmuscle-3.7 dev-libs/boost doc? ( app-doc/doxygen ) dev-vcs/subversion net-misc/rsync || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=sci-libs/libgenome-1.3 >=sci-libs/libmuscle-3.7 dev-libs/boost
 0
 
diff --git a/metadata/cache/sci-libs/libmuscle-3.7-r1 b/metadata/cache/sci-libs/libmuscle-3.7-r1
index 1f1480a7f3d2..29a0a9e6673b 100644
--- a/metadata/cache/sci-libs/libmuscle-3.7-r1
+++ b/metadata/cache/sci-libs/libmuscle-3.7-r1
@@ -1,4 +1,4 @@
-doc? ( app-doc/doxygen ) !sci-biology/muscle || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+doc? ( app-doc/doxygen ) !sci-biology/muscle || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 mirror://gentoo/libmuscle-3.7-r1.tar.bz2
diff --git a/metadata/cache/sci-libs/libmuscle-3.7-r2 b/metadata/cache/sci-libs/libmuscle-3.7-r2
index 1f1480a7f3d2..29a0a9e6673b 100644
--- a/metadata/cache/sci-libs/libmuscle-3.7-r2
+++ b/metadata/cache/sci-libs/libmuscle-3.7-r2
@@ -1,4 +1,4 @@
-doc? ( app-doc/doxygen ) !sci-biology/muscle || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+doc? ( app-doc/doxygen ) !sci-biology/muscle || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 mirror://gentoo/libmuscle-3.7-r1.tar.bz2
diff --git a/metadata/cache/sci-libs/libmuscle-9999 b/metadata/cache/sci-libs/libmuscle-9999
index 5d448f9d9e96..727a0f9f0eb7 100644
--- a/metadata/cache/sci-libs/libmuscle-9999
+++ b/metadata/cache/sci-libs/libmuscle-9999
@@ -1,4 +1,4 @@
-doc? ( app-doc/doxygen ) !sci-biology/muscle dev-vcs/subversion net-misc/rsync || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+doc? ( app-doc/doxygen ) !sci-biology/muscle dev-vcs/subversion net-misc/rsync || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 
diff --git a/metadata/cache/sci-libs/libnova-0.12.3 b/metadata/cache/sci-libs/libnova-0.12.3
index 1591c1a83007..ec55a6c2f0dd 100644
--- a/metadata/cache/sci-libs/libnova-0.12.3
+++ b/metadata/cache/sci-libs/libnova-0.12.3
@@ -1,4 +1,4 @@
-doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 mirror://sourceforge/libnova/libnova-0.12.3.tar.gz
diff --git a/metadata/cache/sci-libs/linux-gpib-3.2.16-r1 b/metadata/cache/sci-libs/linux-gpib-3.2.16-r1
index a2d75293fcb6..c2d084bab071 100644
--- a/metadata/cache/sci-libs/linux-gpib-3.2.16-r1
+++ b/metadata/cache/sci-libs/linux-gpib-3.2.16-r1
@@ -1,4 +1,4 @@
-tcl? ( dev-lang/tcl ) guile? ( dev-scheme/guile ) perl? ( dev-lang/perl ) php? ( dev-lang/php ) python? ( dev-lang/python ) firmware? ( sys-apps/fxload ) sys-kernel/module-rebuild doc? ( app-text/docbook-sgml-utils ) perl? ( virtual/perl-ExtUtils-MakeMaker ) kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-lang/perl[-build]
+tcl? ( dev-lang/tcl ) guile? ( dev-scheme/guile ) perl? ( dev-lang/perl ) php? ( dev-lang/php ) python? ( dev-lang/python ) firmware? ( sys-apps/fxload ) sys-kernel/module-rebuild doc? ( app-text/docbook-sgml-utils ) perl? ( virtual/perl-ExtUtils-MakeMaker ) kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-lang/perl[-build]
 tcl? ( dev-lang/tcl ) guile? ( dev-scheme/guile ) perl? ( dev-lang/perl ) php? ( dev-lang/php ) python? ( dev-lang/python ) firmware? ( sys-apps/fxload ) kernel_linux? ( virtual/modutils ) dev-lang/perl[-build]
 0
 mirror://sourceforge/linux-gpib/linux-gpib-3.2.16.tar.gz firmware? ( http://linux-gpib.sourceforge.net/firmware/gpib_firmware-2006-11-12.tar.gz )
diff --git a/metadata/cache/sci-libs/lis-1.2.62 b/metadata/cache/sci-libs/lis-1.2.62
index 5cbaf3fcf659..fd3509c09cee 100644
--- a/metadata/cache/sci-libs/lis-1.2.62
+++ b/metadata/cache/sci-libs/lis-1.2.62
@@ -1,4 +1,4 @@
-mpi? ( virtual/mpi ) fortran? ( virtual/fortran ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+mpi? ( virtual/mpi ) fortran? ( virtual/fortran ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 mpi? ( virtual/mpi )
 0
 http://www.ssisc.org/lis/dl/lis-1.2.62.tar.gz
diff --git a/metadata/cache/sci-libs/mathgl-1.11.1.1 b/metadata/cache/sci-libs/mathgl-1.11.1.1
index 79223912eaaa..29f789961803 100644
--- a/metadata/cache/sci-libs/mathgl-1.11.1.1
+++ b/metadata/cache/sci-libs/mathgl-1.11.1.1
@@ -1,4 +1,4 @@
-media-libs/libpng virtual/opengl python? ( dev-python/numpy ) glut? ( media-libs/freeglut ) fltk? ( x11-libs/fltk:1 ) gif? ( media-libs/giflib ) jpeg? ( virtual/jpeg ) hdf5? ( >=sci-libs/hdf5-1.8 ) gsl? ( sci-libs/gsl ) octave? ( >=sci-mathematics/octave-3.4.0 ) qt4? ( x11-libs/qt-gui:4 ) wxwidgets? ( x11-libs/wxGTK:2.8 ) >=sys-devel/libtool-2.2.4 doc? ( app-text/texi2html virtual/texi2dvi ) python? ( dev-lang/swig ) octave? ( dev-lang/swig ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool =dev-lang/python-2*
+media-libs/libpng virtual/opengl python? ( dev-python/numpy ) glut? ( media-libs/freeglut ) fltk? ( x11-libs/fltk:1 ) gif? ( media-libs/giflib ) jpeg? ( virtual/jpeg ) hdf5? ( >=sci-libs/hdf5-1.8 ) gsl? ( sci-libs/gsl ) octave? ( >=sci-mathematics/octave-3.4.0 ) qt4? ( x11-libs/qt-gui:4 ) wxwidgets? ( x11-libs/wxGTK:2.8 ) >=sys-devel/libtool-2.2.4 doc? ( app-text/texi2html virtual/texi2dvi ) python? ( dev-lang/swig ) octave? ( dev-lang/swig ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool =dev-lang/python-2*
 media-libs/libpng virtual/opengl python? ( dev-python/numpy ) glut? ( media-libs/freeglut ) fltk? ( x11-libs/fltk:1 ) gif? ( media-libs/giflib ) jpeg? ( virtual/jpeg ) hdf5? ( >=sci-libs/hdf5-1.8 ) gsl? ( sci-libs/gsl ) octave? ( >=sci-mathematics/octave-3.4.0 ) qt4? ( x11-libs/qt-gui:4 ) wxwidgets? ( x11-libs/wxGTK:2.8 ) =dev-lang/python-2*
 0
 mirror://sourceforge/mathgl/mathgl-1.11.1.1.tar.gz mirror://sourceforge/mathgl/STIX_font.tgz
diff --git a/metadata/cache/sci-libs/mathgl-1.11.2 b/metadata/cache/sci-libs/mathgl-1.11.2
index fce2f329b67a..f85658eaea5e 100644
--- a/metadata/cache/sci-libs/mathgl-1.11.2
+++ b/metadata/cache/sci-libs/mathgl-1.11.2
@@ -1,4 +1,4 @@
-media-libs/libpng sys-libs/zlib virtual/opengl fltk? ( x11-libs/fltk:1 ) gif? ( media-libs/giflib ) glut? ( media-libs/freeglut ) gsl? ( sci-libs/gsl ) hdf5? ( >=sci-libs/hdf5-1.8[mpi=] ) jpeg? ( virtual/jpeg ) octave? ( >=sci-mathematics/octave-3.4.0 ) python? ( dev-python/numpy ) qt4? ( x11-libs/qt-gui:4 ) wxwidgets? ( x11-libs/wxGTK:2.8 ) sys-devel/libtool:2 doc? ( app-text/texi2html virtual/texi2dvi ) octave? ( dev-lang/swig ) python? ( dev-lang/swig ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( =dev-lang/python-2* )
+media-libs/libpng sys-libs/zlib virtual/opengl fltk? ( x11-libs/fltk:1 ) gif? ( media-libs/giflib ) glut? ( media-libs/freeglut ) gsl? ( sci-libs/gsl ) hdf5? ( >=sci-libs/hdf5-1.8[mpi=] ) jpeg? ( virtual/jpeg ) octave? ( >=sci-mathematics/octave-3.4.0 ) python? ( dev-python/numpy ) qt4? ( x11-libs/qt-gui:4 ) wxwidgets? ( x11-libs/wxGTK:2.8 ) sys-devel/libtool:2 doc? ( app-text/texi2html virtual/texi2dvi ) octave? ( dev-lang/swig ) python? ( dev-lang/swig ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( =dev-lang/python-2* )
 media-libs/libpng sys-libs/zlib virtual/opengl fltk? ( x11-libs/fltk:1 ) gif? ( media-libs/giflib ) glut? ( media-libs/freeglut ) gsl? ( sci-libs/gsl ) hdf5? ( >=sci-libs/hdf5-1.8[mpi=] ) jpeg? ( virtual/jpeg ) octave? ( >=sci-mathematics/octave-3.4.0 ) python? ( dev-python/numpy ) qt4? ( x11-libs/qt-gui:4 ) wxwidgets? ( x11-libs/wxGTK:2.8 ) python? ( =dev-lang/python-2* )
 0
 mirror://sourceforge/mathgl/mathgl-1.11.2.tar.gz mirror://sourceforge/mathgl/STIX_font.tgz
diff --git a/metadata/cache/sci-libs/mc-1.4 b/metadata/cache/sci-libs/mc-1.4
index c8366050c21f..7d4a1e056ec7 100644
--- a/metadata/cache/sci-libs/mc-1.4
+++ b/metadata/cache/sci-libs/mc-1.4
@@ -1,4 +1,4 @@
-virtual/fortran dev-libs/maloc media-libs/sg sci-libs/amd sci-libs/gamer sci-libs/punc sci-libs/superlu sci-libs/umfpack doc? ( media-gfx/graphviz app-doc/doxygen ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+virtual/fortran dev-libs/maloc media-libs/sg sci-libs/amd sci-libs/gamer sci-libs/punc sci-libs/superlu sci-libs/umfpack doc? ( media-gfx/graphviz app-doc/doxygen ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 virtual/fortran dev-libs/maloc media-libs/sg sci-libs/amd sci-libs/gamer sci-libs/punc sci-libs/superlu sci-libs/umfpack
 0
 http://www.fetk.org/codes/download/mc-1.4.tar.gz
diff --git a/metadata/cache/sci-libs/mc-1.5 b/metadata/cache/sci-libs/mc-1.5
index 3833cea88582..040c33a534c2 100644
--- a/metadata/cache/sci-libs/mc-1.5
+++ b/metadata/cache/sci-libs/mc-1.5
@@ -1,4 +1,4 @@
-virtual/fortran dev-libs/maloc media-libs/sg sci-libs/amd sci-libs/gamer sci-libs/punc sci-libs/superlu sci-libs/umfpack virtual/blas virtual/lapack doc? ( media-gfx/graphviz app-doc/doxygen ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+virtual/fortran dev-libs/maloc media-libs/sg sci-libs/amd sci-libs/gamer sci-libs/punc sci-libs/superlu sci-libs/umfpack virtual/blas virtual/lapack doc? ( media-gfx/graphviz app-doc/doxygen ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 virtual/fortran dev-libs/maloc media-libs/sg sci-libs/amd sci-libs/gamer sci-libs/punc sci-libs/superlu sci-libs/umfpack virtual/blas virtual/lapack
 0
 http://www.fetk.org/codes/download/mc-1.5.tar.gz
diff --git a/metadata/cache/sci-libs/metis-4.0.3 b/metadata/cache/sci-libs/metis-4.0.3
index 70023de789cc..0d45c49a5147 100644
--- a/metadata/cache/sci-libs/metis-4.0.3
+++ b/metadata/cache/sci-libs/metis-4.0.3
@@ -1,4 +1,4 @@
-virtual/fortran || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+virtual/fortran || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 virtual/fortran !sci-libs/parmetis
 0
 http://glaros.dtc.umn.edu/gkhome/fetch/sw/metis/OLD/metis-4.0.3.tar.gz
diff --git a/metadata/cache/sci-libs/minuit-5.28.00 b/metadata/cache/sci-libs/minuit-5.28.00
index 90b1cefd6f1d..6d3e67765f98 100644
--- a/metadata/cache/sci-libs/minuit-5.28.00
+++ b/metadata/cache/sci-libs/minuit-5.28.00
@@ -1,4 +1,4 @@
-doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 http://seal.web.cern.ch/seal/MathLibs/Minuit2/Minuit2-5.28.00.tar.gz doc? ( http://seal.cern.ch/documents/minuit/mnusersguide.pdf http://seal.cern.ch/documents/minuit/mntutorial.pdf )
diff --git a/metadata/cache/sci-libs/mmdb-1.21-r4 b/metadata/cache/sci-libs/mmdb-1.21-r4
index 5e25e846e45e..492d2119a739 100644
--- a/metadata/cache/sci-libs/mmdb-1.21-r4
+++ b/metadata/cache/sci-libs/mmdb-1.21-r4
@@ -1,4 +1,4 @@
-!<sci-libs/ccp4-libs-6.1.3 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+!<sci-libs/ccp4-libs-6.1.3 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 http://www.ysbl.york.ac.uk/~emsley/software/mmdb-1.21.tar.gz
diff --git a/metadata/cache/sci-libs/mmdb-1.23.2-r1 b/metadata/cache/sci-libs/mmdb-1.23.2-r1
index 048f0ac84a75..e526ca5a54d8 100644
--- a/metadata/cache/sci-libs/mmdb-1.23.2-r1
+++ b/metadata/cache/sci-libs/mmdb-1.23.2-r1
@@ -1,4 +1,4 @@
-!<sci-libs/ccp4-libs-6.1.3 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+!<sci-libs/ccp4-libs-6.1.3 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 http://www.ysbl.york.ac.uk/~emsley/software/mmdb-1.23.2.tar.gz
diff --git a/metadata/cache/sci-libs/mpir-2.2.1 b/metadata/cache/sci-libs/mpir-2.2.1
index 26864605a584..e0d070f81eed 100644
--- a/metadata/cache/sci-libs/mpir-2.2.1
+++ b/metadata/cache/sci-libs/mpir-2.2.1
@@ -1,4 +1,4 @@
-x86? ( dev-lang/yasm ) amd64? ( dev-lang/yasm ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+x86? ( dev-lang/yasm ) amd64? ( dev-lang/yasm ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 http://www.mpir.org/mpir-2.2.1.tar.bz2
diff --git a/metadata/cache/sci-libs/mpir-2.3.1 b/metadata/cache/sci-libs/mpir-2.3.1
index 1567d1ddb03d..5336ac3de4ce 100644
--- a/metadata/cache/sci-libs/mpir-2.3.1
+++ b/metadata/cache/sci-libs/mpir-2.3.1
@@ -1,4 +1,4 @@
-x86? ( dev-lang/yasm ) amd64? ( dev-lang/yasm ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+x86? ( dev-lang/yasm ) amd64? ( dev-lang/yasm ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 http://www.mpir.org/mpir-2.3.1.tar.bz2
diff --git a/metadata/cache/sci-libs/netcdf-3.6.3 b/metadata/cache/sci-libs/netcdf-3.6.3
index 56a1151760ec..04938284fb14 100644
--- a/metadata/cache/sci-libs/netcdf-3.6.3
+++ b/metadata/cache/sci-libs/netcdf-3.6.3
@@ -1,4 +1,4 @@
-fortran? ( virtual/fortran ) >=sys-devel/libtool-2.2 doc? ( virtual/latex-base ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+fortran? ( virtual/fortran ) >=sys-devel/libtool-2.2 doc? ( virtual/latex-base ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 fortran? ( virtual/fortran )
 0
 ftp://ftp.unidata.ucar.edu/pub/netcdf/netcdf-3.6.3.tar.gz
diff --git a/metadata/cache/sci-libs/netcdf-4.1.1-r4 b/metadata/cache/sci-libs/netcdf-4.1.1-r4
index f201b9f2252f..beb68f56fc7b 100644
--- a/metadata/cache/sci-libs/netcdf-4.1.1-r4
+++ b/metadata/cache/sci-libs/netcdf-4.1.1-r4
@@ -1,4 +1,4 @@
-fortran? ( virtual/fortran ) dap? ( net-misc/curl ) hdf5? ( >=sci-libs/hdf5-1.8[zlib,szip?,fortran?] ) >=sys-devel/libtool-2.2 doc? ( virtual/latex-base ) fortran? ( dev-lang/cfortran ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+fortran? ( virtual/fortran ) dap? ( net-misc/curl ) hdf5? ( >=sci-libs/hdf5-1.8[zlib,szip?,fortran?] ) >=sys-devel/libtool-2.2 doc? ( virtual/latex-base ) fortran? ( dev-lang/cfortran ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 fortran? ( virtual/fortran ) dap? ( net-misc/curl ) hdf5? ( >=sci-libs/hdf5-1.8[zlib,szip?,fortran?] )
 0
 ftp://ftp.unidata.ucar.edu/pub/netcdf/netcdf-4.1.1.tar.gz
diff --git a/metadata/cache/sci-libs/netcdf-4.1.3 b/metadata/cache/sci-libs/netcdf-4.1.3
index cfbe5ec9160e..486849264809 100644
--- a/metadata/cache/sci-libs/netcdf-4.1.3
+++ b/metadata/cache/sci-libs/netcdf-4.1.3
@@ -1,4 +1,4 @@
-fortran? ( virtual/fortran ) dap? ( net-misc/curl ) hdf5? ( >=sci-libs/hdf5-1.8.6[zlib,szip,fortran?] ) >=sys-devel/libtool-2.2 doc? ( virtual/latex-base ) fortran? ( dev-lang/cfortran ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+fortran? ( virtual/fortran ) dap? ( net-misc/curl ) hdf5? ( >=sci-libs/hdf5-1.8.6[zlib,szip,fortran?] ) >=sys-devel/libtool-2.2 doc? ( virtual/latex-base ) fortran? ( dev-lang/cfortran ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 fortran? ( virtual/fortran ) dap? ( net-misc/curl ) hdf5? ( >=sci-libs/hdf5-1.8.6[zlib,szip,fortran?] )
 0
 ftp://ftp.unidata.ucar.edu/pub/netcdf/netcdf-4.1.3.tar.gz
diff --git a/metadata/cache/sci-libs/opencascade-6.5 b/metadata/cache/sci-libs/opencascade-6.5
index c6d40c373cf5..af300897675c 100644
--- a/metadata/cache/sci-libs/opencascade-6.5
+++ b/metadata/cache/sci-libs/opencascade-6.5
@@ -1,4 +1,4 @@
-media-libs/ftgl virtual/opengl x11-libs/libXmu >=dev-lang/tcl-8.4 >=dev-lang/tk-8.4 >=dev-tcltk/itcl-3.2 >=dev-tcltk/itk-3.2 >=dev-tcltk/tix-8.4.2 gl2ps? ( x11-libs/gl2ps ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool java? ( >=dev-java/java-config-2.1.9-r1 )
+media-libs/ftgl virtual/opengl x11-libs/libXmu >=dev-lang/tcl-8.4 >=dev-lang/tk-8.4 >=dev-tcltk/itcl-3.2 >=dev-tcltk/itk-3.2 >=dev-tcltk/tix-8.4.2 gl2ps? ( x11-libs/gl2ps ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool java? ( >=dev-java/java-config-2.1.9-r1 )
 media-libs/ftgl virtual/opengl x11-libs/libXmu >=dev-lang/tcl-8.4 >=dev-lang/tk-8.4 >=dev-tcltk/itcl-3.2 >=dev-tcltk/itk-3.2 >=dev-tcltk/tix-8.4.2 gl2ps? ( x11-libs/gl2ps ) java? ( >=dev-java/java-config-2.1.9-r1 )
 0
 http://files.opencascade.com/OCCT/OCC_6.5_release/OpenCASCADE650.tar.gz
diff --git a/metadata/cache/sci-libs/parmetis-3.1.1 b/metadata/cache/sci-libs/parmetis-3.1.1
index 25974f3b3006..8419437367c3 100644
--- a/metadata/cache/sci-libs/parmetis-3.1.1
+++ b/metadata/cache/sci-libs/parmetis-3.1.1
@@ -1,4 +1,4 @@
-virtual/mpi || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+virtual/mpi || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 virtual/mpi !sci-libs/metis
 0
 http://glaros.dtc.umn.edu/gkhome/fetch/sw/parmetis/OLD/ParMetis-3.1.1.tar.gz
diff --git a/metadata/cache/sci-libs/parmetis-3.2.0 b/metadata/cache/sci-libs/parmetis-3.2.0
index f024b9113094..6a32687e578b 100644
--- a/metadata/cache/sci-libs/parmetis-3.2.0
+++ b/metadata/cache/sci-libs/parmetis-3.2.0
@@ -1,4 +1,4 @@
-virtual/mpi || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+virtual/mpi || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 virtual/mpi !sci-libs/metis
 0
 http://glaros.dtc.umn.edu/gkhome/fetch/sw/parmetis/OLD/ParMetis-3.2.0.tar.gz
diff --git a/metadata/cache/sci-libs/parmgridgen-1.0 b/metadata/cache/sci-libs/parmgridgen-1.0
index 2925df53dbf2..c448ba897305 100644
--- a/metadata/cache/sci-libs/parmgridgen-1.0
+++ b/metadata/cache/sci-libs/parmgridgen-1.0
@@ -1,4 +1,4 @@
-virtual/mpi || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+virtual/mpi || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 virtual/mpi
 0
 http://www-users.cs.umn.edu/~moulitsa/download/ParMGridGen-1.0.tar.gz
diff --git a/metadata/cache/sci-libs/punc-0.2_p1 b/metadata/cache/sci-libs/punc-0.2_p1
index e731b374b91b..78825489f45f 100644
--- a/metadata/cache/sci-libs/punc-0.2_p1
+++ b/metadata/cache/sci-libs/punc-0.2_p1
@@ -1,4 +1,4 @@
-dev-libs/maloc[mpi=] sci-libs/arpack[mpi=] sci-libs/superlu virtual/blas virtual/mpi || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-libs/maloc[mpi=] sci-libs/arpack[mpi=] sci-libs/superlu virtual/blas virtual/mpi || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 virtual/fortran dev-libs/maloc[mpi=] sci-libs/arpack[mpi=] sci-libs/superlu virtual/blas virtual/mpi
 0
 http://www.fetk.org/codes/punc/punc-0.2-1.tar.gz
diff --git a/metadata/cache/sci-libs/punc-1.4-r1 b/metadata/cache/sci-libs/punc-1.4-r1
index a03c0581e7ce..82e0b0924167 100644
--- a/metadata/cache/sci-libs/punc-1.4-r1
+++ b/metadata/cache/sci-libs/punc-1.4-r1
@@ -1,4 +1,4 @@
-virtual/fortran dev-libs/maloc[mpi=] dev-libs/libf2c sci-libs/amd sci-libs/cgcode sci-libs/arpack[mpi=] sci-libs/superlu sci-libs/umfpack virtual/blas virtual/lapack mpi? ( virtual/mpi ) doc? ( media-gfx/graphviz app-doc/doxygen ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+virtual/fortran dev-libs/maloc[mpi=] dev-libs/libf2c sci-libs/amd sci-libs/cgcode sci-libs/arpack[mpi=] sci-libs/superlu sci-libs/umfpack virtual/blas virtual/lapack mpi? ( virtual/mpi ) doc? ( media-gfx/graphviz app-doc/doxygen ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 virtual/fortran dev-libs/maloc[mpi=] dev-libs/libf2c sci-libs/amd sci-libs/cgcode sci-libs/arpack[mpi=] sci-libs/superlu sci-libs/umfpack virtual/blas virtual/lapack mpi? ( virtual/mpi )
 0
 http://www.fetk.org/codes/download/punc-1.4.tar.gz
diff --git a/metadata/cache/sci-libs/punc-1.5 b/metadata/cache/sci-libs/punc-1.5
index d561cb4adf5d..2064b09a5d2e 100644
--- a/metadata/cache/sci-libs/punc-1.5
+++ b/metadata/cache/sci-libs/punc-1.5
@@ -1,4 +1,4 @@
-virtual/fortran dev-libs/maloc[mpi=] dev-libs/libf2c sci-libs/amd sci-libs/cgcode sci-libs/arpack[mpi=] sci-libs/superlu sci-libs/umfpack virtual/blas virtual/lapack mpi? ( virtual/mpi ) doc? ( media-gfx/graphviz app-doc/doxygen ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+virtual/fortran dev-libs/maloc[mpi=] dev-libs/libf2c sci-libs/amd sci-libs/cgcode sci-libs/arpack[mpi=] sci-libs/superlu sci-libs/umfpack virtual/blas virtual/lapack mpi? ( virtual/mpi ) doc? ( media-gfx/graphviz app-doc/doxygen ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 virtual/fortran dev-libs/maloc[mpi=] dev-libs/libf2c sci-libs/amd sci-libs/cgcode sci-libs/arpack[mpi=] sci-libs/superlu sci-libs/umfpack virtual/blas virtual/lapack mpi? ( virtual/mpi )
 0
 http://www.fetk.org/codes/download/punc-1.5.tar.gz
diff --git a/metadata/cache/sci-libs/qd-2.3.11 b/metadata/cache/sci-libs/qd-2.3.11
index f4a72da09ee8..1f57f0b90dd4 100644
--- a/metadata/cache/sci-libs/qd-2.3.11
+++ b/metadata/cache/sci-libs/qd-2.3.11
@@ -1,4 +1,4 @@
-fortran? ( virtual/fortran ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+fortran? ( virtual/fortran ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 fortran? ( virtual/fortran )
 0
 http://crd.lbl.gov/~dhbailey/mpdist/qd-2.3.11.tar.gz
diff --git a/metadata/cache/sci-libs/qd-2.3.12 b/metadata/cache/sci-libs/qd-2.3.12
index b3cc609249b2..1c69ae345931 100644
--- a/metadata/cache/sci-libs/qd-2.3.12
+++ b/metadata/cache/sci-libs/qd-2.3.12
@@ -1,4 +1,4 @@
-fortran? ( virtual/fortran ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+fortran? ( virtual/fortran ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 fortran? ( virtual/fortran )
 0
 http://crd.lbl.gov/~dhbailey/mpdist/qd-2.3.12.tar.gz
diff --git a/metadata/cache/sci-libs/spqr-1.2.3 b/metadata/cache/sci-libs/spqr-1.2.3
index 80406affeeaa..3ba9bc933fa0 100644
--- a/metadata/cache/sci-libs/spqr-1.2.3
+++ b/metadata/cache/sci-libs/spqr-1.2.3
@@ -1,4 +1,4 @@
-sci-libs/cholmod[supernodal] tbb? ( dev-cpp/tbb ) metis? ( >=sci-libs/cholmod-1.7.0-r1[metis] ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+sci-libs/cholmod[supernodal] tbb? ( dev-cpp/tbb ) metis? ( >=sci-libs/cholmod-1.7.0-r1[metis] ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 sci-libs/cholmod[supernodal] tbb? ( dev-cpp/tbb ) metis? ( >=sci-libs/cholmod-1.7.0-r1[metis] )
 0
 http://www.cise.ufl.edu/research/sparse/SPQR/SPQR-1.2.3.tar.gz
diff --git a/metadata/cache/sci-libs/spr-3.3.2 b/metadata/cache/sci-libs/spr-3.3.2
index a019695052b2..d97935eff114 100644
--- a/metadata/cache/sci-libs/spr-3.3.2
+++ b/metadata/cache/sci-libs/spr-3.3.2
@@ -1,4 +1,4 @@
-root? ( sci-physics/root ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+root? ( sci-physics/root ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 root? ( sci-physics/root )
 0
 mirror://sourceforge/statpatrec/SPR-3.3.2.tar.gz
diff --git a/metadata/cache/sci-libs/ssm-1.1 b/metadata/cache/sci-libs/ssm-1.1
index 937f93f611b8..483a0467c871 100644
--- a/metadata/cache/sci-libs/ssm-1.1
+++ b/metadata/cache/sci-libs/ssm-1.1
@@ -1,4 +1,4 @@
->=sci-libs/mmdb-1.23 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=sci-libs/mmdb-1.23 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=sci-libs/mmdb-1.23 !<sci-libs/ccp4-libs-6.1.3-r10
 0
 http://launchpad.net/ssm/trunk/1.1/+download/ssm-1.1.tar.gz
diff --git a/metadata/cache/sci-libs/starparse-1.0-r1 b/metadata/cache/sci-libs/starparse-1.0-r1
index ea0806ac4ce3..ade15ae87108 100644
--- a/metadata/cache/sci-libs/starparse-1.0-r1
+++ b/metadata/cache/sci-libs/starparse-1.0-r1
@@ -1,4 +1,4 @@
-guile? ( dev-scheme/guile ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+guile? ( dev-scheme/guile ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 guile? ( dev-scheme/guile )
 0
 http://dev.gentooexperimental.org/~jlec/distfiles/starparse-1.0.tar.bz2
diff --git a/metadata/cache/sci-libs/superlu-4.0-r2 b/metadata/cache/sci-libs/superlu-4.0-r2
index 37b86d72bd31..df187f4722bf 100644
--- a/metadata/cache/sci-libs/superlu-4.0-r2
+++ b/metadata/cache/sci-libs/superlu-4.0-r2
@@ -1,4 +1,4 @@
-virtual/fortran virtual/blas dev-util/pkgconfig test? ( app-shells/tcsh ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+virtual/fortran virtual/blas dev-util/pkgconfig test? ( app-shells/tcsh ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 virtual/fortran virtual/blas
 0
 http://crd.lbl.gov/~xiaoye/SuperLU//superlu_4.0.tar.gz
diff --git a/metadata/cache/sci-libs/superlu-4.1-r1 b/metadata/cache/sci-libs/superlu-4.1-r1
index 6bcba05b9fc0..a76b11c36a26 100644
--- a/metadata/cache/sci-libs/superlu-4.1-r1
+++ b/metadata/cache/sci-libs/superlu-4.1-r1
@@ -1,4 +1,4 @@
-virtual/fortran virtual/blas dev-util/pkgconfig test? ( app-shells/tcsh ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+virtual/fortran virtual/blas dev-util/pkgconfig test? ( app-shells/tcsh ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 virtual/fortran virtual/blas
 0
 http://crd.lbl.gov/~xiaoye/SuperLU//superlu_4.1.tar.gz
diff --git a/metadata/cache/sci-libs/superlu-4.2 b/metadata/cache/sci-libs/superlu-4.2
index 47d18653c0b8..e49585815a62 100644
--- a/metadata/cache/sci-libs/superlu-4.2
+++ b/metadata/cache/sci-libs/superlu-4.2
@@ -1,4 +1,4 @@
-virtual/fortran virtual/blas dev-util/pkgconfig test? ( app-shells/tcsh ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+virtual/fortran virtual/blas dev-util/pkgconfig test? ( app-shells/tcsh ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 virtual/fortran virtual/blas
 0
 http://crd.lbl.gov/~xiaoye/SuperLU//superlu_4.2.tar.gz
diff --git a/metadata/cache/sci-libs/superlu-4.3 b/metadata/cache/sci-libs/superlu-4.3
index 13a6934f07a8..953492967569 100644
--- a/metadata/cache/sci-libs/superlu-4.3
+++ b/metadata/cache/sci-libs/superlu-4.3
@@ -1,4 +1,4 @@
-virtual/fortran virtual/blas dev-util/pkgconfig test? ( app-shells/tcsh ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+virtual/fortran virtual/blas dev-util/pkgconfig test? ( app-shells/tcsh ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 virtual/fortran virtual/blas
 0
 http://crd.lbl.gov/~xiaoye/SuperLU//superlu_4.3.tar.gz
diff --git a/metadata/cache/sci-libs/tamu_anova-0.2.1 b/metadata/cache/sci-libs/tamu_anova-0.2.1
index 509f88626fd4..73ce5e457799 100644
--- a/metadata/cache/sci-libs/tamu_anova-0.2.1
+++ b/metadata/cache/sci-libs/tamu_anova-0.2.1
@@ -1,4 +1,4 @@
-sci-libs/gsl || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+sci-libs/gsl || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 sci-libs/gsl
 0
 http://www.stat.tamu.edu/~aredd/tamuanova/tamu_anova-0.2.tar.gz -> tamu_anova-0.2.1.tar.gz
diff --git a/metadata/cache/sci-libs/udunits-2.1.15 b/metadata/cache/sci-libs/udunits-2.1.15
index 1f11e89ea4af..aabc02ee9d98 100644
--- a/metadata/cache/sci-libs/udunits-2.1.15
+++ b/metadata/cache/sci-libs/udunits-2.1.15
@@ -1,4 +1,4 @@
-virtual/fortran dev-libs/expat || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+virtual/fortran dev-libs/expat || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 virtual/fortran dev-libs/expat
 0
 ftp://ftp.unidata.ucar.edu/pub/udunits/udunits-2.1.15.tar.gz
diff --git a/metadata/cache/sci-libs/udunits-2.1.21 b/metadata/cache/sci-libs/udunits-2.1.21
index ee4e2c52d33d..c85da58d902c 100644
--- a/metadata/cache/sci-libs/udunits-2.1.21
+++ b/metadata/cache/sci-libs/udunits-2.1.21
@@ -1,4 +1,4 @@
-virtual/fortran dev-libs/expat || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+virtual/fortran dev-libs/expat || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 virtual/fortran dev-libs/expat
 0
 ftp://ftp.unidata.ucar.edu/pub/udunits/udunits-2.1.21.tar.gz
diff --git a/metadata/cache/sci-libs/udunits-2.1.23 b/metadata/cache/sci-libs/udunits-2.1.23
index a3991a408e48..c51e4bfbaf6a 100644
--- a/metadata/cache/sci-libs/udunits-2.1.23
+++ b/metadata/cache/sci-libs/udunits-2.1.23
@@ -1,4 +1,4 @@
-virtual/fortran dev-libs/expat || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+virtual/fortran dev-libs/expat || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 virtual/fortran dev-libs/expat
 0
 ftp://ftp.unidata.ucar.edu/pub/udunits/udunits-2.1.23.tar.gz
diff --git a/metadata/cache/sci-libs/udunits-2.1.24 b/metadata/cache/sci-libs/udunits-2.1.24
index 58c3835ccb05..73bf10ffba15 100644
--- a/metadata/cache/sci-libs/udunits-2.1.24
+++ b/metadata/cache/sci-libs/udunits-2.1.24
@@ -1,4 +1,4 @@
-virtual/fortran dev-libs/expat || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+virtual/fortran dev-libs/expat || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 virtual/fortran dev-libs/expat
 0
 ftp://ftp.unidata.ucar.edu/pub/udunits/udunits-2.1.24.tar.gz
diff --git a/metadata/cache/sci-libs/umfpack-5.5.1 b/metadata/cache/sci-libs/umfpack-5.5.1
index bb5f1543fde9..63e8350869d7 100644
--- a/metadata/cache/sci-libs/umfpack-5.5.1
+++ b/metadata/cache/sci-libs/umfpack-5.5.1
@@ -1,4 +1,4 @@
-virtual/fortran virtual/blas sci-libs/amd metis? ( sci-libs/cholmod[metis] ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+virtual/fortran virtual/blas sci-libs/amd metis? ( sci-libs/cholmod[metis] ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 virtual/fortran virtual/blas sci-libs/amd metis? ( sci-libs/cholmod[metis] )
 0
 http://www.cise.ufl.edu/research/sparse/umfpack/UMFPACK-5.5.1.tar.gz
diff --git a/metadata/cache/sci-libs/umfpack-5.5.2 b/metadata/cache/sci-libs/umfpack-5.5.2
index 0f106fbd84b7..638473db2847 100644
--- a/metadata/cache/sci-libs/umfpack-5.5.2
+++ b/metadata/cache/sci-libs/umfpack-5.5.2
@@ -1,4 +1,4 @@
-virtual/fortran virtual/blas sci-libs/amd metis? ( sci-libs/cholmod[metis] ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+virtual/fortran virtual/blas sci-libs/amd metis? ( sci-libs/cholmod[metis] ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 virtual/fortran virtual/blas sci-libs/amd metis? ( sci-libs/cholmod[metis] )
 0
 http://www.cise.ufl.edu/research/sparse/umfpack/UMFPACK-5.5.2.tar.gz
diff --git a/metadata/cache/sci-mathematics/4ti2-1.3.2-r1 b/metadata/cache/sci-mathematics/4ti2-1.3.2-r1
index e8dae496f996..7f6df3671e9c 100644
--- a/metadata/cache/sci-mathematics/4ti2-1.3.2-r1
+++ b/metadata/cache/sci-mathematics/4ti2-1.3.2-r1
@@ -1,4 +1,4 @@
-sci-mathematics/glpk[gmp] dev-libs/gmp[cxx] || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+sci-mathematics/glpk[gmp] dev-libs/gmp[cxx] || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 sci-mathematics/glpk[gmp] dev-libs/gmp[cxx]
 0
 http://4ti2.de/version_1.3.2/4ti2-1.3.2.tar.gz
diff --git a/metadata/cache/sci-mathematics/Macaulay2-1.4 b/metadata/cache/sci-mathematics/Macaulay2-1.4
index 52ad9081c627..05b4604c9fc4 100644
--- a/metadata/cache/sci-mathematics/Macaulay2-1.4
+++ b/metadata/cache/sci-mathematics/Macaulay2-1.4
@@ -1,4 +1,4 @@
-sys-libs/gdbm >=dev-libs/ntl-5.5.2 >=sci-mathematics/pari-2.3.4[gmp] >=sys-libs/readline-6.1 dev-libs/libxml2:2 sci-mathematics/frobby sci-mathematics/4ti2 sci-mathematics/nauty >=sci-mathematics/normaliz-2.5 sci-mathematics/gfan >=dev-libs/mpfr-3.0.0 >=sci-libs/mpir-2.1.1[cxx] sci-libs/cddlib sci-libs/cdd+ sci-libs/lrslib[gmp] virtual/blas virtual/lapack dev-util/ctags sys-libs/ncurses sys-process/time emacs? ( virtual/emacs ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+sys-libs/gdbm >=dev-libs/ntl-5.5.2 >=sci-mathematics/pari-2.3.4[gmp] >=sys-libs/readline-6.1 dev-libs/libxml2:2 sci-mathematics/frobby sci-mathematics/4ti2 sci-mathematics/nauty >=sci-mathematics/normaliz-2.5 sci-mathematics/gfan >=dev-libs/mpfr-3.0.0 >=sci-libs/mpir-2.1.1[cxx] sci-libs/cddlib sci-libs/cdd+ sci-libs/lrslib[gmp] virtual/blas virtual/lapack dev-util/ctags sys-libs/ncurses sys-process/time emacs? ( virtual/emacs ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 sys-libs/gdbm >=dev-libs/ntl-5.5.2 >=sci-mathematics/pari-2.3.4[gmp] >=sys-libs/readline-6.1 dev-libs/libxml2:2 sci-mathematics/frobby sci-mathematics/4ti2 sci-mathematics/nauty >=sci-mathematics/normaliz-2.5 sci-mathematics/gfan >=dev-libs/mpfr-3.0.0 >=sci-libs/mpir-2.1.1[cxx] sci-libs/cddlib sci-libs/cdd+ sci-libs/lrslib[gmp] virtual/blas virtual/lapack dev-util/ctags sys-libs/ncurses sys-process/time emacs? ( virtual/emacs )
 0
 http://www.math.uiuc.edu/Macaulay2/Downloads//OtherSourceCode/1.4/factory-3-1-1.tar.gz http://www.math.uiuc.edu/Macaulay2/Downloads//OtherSourceCode/1.4/libfac-3-1-1.tar.gz http://www.math.uiuc.edu/Macaulay2/Extra/gc-7.2alpha5-2010-09-03.tar.gz http://www.math.uiuc.edu/Macaulay2/Downloads//SourceCode/Macaulay2-1.4-r12617-src.tar.bz2
diff --git a/metadata/cache/sci-mathematics/Macaulay2-1.4-r1 b/metadata/cache/sci-mathematics/Macaulay2-1.4-r1
index 72cd98cdb8bc..b3d4bc6e32ec 100644
--- a/metadata/cache/sci-mathematics/Macaulay2-1.4-r1
+++ b/metadata/cache/sci-mathematics/Macaulay2-1.4-r1
@@ -1,4 +1,4 @@
-sys-libs/gdbm >=dev-libs/ntl-5.5.2 >=sci-mathematics/pari-2.3.4[gmp] >=sys-libs/readline-6.1 dev-libs/libxml2:2 sci-mathematics/frobby sci-mathematics/4ti2 sci-mathematics/nauty >=sci-mathematics/normaliz-2.5 <sci-mathematics/normaliz-2.7 sci-mathematics/gfan >=dev-libs/mpfr-3.0.0 >=sci-libs/mpir-2.1.1[cxx] sci-libs/cddlib sci-libs/cdd+ sci-libs/lrslib[gmp] virtual/blas virtual/lapack dev-util/ctags sys-libs/ncurses sys-process/time emacs? ( virtual/emacs ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+sys-libs/gdbm >=dev-libs/ntl-5.5.2 >=sci-mathematics/pari-2.3.4[gmp] >=sys-libs/readline-6.1 dev-libs/libxml2:2 sci-mathematics/frobby sci-mathematics/4ti2 sci-mathematics/nauty >=sci-mathematics/normaliz-2.5 <sci-mathematics/normaliz-2.7 sci-mathematics/gfan >=dev-libs/mpfr-3.0.0 >=sci-libs/mpir-2.1.1[cxx] sci-libs/cddlib sci-libs/cdd+ sci-libs/lrslib[gmp] virtual/blas virtual/lapack dev-util/ctags sys-libs/ncurses sys-process/time emacs? ( virtual/emacs ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 sys-libs/gdbm >=dev-libs/ntl-5.5.2 >=sci-mathematics/pari-2.3.4[gmp] >=sys-libs/readline-6.1 dev-libs/libxml2:2 sci-mathematics/frobby sci-mathematics/4ti2 sci-mathematics/nauty >=sci-mathematics/normaliz-2.5 <sci-mathematics/normaliz-2.7 sci-mathematics/gfan >=dev-libs/mpfr-3.0.0 >=sci-libs/mpir-2.1.1[cxx] sci-libs/cddlib sci-libs/cdd+ sci-libs/lrslib[gmp] virtual/blas virtual/lapack dev-util/ctags sys-libs/ncurses sys-process/time emacs? ( virtual/emacs )
 0
 http://www.math.uiuc.edu/Macaulay2/Downloads//OtherSourceCode/1.4/factory-3-1-1.tar.gz http://www.math.uiuc.edu/Macaulay2/Downloads//OtherSourceCode/1.4/libfac-3-1-1.tar.gz http://www.math.uiuc.edu/Macaulay2/Extra/gc-7.2alpha5-2010-09-03.tar.gz http://www.math.uiuc.edu/Macaulay2/Downloads//SourceCode/Macaulay2-1.4-r12617-src.tar.bz2
diff --git a/metadata/cache/sci-mathematics/dataplot-20090821 b/metadata/cache/sci-mathematics/dataplot-20090821
index 770e59e197fe..d56e277e0c1c 100644
--- a/metadata/cache/sci-mathematics/dataplot-20090821
+++ b/metadata/cache/sci-mathematics/dataplot-20090821
@@ -1,4 +1,4 @@
-media-libs/plotutils opengl? ( virtual/opengl ) gd? ( media-libs/gd[png,jpeg] ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+media-libs/plotutils opengl? ( virtual/opengl ) gd? ( media-libs/gd[png,jpeg] ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 virtual/fortran media-libs/plotutils opengl? ( virtual/opengl ) gd? ( media-libs/gd[png,jpeg] ) X? ( x11-misc/xdg-utils )
 0
 ftp://ftp.nist.gov/pub/dataplot/unix/dpsrc_2009_08_21.tar.gz ftp://ftp.nist.gov/pub/dataplot/unix/dplib.2009_07_15.tar.gz
diff --git a/metadata/cache/sci-mathematics/diagrtb-2.64 b/metadata/cache/sci-mathematics/diagrtb-2.64
new file mode 100644
index 000000000000..a905e88f45d0
--- /dev/null
+++ b/metadata/cache/sci-mathematics/diagrtb-2.64
@@ -0,0 +1,22 @@
+>=dev-util/cmake-2.8.4 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
+
+0
+http://ecole.modelisation.free.fr/rtb2011.tar.gz -> diagrtb-2.64.tar.gz
+
+http://ecole.modelisation.free.fr/modes.html
+as-is
+Calculation of some eigenvectors of a large real, symmetrical, matrix
+~amd64 ~x86 ~amd64-linux ~x86-linux
+base cmake-utils eutils flag-o-matic fortran-2 multilib toolchain-funcs user
+examples
+
+
+
+4
+
+compile configure install prepare setup test unpack
+
+
+
+
+
diff --git a/metadata/cache/sci-mathematics/euler-1.61.0 b/metadata/cache/sci-mathematics/euler-1.61.0
index 5e535dfe7237..d7be0d6f52ef 100644
--- a/metadata/cache/sci-mathematics/euler-1.61.0
+++ b/metadata/cache/sci-mathematics/euler-1.61.0
@@ -1,4 +1,4 @@
-x11-libs/gtk+:2 dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+x11-libs/gtk+:2 dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 x11-libs/gtk+:2 x11-misc/xdg-utils
 0
 mirror://sourceforge/euler/euler-1.61.0.tgz
diff --git a/metadata/cache/sci-mathematics/fann-2.1.0_beta b/metadata/cache/sci-mathematics/fann-2.1.0_beta
index c646ef70c447..47fcaffc58ef 100644
--- a/metadata/cache/sci-mathematics/fann-2.1.0_beta
+++ b/metadata/cache/sci-mathematics/fann-2.1.0_beta
@@ -1,4 +1,4 @@
-python? ( dev-lang/swig ) app-arch/unzip python? ( =dev-lang/python-2* ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+python? ( dev-lang/swig ) app-arch/unzip python? ( =dev-lang/python-2* ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 python? ( =dev-lang/python-2* )
 0
 mirror://sourceforge/fann/fann-2.1.0beta.zip
diff --git a/metadata/cache/sci-mathematics/fann-2.1.0_beta-r1 b/metadata/cache/sci-mathematics/fann-2.1.0_beta-r1
index 20b57e38cdcc..d0c44c327ed8 100644
--- a/metadata/cache/sci-mathematics/fann-2.1.0_beta-r1
+++ b/metadata/cache/sci-mathematics/fann-2.1.0_beta-r1
@@ -1,4 +1,4 @@
-python? ( dev-lang/swig ) app-arch/unzip python? ( =dev-lang/python-2* ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+python? ( dev-lang/swig ) app-arch/unzip python? ( =dev-lang/python-2* ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 python? ( =dev-lang/python-2* )
 0
 mirror://sourceforge/fann/fann-2.1.0beta.zip
diff --git a/metadata/cache/sci-mathematics/maxima-5.23.2 b/metadata/cache/sci-mathematics/maxima-5.23.2
index 8f80f71ae7ee..be212e908f73 100644
--- a/metadata/cache/sci-mathematics/maxima-5.23.2
+++ b/metadata/cache/sci-mathematics/maxima-5.23.2
@@ -1,4 +1,4 @@
-X? ( x11-misc/xdg-utils sci-visualization/gnuplot[gd] tk? ( dev-lang/tk ) ) latex? ( virtual/latex-base ) emacs? ( virtual/emacs latex? ( app-emacs/auctex ) ) xemacs? ( app-editors/xemacs latex? ( app-emacs/auctex ) ) clisp? ( dev-lisp/clisp ) clozurecl? ( dev-lisp/clozurecl app-misc/rlwrap ) ecls? ( >=dev-lisp/ecls-10 app-misc/rlwrap ) gcl? ( >=dev-lisp/gcl-2.6.8_pre[ansi] ) cmucl? ( dev-lisp/cmucl app-misc/rlwrap ) sbcl? ( dev-lisp/sbcl app-misc/rlwrap ) !clisp? ( !clozurecl? ( !ecls? ( !gcl? ( !cmucl? ( dev-lisp/sbcl app-misc/rlwrap ) ) ) ) ) sys-apps/texinfo || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+X? ( x11-misc/xdg-utils sci-visualization/gnuplot[gd] tk? ( dev-lang/tk ) ) latex? ( virtual/latex-base ) emacs? ( virtual/emacs latex? ( app-emacs/auctex ) ) xemacs? ( app-editors/xemacs latex? ( app-emacs/auctex ) ) clisp? ( dev-lisp/clisp ) clozurecl? ( dev-lisp/clozurecl app-misc/rlwrap ) ecls? ( >=dev-lisp/ecls-10 app-misc/rlwrap ) gcl? ( >=dev-lisp/gcl-2.6.8_pre[ansi] ) cmucl? ( dev-lisp/cmucl app-misc/rlwrap ) sbcl? ( dev-lisp/sbcl app-misc/rlwrap ) !clisp? ( !clozurecl? ( !ecls? ( !gcl? ( !cmucl? ( dev-lisp/sbcl app-misc/rlwrap ) ) ) ) ) sys-apps/texinfo || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 X? ( x11-misc/xdg-utils sci-visualization/gnuplot[gd] tk? ( dev-lang/tk ) ) latex? ( virtual/latex-base ) emacs? ( virtual/emacs latex? ( app-emacs/auctex ) ) xemacs? ( app-editors/xemacs latex? ( app-emacs/auctex ) ) clisp? ( dev-lisp/clisp ) clozurecl? ( dev-lisp/clozurecl app-misc/rlwrap ) ecls? ( >=dev-lisp/ecls-10 app-misc/rlwrap ) gcl? ( >=dev-lisp/gcl-2.6.8_pre[ansi] ) cmucl? ( dev-lisp/cmucl app-misc/rlwrap ) sbcl? ( dev-lisp/sbcl app-misc/rlwrap ) !clisp? ( !clozurecl? ( !ecls? ( !gcl? ( !cmucl? ( dev-lisp/sbcl app-misc/rlwrap ) ) ) ) )
 0
 mirror://sourceforge/maxima/maxima-5.23.2.tar.gz
diff --git a/metadata/cache/sci-mathematics/maxima-5.24.0-r1 b/metadata/cache/sci-mathematics/maxima-5.24.0-r1
index 758922e6052e..d9e67096f3b8 100644
--- a/metadata/cache/sci-mathematics/maxima-5.24.0-r1
+++ b/metadata/cache/sci-mathematics/maxima-5.24.0-r1
@@ -1,4 +1,4 @@
-X? ( x11-misc/xdg-utils sci-visualization/gnuplot[gd] tk? ( dev-lang/tk ) ) latex? ( virtual/latex-base ) emacs? ( virtual/emacs latex? ( app-emacs/auctex ) ) xemacs? ( app-editors/xemacs latex? ( app-emacs/auctex ) ) clisp? ( dev-lisp/clisp ) clozurecl? ( dev-lisp/clozurecl app-misc/rlwrap ) ecls? ( >=dev-lisp/ecls-10 app-misc/rlwrap ) gcl? ( >=dev-lisp/gcl-2.6.8_pre[ansi] ) cmucl? ( dev-lisp/cmucl app-misc/rlwrap ) sbcl? ( dev-lisp/sbcl app-misc/rlwrap ) !clisp? ( !clozurecl? ( !ecls? ( !gcl? ( !cmucl? ( dev-lisp/sbcl app-misc/rlwrap ) ) ) ) ) sys-apps/texinfo || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+X? ( x11-misc/xdg-utils sci-visualization/gnuplot[gd] tk? ( dev-lang/tk ) ) latex? ( virtual/latex-base ) emacs? ( virtual/emacs latex? ( app-emacs/auctex ) ) xemacs? ( app-editors/xemacs latex? ( app-emacs/auctex ) ) clisp? ( dev-lisp/clisp ) clozurecl? ( dev-lisp/clozurecl app-misc/rlwrap ) ecls? ( >=dev-lisp/ecls-10 app-misc/rlwrap ) gcl? ( >=dev-lisp/gcl-2.6.8_pre[ansi] ) cmucl? ( dev-lisp/cmucl app-misc/rlwrap ) sbcl? ( dev-lisp/sbcl app-misc/rlwrap ) !clisp? ( !clozurecl? ( !ecls? ( !gcl? ( !cmucl? ( dev-lisp/sbcl app-misc/rlwrap ) ) ) ) ) sys-apps/texinfo || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 X? ( x11-misc/xdg-utils sci-visualization/gnuplot[gd] tk? ( dev-lang/tk ) ) latex? ( virtual/latex-base ) emacs? ( virtual/emacs latex? ( app-emacs/auctex ) ) xemacs? ( app-editors/xemacs latex? ( app-emacs/auctex ) ) clisp? ( dev-lisp/clisp ) clozurecl? ( dev-lisp/clozurecl app-misc/rlwrap ) ecls? ( >=dev-lisp/ecls-10 app-misc/rlwrap ) gcl? ( >=dev-lisp/gcl-2.6.8_pre[ansi] ) cmucl? ( dev-lisp/cmucl app-misc/rlwrap ) sbcl? ( dev-lisp/sbcl app-misc/rlwrap ) !clisp? ( !clozurecl? ( !ecls? ( !gcl? ( !cmucl? ( dev-lisp/sbcl app-misc/rlwrap ) ) ) ) )
 0
 mirror://sourceforge/maxima/maxima-5.24.0.tar.gz
diff --git a/metadata/cache/sci-mathematics/maxima-5.25.1 b/metadata/cache/sci-mathematics/maxima-5.25.1
index b67509ab1108..ca3a527a48ba 100644
--- a/metadata/cache/sci-mathematics/maxima-5.25.1
+++ b/metadata/cache/sci-mathematics/maxima-5.25.1
@@ -1,4 +1,4 @@
-X? ( x11-misc/xdg-utils sci-visualization/gnuplot[gd] tk? ( dev-lang/tk ) ) latex? ( virtual/latex-base ) emacs? ( virtual/emacs latex? ( app-emacs/auctex ) ) xemacs? ( app-editors/xemacs latex? ( app-emacs/auctex ) ) clisp? ( dev-lisp/clisp ) clozurecl? ( dev-lisp/clozurecl app-misc/rlwrap ) ecls? ( >=dev-lisp/ecls-10 app-misc/rlwrap ) gcl? ( >=dev-lisp/gcl-2.6.8_pre[ansi] ) cmucl? ( dev-lisp/cmucl app-misc/rlwrap ) sbcl? ( dev-lisp/sbcl app-misc/rlwrap ) !clisp? ( !clozurecl? ( !ecls? ( !gcl? ( !cmucl? ( dev-lisp/sbcl app-misc/rlwrap ) ) ) ) ) sys-apps/texinfo || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+X? ( x11-misc/xdg-utils sci-visualization/gnuplot[gd] tk? ( dev-lang/tk ) ) latex? ( virtual/latex-base ) emacs? ( virtual/emacs latex? ( app-emacs/auctex ) ) xemacs? ( app-editors/xemacs latex? ( app-emacs/auctex ) ) clisp? ( dev-lisp/clisp ) clozurecl? ( dev-lisp/clozurecl app-misc/rlwrap ) ecls? ( >=dev-lisp/ecls-10 app-misc/rlwrap ) gcl? ( >=dev-lisp/gcl-2.6.8_pre[ansi] ) cmucl? ( dev-lisp/cmucl app-misc/rlwrap ) sbcl? ( dev-lisp/sbcl app-misc/rlwrap ) !clisp? ( !clozurecl? ( !ecls? ( !gcl? ( !cmucl? ( dev-lisp/sbcl app-misc/rlwrap ) ) ) ) ) sys-apps/texinfo || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 X? ( x11-misc/xdg-utils sci-visualization/gnuplot[gd] tk? ( dev-lang/tk ) ) latex? ( virtual/latex-base ) emacs? ( virtual/emacs latex? ( app-emacs/auctex ) ) xemacs? ( app-editors/xemacs latex? ( app-emacs/auctex ) ) clisp? ( dev-lisp/clisp ) clozurecl? ( dev-lisp/clozurecl app-misc/rlwrap ) ecls? ( >=dev-lisp/ecls-10 app-misc/rlwrap ) gcl? ( >=dev-lisp/gcl-2.6.8_pre[ansi] ) cmucl? ( dev-lisp/cmucl app-misc/rlwrap ) sbcl? ( dev-lisp/sbcl app-misc/rlwrap ) !clisp? ( !clozurecl? ( !ecls? ( !gcl? ( !cmucl? ( dev-lisp/sbcl app-misc/rlwrap ) ) ) ) )
 0
 mirror://sourceforge/maxima/maxima-5.25.1.tar.gz
diff --git a/metadata/cache/sci-mathematics/maxima-5.26.0 b/metadata/cache/sci-mathematics/maxima-5.26.0
index b25e08cf0de5..1aaae242da25 100644
--- a/metadata/cache/sci-mathematics/maxima-5.26.0
+++ b/metadata/cache/sci-mathematics/maxima-5.26.0
@@ -1,4 +1,4 @@
-X? ( x11-misc/xdg-utils sci-visualization/gnuplot[gd] tk? ( dev-lang/tk ) ) latex? ( virtual/latex-base ) emacs? ( virtual/emacs latex? ( app-emacs/auctex ) ) xemacs? ( app-editors/xemacs latex? ( app-emacs/auctex ) ) clisp? ( dev-lisp/clisp ) clozurecl? ( dev-lisp/clozurecl app-misc/rlwrap ) ecls? ( >=dev-lisp/ecls-10 app-misc/rlwrap ) gcl? ( >=dev-lisp/gcl-2.6.8_pre[ansi] ) cmucl? ( dev-lisp/cmucl app-misc/rlwrap ) sbcl? ( dev-lisp/sbcl app-misc/rlwrap ) !clisp? ( !clozurecl? ( !ecls? ( !gcl? ( !cmucl? ( dev-lisp/sbcl app-misc/rlwrap ) ) ) ) ) sys-apps/texinfo || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+X? ( x11-misc/xdg-utils sci-visualization/gnuplot[gd] tk? ( dev-lang/tk ) ) latex? ( virtual/latex-base ) emacs? ( virtual/emacs latex? ( app-emacs/auctex ) ) xemacs? ( app-editors/xemacs latex? ( app-emacs/auctex ) ) clisp? ( dev-lisp/clisp ) clozurecl? ( dev-lisp/clozurecl app-misc/rlwrap ) ecls? ( >=dev-lisp/ecls-10 app-misc/rlwrap ) gcl? ( >=dev-lisp/gcl-2.6.8_pre[ansi] ) cmucl? ( dev-lisp/cmucl app-misc/rlwrap ) sbcl? ( dev-lisp/sbcl app-misc/rlwrap ) !clisp? ( !clozurecl? ( !ecls? ( !gcl? ( !cmucl? ( dev-lisp/sbcl app-misc/rlwrap ) ) ) ) ) sys-apps/texinfo || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 X? ( x11-misc/xdg-utils sci-visualization/gnuplot[gd] tk? ( dev-lang/tk ) ) latex? ( virtual/latex-base ) emacs? ( virtual/emacs latex? ( app-emacs/auctex ) ) xemacs? ( app-editors/xemacs latex? ( app-emacs/auctex ) ) clisp? ( dev-lisp/clisp ) clozurecl? ( dev-lisp/clozurecl app-misc/rlwrap ) ecls? ( >=dev-lisp/ecls-10 app-misc/rlwrap ) gcl? ( >=dev-lisp/gcl-2.6.8_pre[ansi] ) cmucl? ( dev-lisp/cmucl app-misc/rlwrap ) sbcl? ( dev-lisp/sbcl app-misc/rlwrap ) !clisp? ( !clozurecl? ( !ecls? ( !gcl? ( !cmucl? ( dev-lisp/sbcl app-misc/rlwrap ) ) ) ) )
 0
 mirror://sourceforge/maxima/maxima-5.26.0.tar.gz
diff --git a/metadata/cache/sci-mathematics/octave-3.2.4-r1 b/metadata/cache/sci-mathematics/octave-3.2.4-r1
index 6caa06ff815c..f0bab222363f 100644
--- a/metadata/cache/sci-mathematics/octave-3.2.4-r1
+++ b/metadata/cache/sci-mathematics/octave-3.2.4-r1
@@ -1,4 +1,4 @@
-dev-libs/libpcre media-gfx/graphicsmagick[cxx] media-libs/qhull sci-libs/qrupdate sci-mathematics/glpk sci-visualization/gnuplot sys-libs/ncurses virtual/lapack x11-libs/libX11 curl? ( net-misc/curl ) fltk? ( x11-libs/fltk:1[opengl?] ) fftw? ( sci-libs/fftw:3.0 ) opengl? ( virtual/opengl media-libs/ftgl ) sparse? ( sci-libs/arpack sci-libs/camd sci-libs/ccolamd sci-libs/cholmod sci-libs/colamd sci-libs/cxsparse sci-libs/umfpack ) xemacs? ( app-editors/xemacs ) zlib? ( sys-libs/zlib ) !sci-mathematics/octave-forge virtual/latex-base sys-apps/texinfo dev-texlive/texlive-genericrecommended dev-util/gperf dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-libs/libpcre media-gfx/graphicsmagick[cxx] media-libs/qhull sci-libs/qrupdate sci-mathematics/glpk sci-visualization/gnuplot sys-libs/ncurses virtual/lapack x11-libs/libX11 curl? ( net-misc/curl ) fltk? ( x11-libs/fltk:1[opengl?] ) fftw? ( sci-libs/fftw:3.0 ) opengl? ( virtual/opengl media-libs/ftgl ) sparse? ( sci-libs/arpack sci-libs/camd sci-libs/ccolamd sci-libs/cholmod sci-libs/colamd sci-libs/cxsparse sci-libs/umfpack ) xemacs? ( app-editors/xemacs ) zlib? ( sys-libs/zlib ) !sci-mathematics/octave-forge virtual/latex-base sys-apps/texinfo dev-texlive/texlive-genericrecommended dev-util/gperf dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-libs/libpcre media-gfx/graphicsmagick[cxx] media-libs/qhull sci-libs/qrupdate sci-mathematics/glpk sci-visualization/gnuplot sys-libs/ncurses virtual/lapack x11-libs/libX11 curl? ( net-misc/curl ) fltk? ( x11-libs/fltk:1[opengl?] ) fftw? ( sci-libs/fftw:3.0 ) opengl? ( virtual/opengl media-libs/ftgl ) sparse? ( sci-libs/arpack sci-libs/camd sci-libs/ccolamd sci-libs/cholmod sci-libs/colamd sci-libs/cxsparse sci-libs/umfpack ) xemacs? ( app-editors/xemacs ) zlib? ( sys-libs/zlib ) !sci-mathematics/octave-forge
 0
 ftp://ftp.gnu.org/pub/gnu/octave/octave-3.2.4.tar.bz2
diff --git a/metadata/cache/sci-mathematics/octave-3.4.3-r1 b/metadata/cache/sci-mathematics/octave-3.4.3-r1
index a0b459df873a..1badaee89fed 100644
--- a/metadata/cache/sci-mathematics/octave-3.4.3-r1
+++ b/metadata/cache/sci-mathematics/octave-3.4.3-r1
@@ -1,4 +1,4 @@
-dev-libs/libpcre app-text/ghostscript-gpl sys-libs/ncurses virtual/lapack curl? ( net-misc/curl ) fftw? ( sci-libs/fftw:3.0 ) glpk? ( sci-mathematics/glpk ) imagemagick? ( || ( media-gfx/graphicsmagick[cxx] media-gfx/imagemagick[cxx] ) ) opengl? ( media-libs/freetype:2 media-libs/fontconfig >=x11-libs/fltk-1.3:1[opengl] ) qhull? ( media-libs/qhull ) qrupdate? ( sci-libs/qrupdate ) readline? ( sys-libs/readline ) sparse? ( sci-libs/camd sci-libs/ccolamd sci-libs/cholmod sci-libs/colamd sci-libs/cxsparse sci-libs/umfpack ) X? ( x11-libs/libX11 ) zlib? ( sys-libs/zlib ) doc? ( virtual/latex-base dev-texlive/texlive-genericrecommended sys-apps/texinfo ) dev-util/gperf dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-libs/libpcre app-text/ghostscript-gpl sys-libs/ncurses virtual/lapack curl? ( net-misc/curl ) fftw? ( sci-libs/fftw:3.0 ) glpk? ( sci-mathematics/glpk ) imagemagick? ( || ( media-gfx/graphicsmagick[cxx] media-gfx/imagemagick[cxx] ) ) opengl? ( media-libs/freetype:2 media-libs/fontconfig >=x11-libs/fltk-1.3:1[opengl] ) qhull? ( media-libs/qhull ) qrupdate? ( sci-libs/qrupdate ) readline? ( sys-libs/readline ) sparse? ( sci-libs/camd sci-libs/ccolamd sci-libs/cholmod sci-libs/colamd sci-libs/cxsparse sci-libs/umfpack ) X? ( x11-libs/libX11 ) zlib? ( sys-libs/zlib ) doc? ( virtual/latex-base dev-texlive/texlive-genericrecommended sys-apps/texinfo ) dev-util/gperf dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-libs/libpcre app-text/ghostscript-gpl sys-libs/ncurses virtual/lapack curl? ( net-misc/curl ) fftw? ( sci-libs/fftw:3.0 ) glpk? ( sci-mathematics/glpk ) imagemagick? ( || ( media-gfx/graphicsmagick[cxx] media-gfx/imagemagick[cxx] ) ) opengl? ( media-libs/freetype:2 media-libs/fontconfig >=x11-libs/fltk-1.3:1[opengl] ) qhull? ( media-libs/qhull ) qrupdate? ( sci-libs/qrupdate ) readline? ( sys-libs/readline ) sparse? ( sci-libs/camd sci-libs/ccolamd sci-libs/cholmod sci-libs/colamd sci-libs/cxsparse sci-libs/umfpack ) X? ( x11-libs/libX11 ) zlib? ( sys-libs/zlib )
 0
 ftp://ftp.gnu.org/pub/gnu/octave/octave-3.4.3.tar.bz2
diff --git a/metadata/cache/sci-mathematics/octave-3.6.0 b/metadata/cache/sci-mathematics/octave-3.6.0
index 173d725e4552..7d37f136ac7e 100644
--- a/metadata/cache/sci-mathematics/octave-3.6.0
+++ b/metadata/cache/sci-mathematics/octave-3.6.0
@@ -1,4 +1,4 @@
-dev-libs/libpcre app-text/ghostscript-gpl sys-libs/ncurses virtual/lapack curl? ( net-misc/curl ) fftw? ( sci-libs/fftw:3.0 ) glpk? ( sci-mathematics/glpk ) imagemagick? ( || ( media-gfx/graphicsmagick[cxx] media-gfx/imagemagick[cxx] ) ) opengl? ( media-libs/freetype:2 media-libs/fontconfig >=x11-libs/fltk-1.3:1[opengl] ) qhull? ( media-libs/qhull ) qrupdate? ( sci-libs/qrupdate ) readline? ( sys-libs/readline ) sparse? ( sci-libs/arpack sci-libs/camd sci-libs/ccolamd sci-libs/cholmod sci-libs/colamd sci-libs/cxsparse sci-libs/umfpack ) X? ( x11-libs/libX11 ) zlib? ( sys-libs/zlib ) doc? ( virtual/latex-base dev-texlive/texlive-genericrecommended sys-apps/texinfo ) dev-util/gperf dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-libs/libpcre app-text/ghostscript-gpl sys-libs/ncurses virtual/lapack curl? ( net-misc/curl ) fftw? ( sci-libs/fftw:3.0 ) glpk? ( sci-mathematics/glpk ) imagemagick? ( || ( media-gfx/graphicsmagick[cxx] media-gfx/imagemagick[cxx] ) ) opengl? ( media-libs/freetype:2 media-libs/fontconfig >=x11-libs/fltk-1.3:1[opengl] ) qhull? ( media-libs/qhull ) qrupdate? ( sci-libs/qrupdate ) readline? ( sys-libs/readline ) sparse? ( sci-libs/arpack sci-libs/camd sci-libs/ccolamd sci-libs/cholmod sci-libs/colamd sci-libs/cxsparse sci-libs/umfpack ) X? ( x11-libs/libX11 ) zlib? ( sys-libs/zlib ) doc? ( virtual/latex-base dev-texlive/texlive-genericrecommended sys-apps/texinfo ) dev-util/gperf dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-libs/libpcre app-text/ghostscript-gpl sys-libs/ncurses virtual/lapack curl? ( net-misc/curl ) fftw? ( sci-libs/fftw:3.0 ) glpk? ( sci-mathematics/glpk ) imagemagick? ( || ( media-gfx/graphicsmagick[cxx] media-gfx/imagemagick[cxx] ) ) opengl? ( media-libs/freetype:2 media-libs/fontconfig >=x11-libs/fltk-1.3:1[opengl] ) qhull? ( media-libs/qhull ) qrupdate? ( sci-libs/qrupdate ) readline? ( sys-libs/readline ) sparse? ( sci-libs/arpack sci-libs/camd sci-libs/ccolamd sci-libs/cholmod sci-libs/colamd sci-libs/cxsparse sci-libs/umfpack ) X? ( x11-libs/libX11 ) zlib? ( sys-libs/zlib )
 0
 ftp://ftp.gnu.org/pub/gnu/octave/octave-3.6.0.tar.bz2
diff --git a/metadata/cache/sci-mathematics/octave-3.6.1 b/metadata/cache/sci-mathematics/octave-3.6.1
index e921157ad198..d5da167a7dd2 100644
--- a/metadata/cache/sci-mathematics/octave-3.6.1
+++ b/metadata/cache/sci-mathematics/octave-3.6.1
@@ -1,4 +1,4 @@
-dev-libs/libpcre app-text/ghostscript-gpl sys-libs/ncurses virtual/lapack curl? ( net-misc/curl ) fftw? ( sci-libs/fftw:3.0 ) glpk? ( sci-mathematics/glpk ) gnuplot? ( sci-visualization/gnuplot ) imagemagick? ( || ( media-gfx/graphicsmagick[cxx] media-gfx/imagemagick[cxx] ) ) opengl? ( media-libs/freetype:2 media-libs/fontconfig >=x11-libs/fltk-1.3:1[opengl] ) qhull? ( media-libs/qhull ) qrupdate? ( sci-libs/qrupdate ) readline? ( sys-libs/readline ) sparse? ( sci-libs/arpack sci-libs/camd sci-libs/ccolamd sci-libs/cholmod sci-libs/colamd sci-libs/cxsparse sci-libs/umfpack ) X? ( x11-libs/libX11 ) zlib? ( sys-libs/zlib ) doc? ( virtual/latex-base dev-texlive/texlive-genericrecommended sys-apps/texinfo ) dev-util/gperf dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-libs/libpcre app-text/ghostscript-gpl sys-libs/ncurses virtual/lapack curl? ( net-misc/curl ) fftw? ( sci-libs/fftw:3.0 ) glpk? ( sci-mathematics/glpk ) gnuplot? ( sci-visualization/gnuplot ) imagemagick? ( || ( media-gfx/graphicsmagick[cxx] media-gfx/imagemagick[cxx] ) ) opengl? ( media-libs/freetype:2 media-libs/fontconfig >=x11-libs/fltk-1.3:1[opengl] ) qhull? ( media-libs/qhull ) qrupdate? ( sci-libs/qrupdate ) readline? ( sys-libs/readline ) sparse? ( sci-libs/arpack sci-libs/camd sci-libs/ccolamd sci-libs/cholmod sci-libs/colamd sci-libs/cxsparse sci-libs/umfpack ) X? ( x11-libs/libX11 ) zlib? ( sys-libs/zlib ) doc? ( virtual/latex-base dev-texlive/texlive-genericrecommended sys-apps/texinfo ) dev-util/gperf dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-libs/libpcre app-text/ghostscript-gpl sys-libs/ncurses virtual/lapack curl? ( net-misc/curl ) fftw? ( sci-libs/fftw:3.0 ) glpk? ( sci-mathematics/glpk ) gnuplot? ( sci-visualization/gnuplot ) imagemagick? ( || ( media-gfx/graphicsmagick[cxx] media-gfx/imagemagick[cxx] ) ) opengl? ( media-libs/freetype:2 media-libs/fontconfig >=x11-libs/fltk-1.3:1[opengl] ) qhull? ( media-libs/qhull ) qrupdate? ( sci-libs/qrupdate ) readline? ( sys-libs/readline ) sparse? ( sci-libs/arpack sci-libs/camd sci-libs/ccolamd sci-libs/cholmod sci-libs/colamd sci-libs/cxsparse sci-libs/umfpack ) X? ( x11-libs/libX11 ) zlib? ( sys-libs/zlib )
 0
 ftp://ftp.gnu.org/pub/gnu/octave/octave-3.6.1.tar.bz2
diff --git a/metadata/cache/sci-mathematics/prng-3.0.2 b/metadata/cache/sci-mathematics/prng-3.0.2
index c8fccefb20ef..0faa3fa23c68 100644
--- a/metadata/cache/sci-mathematics/prng-3.0.2
+++ b/metadata/cache/sci-mathematics/prng-3.0.2
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 http://statmath.wu.ac.at/prng/prng-3.0.2.tar.gz
diff --git a/metadata/cache/sci-mathematics/pspp-0.6.2 b/metadata/cache/sci-mathematics/pspp-0.6.2
index abdb777a98dc..eb90ed011b3d 100644
--- a/metadata/cache/sci-mathematics/pspp-0.6.2
+++ b/metadata/cache/sci-mathematics/pspp-0.6.2
@@ -1,4 +1,4 @@
-sci-libs/gsl sys-libs/readline sys-devel/gettext virtual/libiconv sys-libs/zlib dev-libs/libxml2:2 emacs? ( virtual/emacs ) gtk? ( x11-libs/gtk+:2 gnome-base/libglade:2.0 ) ncurses? ( sys-libs/ncurses ) plotutils? ( media-libs/plotutils ) postgres? ( dev-db/postgresql-server ) dev-util/pkgconfig doc? ( virtual/latex-base ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+sci-libs/gsl sys-libs/readline sys-devel/gettext virtual/libiconv sys-libs/zlib dev-libs/libxml2:2 emacs? ( virtual/emacs ) gtk? ( x11-libs/gtk+:2 gnome-base/libglade:2.0 ) ncurses? ( sys-libs/ncurses ) plotutils? ( media-libs/plotutils ) postgres? ( dev-db/postgresql-server ) dev-util/pkgconfig doc? ( virtual/latex-base ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 sci-libs/gsl sys-libs/readline sys-devel/gettext virtual/libiconv sys-libs/zlib dev-libs/libxml2:2 emacs? ( virtual/emacs ) gtk? ( x11-libs/gtk+:2 gnome-base/libglade:2.0 ) ncurses? ( sys-libs/ncurses ) plotutils? ( media-libs/plotutils ) postgres? ( dev-db/postgresql-server )
 0
 ftp://ftp.gnu.org/pub/gnu/pspp/pspp-0.6.2.tar.gz
diff --git a/metadata/cache/sci-mathematics/pspp-0.6.2-r1 b/metadata/cache/sci-mathematics/pspp-0.6.2-r1
index a86bf99e11a7..20b9911581c4 100644
--- a/metadata/cache/sci-mathematics/pspp-0.6.2-r1
+++ b/metadata/cache/sci-mathematics/pspp-0.6.2-r1
@@ -1,4 +1,4 @@
-sci-libs/gsl sys-libs/readline sys-devel/gettext virtual/libiconv sys-libs/zlib dev-libs/libxml2:2 emacs? ( virtual/emacs ) gtk? ( x11-libs/gtk+:2 gnome-base/libglade:2.0 gnome-extra/yelp ) ncurses? ( sys-libs/ncurses ) plotutils? ( media-libs/plotutils ) postgres? ( dev-db/postgresql-server ) dev-util/pkgconfig doc? ( virtual/latex-base ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+sci-libs/gsl sys-libs/readline sys-devel/gettext virtual/libiconv sys-libs/zlib dev-libs/libxml2:2 emacs? ( virtual/emacs ) gtk? ( x11-libs/gtk+:2 gnome-base/libglade:2.0 gnome-extra/yelp ) ncurses? ( sys-libs/ncurses ) plotutils? ( media-libs/plotutils ) postgres? ( dev-db/postgresql-server ) dev-util/pkgconfig doc? ( virtual/latex-base ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 sci-libs/gsl sys-libs/readline sys-devel/gettext virtual/libiconv sys-libs/zlib dev-libs/libxml2:2 emacs? ( virtual/emacs ) gtk? ( x11-libs/gtk+:2 gnome-base/libglade:2.0 gnome-extra/yelp ) ncurses? ( sys-libs/ncurses ) plotutils? ( media-libs/plotutils ) postgres? ( dev-db/postgresql-server )
 0
 ftp://ftp.gnu.org/pub/gnu/pspp/pspp-0.6.2.tar.gz
diff --git a/metadata/cache/sci-mathematics/scilab-4.1.2-r1 b/metadata/cache/sci-mathematics/scilab-4.1.2-r1
index ed3130c4cbaf..604ff6c6f648 100644
--- a/metadata/cache/sci-mathematics/scilab-4.1.2-r1
+++ b/metadata/cache/sci-mathematics/scilab-4.1.2-r1
@@ -1,4 +1,4 @@
-virtual/fortran virtual/blas virtual/lapack virtual/cblas sys-libs/ncurses gtk? ( virtual/jpeg media-libs/libpng sys-libs/zlib x11-libs/gtk+:2 x11-libs/vte:0 gnome-extra/gtkhtml:2 ) >=dev-lang/tk-8.4 >=dev-lang/tcl-8.4 Xaw3d? ( x11-libs/libXaw3d ) ocaml? ( dev-lang/ocaml ) java? ( >=virtual/jdk-1.4 ) app-text/sablotron || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool java? ( >=dev-java/java-config-2.1.9-r1 >=sys-apps/portage-2.1.2.7 )
+virtual/fortran virtual/blas virtual/lapack virtual/cblas sys-libs/ncurses gtk? ( virtual/jpeg media-libs/libpng sys-libs/zlib x11-libs/gtk+:2 x11-libs/vte:0 gnome-extra/gtkhtml:2 ) >=dev-lang/tk-8.4 >=dev-lang/tcl-8.4 Xaw3d? ( x11-libs/libXaw3d ) ocaml? ( dev-lang/ocaml ) java? ( >=virtual/jdk-1.4 ) app-text/sablotron || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool java? ( >=dev-java/java-config-2.1.9-r1 >=sys-apps/portage-2.1.2.7 )
 virtual/fortran virtual/blas virtual/lapack virtual/cblas sys-libs/ncurses gtk? ( virtual/jpeg media-libs/libpng sys-libs/zlib x11-libs/gtk+:2 x11-libs/vte:0 gnome-extra/gtkhtml:2 ) >=dev-lang/tk-8.4 >=dev-lang/tcl-8.4 Xaw3d? ( x11-libs/libXaw3d ) ocaml? ( dev-lang/ocaml ) java? ( >=virtual/jdk-1.4 ) java? ( >=dev-java/java-config-2.1.9-r1 >=sys-apps/portage-2.1.2.7 )
 0
 http://www.scilab.org/download/4.1.2/scilab-4.1.2-src.tar.gz
diff --git a/metadata/cache/sci-mathematics/scilab-4.1.2-r2 b/metadata/cache/sci-mathematics/scilab-4.1.2-r2
index 156f8fc898fc..537ac38e0dd5 100644
--- a/metadata/cache/sci-mathematics/scilab-4.1.2-r2
+++ b/metadata/cache/sci-mathematics/scilab-4.1.2-r2
@@ -1,4 +1,4 @@
-virtual/fortran virtual/blas virtual/lapack virtual/cblas sys-libs/ncurses gtk? ( virtual/jpeg media-libs/libpng sys-libs/zlib x11-libs/gtk+:2 x11-libs/vte:0 gnome-extra/gtkhtml:2 ) >=dev-lang/tk-8.4 >=dev-lang/tcl-8.4 Xaw3d? ( x11-libs/libXaw3d ) ocaml? ( dev-lang/ocaml ) java? ( >=virtual/jdk-1.4 ) app-text/sablotron || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool java? ( >=dev-java/java-config-2.1.9-r1 )
+virtual/fortran virtual/blas virtual/lapack virtual/cblas sys-libs/ncurses gtk? ( virtual/jpeg media-libs/libpng sys-libs/zlib x11-libs/gtk+:2 x11-libs/vte:0 gnome-extra/gtkhtml:2 ) >=dev-lang/tk-8.4 >=dev-lang/tcl-8.4 Xaw3d? ( x11-libs/libXaw3d ) ocaml? ( dev-lang/ocaml ) java? ( >=virtual/jdk-1.4 ) app-text/sablotron || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool java? ( >=dev-java/java-config-2.1.9-r1 )
 virtual/fortran virtual/blas virtual/lapack virtual/cblas sys-libs/ncurses gtk? ( virtual/jpeg media-libs/libpng sys-libs/zlib x11-libs/gtk+:2 x11-libs/vte:0 gnome-extra/gtkhtml:2 ) >=dev-lang/tk-8.4 >=dev-lang/tcl-8.4 Xaw3d? ( x11-libs/libXaw3d ) ocaml? ( dev-lang/ocaml ) java? ( >=virtual/jdk-1.4 ) java? ( >=dev-java/java-config-2.1.9-r1 )
 0
 http://www.scilab.org/download/4.1.2/scilab-4.1.2-src.tar.gz
diff --git a/metadata/cache/sci-mathematics/scilab-4.1.2-r3 b/metadata/cache/sci-mathematics/scilab-4.1.2-r3
index 61fd99f907d1..1492ed03f7ef 100644
--- a/metadata/cache/sci-mathematics/scilab-4.1.2-r3
+++ b/metadata/cache/sci-mathematics/scilab-4.1.2-r3
@@ -1,4 +1,4 @@
-virtual/fortran virtual/blas virtual/lapack virtual/cblas sys-libs/ncurses gtk? ( virtual/jpeg media-libs/libpng sys-libs/zlib x11-libs/gtk+:2 x11-libs/vte:0 gnome-extra/gtkhtml:2 ) >=dev-lang/tk-8.4 >=dev-lang/tcl-8.4 Xaw3d? ( x11-libs/libXaw3d ) ocaml? ( dev-lang/ocaml ) java? ( >=virtual/jdk-1.4 ) app-text/sablotron || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool java? ( >=dev-java/java-config-2.1.9-r1 )
+virtual/fortran virtual/blas virtual/lapack virtual/cblas sys-libs/ncurses gtk? ( virtual/jpeg media-libs/libpng sys-libs/zlib x11-libs/gtk+:2 x11-libs/vte:0 gnome-extra/gtkhtml:2 ) >=dev-lang/tk-8.4 >=dev-lang/tcl-8.4 Xaw3d? ( x11-libs/libXaw3d ) ocaml? ( dev-lang/ocaml ) java? ( >=virtual/jdk-1.4 ) app-text/sablotron || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool java? ( >=dev-java/java-config-2.1.9-r1 )
 virtual/fortran virtual/blas virtual/lapack virtual/cblas sys-libs/ncurses gtk? ( virtual/jpeg media-libs/libpng sys-libs/zlib x11-libs/gtk+:2 x11-libs/vte:0 gnome-extra/gtkhtml:2 ) >=dev-lang/tk-8.4 >=dev-lang/tcl-8.4 Xaw3d? ( x11-libs/libXaw3d ) ocaml? ( dev-lang/ocaml ) java? ( >=virtual/jdk-1.4 ) java? ( >=dev-java/java-config-2.1.9-r1 )
 0
 http://www.scilab.org/download/4.1.2/scilab-4.1.2-src.tar.gz
diff --git a/metadata/cache/sci-mathematics/singular-3.1.2-r2 b/metadata/cache/sci-mathematics/singular-3.1.2-r2
index e557187ebc7d..25b784101f44 100644
--- a/metadata/cache/sci-mathematics/singular-3.1.2-r2
+++ b/metadata/cache/sci-mathematics/singular-3.1.2-r2
@@ -1,4 +1,4 @@
-dev-libs/gmp >=dev-libs/ntl-5.5.1 emacs? ( >=virtual/emacs-22 ) dev-lang/perl boost? ( dev-libs/boost ) readline? ( sys-libs/readline ) test? ( dev-util/cmake dev-util/cppunit ) || ( >=sys-devel/automake-1.11.1 ) =sys-devel/autoconf-2.1* sys-devel/libtool
+dev-libs/gmp >=dev-libs/ntl-5.5.1 emacs? ( >=virtual/emacs-22 ) dev-lang/perl boost? ( dev-libs/boost ) readline? ( sys-libs/readline ) test? ( dev-util/cmake dev-util/cppunit ) || ( >=sys-devel/automake-1.11.1:1.11 ) =sys-devel/autoconf-2.1* sys-devel/libtool
 dev-libs/gmp >=dev-libs/ntl-5.5.1 emacs? ( >=virtual/emacs-22 )
 0
 http://www.mathematik.uni-kl.de/ftp/pub/Math/Singular/SOURCES/3-1-2/Singular-3-1-2.tar.gz http://www.mathematik.uni-kl.de/ftp/pub/Math/Singular/SOURCES/3-1-2/Singular-3-1-2-share.tar.gz
diff --git a/metadata/cache/sci-mathematics/singular-3.1.3.1 b/metadata/cache/sci-mathematics/singular-3.1.3.1
index 23ac3b27aeed..a170a950b4c0 100644
--- a/metadata/cache/sci-mathematics/singular-3.1.3.1
+++ b/metadata/cache/sci-mathematics/singular-3.1.3.1
@@ -1,4 +1,4 @@
-dev-libs/gmp >=dev-libs/ntl-5.5.1 emacs? ( >=virtual/emacs-22 ) dev-lang/perl boost? ( dev-libs/boost ) readline? ( sys-libs/readline ) test? ( dev-util/cmake dev-util/cppunit ) || ( >=sys-devel/automake-1.11.1 ) =sys-devel/autoconf-2.1* sys-devel/libtool
+dev-libs/gmp >=dev-libs/ntl-5.5.1 emacs? ( >=virtual/emacs-22 ) dev-lang/perl boost? ( dev-libs/boost ) readline? ( sys-libs/readline ) test? ( dev-util/cmake dev-util/cppunit ) || ( >=sys-devel/automake-1.11.1:1.11 ) =sys-devel/autoconf-2.1* sys-devel/libtool
 dev-libs/gmp >=dev-libs/ntl-5.5.1 emacs? ( >=virtual/emacs-22 )
 0
 http://www.mathematik.uni-kl.de/ftp/pub/Math/Singular/SOURCES/3-1-3/Singular-3-1-3-1.tar.gz http://www.mathematik.uni-kl.de/ftp/pub/Math/Singular/SOURCES/3-1-3/Singular-3-1-3-1-share.tar.gz
diff --git a/metadata/cache/sci-mathematics/singular-3.1.3.3 b/metadata/cache/sci-mathematics/singular-3.1.3.3
index 4e192bd004d0..a182a79bfe69 100644
--- a/metadata/cache/sci-mathematics/singular-3.1.3.3
+++ b/metadata/cache/sci-mathematics/singular-3.1.3.3
@@ -1,4 +1,4 @@
-dev-libs/gmp >=dev-libs/ntl-5.5.1 emacs? ( >=virtual/emacs-22 ) dev-lang/perl boost? ( dev-libs/boost ) readline? ( sys-libs/readline ) test? ( dev-util/cmake dev-util/cppunit ) || ( >=sys-devel/automake-1.11.1 ) =sys-devel/autoconf-2.1* sys-devel/libtool
+dev-libs/gmp >=dev-libs/ntl-5.5.1 emacs? ( >=virtual/emacs-22 ) dev-lang/perl boost? ( dev-libs/boost ) readline? ( sys-libs/readline ) test? ( dev-util/cmake dev-util/cppunit ) || ( >=sys-devel/automake-1.11.1:1.11 ) =sys-devel/autoconf-2.1* sys-devel/libtool
 dev-libs/gmp >=dev-libs/ntl-5.5.1 emacs? ( >=virtual/emacs-22 )
 0
 http://www.mathematik.uni-kl.de/ftp/pub/Math/Singular/SOURCES/3-1-3/Singular-3-1-3-3.tar.gz http://www.mathematik.uni-kl.de/ftp/pub/Math/Singular/SOURCES/3-1-3/Singular-3-1-3-3-share.tar.gz
diff --git a/metadata/cache/sci-mathematics/topcom-0.16.2 b/metadata/cache/sci-mathematics/topcom-0.16.2
index a30c2d39417b..158bb5fd419f 100644
--- a/metadata/cache/sci-mathematics/topcom-0.16.2
+++ b/metadata/cache/sci-mathematics/topcom-0.16.2
@@ -1,4 +1,4 @@
->=dev-libs/gmp-4.1-r1 >=sci-libs/cddlib-094f || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-libs/gmp-4.1-r1 >=sci-libs/cddlib-094f || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=dev-libs/gmp-4.1-r1 >=sci-libs/cddlib-094f
 0
 http://www.uni-bayreuth.de/departments/wirtschaftsmathematik/rambau/Software/TOPCOM-0.16.2.tar.gz doc? ( http://www.rambau.wm.uni-bayreuth.de/TOPCOM/TOPCOM-manual.html )
diff --git a/metadata/cache/sci-mathematics/unuran-1.8.0 b/metadata/cache/sci-mathematics/unuran-1.8.0
index e9ebfbf0f799..b7bf808cc4d3 100644
--- a/metadata/cache/sci-mathematics/unuran-1.8.0
+++ b/metadata/cache/sci-mathematics/unuran-1.8.0
@@ -1,4 +1,4 @@
-gsl? ( sci-libs/gsl ) prng? ( sci-mathematics/prng ) rngstreams? ( sci-mathematics/rngstreams ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+gsl? ( sci-libs/gsl ) prng? ( sci-mathematics/prng ) rngstreams? ( sci-mathematics/rngstreams ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 gsl? ( sci-libs/gsl ) prng? ( sci-mathematics/prng ) rngstreams? ( sci-mathematics/rngstreams )
 0
 http://statmath.wu.ac.at/unuran/unuran-1.8.0.tar.gz
diff --git a/metadata/cache/sci-mathematics/unuran-1.8.1 b/metadata/cache/sci-mathematics/unuran-1.8.1
index 4fe14a01c36c..777e34d75022 100644
--- a/metadata/cache/sci-mathematics/unuran-1.8.1
+++ b/metadata/cache/sci-mathematics/unuran-1.8.1
@@ -1,4 +1,4 @@
-gsl? ( sci-libs/gsl ) prng? ( sci-mathematics/prng ) rngstreams? ( sci-mathematics/rngstreams ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+gsl? ( sci-libs/gsl ) prng? ( sci-mathematics/prng ) rngstreams? ( sci-mathematics/rngstreams ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 gsl? ( sci-libs/gsl ) prng? ( sci-mathematics/prng ) rngstreams? ( sci-mathematics/rngstreams )
 0
 http://statmath.wu.ac.at/unuran/unuran-1.8.1.tar.gz
diff --git a/metadata/cache/sci-mathematics/yacas-1.2.2-r1 b/metadata/cache/sci-mathematics/yacas-1.2.2-r1
index 681d0eeca60e..2f38dc2e49e9 100644
--- a/metadata/cache/sci-mathematics/yacas-1.2.2-r1
+++ b/metadata/cache/sci-mathematics/yacas-1.2.2-r1
@@ -1,4 +1,4 @@
-java? ( >=virtual/jdk-1.6 ) java? ( >=dev-java/java-config-2.1.9-r1 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+java? ( >=virtual/jdk-1.6 ) java? ( >=dev-java/java-config-2.1.9-r1 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 java? ( >=virtual/jre-1.6 ) java? ( >=dev-java/java-config-2.1.9-r1 )
 0
 http://yacas.sourceforge.net/backups/yacas-1.2.2.tar.gz
diff --git a/metadata/cache/sci-mathematics/yacas-1.3.1 b/metadata/cache/sci-mathematics/yacas-1.3.1
index b08e9abc6e42..b38dc2475ac5 100644
--- a/metadata/cache/sci-mathematics/yacas-1.3.1
+++ b/metadata/cache/sci-mathematics/yacas-1.3.1
@@ -1,4 +1,4 @@
-java? ( >=virtual/jdk-1.6 ) java? ( >=dev-java/java-config-2.1.9-r1 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+java? ( >=virtual/jdk-1.6 ) java? ( >=dev-java/java-config-2.1.9-r1 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 java? ( >=virtual/jre-1.6 ) java? ( >=dev-java/java-config-2.1.9-r1 )
 0
 http://yacas.sourceforge.net/backups/yacas-1.3.1.tar.gz
diff --git a/metadata/cache/sci-mathematics/yacas-1.3.2 b/metadata/cache/sci-mathematics/yacas-1.3.2
index cc591bf8e768..cbb41e8ecbdc 100644
--- a/metadata/cache/sci-mathematics/yacas-1.3.2
+++ b/metadata/cache/sci-mathematics/yacas-1.3.2
@@ -1,4 +1,4 @@
-java? ( >=virtual/jdk-1.6 ) java? ( >=dev-java/java-config-2.1.9-r1 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+java? ( >=virtual/jdk-1.6 ) java? ( >=dev-java/java-config-2.1.9-r1 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 java? ( >=virtual/jre-1.6 ) java? ( >=dev-java/java-config-2.1.9-r1 )
 0
 http://yacas.sourceforge.net/backups/yacas-1.3.2.tar.gz
diff --git a/metadata/cache/sci-misc/apertium-3.2.0 b/metadata/cache/sci-misc/apertium-3.2.0
index 437547cc4525..cc9edaf13c6b 100644
--- a/metadata/cache/sci-misc/apertium-3.2.0
+++ b/metadata/cache/sci-misc/apertium-3.2.0
@@ -1,4 +1,4 @@
-virtual/libiconv dev-libs/libxslt dev-libs/libpcre[cxx] >=sci-misc/lttoolbox-3.2 dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+virtual/libiconv dev-libs/libxslt dev-libs/libpcre[cxx] >=sci-misc/lttoolbox-3.2 dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 virtual/libiconv dev-libs/libxslt dev-libs/libpcre[cxx] >=sci-misc/lttoolbox-3.2
 0
 mirror://sourceforge/apertium/apertium-3.2.0.tar.gz
diff --git a/metadata/cache/sci-misc/boinc-6.12.42 b/metadata/cache/sci-misc/boinc-6.12.42
index 4d4290fb90c8..6f7b1bfaf7ff 100644
--- a/metadata/cache/sci-misc/boinc-6.12.42
+++ b/metadata/cache/sci-misc/boinc-6.12.42
@@ -1,4 +1,4 @@
-!sci-misc/boinc-bin !app-admin/quickswitch >=app-misc/ca-certificates-20080809 dev-libs/openssl net-misc/curl[ssl,-gnutls] sys-apps/util-linux sys-libs/zlib cuda? ( >=dev-util/nvidia-cuda-toolkit-2.1 >=x11-drivers/nvidia-drivers-180.22 ) X? ( dev-db/sqlite:3 media-libs/freeglut sys-libs/glibc:2.2 virtual/jpeg x11-libs/gtk+:2 >=x11-libs/libnotify-0.7 x11-libs/wxGTK:2.8[X,opengl] ) sys-devel/gettext app-text/docbook-xml-dtd:4.4 app-text/docbook2X || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+!sci-misc/boinc-bin !app-admin/quickswitch >=app-misc/ca-certificates-20080809 dev-libs/openssl net-misc/curl[ssl,-gnutls] sys-apps/util-linux sys-libs/zlib cuda? ( >=dev-util/nvidia-cuda-toolkit-2.1 >=x11-drivers/nvidia-drivers-180.22 ) X? ( dev-db/sqlite:3 media-libs/freeglut sys-libs/glibc:2.2 virtual/jpeg x11-libs/gtk+:2 >=x11-libs/libnotify-0.7 x11-libs/wxGTK:2.8[X,opengl] ) sys-devel/gettext app-text/docbook-xml-dtd:4.4 app-text/docbook2X || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 !sci-misc/boinc-bin !app-admin/quickswitch >=app-misc/ca-certificates-20080809 dev-libs/openssl net-misc/curl[ssl,-gnutls] sys-apps/util-linux sys-libs/zlib cuda? ( >=dev-util/nvidia-cuda-toolkit-2.1 >=x11-drivers/nvidia-drivers-180.22 ) X? ( dev-db/sqlite:3 media-libs/freeglut sys-libs/glibc:2.2 virtual/jpeg x11-libs/gtk+:2 >=x11-libs/libnotify-0.7 x11-libs/wxGTK:2.8[X,opengl] )
 0
 http://dev.gentooexperimental.org/~scarabeus/boinc-6.12.42.tar.xz
diff --git a/metadata/cache/sci-misc/gcam-9999 b/metadata/cache/sci-misc/gcam-9999
index 1a699a74e2a5..ffea2a87146a 100644
--- a/metadata/cache/sci-misc/gcam-9999
+++ b/metadata/cache/sci-misc/gcam-9999
@@ -1,4 +1,4 @@
->=media-libs/libpng-1.5 x11-libs/gtk+:2 x11-libs/gtkglext || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/subversion net-misc/rsync
+>=media-libs/libpng-1.5 x11-libs/gtk+:2 x11-libs/gtkglext || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/subversion net-misc/rsync
 >=media-libs/libpng-1.5 x11-libs/gtk+:2 x11-libs/gtkglext
 0
 
diff --git a/metadata/cache/sci-misc/h5utils-1.12.1-r2 b/metadata/cache/sci-misc/h5utils-1.12.1-r2
index faf7fef28f30..a36245263be9 100644
--- a/metadata/cache/sci-misc/h5utils-1.12.1-r2
+++ b/metadata/cache/sci-misc/h5utils-1.12.1-r2
@@ -1,4 +1,4 @@
-media-libs/libpng sci-libs/hdf5 sys-libs/zlib hdf? ( sci-libs/hdf virtual/jpeg ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+media-libs/libpng sci-libs/hdf5 sys-libs/zlib hdf? ( sci-libs/hdf virtual/jpeg ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 media-libs/libpng sci-libs/hdf5 sys-libs/zlib hdf? ( sci-libs/hdf virtual/jpeg )
 0
 http://ab-initio.mit.edu/h5utils/h5utils-1.12.1.tar.gz
diff --git a/metadata/cache/sci-misc/lttoolbox-3.2.0 b/metadata/cache/sci-misc/lttoolbox-3.2.0
index dff5e149ba40..ee18d815bd33 100644
--- a/metadata/cache/sci-misc/lttoolbox-3.2.0
+++ b/metadata/cache/sci-misc/lttoolbox-3.2.0
@@ -1,4 +1,4 @@
-dev-libs/libxml2:2 dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-libs/libxml2:2 dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-libs/libxml2:2
 0
 mirror://sourceforge/apertium/lttoolbox-3.2.0.tar.gz
diff --git a/metadata/cache/sci-physics/abinit-6.0.4 b/metadata/cache/sci-physics/abinit-6.0.4
index 93c9ecf703e8..31f12f9045f5 100644
--- a/metadata/cache/sci-physics/abinit-6.0.4
+++ b/metadata/cache/sci-physics/abinit-6.0.4
@@ -1,4 +1,4 @@
-virtual/fortran virtual/blas virtual/lapack dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+virtual/fortran virtual/blas virtual/lapack dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 virtual/fortran virtual/blas virtual/lapack
 0
 http://ftp.abinit.org/abinit-6.0.4.tar.gz
diff --git a/metadata/cache/sci-physics/clhep-2.0.4.6 b/metadata/cache/sci-physics/clhep-2.0.4.6
index 5721999eb7a7..f6dd3f7d6596 100644
--- a/metadata/cache/sci-physics/clhep-2.0.4.6
+++ b/metadata/cache/sci-physics/clhep-2.0.4.6
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 2
 http://proj-clhep.web.cern.ch/proj-clhep/DISTRIBUTION/tarFiles/clhep-2.0.4.6.tgz
diff --git a/metadata/cache/sci-physics/clhep-2.1.0.1 b/metadata/cache/sci-physics/clhep-2.1.0.1
index b02d32e53dac..0c5dee63eac6 100644
--- a/metadata/cache/sci-physics/clhep-2.1.0.1
+++ b/metadata/cache/sci-physics/clhep-2.1.0.1
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 2
 http://proj-clhep.web.cern.ch/proj-clhep/DISTRIBUTION/tarFiles/clhep-2.1.0.1.tgz
diff --git a/metadata/cache/sci-physics/clhep-2.1.1.0 b/metadata/cache/sci-physics/clhep-2.1.1.0
index c1da5d9e95b5..0558943e3fc6 100644
--- a/metadata/cache/sci-physics/clhep-2.1.1.0
+++ b/metadata/cache/sci-physics/clhep-2.1.1.0
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 2
 http://proj-clhep.web.cern.ch/proj-clhep/DISTRIBUTION/tarFiles/clhep-2.1.1.0.tgz
diff --git a/metadata/cache/sci-physics/clhep-2.1.2.0 b/metadata/cache/sci-physics/clhep-2.1.2.0
index 7876fd67344b..723e1d55cded 100644
--- a/metadata/cache/sci-physics/clhep-2.1.2.0
+++ b/metadata/cache/sci-physics/clhep-2.1.2.0
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 2
 http://proj-clhep.web.cern.ch/proj-clhep/DISTRIBUTION/tarFiles/clhep-2.1.2.0.tgz
diff --git a/metadata/cache/sci-physics/clhep-2.1.2.2 b/metadata/cache/sci-physics/clhep-2.1.2.2
index 6a2194c4a7f5..7da50a2a0b29 100644
--- a/metadata/cache/sci-physics/clhep-2.1.2.2
+++ b/metadata/cache/sci-physics/clhep-2.1.2.2
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 2
 http://proj-clhep.web.cern.ch/proj-clhep/DISTRIBUTION/tarFiles/clhep-2.1.2.2.tgz
diff --git a/metadata/cache/sci-physics/espresso-3.0.2 b/metadata/cache/sci-physics/espresso-3.1.0
similarity index 71%
rename from metadata/cache/sci-physics/espresso-3.0.2
rename to metadata/cache/sci-physics/espresso-3.1.0
index 976e3d68c306..8c3abba23e3b 100644
--- a/metadata/cache/sci-physics/espresso-3.0.2
+++ b/metadata/cache/sci-physics/espresso-3.1.0
@@ -1,7 +1,7 @@
-dev-lang/tcl fftw? ( sci-libs/fftw:3.0 ) mpi? ( virtual/mpi ) tk? ( >=dev-lang/tk-8.4.18-r1 ) X? ( x11-libs/libX11 ) doc? ( || ( <app-doc/doxygen-1.7.6.1[-nodot] >=app-doc/doxygen-1.7.6.1[dot] ) virtual/latex-base )
+dev-lang/tcl fftw? ( sci-libs/fftw:3.0 ) mpi? ( virtual/mpi ) tk? ( >=dev-lang/tk-8.4.18-r1 ) X? ( x11-libs/libX11 ) dev-lang/python doc? ( app-doc/doxygen[-nodot] virtual/latex-base )
 dev-lang/tcl fftw? ( sci-libs/fftw:3.0 ) mpi? ( virtual/mpi ) tk? ( >=dev-lang/tk-8.4.18-r1 ) X? ( x11-libs/libX11 )
 0
-mirror://nongnu/espressomd/espresso-3.0.2.tar.gz
+mirror://nongnu/espressomd/espresso-3.1.0.tar.gz
 tk? ( test )
 http://www.espressomd.org
 GPL-3
diff --git a/metadata/cache/sci-physics/heppdt-3.04.01 b/metadata/cache/sci-physics/heppdt-3.04.01
index e75a99ccc395..87b4bd11f66a 100644
--- a/metadata/cache/sci-physics/heppdt-3.04.01
+++ b/metadata/cache/sci-physics/heppdt-3.04.01
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 http://lcgapp.cern.ch/project/simu/HepPDT//download/HepPDT-3.04.01.tar.gz
diff --git a/metadata/cache/sci-physics/herwig-6.5.10 b/metadata/cache/sci-physics/herwig-6.5.10
index 1d528846caf7..e5f3f9753403 100644
--- a/metadata/cache/sci-physics/herwig-6.5.10
+++ b/metadata/cache/sci-physics/herwig-6.5.10
@@ -1,4 +1,4 @@
-!sci-physics/cernlib-montecarlo[herwig] || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+!sci-physics/cernlib-montecarlo[herwig] || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 http://hepwww.rl.ac.uk/theory/seymour/herwig/herwig6510.f http://hepwww.rl.ac.uk/theory/seymour/herwig/herwig6510.inc http://hepwww.rl.ac.uk/theory/seymour/herwig/HERWIG65.INC
diff --git a/metadata/cache/sci-physics/herwig-6.5.20 b/metadata/cache/sci-physics/herwig-6.5.20
index 0e61e0baa9d8..4be6bae2f5a2 100644
--- a/metadata/cache/sci-physics/herwig-6.5.20
+++ b/metadata/cache/sci-physics/herwig-6.5.20
@@ -1,4 +1,4 @@
-!sci-physics/cernlib-montecarlo[herwig] virtual/fortran || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+!sci-physics/cernlib-montecarlo[herwig] virtual/fortran || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 !sci-physics/cernlib-montecarlo[herwig]
 0
 http://www.hep.phy.cam.ac.uk/theory/webber/Herwig/herwig6520.f http://www.hep.phy.cam.ac.uk/theory/webber/Herwig/herwig6520.inc http://www.hep.phy.cam.ac.uk/theory/webber/Herwig/HERWIG65.INC doc? ( http://www.hep.phy.cam.ac.uk/theory/webber/Herwig/hw65_manual.pdf )
diff --git a/metadata/cache/sci-physics/lightspeed-1.2a-r1 b/metadata/cache/sci-physics/lightspeed-1.2a-r1
index e264118b6528..7398240aea87 100644
--- a/metadata/cache/sci-physics/lightspeed-1.2a-r1
+++ b/metadata/cache/sci-physics/lightspeed-1.2a-r1
@@ -1,4 +1,4 @@
-media-libs/libpng media-libs/tiff virtual/opengl x11-libs/gtkglext x11-libs/gtkglarea:2 x11-libs/gtk+:2 x11-libs/libXmu truetype? ( media-libs/ftgl ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+media-libs/libpng media-libs/tiff virtual/opengl x11-libs/gtkglext x11-libs/gtkglarea:2 x11-libs/gtk+:2 x11-libs/libXmu truetype? ( media-libs/ftgl ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 media-libs/libpng media-libs/tiff virtual/opengl x11-libs/gtkglext x11-libs/gtkglarea:2 x11-libs/gtk+:2 x11-libs/libXmu truetype? ( media-libs/ftgl )
 0
 mirror://sourceforge/lightspeed/lightspeed-1.2a.tar.gz mirror://sourceforge/lightspeed/objects-1.tar.gz mirror://debian/pool/main/l/lightspeed/lightspeed_1.2a-7.diff.gz
diff --git a/metadata/cache/sci-physics/mpb-1.4.2-r2 b/metadata/cache/sci-physics/mpb-1.4.2-r2
index 686152683c9b..714b63bca3db 100644
--- a/metadata/cache/sci-physics/mpb-1.4.2-r2
+++ b/metadata/cache/sci-physics/mpb-1.4.2-r2
@@ -1,4 +1,4 @@
-virtual/lapack dev-scheme/guile sci-libs/libctl sci-libs/fftw:2.1[mpi?] sys-libs/readline hdf5? ( sci-libs/hdf5 ) mpi? ( virtual/mpi ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+virtual/lapack dev-scheme/guile sci-libs/libctl sci-libs/fftw:2.1[mpi?] sys-libs/readline hdf5? ( sci-libs/hdf5 ) mpi? ( virtual/mpi ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 virtual/lapack dev-scheme/guile sci-libs/libctl sci-libs/fftw:2.1[mpi?] sys-libs/readline hdf5? ( sci-libs/hdf5 ) mpi? ( virtual/mpi )
 0
 http://ab-initio.mit.edu/mpb/mpb-1.4.2.tar.gz
diff --git a/metadata/cache/sci-physics/pythia-6.4.24 b/metadata/cache/sci-physics/pythia-6.4.24
index a8a42c9919e6..8bc24dbf7987 100644
--- a/metadata/cache/sci-physics/pythia-6.4.24
+++ b/metadata/cache/sci-physics/pythia-6.4.24
@@ -1,4 +1,4 @@
-virtual/fortran || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+virtual/fortran || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 virtual/fortran
 6
 mirror://gentoo/pythia-6.4.24.tar.bz2 ftp://root.cern.ch/root/pythia6.tar.gz doc? ( http://home.thep.lu.se/~torbjorn/pythia/lutp0613man2.pdf ) examples? ( mirror://gentoo/pythia-6.4.18-examples.tar.bz2 )
diff --git a/metadata/cache/sci-physics/pythia-6.4.26 b/metadata/cache/sci-physics/pythia-6.4.26
index a1132c821c75..0b293938ac1c 100644
--- a/metadata/cache/sci-physics/pythia-6.4.26
+++ b/metadata/cache/sci-physics/pythia-6.4.26
@@ -1,4 +1,4 @@
-virtual/fortran || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+virtual/fortran || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 virtual/fortran
 6
 http://dev.gentoo.org/~bicatali/pythia-6.4.26.tar.bz2 ftp://root.cern.ch/root/pythia6.tar.gz doc? ( http://home.thep.lu.se/~torbjorn/pythia/lutp0613man2.pdf ) examples? ( mirror://gentoo/pythia-6.4.18-examples.tar.bz2 )
diff --git a/metadata/cache/sci-visualization/epix-1.2.6 b/metadata/cache/sci-visualization/epix-1.2.6
index b727fd9c8f25..b6a126a0d254 100644
--- a/metadata/cache/sci-visualization/epix-1.2.6
+++ b/metadata/cache/sci-visualization/epix-1.2.6
@@ -1,4 +1,4 @@
-virtual/latex-base dev-texlive/texlive-pstricks dev-texlive/texlive-pictures dev-texlive/texlive-latexextra dev-tex/xcolor emacs? ( virtual/emacs ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+virtual/latex-base dev-texlive/texlive-pstricks dev-texlive/texlive-pictures dev-texlive/texlive-latexextra dev-tex/xcolor emacs? ( virtual/emacs ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 virtual/latex-base dev-texlive/texlive-pstricks dev-texlive/texlive-pictures dev-texlive/texlive-latexextra dev-tex/xcolor emacs? ( virtual/emacs ) bash-completion? ( app-admin/eselect )
 0
 http://mathcs.holycross.edu/~ahwang/epix/epix-1.2.6_withpdf.tar.bz2
diff --git a/metadata/cache/sci-visualization/epix-1.2.9 b/metadata/cache/sci-visualization/epix-1.2.9
index 21c45e1b6cb2..fee569e7b158 100644
--- a/metadata/cache/sci-visualization/epix-1.2.9
+++ b/metadata/cache/sci-visualization/epix-1.2.9
@@ -1,4 +1,4 @@
-virtual/latex-base dev-texlive/texlive-pstricks dev-texlive/texlive-pictures dev-texlive/texlive-latexextra dev-tex/xcolor emacs? ( virtual/emacs ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+virtual/latex-base dev-texlive/texlive-pstricks dev-texlive/texlive-pictures dev-texlive/texlive-latexextra dev-tex/xcolor emacs? ( virtual/emacs ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 virtual/latex-base dev-texlive/texlive-pstricks dev-texlive/texlive-pictures dev-texlive/texlive-latexextra dev-tex/xcolor emacs? ( virtual/emacs )
 0
 http://mathcs.holycross.edu/~ahwang/epix/epix-1.2.9_withpdf.tar.bz2
diff --git a/metadata/cache/sci-visualization/fityk-1.1.1 b/metadata/cache/sci-visualization/fityk-1.1.1
index 3303b356c639..588fa76f59a3 100644
--- a/metadata/cache/sci-visualization/fityk-1.1.1
+++ b/metadata/cache/sci-visualization/fityk-1.1.1
@@ -1,4 +1,4 @@
->=sci-libs/xylib-0.8 dev-lang/lua readline? ( sys-libs/readline ) wxwidgets? ( >=x11-libs/wxGTK-2.9.2 ) dev-libs/boost >=sys-devel/libtool-2.2 python? ( =dev-lang/python-2* ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=sci-libs/xylib-0.8 dev-lang/lua readline? ( sys-libs/readline ) wxwidgets? ( >=x11-libs/wxGTK-2.9.2 ) dev-libs/boost >=sys-devel/libtool-2.2 python? ( =dev-lang/python-2* ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=sci-libs/xylib-0.8 dev-lang/lua readline? ( sys-libs/readline ) wxwidgets? ( >=x11-libs/wxGTK-2.9.2 ) gnuplot? ( sci-visualization/gnuplot ) python? ( =dev-lang/python-2* )
 0
 http://github.com/wojdyr/fityk/tarball/v1.1.1 -> fityk-1.1.1.tar.gz
diff --git a/metadata/cache/sci-visualization/ggobi-2.1.8 b/metadata/cache/sci-visualization/ggobi-2.1.8
index 5407139c5ea6..c2dec6bd005c 100644
--- a/metadata/cache/sci-visualization/ggobi-2.1.8
+++ b/metadata/cache/sci-visualization/ggobi-2.1.8
@@ -1,4 +1,4 @@
->=media-gfx/graphviz-2.6 x11-libs/gtk+:2 dev-libs/libxml2:2 dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=media-gfx/graphviz-2.6 x11-libs/gtk+:2 dev-libs/libxml2:2 dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=media-gfx/graphviz-2.6 x11-libs/gtk+:2 dev-libs/libxml2:2
 0
 http://www.ggobi.org/downloads/ggobi-2.1.8.tar.bz2
diff --git a/metadata/cache/sci-visualization/ggobi-2.1.9 b/metadata/cache/sci-visualization/ggobi-2.1.9
index 4b7955f767c6..7515a378201c 100644
--- a/metadata/cache/sci-visualization/ggobi-2.1.9
+++ b/metadata/cache/sci-visualization/ggobi-2.1.9
@@ -1,4 +1,4 @@
-media-gfx/graphviz x11-libs/gtk+:2 dev-libs/libxml2:2 dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+media-gfx/graphviz x11-libs/gtk+:2 dev-libs/libxml2:2 dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 media-gfx/graphviz x11-libs/gtk+:2 dev-libs/libxml2:2
 0
 http://www.ggobi.org/downloads/ggobi-2.1.9.tar.bz2
diff --git a/metadata/cache/sci-visualization/gle-4.2.4b b/metadata/cache/sci-visualization/gle-4.2.4b
index 740e8e2f360e..8659590b179c 100644
--- a/metadata/cache/sci-visualization/gle-4.2.4b
+++ b/metadata/cache/sci-visualization/gle-4.2.4b
@@ -1,4 +1,4 @@
-sys-libs/ncurses X? ( x11-libs/libX11 ) qt4? ( x11-libs/qt-opengl:4 ) jpeg? ( virtual/jpeg ) png? ( media-libs/libpng ) tiff? ( media-libs/tiff ) emacs? ( virtual/emacs ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+sys-libs/ncurses X? ( x11-libs/libX11 ) qt4? ( x11-libs/qt-opengl:4 ) jpeg? ( virtual/jpeg ) png? ( media-libs/libpng ) tiff? ( media-libs/tiff ) emacs? ( virtual/emacs ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 sys-libs/ncurses X? ( x11-libs/libX11 ) qt4? ( x11-libs/qt-opengl:4 ) jpeg? ( virtual/jpeg ) png? ( media-libs/libpng ) tiff? ( media-libs/tiff ) emacs? ( virtual/emacs ) app-text/ghostscript-gpl virtual/latex-base vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
 0
 mirror://sourceforge/glx/gle-graphics-4.2.4bf-src.tar.gz doc? ( mirror://sourceforge/glx/gle-manual-4.2.2.pdf mirror://sourceforge/glx/GLEusersguide.pdf )
diff --git a/metadata/cache/sci-visualization/opendx-4.4.4-r4 b/metadata/cache/sci-visualization/opendx-4.4.4-r4
index 0eb0f06e918d..f3a938a930a0 100644
--- a/metadata/cache/sci-visualization/opendx-4.4.4-r4
+++ b/metadata/cache/sci-visualization/opendx-4.4.4-r4
@@ -1,4 +1,4 @@
-x11-libs/libXmu x11-libs/libXi x11-libs/libXp x11-libs/libXpm >=x11-libs/openmotif-2.3:0 virtual/opengl virtual/glu szip? ( sci-libs/szip ) hdf? ( sci-libs/hdf ) cdf? ( sci-libs/cdf ) netcdf? ( sci-libs/netcdf ) tiff? ( media-libs/tiff ) imagemagick? ( >=media-gfx/imagemagick-5.3.4 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+x11-libs/libXmu x11-libs/libXi x11-libs/libXp x11-libs/libXpm >=x11-libs/openmotif-2.3:0 virtual/opengl virtual/glu szip? ( sci-libs/szip ) hdf? ( sci-libs/hdf ) cdf? ( sci-libs/cdf ) netcdf? ( sci-libs/netcdf ) tiff? ( media-libs/tiff ) imagemagick? ( >=media-gfx/imagemagick-5.3.4 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 x11-libs/libXmu x11-libs/libXi x11-libs/libXp x11-libs/libXpm >=x11-libs/openmotif-2.3:0 virtual/opengl virtual/glu szip? ( sci-libs/szip ) hdf? ( sci-libs/hdf ) cdf? ( sci-libs/cdf ) netcdf? ( sci-libs/netcdf ) tiff? ( media-libs/tiff ) imagemagick? ( >=media-gfx/imagemagick-5.3.4 )
 0
 http://opendx.sdsc.edu/source/dx-4.4.4.tar.gz
diff --git a/metadata/cache/sci-visualization/opendx-samples-4.4.0-r1 b/metadata/cache/sci-visualization/opendx-samples-4.4.0-r1
index 7e7be18c8938..72d78b1bf741 100644
--- a/metadata/cache/sci-visualization/opendx-samples-4.4.0-r1
+++ b/metadata/cache/sci-visualization/opendx-samples-4.4.0-r1
@@ -1,4 +1,4 @@
->=sci-visualization/opendx-4.4.4-r2 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=sci-visualization/opendx-4.4.4-r2 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=sci-visualization/opendx-4.4.4-r2
 0
 http://opendx.sdsc.edu/source/dxsamples-4.4.0.tar.gz mirror://gentoo/opendx-samples-4.4.0-install.patch.bz2
diff --git a/metadata/cache/sci-visualization/quickplot-0.8.15 b/metadata/cache/sci-visualization/quickplot-0.8.15
index 82703c8e9c63..9e6e7f8d3071 100644
--- a/metadata/cache/sci-visualization/quickplot-0.8.15
+++ b/metadata/cache/sci-visualization/quickplot-0.8.15
@@ -1,4 +1,4 @@
-dev-cpp/gtkmm:2.4 sndfile? ( media-libs/libsndfile ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-cpp/gtkmm:2.4 sndfile? ( media-libs/libsndfile ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-cpp/gtkmm:2.4 sndfile? ( media-libs/libsndfile )
 0
 mirror://sourceforge/quickplot/quickplot-0.8.15.tar.bz2
diff --git a/metadata/cache/sci-visualization/xgraph-12.1-r2 b/metadata/cache/sci-visualization/xgraph-12.1-r2
index 6288be119fce..2af071042bf8 100644
--- a/metadata/cache/sci-visualization/xgraph-12.1-r2
+++ b/metadata/cache/sci-visualization/xgraph-12.1-r2
@@ -1,4 +1,4 @@
-x11-libs/libSM x11-libs/libX11 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+x11-libs/libSM x11-libs/libX11 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 x11-libs/libSM x11-libs/libX11
 0
 http://www.isi.edu/nsnam/dist/xgraph-12.1.tar.gz mirror://debian/pool/main/x/xgraph/xgraph_12.1-10.diff.gz
diff --git a/metadata/cache/sys-apps/bar-1.11.1 b/metadata/cache/sys-apps/bar-1.11.1
index 719dbb70518c..a3e1f3060671 100644
--- a/metadata/cache/sys-apps/bar-1.11.1
+++ b/metadata/cache/sys-apps/bar-1.11.1
@@ -1,4 +1,4 @@
-doc? ( >=app-doc/doxygen-1.3.5 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+doc? ( >=app-doc/doxygen-1.3.5 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 mirror://sourceforge/clpbar/bar_1.11.1.tar.gz
diff --git a/metadata/cache/sys-apps/baselayout-prefix-1.12.14 b/metadata/cache/sys-apps/baselayout-prefix-1.12.14
index 603ab9c8275a..11df986b792f 100644
--- a/metadata/cache/sys-apps/baselayout-prefix-1.12.14
+++ b/metadata/cache/sys-apps/baselayout-prefix-1.12.14
@@ -1,4 +1,4 @@
->=sys-apps/portage-2.2.01 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=sys-apps/portage-2.2.01 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=sys-libs/readline-5.0-r1 >=app-shells/bash-3.1_p7 >=sys-apps/coreutils-5.2.1 kernel_Darwin? ( sys-process/pidof-bsd ) kernel_FreeBSD? ( sys-process/pidof-bsd )
 0
 http://dev.gentoo.org/~grobian/distfiles/baselayout-prefix-1.12.14.1709.tar.bz2
diff --git a/metadata/cache/sys-apps/baselayout-prefix-1.12.5-r10 b/metadata/cache/sys-apps/baselayout-prefix-1.12.5-r10
index fd4f7b747101..3c2cb6e84092 100644
--- a/metadata/cache/sys-apps/baselayout-prefix-1.12.5-r10
+++ b/metadata/cache/sys-apps/baselayout-prefix-1.12.5-r10
@@ -1,4 +1,4 @@
->=sys-apps/portage-2.2.01 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=sys-apps/portage-2.2.01 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=sys-libs/readline-5.0-r1 >=app-shells/bash-3.1_p7 >=sys-apps/coreutils-5.2.1 kernel_Darwin? ( sys-process/pidof-bsd ) kernel_FreeBSD? ( sys-process/pidof-bsd )
 0
 http://dev.gentoo.org/~grobian/distfiles/baselayout-1.12.5.tar.bz2 http://dev.gentoo.org/~haubi/distfiles/baselayout-1.12.5-gnulib-2.tar.bz2
diff --git a/metadata/cache/sys-apps/baselayout-prefix-1.12.5-r11 b/metadata/cache/sys-apps/baselayout-prefix-1.12.5-r11
index 2958bb996c30..616955a2884f 100644
--- a/metadata/cache/sys-apps/baselayout-prefix-1.12.5-r11
+++ b/metadata/cache/sys-apps/baselayout-prefix-1.12.5-r11
@@ -1,4 +1,4 @@
->=sys-apps/portage-2.2.01 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=sys-apps/portage-2.2.01 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=sys-libs/readline-5.0-r1 >=app-shells/bash-3.1_p7 >=sys-apps/coreutils-5.2.1 kernel_Darwin? ( sys-process/pidof-bsd ) kernel_FreeBSD? ( sys-process/pidof-bsd )
 0
 http://dev.gentoo.org/~grobian/distfiles/baselayout-prefix-1.12.5.1701.tar.bz2
diff --git a/metadata/cache/sys-apps/conspy-1.7 b/metadata/cache/sys-apps/conspy-1.7
index 93106829061a..cb47f23eb350 100644
--- a/metadata/cache/sys-apps/conspy-1.7
+++ b/metadata/cache/sys-apps/conspy-1.7
@@ -1,4 +1,4 @@
-sys-libs/ncurses || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+sys-libs/ncurses || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 sys-libs/ncurses
 0
 http://ace-host.stuart.id.au/russell/files/conspy/conspy-1.7.tar.gz
diff --git a/metadata/cache/sys-apps/conspy-1.8 b/metadata/cache/sys-apps/conspy-1.8
index e7e6c47e5d9c..52cdf7189258 100644
--- a/metadata/cache/sys-apps/conspy-1.8
+++ b/metadata/cache/sys-apps/conspy-1.8
@@ -1,4 +1,4 @@
-sys-libs/ncurses || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+sys-libs/ncurses || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 sys-libs/ncurses
 0
 http://ace-host.stuart.id.au/russell/files/conspy/conspy-1.8.tar.gz
diff --git a/metadata/cache/sys-apps/dbus-1.4.16 b/metadata/cache/sys-apps/dbus-1.4.16
index 6bf1ed226ed1..a4f2c20cfa1c 100644
--- a/metadata/cache/sys-apps/dbus-1.4.16
+++ b/metadata/cache/sys-apps/dbus-1.4.16
@@ -1,4 +1,4 @@
-X? ( x11-libs/libX11 x11-libs/libXt ) selinux? ( sys-libs/libselinux sec-policy/selinux-dbus ) >=dev-libs/expat-1.95.8 dev-util/pkgconfig doc? ( app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/xmlto ) test? ( =dev-lang/python-2* >=dev-libs/glib-2.22:2 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool !<sys-apps/systemd-29-r4 !=sys-apps/systemd-37-r1 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+X? ( x11-libs/libX11 x11-libs/libXt ) selinux? ( sys-libs/libselinux sec-policy/selinux-dbus ) >=dev-libs/expat-1.95.8 dev-util/pkgconfig doc? ( app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/xmlto ) test? ( =dev-lang/python-2* >=dev-libs/glib-2.22:2 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool !<sys-apps/systemd-29-r4 !=sys-apps/systemd-37-r1 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 X? ( x11-libs/libX11 x11-libs/libXt ) selinux? ( sys-libs/libselinux sec-policy/selinux-dbus ) >=dev-libs/expat-1.95.8
 0
 http://dbus.freedesktop.org/releases/dbus/dbus-1.4.16.tar.gz
diff --git a/metadata/cache/sys-apps/dbus-1.4.16-r2 b/metadata/cache/sys-apps/dbus-1.4.16-r2
index cb4bf242f8d6..4a661c26b447 100644
--- a/metadata/cache/sys-apps/dbus-1.4.16-r2
+++ b/metadata/cache/sys-apps/dbus-1.4.16-r2
@@ -1,4 +1,4 @@
-X? ( x11-libs/libX11 x11-libs/libXt ) selinux? ( sys-libs/libselinux sec-policy/selinux-dbus ) >=dev-libs/expat-1.95.8 dev-util/pkgconfig doc? ( app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/xmlto ) test? ( =dev-lang/python-2* >=dev-libs/glib-2.30.1-r2:2 ) !<dev-libs/glib-2.30.1-r2:2 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool !<sys-apps/systemd-29-r4 !=sys-apps/systemd-37-r1 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+X? ( x11-libs/libX11 x11-libs/libXt ) selinux? ( sys-libs/libselinux sec-policy/selinux-dbus ) >=dev-libs/expat-1.95.8 dev-util/pkgconfig doc? ( app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/xmlto ) test? ( =dev-lang/python-2* >=dev-libs/glib-2.30.1-r2:2 ) !<dev-libs/glib-2.30.1-r2:2 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool !<sys-apps/systemd-29-r4 !=sys-apps/systemd-37-r1 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 X? ( x11-libs/libX11 x11-libs/libXt ) selinux? ( sys-libs/libselinux sec-policy/selinux-dbus ) >=dev-libs/expat-1.95.8
 0
 http://dbus.freedesktop.org/releases/dbus/dbus-1.4.16.tar.gz
diff --git a/metadata/cache/sys-apps/dbus-1.4.18 b/metadata/cache/sys-apps/dbus-1.4.18
index 9b96bd855fcc..9719c4bdcedb 100644
--- a/metadata/cache/sys-apps/dbus-1.4.18
+++ b/metadata/cache/sys-apps/dbus-1.4.18
@@ -1,4 +1,4 @@
->=dev-libs/expat-2 selinux? ( sec-policy/selinux-dbus sys-libs/libselinux ) X? ( x11-libs/libX11 x11-libs/libXt ) dev-util/pkgconfig doc? ( app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/xmlto ) test? ( >=dev-libs/glib-2.28 dev-lang/python:2.7 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool !<sys-apps/systemd-29-r4 !=sys-apps/systemd-37-r1 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+>=dev-libs/expat-2 selinux? ( sec-policy/selinux-dbus sys-libs/libselinux ) X? ( x11-libs/libX11 x11-libs/libXt ) dev-util/pkgconfig doc? ( app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/xmlto ) test? ( >=dev-libs/glib-2.28 dev-lang/python:2.7 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool !<sys-apps/systemd-29-r4 !=sys-apps/systemd-37-r1 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 >=dev-libs/expat-2 selinux? ( sec-policy/selinux-dbus sys-libs/libselinux ) X? ( x11-libs/libX11 x11-libs/libXt )
 0
 http://dbus.freedesktop.org/releases/dbus/dbus-1.4.18.tar.gz
diff --git a/metadata/cache/sys-apps/dmtcp-1.2.1 b/metadata/cache/sys-apps/dmtcp-1.2.1
index 45786b297a8f..47669ab707de 100644
--- a/metadata/cache/sys-apps/dmtcp-1.2.1
+++ b/metadata/cache/sys-apps/dmtcp-1.2.1
@@ -1,4 +1,4 @@
-sys-libs/readline app-arch/gzip sys-kernel/linux-headers emacs? ( dev-lisp/clisp ) mpi? ( virtual/mpi ) || ( app-shells/dash app-shells/zsh app-shells/tcsh ) sys-devel/patch || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+sys-libs/readline app-arch/gzip sys-kernel/linux-headers emacs? ( dev-lisp/clisp ) mpi? ( virtual/mpi ) || ( app-shells/dash app-shells/zsh app-shells/tcsh ) sys-devel/patch || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 sys-libs/readline app-arch/gzip sys-kernel/linux-headers emacs? ( dev-lisp/clisp ) mpi? ( virtual/mpi ) || ( app-shells/dash app-shells/zsh app-shells/tcsh )
 0
 mirror://sourceforge/dmtcp/dmtcp-1.2.1.tar.gz
diff --git a/metadata/cache/sys-apps/fakechroot-2.16 b/metadata/cache/sys-apps/fakechroot-2.16
index 331a0a72b5aa..bb5734ec0be3 100644
--- a/metadata/cache/sys-apps/fakechroot-2.16
+++ b/metadata/cache/sys-apps/fakechroot-2.16
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 mirror://debian/pool/main/f/fakechroot/fakechroot_2.16.orig.tar.gz
diff --git a/metadata/cache/sys-apps/gnome-disk-utility-2.32.1 b/metadata/cache/sys-apps/gnome-disk-utility-2.32.1
index 2b258acebeb1..6ea4b8bf6921 100644
--- a/metadata/cache/sys-apps/gnome-disk-utility-2.32.1
+++ b/metadata/cache/sys-apps/gnome-disk-utility-2.32.1
@@ -1,4 +1,4 @@
->=dev-libs/glib-2.22:2 >=dev-libs/dbus-glib-0.74 >=dev-libs/libunique-1:1 >=x11-libs/gtk+-2.20:2 =sys-fs/udisks-1.0*[remote-access?] >=dev-libs/libatasmart-0.14 >=x11-libs/libnotify-0.6.1 avahi? ( >=net-dns/avahi-0.6.25[gtk] ) gnome-keyring? ( gnome-base/libgnome-keyring ) nautilus? ( >=gnome-base/nautilus-2.24 ) sys-devel/gettext gnome-base/gnome-common app-text/docbook-xml-dtd:4.1.2 app-text/rarian app-text/gnome-doc-utils >=dev-util/pkgconfig-0.9 >=dev-util/intltool-0.35 >=dev-util/gtk-doc-am-1.13 doc? ( >=dev-util/gtk-doc-1.3 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+>=dev-libs/glib-2.22:2 >=dev-libs/dbus-glib-0.74 >=dev-libs/libunique-1:1 >=x11-libs/gtk+-2.20:2 =sys-fs/udisks-1.0*[remote-access?] >=dev-libs/libatasmart-0.14 >=x11-libs/libnotify-0.6.1 avahi? ( >=net-dns/avahi-0.6.25[gtk] ) gnome-keyring? ( gnome-base/libgnome-keyring ) nautilus? ( >=gnome-base/nautilus-2.24 ) sys-devel/gettext gnome-base/gnome-common app-text/docbook-xml-dtd:4.1.2 app-text/rarian app-text/gnome-doc-utils >=dev-util/pkgconfig-0.9 >=dev-util/intltool-0.35 >=dev-util/gtk-doc-am-1.13 doc? ( >=dev-util/gtk-doc-1.3 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 >=dev-libs/glib-2.22:2 >=dev-libs/dbus-glib-0.74 >=dev-libs/libunique-1:1 >=x11-libs/gtk+-2.20:2 =sys-fs/udisks-1.0*[remote-access?] >=dev-libs/libatasmart-0.14 >=x11-libs/libnotify-0.6.1 avahi? ( >=net-dns/avahi-0.6.25[gtk] ) gnome-keyring? ( gnome-base/libgnome-keyring ) nautilus? ( >=gnome-base/nautilus-2.24 ) x11-misc/xdg-utils fat? ( sys-fs/dosfstools )
 0
 mirror://gnome/sources/gnome-disk-utility/2.32/gnome-disk-utility-2.32.1.tar.bz2
diff --git a/metadata/cache/sys-apps/gnome-disk-utility-2.32.1-r1 b/metadata/cache/sys-apps/gnome-disk-utility-2.32.1-r1
index 2b258acebeb1..6ea4b8bf6921 100644
--- a/metadata/cache/sys-apps/gnome-disk-utility-2.32.1-r1
+++ b/metadata/cache/sys-apps/gnome-disk-utility-2.32.1-r1
@@ -1,4 +1,4 @@
->=dev-libs/glib-2.22:2 >=dev-libs/dbus-glib-0.74 >=dev-libs/libunique-1:1 >=x11-libs/gtk+-2.20:2 =sys-fs/udisks-1.0*[remote-access?] >=dev-libs/libatasmart-0.14 >=x11-libs/libnotify-0.6.1 avahi? ( >=net-dns/avahi-0.6.25[gtk] ) gnome-keyring? ( gnome-base/libgnome-keyring ) nautilus? ( >=gnome-base/nautilus-2.24 ) sys-devel/gettext gnome-base/gnome-common app-text/docbook-xml-dtd:4.1.2 app-text/rarian app-text/gnome-doc-utils >=dev-util/pkgconfig-0.9 >=dev-util/intltool-0.35 >=dev-util/gtk-doc-am-1.13 doc? ( >=dev-util/gtk-doc-1.3 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+>=dev-libs/glib-2.22:2 >=dev-libs/dbus-glib-0.74 >=dev-libs/libunique-1:1 >=x11-libs/gtk+-2.20:2 =sys-fs/udisks-1.0*[remote-access?] >=dev-libs/libatasmart-0.14 >=x11-libs/libnotify-0.6.1 avahi? ( >=net-dns/avahi-0.6.25[gtk] ) gnome-keyring? ( gnome-base/libgnome-keyring ) nautilus? ( >=gnome-base/nautilus-2.24 ) sys-devel/gettext gnome-base/gnome-common app-text/docbook-xml-dtd:4.1.2 app-text/rarian app-text/gnome-doc-utils >=dev-util/pkgconfig-0.9 >=dev-util/intltool-0.35 >=dev-util/gtk-doc-am-1.13 doc? ( >=dev-util/gtk-doc-1.3 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 >=dev-libs/glib-2.22:2 >=dev-libs/dbus-glib-0.74 >=dev-libs/libunique-1:1 >=x11-libs/gtk+-2.20:2 =sys-fs/udisks-1.0*[remote-access?] >=dev-libs/libatasmart-0.14 >=x11-libs/libnotify-0.6.1 avahi? ( >=net-dns/avahi-0.6.25[gtk] ) gnome-keyring? ( gnome-base/libgnome-keyring ) nautilus? ( >=gnome-base/nautilus-2.24 ) x11-misc/xdg-utils fat? ( sys-fs/dosfstools )
 0
 mirror://gnome/sources/gnome-disk-utility/2.32/gnome-disk-utility-2.32.1.tar.bz2
diff --git a/metadata/cache/sys-apps/gnome-disk-utility-3.0.2-r200 b/metadata/cache/sys-apps/gnome-disk-utility-3.0.2-r200
index f5b24e052983..0a2b2d9b72af 100644
--- a/metadata/cache/sys-apps/gnome-disk-utility-3.0.2-r200
+++ b/metadata/cache/sys-apps/gnome-disk-utility-3.0.2-r200
@@ -1,4 +1,4 @@
->=dev-libs/glib-2.22:2 >=dev-libs/dbus-glib-0.74 >=dev-libs/libunique-2.90.1:3 >=x11-libs/gtk+-2.90.7:3 =sys-fs/udisks-1.0*[remote-access?] >=dev-libs/libatasmart-0.14 >=x11-libs/libnotify-0.6.1 avahi? ( >=net-dns/avahi-0.6.25[gtk3] ) gnome-keyring? ( gnome-base/libgnome-keyring ) nautilus? ( >=gnome-base/nautilus-2.24.0 ) sys-devel/gettext gnome-base/gnome-common app-text/docbook-xml-dtd:4.1.2 app-text/rarian app-text/gnome-doc-utils >=dev-util/pkgconfig-0.9 >=dev-util/intltool-0.35 >=dev-util/gtk-doc-am-1.13 doc? ( >=dev-util/gtk-doc-1.3 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
+>=dev-libs/glib-2.22:2 >=dev-libs/dbus-glib-0.74 >=dev-libs/libunique-2.90.1:3 >=x11-libs/gtk+-2.90.7:3 =sys-fs/udisks-1.0*[remote-access?] >=dev-libs/libatasmart-0.14 >=x11-libs/libnotify-0.6.1 avahi? ( >=net-dns/avahi-0.6.25[gtk3] ) gnome-keyring? ( gnome-base/libgnome-keyring ) nautilus? ( >=gnome-base/nautilus-2.24.0 ) sys-devel/gettext gnome-base/gnome-common app-text/docbook-xml-dtd:4.1.2 app-text/rarian app-text/gnome-doc-utils >=dev-util/pkgconfig-0.9 >=dev-util/intltool-0.35 >=dev-util/gtk-doc-am-1.13 doc? ( >=dev-util/gtk-doc-1.3 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
 >=dev-libs/glib-2.22:2 >=dev-libs/dbus-glib-0.74 >=dev-libs/libunique-2.90.1:3 >=x11-libs/gtk+-2.90.7:3 =sys-fs/udisks-1.0*[remote-access?] >=dev-libs/libatasmart-0.14 >=x11-libs/libnotify-0.6.1 avahi? ( >=net-dns/avahi-0.6.25[gtk3] ) gnome-keyring? ( gnome-base/libgnome-keyring ) nautilus? ( >=gnome-base/nautilus-2.24.0 ) x11-misc/xdg-utils fat? ( sys-fs/dosfstools )
 0
 mirror://gnome/sources/gnome-disk-utility/3.0/gnome-disk-utility-3.0.2.tar.xz
diff --git a/metadata/cache/sys-apps/gnome-disk-utility-3.0.2-r300 b/metadata/cache/sys-apps/gnome-disk-utility-3.0.2-r300
index 958602407c98..a97d1f61e17e 100644
--- a/metadata/cache/sys-apps/gnome-disk-utility-3.0.2-r300
+++ b/metadata/cache/sys-apps/gnome-disk-utility-3.0.2-r300
@@ -1,4 +1,4 @@
->=dev-libs/glib-2.22:2 >=dev-libs/dbus-glib-0.74 >=dev-libs/libunique-2.90.1:3 >=x11-libs/gtk+-2.90.7:3 =sys-fs/udisks-1.0*[remote-access?] >=dev-libs/libatasmart-0.14 >=x11-libs/libnotify-0.6.1 avahi? ( >=net-dns/avahi-0.6.25[gtk3] ) gnome-keyring? ( gnome-base/libgnome-keyring ) nautilus? ( >=gnome-base/nautilus-2.91.0 ) sys-devel/gettext gnome-base/gnome-common app-text/docbook-xml-dtd:4.1.2 app-text/rarian app-text/gnome-doc-utils >=dev-util/pkgconfig-0.9 >=dev-util/intltool-0.35 >=dev-util/gtk-doc-am-1.13 doc? ( >=dev-util/gtk-doc-1.3 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
+>=dev-libs/glib-2.22:2 >=dev-libs/dbus-glib-0.74 >=dev-libs/libunique-2.90.1:3 >=x11-libs/gtk+-2.90.7:3 =sys-fs/udisks-1.0*[remote-access?] >=dev-libs/libatasmart-0.14 >=x11-libs/libnotify-0.6.1 avahi? ( >=net-dns/avahi-0.6.25[gtk3] ) gnome-keyring? ( gnome-base/libgnome-keyring ) nautilus? ( >=gnome-base/nautilus-2.91.0 ) sys-devel/gettext gnome-base/gnome-common app-text/docbook-xml-dtd:4.1.2 app-text/rarian app-text/gnome-doc-utils >=dev-util/pkgconfig-0.9 >=dev-util/intltool-0.35 >=dev-util/gtk-doc-am-1.13 doc? ( >=dev-util/gtk-doc-1.3 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
 >=dev-libs/glib-2.22:2 >=dev-libs/dbus-glib-0.74 >=dev-libs/libunique-2.90.1:3 >=x11-libs/gtk+-2.90.7:3 =sys-fs/udisks-1.0*[remote-access?] >=dev-libs/libatasmart-0.14 >=x11-libs/libnotify-0.6.1 avahi? ( >=net-dns/avahi-0.6.25[gtk3] ) gnome-keyring? ( gnome-base/libgnome-keyring ) nautilus? ( >=gnome-base/nautilus-2.91.0 ) x11-misc/xdg-utils fat? ( sys-fs/dosfstools )
 0
 mirror://gnome/sources/gnome-disk-utility/3.0/gnome-disk-utility-3.0.2.tar.xz
diff --git a/metadata/cache/sys-apps/groff-1.21-r1 b/metadata/cache/sys-apps/groff-1.21-r1
index 616914ea6a36..0b01e04311e7 100644
--- a/metadata/cache/sys-apps/groff-1.21-r1
+++ b/metadata/cache/sys-apps/groff-1.21-r1
@@ -1,4 +1,4 @@
->=sys-apps/texinfo-4.7-r1 X? ( x11-libs/libX11 x11-libs/libXt x11-libs/libXmu x11-libs/libXaw x11-libs/libSM x11-libs/libICE ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=sys-apps/texinfo-4.7-r1 X? ( x11-libs/libX11 x11-libs/libXt x11-libs/libXmu x11-libs/libXaw x11-libs/libSM x11-libs/libICE ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=sys-apps/texinfo-4.7-r1 X? ( x11-libs/libX11 x11-libs/libXt x11-libs/libXmu x11-libs/libXaw x11-libs/libSM x11-libs/libICE )
 0
 mirror://gnu/groff/groff-1.21.tar.gz linguas_ja? ( mirror://gentoo/groff-1.21-japanese.patch.bz2 )
diff --git a/metadata/cache/sys-apps/ipmiutil-2.6.7 b/metadata/cache/sys-apps/ipmiutil-2.6.7
index 20ed4e0c4c79..81110e206681 100644
--- a/metadata/cache/sys-apps/ipmiutil-2.6.7
+++ b/metadata/cache/sys-apps/ipmiutil-2.6.7
@@ -1,4 +1,4 @@
-dev-libs/openssl virtual/os-headers || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-libs/openssl virtual/os-headers || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-libs/openssl
 0
 mirror://sourceforge/ipmiutil/ipmiutil-2.6.7.tar.gz
diff --git a/metadata/cache/sys-apps/ipmiutil-2.7.7 b/metadata/cache/sys-apps/ipmiutil-2.7.7
index f12b580a27ac..76aeb6aff828 100644
--- a/metadata/cache/sys-apps/ipmiutil-2.7.7
+++ b/metadata/cache/sys-apps/ipmiutil-2.7.7
@@ -1,4 +1,4 @@
-dev-libs/openssl:0 virtual/os-headers || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-libs/openssl:0 virtual/os-headers || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-libs/openssl:0
 0
 mirror://sourceforge/ipmiutil/ipmiutil-2.7.7.tar.gz
diff --git a/metadata/cache/sys-apps/ipmiutil-2.8.2 b/metadata/cache/sys-apps/ipmiutil-2.8.2
index 719d8b79f5e3..ab38f9144ba8 100644
--- a/metadata/cache/sys-apps/ipmiutil-2.8.2
+++ b/metadata/cache/sys-apps/ipmiutil-2.8.2
@@ -1,4 +1,4 @@
->=dev-libs/openssl-1:0 virtual/os-headers || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool !<sys-apps/systemd-29-r4 !=sys-apps/systemd-37-r1
+>=dev-libs/openssl-1:0 virtual/os-headers || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool !<sys-apps/systemd-29-r4 !=sys-apps/systemd-37-r1
 >=dev-libs/openssl-1:0
 0
 mirror://sourceforge/ipmiutil/ipmiutil-2.8.2.tar.gz
diff --git a/metadata/cache/sys-apps/irqbalance-0.56 b/metadata/cache/sys-apps/irqbalance-0.56
index 1fdc656134e2..878ed855ddad 100644
--- a/metadata/cache/sys-apps/irqbalance-0.56
+++ b/metadata/cache/sys-apps/irqbalance-0.56
@@ -1,4 +1,4 @@
-dev-libs/glib:2 caps? ( sys-libs/libcap-ng ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-libs/glib:2 caps? ( sys-libs/libcap-ng ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-libs/glib:2 caps? ( sys-libs/libcap-ng )
 0
 http://irqbalance.googlecode.com/files/irqbalance-0.56.tbz2
diff --git a/metadata/cache/sys-apps/irqbalance-1.0.1 b/metadata/cache/sys-apps/irqbalance-1.0.1
index 2a1cc8d202f1..839f6eda775a 100644
--- a/metadata/cache/sys-apps/irqbalance-1.0.1
+++ b/metadata/cache/sys-apps/irqbalance-1.0.1
@@ -1,4 +1,4 @@
-dev-libs/glib:2 caps? ( sys-libs/libcap-ng ) numa? ( sys-process/numactl ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-libs/glib:2 caps? ( sys-libs/libcap-ng ) numa? ( sys-process/numactl ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-libs/glib:2 caps? ( sys-libs/libcap-ng ) numa? ( sys-process/numactl )
 0
 http://irqbalance.googlecode.com/files/irqbalance-1.0.1.tar.gz
diff --git a/metadata/cache/sys-apps/kexec-tools-9999 b/metadata/cache/sys-apps/kexec-tools-9999
index 62a3998ec2e8..132c16372e87 100644
--- a/metadata/cache/sys-apps/kexec-tools-9999
+++ b/metadata/cache/sys-apps/kexec-tools-9999
@@ -1,4 +1,4 @@
-zlib? ( sys-libs/zlib ) dev-vcs/git || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+zlib? ( sys-libs/zlib ) dev-vcs/git || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 zlib? ( sys-libs/zlib )
 0
 
diff --git a/metadata/cache/sys-apps/kmod-7 b/metadata/cache/sys-apps/kmod-7
index 7dc97985c770..986063d880cc 100644
--- a/metadata/cache/sys-apps/kmod-7
+++ b/metadata/cache/sys-apps/kmod-7
@@ -1,4 +1,4 @@
-!sys-apps/module-init-tools !sys-apps/modutils lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib ) doc? ( dev-util/gtk-doc ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+!sys-apps/module-init-tools !sys-apps/modutils lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib ) doc? ( dev-util/gtk-doc ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 !sys-apps/module-init-tools !sys-apps/modutils lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib )
 0
 mirror://kernel/linux/utils/kernel/kmod/kmod-7.tar.xz
diff --git a/metadata/cache/sys-apps/kmod-9999 b/metadata/cache/sys-apps/kmod-9999
index 37f9b820cbd5..67df3f355389 100644
--- a/metadata/cache/sys-apps/kmod-9999
+++ b/metadata/cache/sys-apps/kmod-9999
@@ -1,4 +1,4 @@
-!sys-apps/module-init-tools !sys-apps/modutils lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib ) doc? ( dev-util/gtk-doc ) dev-vcs/git || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+!sys-apps/module-init-tools !sys-apps/modutils lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib ) doc? ( dev-util/gtk-doc ) dev-vcs/git || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 !sys-apps/module-init-tools !sys-apps/modutils lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib )
 0
 
diff --git a/metadata/cache/sys-apps/lomoco-1.0-r4 b/metadata/cache/sys-apps/lomoco-1.0-r4
index ed13d282a7c5..a03ef49cf80f 100644
--- a/metadata/cache/sys-apps/lomoco-1.0-r4
+++ b/metadata/cache/sys-apps/lomoco-1.0-r4
@@ -1,4 +1,4 @@
-=virtual/libusb-0* || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+=virtual/libusb-0* || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 =virtual/libusb-0* !<sys-fs/udev-114
 0
 http://www.lomoco.org/lomoco-1.0.tar.gz
diff --git a/metadata/cache/sys-apps/lomoco-1.0-r6 b/metadata/cache/sys-apps/lomoco-1.0-r6
index 8813b5e51e12..94faec1b4ff8 100644
--- a/metadata/cache/sys-apps/lomoco-1.0-r6
+++ b/metadata/cache/sys-apps/lomoco-1.0-r6
@@ -1,4 +1,4 @@
-=virtual/libusb-0* || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+=virtual/libusb-0* || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 =virtual/libusb-0* !<sys-fs/udev-114
 0
 http://www.lomoco.org/lomoco-1.0.tar.gz
diff --git a/metadata/cache/sys-apps/pacman-4.0.1 b/metadata/cache/sys-apps/pacman-4.0.1
index 4f916a96ee28..2a796fbe7066 100644
--- a/metadata/cache/sys-apps/pacman-4.0.1
+++ b/metadata/cache/sys-apps/pacman-4.0.1
@@ -1,4 +1,4 @@
-app-arch/libarchive dev-libs/openssl virtual/libiconv virtual/libintl sys-devel/gettext curl? ( net-misc/curl ) gpg? ( app-crypt/gpgme ) app-crypt/gpgme doc? ( app-doc/doxygen app-text/asciidoc ) test? ( dev-lang/python ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+app-arch/libarchive dev-libs/openssl virtual/libiconv virtual/libintl sys-devel/gettext curl? ( net-misc/curl ) gpg? ( app-crypt/gpgme ) app-crypt/gpgme doc? ( app-doc/doxygen app-text/asciidoc ) test? ( dev-lang/python ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 app-arch/libarchive dev-libs/openssl virtual/libiconv virtual/libintl sys-devel/gettext curl? ( net-misc/curl ) gpg? ( app-crypt/gpgme ) app-arch/xz-utils
 0
 ftp://ftp.archlinux.org/other/pacman/pacman-4.0.1.tar.gz
diff --git a/metadata/cache/sys-apps/portage-2.2.0_alpha84 b/metadata/cache/sys-apps/portage-2.2.0_alpha84
deleted file mode 100644
index 2c684afd25e1..000000000000
--- a/metadata/cache/sys-apps/portage-2.2.0_alpha84
+++ /dev/null
@@ -1,22 +0,0 @@
-python3? ( =dev-lang/python-3* ) !python2? ( !python3? ( || ( >=dev-lang/python-2.7 dev-lang/python:2.6[threads] ) ) ) python2? ( !python3? ( || ( dev-lang/python:2.7 dev-lang/python:2.6[threads] ) ) ) !build? ( >=sys-apps/sed-4.0.5 ) doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 ) epydoc? ( >=dev-python/epydoc-2.0 !<=dev-python/pysqlite-2.4.1 )
-python3? ( =dev-lang/python-3* ) !python2? ( !python3? ( || ( >=dev-lang/python-2.7 dev-lang/python:2.6[threads] ) ) ) python2? ( !python3? ( || ( dev-lang/python:2.7 dev-lang/python:2.6[threads] ) ) ) !build? ( >=sys-apps/sed-4.0.5 >=app-shells/bash-3.2_p17 >=app-admin/eselect-1.2 ) elibc_FreeBSD? ( sys-freebsd/freebsd-bin ) elibc_glibc? ( >=sys-apps/sandbox-2.2 ) elibc_uclibc? ( >=sys-apps/sandbox-2.2 ) >=app-misc/pax-utils-0.1.17 xattr? ( kernel_linux? ( || ( >=dev-lang/python-3.3_pre20110902 dev-python/pyxattr ) ) ) selinux? ( || ( >=sys-libs/libselinux-2.0.94[python] <sys-libs/libselinux-2.0.94 ) ) !<app-shells/bash-3.2_p17 !<app-admin/logrotate-3.8.0
-0
-mirror://gentoo/portage-2.2.0_alpha84.tar.bz2 http://dev.gentoo.org/~zmedico/portage/archives/portage-2.2.0_alpha84.tar.bz2 linguas_pl? ( mirror://gentoo/portage-man-pl-2.1.2.tar.bz2 http://dev.gentoo.org/~zmedico/portage/archives/portage-man-pl-2.1.2.tar.bz2 )
-
-http://www.gentoo.org/proj/en/portage/index.xml
-GPL-2
-Portage is the package management and distribution system for Gentoo
-~sparc-fbsd ~x86-fbsd
-eutils multilib python toolchain-funcs user
-build doc epydoc +ipc linguas_pl python2 python3 selinux xattr
-
-!build? ( >=net-misc/rsync-2.6.4 userland_GNU? ( >=sys-apps/coreutils-6.4 ) )
-
-3
-
-compile install postinst postrm preinst prepare setup test
-
-
-
-
-
diff --git a/metadata/cache/sys-apps/portage-2.2.0_alpha90 b/metadata/cache/sys-apps/portage-2.2.0_alpha90
deleted file mode 100644
index 529d7d0bd604..000000000000
--- a/metadata/cache/sys-apps/portage-2.2.0_alpha90
+++ /dev/null
@@ -1,22 +0,0 @@
-python3? ( =dev-lang/python-3* ) !pypy1_8? ( !python2? ( !python3? ( || ( >=dev-lang/python-2.7 dev-lang/python:2.6[threads] ) ) ) ) pypy1_8? ( !python2? ( !python3? ( dev-python/pypy:1.8[bzip2] ) ) ) python2? ( !python3? ( || ( dev-lang/python:2.7 dev-lang/python:2.6[threads] ) ) ) !build? ( >=sys-apps/sed-4.0.5 ) doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 ) epydoc? ( >=dev-python/epydoc-2.0 !<=dev-python/pysqlite-2.4.1 )
-python3? ( =dev-lang/python-3* ) !pypy1_8? ( !python2? ( !python3? ( || ( >=dev-lang/python-2.7 dev-lang/python:2.6[threads] ) ) ) ) pypy1_8? ( !python2? ( !python3? ( dev-python/pypy:1.8[bzip2] ) ) ) python2? ( !python3? ( || ( dev-lang/python:2.7 dev-lang/python:2.6[threads] ) ) ) !build? ( >=sys-apps/sed-4.0.5 >=app-shells/bash-3.2_p17 >=app-admin/eselect-1.2 ) elibc_FreeBSD? ( sys-freebsd/freebsd-bin ) elibc_glibc? ( >=sys-apps/sandbox-2.2 ) elibc_uclibc? ( >=sys-apps/sandbox-2.2 ) >=app-misc/pax-utils-0.1.17 xattr? ( kernel_linux? ( || ( >=dev-lang/python-3.3_pre20110902 dev-python/pyxattr ) ) ) selinux? ( || ( >=sys-libs/libselinux-2.0.94[python] <sys-libs/libselinux-2.0.94 ) ) !<app-shells/bash-3.2_p17 !<app-admin/logrotate-3.8.0
-0
-mirror://gentoo/portage-2.2.0_alpha88.tar.bz2 http://dev.gentoo.org/~zmedico/portage/archives/portage-2.2.0_alpha88.tar.bz2 linguas_pl? ( mirror://gentoo/portage-man-pl-2.1.2.tar.bz2 http://dev.gentoo.org/~zmedico/portage/archives/portage-man-pl-2.1.2.tar.bz2 ) mirror://gentoo/portage-2.2.0_alpha90.patch.bz2 http://dev.gentoo.org/~zmedico/portage/archives/portage-2.2.0_alpha90.patch.bz2
-
-http://www.gentoo.org/proj/en/portage/index.xml
-GPL-2
-Portage is the package management and distribution system for Gentoo
-~sparc-fbsd ~x86-fbsd
-eutils multilib python toolchain-funcs user
-build doc epydoc +ipc linguas_pl pypy1_8 python2 python3 selinux xattr
-
-!build? ( >=net-misc/rsync-2.6.4 userland_GNU? ( >=sys-apps/coreutils-6.4 ) )
-
-3
-
-compile install postinst postrm preinst prepare setup test
-
-
-
-
-
diff --git a/metadata/cache/sys-apps/preload-0.6.4-r2 b/metadata/cache/sys-apps/preload-0.6.4-r2
index 4644843a33d9..4e3e63bacf97 100644
--- a/metadata/cache/sys-apps/preload-0.6.4-r2
+++ b/metadata/cache/sys-apps/preload-0.6.4-r2
@@ -1,4 +1,4 @@
->=dev-libs/glib-2.6:2 dev-util/pkgconfig sys-apps/help2man || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-libs/glib-2.6:2 dev-util/pkgconfig sys-apps/help2man || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=dev-libs/glib-2.6:2
 0
 mirror://sourceforge/preload/preload-0.6.4.tar.gz
diff --git a/metadata/cache/sys-apps/renameutils-0.10.0 b/metadata/cache/sys-apps/renameutils-0.10.0
index df040d28af93..d235cc4d5f48 100644
--- a/metadata/cache/sys-apps/renameutils-0.10.0
+++ b/metadata/cache/sys-apps/renameutils-0.10.0
@@ -1,4 +1,4 @@
->=sys-libs/readline-5.0-r2 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=sys-libs/readline-5.0-r2 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=sys-libs/readline-5.0-r2
 0
 http://savannah.nongnu.org/download/renameutils/renameutils-0.10.0.tar.gz
diff --git a/metadata/cache/sys-apps/renameutils-0.11.0 b/metadata/cache/sys-apps/renameutils-0.11.0
index 924b956389b3..0b5e636fb116 100644
--- a/metadata/cache/sys-apps/renameutils-0.11.0
+++ b/metadata/cache/sys-apps/renameutils-0.11.0
@@ -1,4 +1,4 @@
->=sys-libs/readline-5.0-r2 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=sys-libs/readline-5.0-r2 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=sys-libs/readline-5.0-r2
 0
 http://savannah.nongnu.org/download/renameutils/renameutils-0.11.0.tar.gz
diff --git a/metadata/cache/sys-apps/rng-tools-3 b/metadata/cache/sys-apps/rng-tools-3
index 957b1c110a44..25030eb6bf79 100644
--- a/metadata/cache/sys-apps/rng-tools-3
+++ b/metadata/cache/sys-apps/rng-tools-3
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 mirror://sourceforge/gkernel/rng-tools-3.tar.gz
diff --git a/metadata/cache/sys-apps/smartmontools-9999 b/metadata/cache/sys-apps/smartmontools-9999
index 1de3cf8e1578..71c7d8f81d90 100644
--- a/metadata/cache/sys-apps/smartmontools-9999
+++ b/metadata/cache/sys-apps/smartmontools-9999
@@ -1,4 +1,4 @@
-!minimal? ( caps? ( sys-libs/libcap-ng ) ) dev-vcs/subversion net-misc/rsync || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+!minimal? ( caps? ( sys-libs/libcap-ng ) ) dev-vcs/subversion net-misc/rsync || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 !minimal? ( caps? ( sys-libs/libcap-ng ) ) !minimal? ( virtual/mailx )
 0
 
diff --git a/metadata/cache/sys-apps/the_silver_searcher-0.2 b/metadata/cache/sys-apps/the_silver_searcher-0.2
index ba99ba0bd9f2..081166f06e4c 100644
--- a/metadata/cache/sys-apps/the_silver_searcher-0.2
+++ b/metadata/cache/sys-apps/the_silver_searcher-0.2
@@ -1,4 +1,4 @@
-dev-libs/libpcre || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-libs/libpcre || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-libs/libpcre
 0
 mirror://github/ggreer/the_silver_searcher/the_silver_searcher-0.2.tar.gz
diff --git a/metadata/cache/sys-apps/the_silver_searcher-0.3 b/metadata/cache/sys-apps/the_silver_searcher-0.3
index c7b9e63d8078..a44b2dc0ad71 100644
--- a/metadata/cache/sys-apps/the_silver_searcher-0.3
+++ b/metadata/cache/sys-apps/the_silver_searcher-0.3
@@ -1,4 +1,4 @@
-dev-libs/libpcre || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-libs/libpcre || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-libs/libpcre
 0
 mirror://github/ggreer/the_silver_searcher/the_silver_searcher-0.3.tar.gz
diff --git a/metadata/cache/sys-apps/usbutils-005 b/metadata/cache/sys-apps/usbutils-005
index 10d007db45d5..802afbfd8542 100644
--- a/metadata/cache/sys-apps/usbutils-005
+++ b/metadata/cache/sys-apps/usbutils-005
@@ -1,4 +1,4 @@
-virtual/libusb:1 zlib? ( sys-libs/zlib ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) )
+virtual/libusb:1 zlib? ( sys-libs/zlib ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) )
 virtual/libusb:1 zlib? ( sys-libs/zlib ) python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) )
 0
 mirror://debian/pool/main/u/usbutils/usbutils_005.orig.tar.gz
diff --git a/metadata/cache/sys-apps/util-linux-9999 b/metadata/cache/sys-apps/util-linux-9999
index b59fb0385fe6..a55f236f8c14 100644
--- a/metadata/cache/sys-apps/util-linux-9999
+++ b/metadata/cache/sys-apps/util-linux-9999
@@ -1,4 +1,4 @@
-!sys-process/schedutils !sys-apps/setarch !<sys-apps/sysvinit-2.88-r3 !<sys-libs/e2fsprogs-libs-1.41.8 !<sys-fs/e2fsprogs-1.41.8 cramfs? ( sys-libs/zlib ) ncurses? ( >=sys-libs/ncurses-5.2-r2 ) perl? ( dev-lang/perl ) selinux? ( sys-libs/libselinux ) slang? ( sys-libs/slang ) nls? ( sys-devel/gettext ) virtual/os-headers dev-vcs/git || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+!sys-process/schedutils !sys-apps/setarch !<sys-apps/sysvinit-2.88-r3 !<sys-libs/e2fsprogs-libs-1.41.8 !<sys-fs/e2fsprogs-1.41.8 cramfs? ( sys-libs/zlib ) ncurses? ( >=sys-libs/ncurses-5.2-r2 ) perl? ( dev-lang/perl ) selinux? ( sys-libs/libselinux ) slang? ( sys-libs/slang ) nls? ( sys-devel/gettext ) virtual/os-headers dev-vcs/git || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 !sys-process/schedutils !sys-apps/setarch !<sys-apps/sysvinit-2.88-r3 !<sys-libs/e2fsprogs-libs-1.41.8 !<sys-fs/e2fsprogs-1.41.8 cramfs? ( sys-libs/zlib ) ncurses? ( >=sys-libs/ncurses-5.2-r2 ) perl? ( dev-lang/perl ) selinux? ( sys-libs/libselinux ) slang? ( sys-libs/slang )
 0
 
diff --git a/metadata/cache/sys-apps/vbetool-1.1 b/metadata/cache/sys-apps/vbetool-1.1
index 3767db231e81..14b3cdb341ad 100644
--- a/metadata/cache/sys-apps/vbetool-1.1
+++ b/metadata/cache/sys-apps/vbetool-1.1
@@ -1,4 +1,4 @@
-sys-libs/zlib sys-apps/pciutils >=dev-libs/libx86-1.1-r1 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+sys-libs/zlib sys-apps/pciutils >=dev-libs/libx86-1.1-r1 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 sys-libs/zlib sys-apps/pciutils >=dev-libs/libx86-1.1-r1
 0
 http://www.codon.org.uk/~mjg59/vbetool/download/vbetool-1.1.tar.gz
diff --git a/metadata/cache/sys-auth/consolekit-0.4.5-r1 b/metadata/cache/sys-auth/consolekit-0.4.5-r1
index 3ce6843c089e..5b2133f1252f 100644
--- a/metadata/cache/sys-auth/consolekit-0.4.5-r1
+++ b/metadata/cache/sys-auth/consolekit-0.4.5-r1
@@ -1,4 +1,4 @@
->=dev-libs/dbus-glib-0.88 >=dev-libs/glib-2.20:2 sys-libs/zlib x11-libs/libX11 pam? ( virtual/pam ) policykit? ( >=sys-auth/polkit-0.101-r1 ) dev-util/pkgconfig dev-libs/libxslt doc? ( app-text/xmlto ) test? ( app-text/docbook-xml-dtd:4.1.2 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool !<sys-apps/systemd-29-r4 !=sys-apps/systemd-37-r1
+>=dev-libs/dbus-glib-0.88 >=dev-libs/glib-2.20:2 sys-libs/zlib x11-libs/libX11 pam? ( virtual/pam ) policykit? ( >=sys-auth/polkit-0.101-r1 ) dev-util/pkgconfig dev-libs/libxslt doc? ( app-text/xmlto ) test? ( app-text/docbook-xml-dtd:4.1.2 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool !<sys-apps/systemd-29-r4 !=sys-apps/systemd-37-r1
 >=dev-libs/dbus-glib-0.88 >=dev-libs/glib-2.20:2 sys-libs/zlib x11-libs/libX11 pam? ( virtual/pam ) policykit? ( >=sys-auth/polkit-0.101-r1 )
 0
 http://www.freedesktop.org/software/ConsoleKit/dist/ConsoleKit-0.4.5.tar.bz2
diff --git a/metadata/cache/sys-auth/consolekit-0.4.5-r2 b/metadata/cache/sys-auth/consolekit-0.4.5-r2
index 225811349831..5cc4f6e3b4b9 100644
--- a/metadata/cache/sys-auth/consolekit-0.4.5-r2
+++ b/metadata/cache/sys-auth/consolekit-0.4.5-r2
@@ -1,4 +1,4 @@
->=dev-libs/dbus-glib-0.88 >=dev-libs/glib-2.20:2 sys-libs/zlib x11-libs/libX11 pam? ( virtual/pam ) policykit? ( >=sys-auth/polkit-0.101-r1 ) dev-util/pkgconfig dev-libs/libxslt doc? ( app-text/xmlto ) test? ( app-text/docbook-xml-dtd:4.1.2 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool !<sys-apps/systemd-29-r4 !=sys-apps/systemd-37-r1
+>=dev-libs/dbus-glib-0.88 >=dev-libs/glib-2.20:2 sys-libs/zlib x11-libs/libX11 pam? ( virtual/pam ) policykit? ( >=sys-auth/polkit-0.101-r1 ) dev-util/pkgconfig dev-libs/libxslt doc? ( app-text/xmlto ) test? ( app-text/docbook-xml-dtd:4.1.2 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool !<sys-apps/systemd-29-r4 !=sys-apps/systemd-37-r1
 >=dev-libs/dbus-glib-0.88 >=dev-libs/glib-2.20:2 sys-libs/zlib x11-libs/libX11 pam? ( virtual/pam ) policykit? ( >=sys-auth/polkit-0.101-r1 )
 0
 http://www.freedesktop.org/software/ConsoleKit/dist/ConsoleKit-0.4.5.tar.bz2
diff --git a/metadata/cache/sys-auth/consolekit-0.4.5-r3 b/metadata/cache/sys-auth/consolekit-0.4.5-r3
index ef91410feb79..49056f23f355 100644
--- a/metadata/cache/sys-auth/consolekit-0.4.5-r3
+++ b/metadata/cache/sys-auth/consolekit-0.4.5-r3
@@ -1,4 +1,4 @@
->=dev-libs/dbus-glib-0.98 >=dev-libs/glib-2.22 sys-libs/zlib x11-libs/libX11 acl? ( sys-apps/acl sys-apps/coreutils[acl] >=sys-fs/udev-182 ) pam? ( virtual/pam ) policykit? ( >=sys-auth/polkit-0.101-r1 ) !<sys-fs/udev-182 dev-util/pkgconfig dev-libs/libxslt doc? ( app-text/xmlto ) test? ( app-text/docbook-xml-dtd:4.1.2 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool !<sys-apps/systemd-29-r4 !=sys-apps/systemd-37-r1
+>=dev-libs/dbus-glib-0.98 >=dev-libs/glib-2.22 sys-libs/zlib x11-libs/libX11 acl? ( sys-apps/acl sys-apps/coreutils[acl] >=sys-fs/udev-182 ) pam? ( virtual/pam ) policykit? ( >=sys-auth/polkit-0.101-r1 ) !<sys-fs/udev-182 dev-util/pkgconfig dev-libs/libxslt doc? ( app-text/xmlto ) test? ( app-text/docbook-xml-dtd:4.1.2 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool !<sys-apps/systemd-29-r4 !=sys-apps/systemd-37-r1
 >=dev-libs/dbus-glib-0.98 >=dev-libs/glib-2.22 sys-libs/zlib x11-libs/libX11 acl? ( sys-apps/acl sys-apps/coreutils[acl] >=sys-fs/udev-182 ) pam? ( virtual/pam ) policykit? ( >=sys-auth/polkit-0.101-r1 ) !<sys-fs/udev-182
 0
 http://www.freedesktop.org/software/ConsoleKit/dist/ConsoleKit-0.4.5.tar.bz2
diff --git a/metadata/cache/sys-auth/fprintd-0.2.0 b/metadata/cache/sys-auth/fprintd-0.2.0
index b7a8420841b5..3373c74a5328 100644
--- a/metadata/cache/sys-auth/fprintd-0.2.0
+++ b/metadata/cache/sys-auth/fprintd-0.2.0
@@ -1,4 +1,4 @@
-dev-libs/dbus-glib dev-libs/glib:2 sys-auth/libfprint sys-auth/polkit pam? ( sys-libs/pam ) dev-util/gtk-doc dev-util/intltool doc? ( dev-libs/libxml2 dev-libs/libxslt ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-libs/dbus-glib dev-libs/glib:2 sys-auth/libfprint sys-auth/polkit pam? ( sys-libs/pam ) dev-util/gtk-doc dev-util/intltool doc? ( dev-libs/libxml2 dev-libs/libxslt ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-libs/dbus-glib dev-libs/glib:2 sys-auth/libfprint sys-auth/polkit pam? ( sys-libs/pam )
 0
 http://cgit.freedesktop.org/libfprint/fprintd/snapshot/V_0_2_0.tar.bz2
diff --git a/metadata/cache/sys-auth/fprintd-0.2.0-r1 b/metadata/cache/sys-auth/fprintd-0.2.0-r1
index cb6105bcdee6..b35ba306f269 100644
--- a/metadata/cache/sys-auth/fprintd-0.2.0-r1
+++ b/metadata/cache/sys-auth/fprintd-0.2.0-r1
@@ -1,4 +1,4 @@
-dev-libs/dbus-glib dev-libs/glib:2 sys-auth/libfprint sys-auth/polkit pam? ( sys-libs/pam ) dev-util/gtk-doc dev-util/intltool doc? ( dev-libs/libxml2 dev-libs/libxslt ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-libs/dbus-glib dev-libs/glib:2 sys-auth/libfprint sys-auth/polkit pam? ( sys-libs/pam ) dev-util/gtk-doc dev-util/intltool doc? ( dev-libs/libxml2 dev-libs/libxslt ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-libs/dbus-glib dev-libs/glib:2 sys-auth/libfprint sys-auth/polkit pam? ( sys-libs/pam )
 0
 http://cgit.freedesktop.org/libfprint/fprintd/snapshot/V_0_2_0.tar.bz2
diff --git a/metadata/cache/sys-auth/libfprint-0.4.0 b/metadata/cache/sys-auth/libfprint-0.4.0
index 440520a6c17b..d7e9d3676130 100644
--- a/metadata/cache/sys-auth/libfprint-0.4.0
+++ b/metadata/cache/sys-auth/libfprint-0.4.0
@@ -1,4 +1,4 @@
-dev-libs/libusb:1 dev-libs/nss || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] x11-libs/gdk-pixbuf ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-libs/libusb:1 dev-libs/nss || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] x11-libs/gdk-pixbuf ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-libs/libusb:1 dev-libs/nss || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] x11-libs/gdk-pixbuf )
 0
 http://cgit.freedesktop.org/libfprint/libfprint/snapshot/v_0_4_0.tar.bz2 -> libfprint-0.4.0.tar.bz2
diff --git a/metadata/cache/sys-auth/libnss-mysql-1.5_p20060915-r1 b/metadata/cache/sys-auth/libnss-mysql-1.5_p20060915-r1
index 9242fab7a21e..a80090d958fd 100644
--- a/metadata/cache/sys-auth/libnss-mysql-1.5_p20060915-r1
+++ b/metadata/cache/sys-auth/libnss-mysql-1.5_p20060915-r1
@@ -1,4 +1,4 @@
-virtual/mysql || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+virtual/mysql || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 virtual/mysql
 0
 http://libnss-mysql.sourceforge.net/snapshot/libnss-mysql-20060915.tgz
diff --git a/metadata/cache/sys-auth/libnss-mysql-1.5_p20060915-r2 b/metadata/cache/sys-auth/libnss-mysql-1.5_p20060915-r2
index 9242fab7a21e..a80090d958fd 100644
--- a/metadata/cache/sys-auth/libnss-mysql-1.5_p20060915-r2
+++ b/metadata/cache/sys-auth/libnss-mysql-1.5_p20060915-r2
@@ -1,4 +1,4 @@
-virtual/mysql || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+virtual/mysql || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 virtual/mysql
 0
 http://libnss-mysql.sourceforge.net/snapshot/libnss-mysql-20060915.tgz
diff --git a/metadata/cache/sys-auth/libyubikey-1.6 b/metadata/cache/sys-auth/libyubikey-1.6
index 6be6c5002f04..3d91fcbe9de2 100644
--- a/metadata/cache/sys-auth/libyubikey-1.6
+++ b/metadata/cache/sys-auth/libyubikey-1.6
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 http://yubico-c.googlecode.com/files/libyubikey-1.6.tar.gz
diff --git a/metadata/cache/sys-auth/nss-mdns-0.10-r1 b/metadata/cache/sys-auth/nss-mdns-0.10-r1
index 2e2f2da46fa4..b103d8702395 100644
--- a/metadata/cache/sys-auth/nss-mdns-0.10-r1
+++ b/metadata/cache/sys-auth/nss-mdns-0.10-r1
@@ -1,4 +1,4 @@
-net-dns/avahi || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+net-dns/avahi || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 net-dns/avahi
 0
 http://0pointer.de/lennart/projects/nss-mdns/nss-mdns-0.10.tar.gz
diff --git a/metadata/cache/sys-auth/nss_ldap-264 b/metadata/cache/sys-auth/nss_ldap-264
index c2566bfdc368..79d43f4822f5 100644
--- a/metadata/cache/sys-auth/nss_ldap-264
+++ b/metadata/cache/sys-auth/nss_ldap-264
@@ -1,4 +1,4 @@
->=net-nds/openldap-2.1.30-r5 sasl? ( dev-libs/cyrus-sasl ) kerberos? ( virtual/krb5 ) ssl? ( dev-libs/openssl ) >=sys-apps/sed-4 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=net-nds/openldap-2.1.30-r5 sasl? ( dev-libs/cyrus-sasl ) kerberos? ( virtual/krb5 ) ssl? ( dev-libs/openssl ) >=sys-apps/sed-4 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=net-nds/openldap-2.1.30-r5 sasl? ( dev-libs/cyrus-sasl ) kerberos? ( virtual/krb5 ) ssl? ( dev-libs/openssl ) !<net-fs/autofs-4.1.3
 0
 http://www.padl.com/download/nss_ldap-264.tar.gz
diff --git a/metadata/cache/sys-auth/nss_ldap-264-r1 b/metadata/cache/sys-auth/nss_ldap-264-r1
index a0d8a8331942..539541f4df3e 100644
--- a/metadata/cache/sys-auth/nss_ldap-264-r1
+++ b/metadata/cache/sys-auth/nss_ldap-264-r1
@@ -1,4 +1,4 @@
->=net-nds/openldap-2.1.30-r5 sasl? ( dev-libs/cyrus-sasl ) kerberos? ( virtual/krb5 ) ssl? ( dev-libs/openssl ) >=sys-apps/sed-4 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=net-nds/openldap-2.1.30-r5 sasl? ( dev-libs/cyrus-sasl ) kerberos? ( virtual/krb5 ) ssl? ( dev-libs/openssl ) >=sys-apps/sed-4 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=net-nds/openldap-2.1.30-r5 sasl? ( dev-libs/cyrus-sasl ) kerberos? ( virtual/krb5 ) ssl? ( dev-libs/openssl ) !<net-fs/autofs-4.1.3
 0
 http://www.padl.com/download/nss_ldap-264.tar.gz
diff --git a/metadata/cache/sys-auth/nss_ldap-265 b/metadata/cache/sys-auth/nss_ldap-265
index a8fec034391e..19468cc5337a 100644
--- a/metadata/cache/sys-auth/nss_ldap-265
+++ b/metadata/cache/sys-auth/nss_ldap-265
@@ -1,4 +1,4 @@
->=net-nds/openldap-2.1.30-r5 sasl? ( dev-libs/cyrus-sasl ) kerberos? ( virtual/krb5 ) ssl? ( dev-libs/openssl ) >=sys-apps/sed-4 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=net-nds/openldap-2.1.30-r5 sasl? ( dev-libs/cyrus-sasl ) kerberos? ( virtual/krb5 ) ssl? ( dev-libs/openssl ) >=sys-apps/sed-4 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=net-nds/openldap-2.1.30-r5 sasl? ( dev-libs/cyrus-sasl ) kerberos? ( virtual/krb5 ) ssl? ( dev-libs/openssl ) !<net-fs/autofs-4.1.3
 0
 http://www.padl.com/download/nss_ldap-265.tar.gz
diff --git a/metadata/cache/sys-auth/nss_ldap-265-r1 b/metadata/cache/sys-auth/nss_ldap-265-r1
index a8fec034391e..19468cc5337a 100644
--- a/metadata/cache/sys-auth/nss_ldap-265-r1
+++ b/metadata/cache/sys-auth/nss_ldap-265-r1
@@ -1,4 +1,4 @@
->=net-nds/openldap-2.1.30-r5 sasl? ( dev-libs/cyrus-sasl ) kerberos? ( virtual/krb5 ) ssl? ( dev-libs/openssl ) >=sys-apps/sed-4 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=net-nds/openldap-2.1.30-r5 sasl? ( dev-libs/cyrus-sasl ) kerberos? ( virtual/krb5 ) ssl? ( dev-libs/openssl ) >=sys-apps/sed-4 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=net-nds/openldap-2.1.30-r5 sasl? ( dev-libs/cyrus-sasl ) kerberos? ( virtual/krb5 ) ssl? ( dev-libs/openssl ) !<net-fs/autofs-4.1.3
 0
 http://www.padl.com/download/nss_ldap-265.tar.gz
diff --git a/metadata/cache/sys-auth/pam_krb5-4.5 b/metadata/cache/sys-auth/pam_krb5-4.5
index 97434f999ff5..a5717a2ca5bc 100644
--- a/metadata/cache/sys-auth/pam_krb5-4.5
+++ b/metadata/cache/sys-auth/pam_krb5-4.5
@@ -6,7 +6,7 @@ http://archives.eyrie.org/software/kerberos/pam-krb5-4.5.tar.gz
 http://www.eyrie.org/~eagle/software/pam-krb5
 || ( BSD-2 GPL-2 )
 Kerberos 5 PAM Authentication Module
-~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86
+~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86
 multilib toolchain-funcs
 
 
diff --git a/metadata/cache/sys-auth/pam_mount-2.11 b/metadata/cache/sys-auth/pam_mount-2.11
index 11d2023190dd..01ba1ccfc9c1 100644
--- a/metadata/cache/sys-auth/pam_mount-2.11
+++ b/metadata/cache/sys-auth/pam_mount-2.11
@@ -1,4 +1,4 @@
->=sys-libs/pam-0.99 >=sys-libs/libhx-3.11 >=dev-libs/libxml2-2.6 crypt? ( >=sys-fs/cryptsetup-1.1.0 ) ssl? ( >=dev-libs/openssl-0.9.8 ) selinux? ( sys-libs/libselinux ) dev-util/pkgconfig app-arch/xz-utils || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=sys-libs/pam-0.99 >=sys-libs/libhx-3.11 >=dev-libs/libxml2-2.6 crypt? ( >=sys-fs/cryptsetup-1.1.0 ) ssl? ( >=dev-libs/openssl-0.9.8 ) selinux? ( sys-libs/libselinux ) dev-util/pkgconfig app-arch/xz-utils || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=sys-libs/pam-0.99 >=sys-libs/libhx-3.11 >=dev-libs/libxml2-2.6 crypt? ( >=sys-fs/cryptsetup-1.1.0 ) ssl? ( >=dev-libs/openssl-0.9.8 ) selinux? ( sys-libs/libselinux )
 0
 mirror://sourceforge/pam-mount/pam_mount-2.11.tar.xz
diff --git a/metadata/cache/sys-auth/pam_mount-2.6 b/metadata/cache/sys-auth/pam_mount-2.6
index b7358047f2cb..7431527557db 100644
--- a/metadata/cache/sys-auth/pam_mount-2.6
+++ b/metadata/cache/sys-auth/pam_mount-2.6
@@ -1,4 +1,4 @@
->=sys-libs/pam-0.99 dev-libs/openssl >=sys-libs/libhx-3.6 dev-libs/libxml2 >=sys-fs/cryptsetup-1.1.0 dev-util/pkgconfig app-arch/xz-utils || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=sys-libs/pam-0.99 dev-libs/openssl >=sys-libs/libhx-3.6 dev-libs/libxml2 >=sys-fs/cryptsetup-1.1.0 dev-util/pkgconfig app-arch/xz-utils || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=sys-libs/pam-0.99 dev-libs/openssl >=sys-libs/libhx-3.6 dev-libs/libxml2 >=sys-fs/cryptsetup-1.1.0 sys-process/lsof
 0
 mirror://sourceforge/pam-mount/pam_mount-2.6.tar.xz
diff --git a/metadata/cache/sys-auth/pam_mysql-0.7_rc1-r3 b/metadata/cache/sys-auth/pam_mysql-0.7_rc1-r3
index fc1ee5d19ef3..d33e8aacce69 100644
--- a/metadata/cache/sys-auth/pam_mysql-0.7_rc1-r3
+++ b/metadata/cache/sys-auth/pam_mysql-0.7_rc1-r3
@@ -1,4 +1,4 @@
->=sys-libs/pam-0.72 virtual/mysql || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=sys-libs/pam-0.72 virtual/mysql || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=sys-libs/pam-0.72 virtual/mysql
 0
 mirror://sourceforge/pam-mysql/pam_mysql-0.7RC1.tar.gz
diff --git a/metadata/cache/sys-auth/pam_mysql-0.7_rc1-r4 b/metadata/cache/sys-auth/pam_mysql-0.7_rc1-r4
index 478ab2fac999..79e782137826 100644
--- a/metadata/cache/sys-auth/pam_mysql-0.7_rc1-r4
+++ b/metadata/cache/sys-auth/pam_mysql-0.7_rc1-r4
@@ -1,4 +1,4 @@
->=sys-libs/pam-0.72 virtual/mysql || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=sys-libs/pam-0.72 virtual/mysql || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=sys-libs/pam-0.72 virtual/mysql
 0
 mirror://sourceforge/pam-mysql/pam_mysql-0.7RC1.tar.gz
diff --git a/metadata/cache/sys-auth/pam_skey-1.1.5-r2 b/metadata/cache/sys-auth/pam_skey-1.1.5-r2
index 64c89c486303..7f6daf89849e 100644
--- a/metadata/cache/sys-auth/pam_skey-1.1.5-r2
+++ b/metadata/cache/sys-auth/pam_skey-1.1.5-r2
@@ -1,4 +1,4 @@
->=sys-libs/pam-0.78-r3 >=sys-auth/skey-1.1.5-r4 app-arch/xz-utils || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=sys-libs/pam-0.78-r3 >=sys-auth/skey-1.1.5-r4 app-arch/xz-utils || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=sys-libs/pam-0.78-r3 >=sys-auth/skey-1.1.5-r4
 0
 http://dkorunic.net/tarballs/pam_skey-1.1.5.tar.gz mirror://gentoo/pam_skey-1.1.5-patches-3.tar.xz
diff --git a/metadata/cache/sys-auth/pam_skey-1.1.5-r3 b/metadata/cache/sys-auth/pam_skey-1.1.5-r3
index 995fe7f7036f..ae0ebbd1706c 100644
--- a/metadata/cache/sys-auth/pam_skey-1.1.5-r3
+++ b/metadata/cache/sys-auth/pam_skey-1.1.5-r3
@@ -1,4 +1,4 @@
->=sys-libs/pam-0.78-r3 >=sys-auth/skey-1.1.5-r4 app-arch/xz-utils || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=sys-libs/pam-0.78-r3 >=sys-auth/skey-1.1.5-r4 app-arch/xz-utils || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=sys-libs/pam-0.78-r3 >=sys-auth/skey-1.1.5-r4
 0
 http://dkorunic.net/tarballs/pam_skey-1.1.5.tar.gz mirror://gentoo/pam_skey-1.1.5-patches-4.tar.xz
diff --git a/metadata/cache/sys-auth/pam_ssh-1.97-r1 b/metadata/cache/sys-auth/pam_ssh-1.97-r1
index ef32be7cb540..8ee453810bdb 100644
--- a/metadata/cache/sys-auth/pam_ssh-1.97-r1
+++ b/metadata/cache/sys-auth/pam_ssh-1.97-r1
@@ -1,4 +1,4 @@
-sys-libs/pam sys-devel/libtool || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+sys-libs/pam sys-devel/libtool || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 sys-libs/pam virtual/ssh
 0
 mirror://sourceforge/pam-ssh/pam_ssh-1.97.tar.bz2
diff --git a/metadata/cache/sys-auth/pam_ssh-1.97-r2 b/metadata/cache/sys-auth/pam_ssh-1.97-r2
index 03a54ca4436a..b0178357f115 100644
--- a/metadata/cache/sys-auth/pam_ssh-1.97-r2
+++ b/metadata/cache/sys-auth/pam_ssh-1.97-r2
@@ -1,4 +1,4 @@
-sys-libs/pam net-misc/openssh sys-devel/libtool || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+sys-libs/pam net-misc/openssh sys-devel/libtool || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 sys-libs/pam net-misc/openssh
 0
 mirror://sourceforge/pam-ssh/pam_ssh-1.97.tar.bz2
diff --git a/metadata/cache/sys-auth/pam_ssh-1.97-r3 b/metadata/cache/sys-auth/pam_ssh-1.97-r3
index bd25955981db..46a4672cd678 100644
--- a/metadata/cache/sys-auth/pam_ssh-1.97-r3
+++ b/metadata/cache/sys-auth/pam_ssh-1.97-r3
@@ -1,4 +1,4 @@
-sys-libs/pam net-misc/openssh sys-devel/libtool || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+sys-libs/pam net-misc/openssh sys-devel/libtool || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 sys-libs/pam net-misc/openssh
 0
 mirror://sourceforge/pam-ssh/pam_ssh-1.97.tar.bz2
diff --git a/metadata/cache/sys-auth/ykclient-2.3 b/metadata/cache/sys-auth/ykclient-2.3
index 27b1c1ae6eb4..3d4690143c16 100644
--- a/metadata/cache/sys-auth/ykclient-2.3
+++ b/metadata/cache/sys-auth/ykclient-2.3
@@ -1,4 +1,4 @@
->=net-misc/curl-7.21.1 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=net-misc/curl-7.21.1 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=net-misc/curl-7.21.1
 0
 http://yubico-c-client.googlecode.com/files/ykclient-2.3.tar.gz
diff --git a/metadata/cache/sys-auth/ykpers-1.3.4 b/metadata/cache/sys-auth/ykpers-1.3.4
index 111163b84c1c..eb2d4d5de815 100644
--- a/metadata/cache/sys-auth/ykpers-1.3.4
+++ b/metadata/cache/sys-auth/ykpers-1.3.4
@@ -1,4 +1,4 @@
->=sys-auth/libyubikey-1.6 >=dev-libs/libusb-1.0.8 dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=sys-auth/libyubikey-1.6 >=dev-libs/libusb-1.0.8 dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=sys-auth/libyubikey-1.6 >=dev-libs/libusb-1.0.8
 0
 http://yubikey-personalization.googlecode.com/files/ykpers-1.3.4.tar.gz
diff --git a/metadata/cache/sys-block/partimage-0.6.8 b/metadata/cache/sys-block/partimage-0.6.8
index 3693f32ab5b1..541844a1f92d 100644
--- a/metadata/cache/sys-block/partimage-0.6.8
+++ b/metadata/cache/sys-block/partimage-0.6.8
@@ -1,4 +1,4 @@
-!static? ( pam? ( virtual/pam ) ) app-arch/bzip2 >=dev-libs/newt-0.52 >=sys-libs/slang-2 sys-libs/zlib ssl? ( dev-libs/openssl ) nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+!static? ( pam? ( virtual/pam ) ) app-arch/bzip2 >=dev-libs/newt-0.52 >=sys-libs/slang-2 sys-libs/zlib ssl? ( dev-libs/openssl ) nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 !static? ( pam? ( virtual/pam ) ) !static? ( app-arch/bzip2 >=dev-libs/newt-0.52 >=sys-libs/slang-2 sys-libs/zlib ssl? ( dev-libs/openssl ) )
 0
 mirror://sourceforge/partimage/partimage-0.6.8.tar.bz2
diff --git a/metadata/cache/sys-boot/dvhtool-1.0.1-r2 b/metadata/cache/sys-boot/dvhtool-1.0.1-r2
index 689ad76b50eb..5082a2796e72 100644
--- a/metadata/cache/sys-boot/dvhtool-1.0.1-r2
+++ b/metadata/cache/sys-boot/dvhtool-1.0.1-r2
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 mirror://debian/pool/main/d/dvhtool/dvhtool_1.0.1.orig.tar.gz
diff --git a/metadata/cache/sys-boot/grub-9999 b/metadata/cache/sys-boot/grub-9999
index 2a13dff8c28b..2d88eaeb6b36 100644
--- a/metadata/cache/sys-boot/grub-9999
+++ b/metadata/cache/sys-boot/grub-9999
@@ -1,4 +1,4 @@
-dev-libs/libisoburn dev-libs/lzo sys-boot/os-prober >=sys-libs/ncurses-5.2-r5 debug? ( sdl? ( media-libs/libsdl ) ) device-mapper? ( >=sys-fs/lvm2-2.02.45 ) libzfs? ( sys-fs/zfs ) mount? ( sys-fs/fuse ) truetype? ( media-libs/freetype >=media-fonts/unifont-5 ) >=dev-lang/python-2.5.2 sys-devel/flex virtual/yacc sys-apps/texinfo >=sys-devel/autogen-5.10 sys-apps/help2man || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=dev-vcs/bzr-2.0.1
+dev-libs/libisoburn dev-libs/lzo sys-boot/os-prober >=sys-libs/ncurses-5.2-r5 debug? ( sdl? ( media-libs/libsdl ) ) device-mapper? ( >=sys-fs/lvm2-2.02.45 ) libzfs? ( sys-fs/zfs ) mount? ( sys-fs/fuse ) truetype? ( media-libs/freetype >=media-fonts/unifont-5 ) >=dev-lang/python-2.5.2 sys-devel/flex virtual/yacc sys-apps/texinfo >=sys-devel/autogen-5.10 sys-apps/help2man || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=dev-vcs/bzr-2.0.1
 dev-libs/libisoburn dev-libs/lzo sys-boot/os-prober >=sys-libs/ncurses-5.2-r5 debug? ( sdl? ( media-libs/libsdl ) ) device-mapper? ( >=sys-fs/lvm2-2.02.45 ) libzfs? ( sys-fs/zfs ) mount? ( sys-fs/fuse ) truetype? ( media-libs/freetype >=media-fonts/unifont-5 ) grub_platforms_efi-32? ( sys-boot/efibootmgr ) grub_platforms_efi-64? ( sys-boot/efibootmgr )
 2
 
diff --git a/metadata/cache/sys-cluster/ceph-0.38 b/metadata/cache/sys-cluster/ceph-0.38
index e5132d307498..a19887dc3e01 100644
--- a/metadata/cache/sys-cluster/ceph-0.38
+++ b/metadata/cache/sys-cluster/ceph-0.38
@@ -1,4 +1,4 @@
-dev-libs/boost dev-libs/libedit dev-libs/crypto++ sys-apps/keyutils fuse? ( sys-fs/fuse ) libatomic? ( dev-libs/libatomic_ops ) gtk? ( x11-libs/gtk+:2 dev-cpp/gtkmm:2.4 ) radosgw? ( dev-libs/fcgi dev-libs/expat ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-libs/boost dev-libs/libedit dev-libs/crypto++ sys-apps/keyutils fuse? ( sys-fs/fuse ) libatomic? ( dev-libs/libatomic_ops ) gtk? ( x11-libs/gtk+:2 dev-cpp/gtkmm:2.4 ) radosgw? ( dev-libs/fcgi dev-libs/expat ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-libs/boost dev-libs/libedit dev-libs/crypto++ sys-apps/keyutils fuse? ( sys-fs/fuse ) libatomic? ( dev-libs/libatomic_ops ) gtk? ( x11-libs/gtk+:2 dev-cpp/gtkmm:2.4 ) radosgw? ( dev-libs/fcgi dev-libs/expat ) sys-fs/btrfs-progs
 0
 http://ceph.newdream.net/download/ceph-0.38.tar.gz
diff --git a/metadata/cache/sys-cluster/ceph-0.40 b/metadata/cache/sys-cluster/ceph-0.40
index e7ab03430086..5349794d8dea 100644
--- a/metadata/cache/sys-cluster/ceph-0.40
+++ b/metadata/cache/sys-cluster/ceph-0.40
@@ -1,4 +1,4 @@
-dev-libs/boost dev-libs/libedit dev-libs/crypto++ sys-apps/keyutils fuse? ( sys-fs/fuse ) libatomic? ( dev-libs/libatomic_ops ) gtk? ( x11-libs/gtk+:2 dev-cpp/gtkmm:2.4 gnome-base/librsvg ) radosgw? ( dev-libs/fcgi dev-libs/expat ) tcmalloc? ( dev-util/google-perftools ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-libs/boost dev-libs/libedit dev-libs/crypto++ sys-apps/keyutils fuse? ( sys-fs/fuse ) libatomic? ( dev-libs/libatomic_ops ) gtk? ( x11-libs/gtk+:2 dev-cpp/gtkmm:2.4 gnome-base/librsvg ) radosgw? ( dev-libs/fcgi dev-libs/expat ) tcmalloc? ( dev-util/google-perftools ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-libs/boost dev-libs/libedit dev-libs/crypto++ sys-apps/keyutils fuse? ( sys-fs/fuse ) libatomic? ( dev-libs/libatomic_ops ) gtk? ( x11-libs/gtk+:2 dev-cpp/gtkmm:2.4 gnome-base/librsvg ) radosgw? ( dev-libs/fcgi dev-libs/expat ) tcmalloc? ( dev-util/google-perftools ) sys-fs/btrfs-progs
 0
 http://ceph.newdream.net/download/ceph-0.40.tar.gz
diff --git a/metadata/cache/sys-cluster/ceph-0.41 b/metadata/cache/sys-cluster/ceph-0.41
index 82ecd50cdc54..e598df8b2c6c 100644
--- a/metadata/cache/sys-cluster/ceph-0.41
+++ b/metadata/cache/sys-cluster/ceph-0.41
@@ -1,4 +1,4 @@
-dev-libs/boost dev-libs/libedit dev-libs/crypto++ sys-apps/keyutils fuse? ( sys-fs/fuse ) libatomic? ( dev-libs/libatomic_ops ) gtk? ( x11-libs/gtk+:2 dev-cpp/gtkmm:2.4 gnome-base/librsvg ) radosgw? ( dev-libs/fcgi dev-libs/expat ) tcmalloc? ( dev-util/google-perftools ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-libs/boost dev-libs/libedit dev-libs/crypto++ sys-apps/keyutils fuse? ( sys-fs/fuse ) libatomic? ( dev-libs/libatomic_ops ) gtk? ( x11-libs/gtk+:2 dev-cpp/gtkmm:2.4 gnome-base/librsvg ) radosgw? ( dev-libs/fcgi dev-libs/expat ) tcmalloc? ( dev-util/google-perftools ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-libs/boost dev-libs/libedit dev-libs/crypto++ sys-apps/keyutils fuse? ( sys-fs/fuse ) libatomic? ( dev-libs/libatomic_ops ) gtk? ( x11-libs/gtk+:2 dev-cpp/gtkmm:2.4 gnome-base/librsvg ) radosgw? ( dev-libs/fcgi dev-libs/expat ) tcmalloc? ( dev-util/google-perftools ) sys-fs/btrfs-progs
 0
 http://ceph.newdream.net/download/ceph-0.41.tar.gz
diff --git a/metadata/cache/sys-cluster/cluster-glue-1.0.7-r2 b/metadata/cache/sys-cluster/cluster-glue-1.0.7-r2
index 56fc11423271..f1392759a355 100644
--- a/metadata/cache/sys-cluster/cluster-glue-1.0.7-r2
+++ b/metadata/cache/sys-cluster/cluster-glue-1.0.7-r2
@@ -1,4 +1,4 @@
-app-arch/bzip2 dev-libs/glib:2 libnet? ( <net-libs/libnet-1.1.5 ) net-misc/curl net-misc/iputils || ( net-misc/netkit-telnetd net-misc/telnet-bsd ) dev-libs/libxml2 !<sys-cluster/heartbeat-3.0 doc? ( dev-libs/libxslt app-text/docbook-xsl-stylesheets ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+app-arch/bzip2 dev-libs/glib:2 libnet? ( <net-libs/libnet-1.1.5 ) net-misc/curl net-misc/iputils || ( net-misc/netkit-telnetd net-misc/telnet-bsd ) dev-libs/libxml2 !<sys-cluster/heartbeat-3.0 doc? ( dev-libs/libxslt app-text/docbook-xsl-stylesheets ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 app-arch/bzip2 dev-libs/glib:2 libnet? ( <net-libs/libnet-1.1.5 ) net-misc/curl net-misc/iputils || ( net-misc/netkit-telnetd net-misc/telnet-bsd ) dev-libs/libxml2 !<sys-cluster/heartbeat-3.0
 0
 http://hg.linux-ha.org/glue/archive/glue-1.0.7.tar.bz2
diff --git a/metadata/cache/sys-cluster/cluster-glue-1.0.9 b/metadata/cache/sys-cluster/cluster-glue-1.0.9
index de2ac6ef7f56..816d0134921b 100644
--- a/metadata/cache/sys-cluster/cluster-glue-1.0.9
+++ b/metadata/cache/sys-cluster/cluster-glue-1.0.9
@@ -1,4 +1,4 @@
-app-arch/bzip2 dev-libs/glib:2 libnet? ( net-libs/libnet:1.1 ) net-misc/curl net-misc/iputils || ( net-misc/netkit-telnetd net-misc/telnet-bsd ) dev-libs/libxml2 !<sys-cluster/heartbeat-3.0 doc? ( dev-libs/libxslt app-text/docbook-xsl-stylesheets ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+app-arch/bzip2 dev-libs/glib:2 libnet? ( net-libs/libnet:1.1 ) net-misc/curl net-misc/iputils || ( net-misc/netkit-telnetd net-misc/telnet-bsd ) dev-libs/libxml2 !<sys-cluster/heartbeat-3.0 doc? ( dev-libs/libxslt app-text/docbook-xsl-stylesheets ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 app-arch/bzip2 dev-libs/glib:2 libnet? ( net-libs/libnet:1.1 ) net-misc/curl net-misc/iputils || ( net-misc/netkit-telnetd net-misc/telnet-bsd ) dev-libs/libxml2 !<sys-cluster/heartbeat-3.0
 0
 http://hg.linux-ha.org/glue/archive/glue-1.0.9.tar.bz2
diff --git a/metadata/cache/sys-cluster/corosync-1.3.0 b/metadata/cache/sys-cluster/corosync-1.3.0
index cb363d172498..2c58f47f8d4e 100644
--- a/metadata/cache/sys-cluster/corosync-1.3.0
+++ b/metadata/cache/sys-cluster/corosync-1.3.0
@@ -1,4 +1,4 @@
-!sys-cluster/heartbeat ssl? ( dev-libs/nss ) infiniband? ( sys-infiniband/libibverbs sys-infiniband/librdmacm ) dev-util/pkgconfig doc? ( sys-apps/groff ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+!sys-cluster/heartbeat ssl? ( dev-libs/nss ) infiniband? ( sys-infiniband/libibverbs sys-infiniband/librdmacm ) dev-util/pkgconfig doc? ( sys-apps/groff ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 !sys-cluster/heartbeat ssl? ( dev-libs/nss ) infiniband? ( sys-infiniband/libibverbs sys-infiniband/librdmacm )
 0
 ftp://ftp:corosync.org@corosync.org/downloads/corosync-1.3.0/corosync-1.3.0.tar.gz
diff --git a/metadata/cache/sys-cluster/corosync-1.3.1 b/metadata/cache/sys-cluster/corosync-1.3.1
index 152feb32fe02..c3c13db38f87 100644
--- a/metadata/cache/sys-cluster/corosync-1.3.1
+++ b/metadata/cache/sys-cluster/corosync-1.3.1
@@ -1,4 +1,4 @@
-!sys-cluster/heartbeat ssl? ( dev-libs/nss ) infiniband? ( sys-infiniband/libibverbs sys-infiniband/librdmacm ) dev-util/pkgconfig doc? ( sys-apps/groff ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+!sys-cluster/heartbeat ssl? ( dev-libs/nss ) infiniband? ( sys-infiniband/libibverbs sys-infiniband/librdmacm ) dev-util/pkgconfig doc? ( sys-apps/groff ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 !sys-cluster/heartbeat ssl? ( dev-libs/nss ) infiniband? ( sys-infiniband/libibverbs sys-infiniband/librdmacm )
 0
 ftp://ftp:corosync.org@corosync.org/downloads/corosync-1.3.1/corosync-1.3.1.tar.gz
diff --git a/metadata/cache/sys-cluster/corosync-1.3.3 b/metadata/cache/sys-cluster/corosync-1.3.3
index 4572e4b21a81..652cfa92f021 100644
--- a/metadata/cache/sys-cluster/corosync-1.3.3
+++ b/metadata/cache/sys-cluster/corosync-1.3.3
@@ -1,4 +1,4 @@
-!sys-cluster/heartbeat ssl? ( dev-libs/nss ) infiniband? ( sys-infiniband/libibverbs sys-infiniband/librdmacm ) dev-util/pkgconfig doc? ( sys-apps/groff ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+!sys-cluster/heartbeat ssl? ( dev-libs/nss ) infiniband? ( sys-infiniband/libibverbs sys-infiniband/librdmacm ) dev-util/pkgconfig doc? ( sys-apps/groff ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 !sys-cluster/heartbeat ssl? ( dev-libs/nss ) infiniband? ( sys-infiniband/libibverbs sys-infiniband/librdmacm )
 0
 ftp://ftp:corosync.org@corosync.org/downloads/corosync-1.3.3/corosync-1.3.3.tar.gz
diff --git a/metadata/cache/sys-cluster/corosync-1.3.3-r1 b/metadata/cache/sys-cluster/corosync-1.3.3-r1
index 023574bfc318..83cd9a605068 100644
--- a/metadata/cache/sys-cluster/corosync-1.3.3-r1
+++ b/metadata/cache/sys-cluster/corosync-1.3.3-r1
@@ -1,4 +1,4 @@
-!sys-cluster/heartbeat ssl? ( dev-libs/nss ) infiniband? ( sys-infiniband/libibverbs sys-infiniband/librdmacm ) dev-util/pkgconfig doc? ( sys-apps/groff ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+!sys-cluster/heartbeat ssl? ( dev-libs/nss ) infiniband? ( sys-infiniband/libibverbs sys-infiniband/librdmacm ) dev-util/pkgconfig doc? ( sys-apps/groff ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 !sys-cluster/heartbeat ssl? ( dev-libs/nss ) infiniband? ( sys-infiniband/libibverbs sys-infiniband/librdmacm )
 0
 ftp://ftp:corosync.org@corosync.org/downloads/corosync-1.3.3/corosync-1.3.3.tar.gz
diff --git a/metadata/cache/sys-cluster/csync2-1.34-r2 b/metadata/cache/sys-cluster/csync2-1.34-r2
index 5324ad8d22fc..2450f0897fdc 100644
--- a/metadata/cache/sys-cluster/csync2-1.34-r2
+++ b/metadata/cache/sys-cluster/csync2-1.34-r2
@@ -1,4 +1,4 @@
->=net-libs/librsync-0.9.5 =dev-db/sqlite-2.8* ssl? ( >=net-libs/gnutls-2.7.3 ) xinetd? ( sys-apps/xinetd ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=net-libs/librsync-0.9.5 =dev-db/sqlite-2.8* ssl? ( >=net-libs/gnutls-2.7.3 ) xinetd? ( sys-apps/xinetd ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=net-libs/librsync-0.9.5 =dev-db/sqlite-2.8* ssl? ( >=net-libs/gnutls-2.7.3 ) xinetd? ( sys-apps/xinetd )
 0
 http://oss.linbit.com/csync2/csync2-1.34.tar.gz
diff --git a/metadata/cache/sys-cluster/glusterfs-3.1.2 b/metadata/cache/sys-cluster/glusterfs-3.1.2
index 7fb218bc35c5..0735dc778c70 100644
--- a/metadata/cache/sys-cluster/glusterfs-3.1.2
+++ b/metadata/cache/sys-cluster/glusterfs-3.1.2
@@ -1,4 +1,4 @@
-emacs? ( virtual/emacs ) fuse? ( >=sys-fs/fuse-2.7.0 ) infiniband? ( sys-infiniband/libibverbs ) dev-util/pkgconfig sys-devel/bison sys-devel/flex || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+emacs? ( virtual/emacs ) fuse? ( >=sys-fs/fuse-2.7.0 ) infiniband? ( sys-infiniband/libibverbs ) dev-util/pkgconfig sys-devel/bison sys-devel/flex || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 emacs? ( virtual/emacs ) fuse? ( >=sys-fs/fuse-2.7.0 ) infiniband? ( sys-infiniband/libibverbs )
 0
 http://ftp.gluster.com/pub/gluster/glusterfs/3.1/3.1.2/glusterfs-3.1.2.tar.gz
diff --git a/metadata/cache/sys-cluster/glusterfs-3.2.4 b/metadata/cache/sys-cluster/glusterfs-3.2.4
index d1b828c8b9a8..545cb6060e1f 100644
--- a/metadata/cache/sys-cluster/glusterfs-3.2.4
+++ b/metadata/cache/sys-cluster/glusterfs-3.2.4
@@ -1,4 +1,4 @@
-emacs? ( virtual/emacs ) fuse? ( >=sys-fs/fuse-2.7.0 ) infiniband? ( sys-infiniband/libibverbs ) dev-util/pkgconfig sys-devel/bison sys-devel/flex || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool =dev-lang/python-2*
+emacs? ( virtual/emacs ) fuse? ( >=sys-fs/fuse-2.7.0 ) infiniband? ( sys-infiniband/libibverbs ) dev-util/pkgconfig sys-devel/bison sys-devel/flex || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool =dev-lang/python-2*
 emacs? ( virtual/emacs ) fuse? ( >=sys-fs/fuse-2.7.0 ) infiniband? ( sys-infiniband/libibverbs ) =dev-lang/python-2*
 0
 http://ftp.gluster.com/pub/gluster/glusterfs/3.2/3.2.4/glusterfs-3.2.4.tar.gz
diff --git a/metadata/cache/sys-cluster/glusterfs-3.2.5 b/metadata/cache/sys-cluster/glusterfs-3.2.5
index 3b01f02835a4..3b3677fada5a 100644
--- a/metadata/cache/sys-cluster/glusterfs-3.2.5
+++ b/metadata/cache/sys-cluster/glusterfs-3.2.5
@@ -1,4 +1,4 @@
-emacs? ( virtual/emacs ) fuse? ( >=sys-fs/fuse-2.7.0 ) infiniband? ( sys-infiniband/libibverbs ) dev-util/pkgconfig sys-devel/bison sys-devel/flex || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool =dev-lang/python-2*
+emacs? ( virtual/emacs ) fuse? ( >=sys-fs/fuse-2.7.0 ) infiniband? ( sys-infiniband/libibverbs ) dev-util/pkgconfig sys-devel/bison sys-devel/flex || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool =dev-lang/python-2*
 emacs? ( virtual/emacs ) fuse? ( >=sys-fs/fuse-2.7.0 ) infiniband? ( sys-infiniband/libibverbs ) =dev-lang/python-2*
 0
 http://ftp.gluster.com/pub/gluster/glusterfs/3.2/3.2.5/glusterfs-3.2.5.tar.gz
diff --git a/metadata/cache/sys-cluster/heartbeat-3.0.5 b/metadata/cache/sys-cluster/heartbeat-3.0.5
index 55e756e2cd0a..98ea8a7c65da 100644
--- a/metadata/cache/sys-cluster/heartbeat-3.0.5
+++ b/metadata/cache/sys-cluster/heartbeat-3.0.5
@@ -1,4 +1,4 @@
-sys-cluster/cluster-glue dev-libs/glib:2 virtual/ssh net-libs/gnutls snmp? ( net-analyzer/net-snmp ) dev-util/pkgconfig dev-lang/swig doc? ( dev-libs/libxslt app-text/docbook-xsl-stylesheets ) =dev-lang/python-2* || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+sys-cluster/cluster-glue dev-libs/glib:2 virtual/ssh net-libs/gnutls snmp? ( net-analyzer/net-snmp ) dev-util/pkgconfig dev-lang/swig doc? ( dev-libs/libxslt app-text/docbook-xsl-stylesheets ) =dev-lang/python-2* || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 sys-cluster/cluster-glue dev-libs/glib:2 virtual/ssh net-libs/gnutls snmp? ( net-analyzer/net-snmp ) =dev-lang/python-2*
 0
 http://hg.linux-ha.org/heartbeat-STABLE_3_0/archive/STABLE-3.0.5.tar.bz2
diff --git a/metadata/cache/sys-cluster/keepalived-1.2.2 b/metadata/cache/sys-cluster/keepalived-1.2.2
index aac8c49d43f8..a0ed87db1946 100644
--- a/metadata/cache/sys-cluster/keepalived-1.2.2
+++ b/metadata/cache/sys-cluster/keepalived-1.2.2
@@ -1,4 +1,4 @@
-dev-libs/popt sys-apps/iproute2 dev-libs/libnl:1.1 dev-libs/openssl =sys-kernel/linux-headers-2.6* || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-libs/popt sys-apps/iproute2 dev-libs/libnl:1.1 dev-libs/openssl =sys-kernel/linux-headers-2.6* || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-libs/popt sys-apps/iproute2 dev-libs/libnl:1.1 dev-libs/openssl
 0
 http://www.keepalived.org/software/keepalived-1.2.2.tar.gz
diff --git a/metadata/cache/sys-cluster/keepalived-1.2.2-r1 b/metadata/cache/sys-cluster/keepalived-1.2.2-r1
index 06ad59406d4b..dc860a5a03ef 100644
--- a/metadata/cache/sys-cluster/keepalived-1.2.2-r1
+++ b/metadata/cache/sys-cluster/keepalived-1.2.2-r1
@@ -1,4 +1,4 @@
-dev-libs/popt sys-apps/iproute2 dev-libs/libnl:1.1 dev-libs/openssl >=sys-kernel/linux-headers-2.6.30 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-libs/popt sys-apps/iproute2 dev-libs/libnl:1.1 dev-libs/openssl >=sys-kernel/linux-headers-2.6.30 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-libs/popt sys-apps/iproute2 dev-libs/libnl:1.1 dev-libs/openssl
 0
 http://www.keepalived.org/software/keepalived-1.2.2.tar.gz
diff --git a/metadata/cache/sys-cluster/keepalived-1.2.2-r2 b/metadata/cache/sys-cluster/keepalived-1.2.2-r2
index 06ad59406d4b..dc860a5a03ef 100644
--- a/metadata/cache/sys-cluster/keepalived-1.2.2-r2
+++ b/metadata/cache/sys-cluster/keepalived-1.2.2-r2
@@ -1,4 +1,4 @@
-dev-libs/popt sys-apps/iproute2 dev-libs/libnl:1.1 dev-libs/openssl >=sys-kernel/linux-headers-2.6.30 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-libs/popt sys-apps/iproute2 dev-libs/libnl:1.1 dev-libs/openssl >=sys-kernel/linux-headers-2.6.30 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-libs/popt sys-apps/iproute2 dev-libs/libnl:1.1 dev-libs/openssl
 0
 http://www.keepalived.org/software/keepalived-1.2.2.tar.gz
diff --git a/metadata/cache/sys-cluster/keepalived-1.2.2-r3 b/metadata/cache/sys-cluster/keepalived-1.2.2-r3
index aaaddc24be65..d9399e1ec9e0 100644
--- a/metadata/cache/sys-cluster/keepalived-1.2.2-r3
+++ b/metadata/cache/sys-cluster/keepalived-1.2.2-r3
@@ -1,4 +1,4 @@
-dev-libs/popt sys-apps/iproute2 dev-libs/libnl:1.1 dev-libs/openssl >=sys-kernel/linux-headers-2.6.30 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-libs/popt sys-apps/iproute2 dev-libs/libnl:1.1 dev-libs/openssl >=sys-kernel/linux-headers-2.6.30 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-libs/popt sys-apps/iproute2 dev-libs/libnl:1.1 dev-libs/openssl
 0
 http://www.keepalived.org/software/keepalived-1.2.2.tar.gz mirror://debian/pool/main/k/keepalived/keepalived_1.2.2-3.diff.gz
diff --git a/metadata/cache/sys-cluster/knem-0.9.7 b/metadata/cache/sys-cluster/knem-0.9.7
index 57437146c786..5ca99537d754 100644
--- a/metadata/cache/sys-cluster/knem-0.9.7
+++ b/metadata/cache/sys-cluster/knem-0.9.7
@@ -1,4 +1,4 @@
-sys-apps/hwloc virtual/linux-sources || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
+sys-apps/hwloc virtual/linux-sources || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
 sys-apps/hwloc virtual/modutils kernel_linux? ( virtual/modutils )
 0
 http://runtime.bordeaux.inria.fr/knem/download/knem-0.9.7.tar.gz
diff --git a/metadata/cache/sys-cluster/lam-mpi-7.1.4-r1 b/metadata/cache/sys-cluster/lam-mpi-7.1.4-r1
index 36d9cb7c219d..8ea74a4ffb63 100644
--- a/metadata/cache/sys-cluster/lam-mpi-7.1.4-r1
+++ b/metadata/cache/sys-cluster/lam-mpi-7.1.4-r1
@@ -1,4 +1,4 @@
-pbs? ( sys-cluster/torque ) !sys-cluster/mpich !sys-cluster/openmpi !sys-cluster/mpich2 !app-misc/wipe || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+pbs? ( sys-cluster/torque ) !sys-cluster/mpich !sys-cluster/openmpi !sys-cluster/mpich2 !app-misc/wipe || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 fortran? ( virtual/fortran ) pbs? ( sys-cluster/torque ) !sys-cluster/mpich !sys-cluster/openmpi !sys-cluster/mpich2 !app-misc/wipe crypt? ( net-misc/openssh ) !crypt? ( net-misc/netkit-rsh )
 6
 http://www.lam-mpi.org/download/files/lam-7.1.4.tar.bz2
diff --git a/metadata/cache/sys-cluster/maui-3.3 b/metadata/cache/sys-cluster/maui-3.3
index 58e434c59704..6e534d6295b3 100644
--- a/metadata/cache/sys-cluster/maui-3.3
+++ b/metadata/cache/sys-cluster/maui-3.3
@@ -1,4 +1,4 @@
-sys-cluster/torque || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+sys-cluster/torque || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 sys-cluster/torque
 0
 http://www.clusterresources.com/downloads/maui/maui-3.3.tar.gz
diff --git a/metadata/cache/sys-cluster/mpich2-1.4.1_p1 b/metadata/cache/sys-cluster/mpich2-1.4.1_p1
index c9d914b2cd8c..19c5aaddcd95 100644
--- a/metadata/cache/sys-cluster/mpich2-1.4.1_p1
+++ b/metadata/cache/sys-cluster/mpich2-1.4.1_p1
@@ -1,4 +1,4 @@
-dev-libs/libaio sys-apps/hwloc romio? ( net-fs/nfs-utils ) dev-lang/perl sys-devel/libtool || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-libs/libaio sys-apps/hwloc romio? ( net-fs/nfs-utils ) dev-lang/perl sys-devel/libtool || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-libs/libaio sys-apps/hwloc romio? ( net-fs/nfs-utils ) fortran? ( virtual/fortran ) !sys-cluster/openmpi !sys-cluster/lam-mpi
 0
 http://www.mcs.anl.gov/research/projects/mpich2/downloads/tarballs/1.4.1p1/mpich2-1.4.1p1.tar.gz
diff --git a/metadata/cache/sys-cluster/mpich2-1.4_rc2-r1 b/metadata/cache/sys-cluster/mpich2-1.4_rc2-r1
index 229d66a948e5..492c014eb3b2 100644
--- a/metadata/cache/sys-cluster/mpich2-1.4_rc2-r1
+++ b/metadata/cache/sys-cluster/mpich2-1.4_rc2-r1
@@ -1,4 +1,4 @@
-dev-libs/libaio >=sys-apps/hwloc-1.1.1 romio? ( net-fs/nfs-utils ) dev-lang/perl sys-devel/libtool || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-libs/libaio >=sys-apps/hwloc-1.1.1 romio? ( net-fs/nfs-utils ) dev-lang/perl sys-devel/libtool || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 fortran? ( virtual/fortran ) dev-libs/libaio >=sys-apps/hwloc-1.1.1 romio? ( net-fs/nfs-utils ) !sys-cluster/openmpi !sys-cluster/lam-mpi
 0
 http://www.mcs.anl.gov/research/projects/mpich2/downloads/tarballs/1.4rc2/mpich2-1.4rc2.tar.gz
diff --git a/metadata/cache/sys-cluster/open-mx-1.5.0 b/metadata/cache/sys-cluster/open-mx-1.5.0
index 05dd9ed87a04..8a3c90123d1c 100644
--- a/metadata/cache/sys-cluster/open-mx-1.5.0
+++ b/metadata/cache/sys-cluster/open-mx-1.5.0
@@ -1,4 +1,4 @@
-sys-apps/hwloc virtual/linux-sources || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
+sys-apps/hwloc virtual/linux-sources || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources )
 sys-apps/hwloc virtual/modutils kernel_linux? ( virtual/modutils )
 0
 http://gforge.inria.fr/frs/download.php/28871/open-mx-1.5.0.tar.gz
diff --git a/metadata/cache/sys-cluster/openais-1.1.4 b/metadata/cache/sys-cluster/openais-1.1.4
index 6d64c173e111..705aaf06180f 100644
--- a/metadata/cache/sys-cluster/openais-1.1.4
+++ b/metadata/cache/sys-cluster/openais-1.1.4
@@ -1,4 +1,4 @@
-sys-cluster/corosync dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+sys-cluster/corosync dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 sys-cluster/corosync
 0
 ftp://ftp:openais.org@openais.org/downloads/openais-1.1.4/openais-1.1.4.tar.gz
diff --git a/metadata/cache/sys-cluster/openais-1.1.4-r1 b/metadata/cache/sys-cluster/openais-1.1.4-r1
index fe3ff334c4e7..b62ecc2b064f 100644
--- a/metadata/cache/sys-cluster/openais-1.1.4-r1
+++ b/metadata/cache/sys-cluster/openais-1.1.4-r1
@@ -1,4 +1,4 @@
-sys-cluster/corosync dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+sys-cluster/corosync dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 sys-cluster/corosync
 0
 ftp://ftp:openais.org@openais.org/downloads/openais-1.1.4/openais-1.1.4.tar.gz
diff --git a/metadata/cache/sys-cluster/pacemaker-1.0.10 b/metadata/cache/sys-cluster/pacemaker-1.0.10
index 037f862d81df..67d577a9b863 100644
--- a/metadata/cache/sys-cluster/pacemaker-1.0.10
+++ b/metadata/cache/sys-cluster/pacemaker-1.0.10
@@ -1,4 +1,4 @@
-dev-libs/libxslt sys-cluster/cluster-glue sys-cluster/resource-agents ais? ( sys-cluster/openais ) heartbeat? ( >=sys-cluster/heartbeat-3.0.0 ) smtp? ( net-libs/libesmtp ) snmp? ( net-analyzer/net-snmp ) !heartbeat? ( !ais? ( sys-cluster/openais ) ) =dev-lang/python-2* || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-libs/libxslt sys-cluster/cluster-glue sys-cluster/resource-agents ais? ( sys-cluster/openais ) heartbeat? ( >=sys-cluster/heartbeat-3.0.0 ) smtp? ( net-libs/libesmtp ) snmp? ( net-analyzer/net-snmp ) !heartbeat? ( !ais? ( sys-cluster/openais ) ) =dev-lang/python-2* || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-libs/libxslt sys-cluster/cluster-glue sys-cluster/resource-agents ais? ( sys-cluster/openais ) heartbeat? ( >=sys-cluster/heartbeat-3.0.0 ) smtp? ( net-libs/libesmtp ) snmp? ( net-analyzer/net-snmp ) !heartbeat? ( !ais? ( sys-cluster/openais ) ) =dev-lang/python-2*
 0
 http://hg.clusterlabs.org/pacemaker/stable-1.0/archive/Pacemaker-1.0.10.tar.bz2
diff --git a/metadata/cache/sys-cluster/pacemaker-1.0.11 b/metadata/cache/sys-cluster/pacemaker-1.0.11
index 7d05745d0924..f238f9f01c11 100644
--- a/metadata/cache/sys-cluster/pacemaker-1.0.11
+++ b/metadata/cache/sys-cluster/pacemaker-1.0.11
@@ -1,4 +1,4 @@
-dev-libs/libxslt sys-cluster/cluster-glue sys-cluster/resource-agents ais? ( sys-cluster/openais ) heartbeat? ( >=sys-cluster/heartbeat-3.0.0 ) smtp? ( net-libs/libesmtp ) snmp? ( net-analyzer/net-snmp ) !heartbeat? ( !ais? ( sys-cluster/openais ) ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool =dev-lang/python-2*
+dev-libs/libxslt sys-cluster/cluster-glue sys-cluster/resource-agents ais? ( sys-cluster/openais ) heartbeat? ( >=sys-cluster/heartbeat-3.0.0 ) smtp? ( net-libs/libesmtp ) snmp? ( net-analyzer/net-snmp ) !heartbeat? ( !ais? ( sys-cluster/openais ) ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool =dev-lang/python-2*
 dev-libs/libxslt sys-cluster/cluster-glue sys-cluster/resource-agents ais? ( sys-cluster/openais ) heartbeat? ( >=sys-cluster/heartbeat-3.0.0 ) smtp? ( net-libs/libesmtp ) snmp? ( net-analyzer/net-snmp ) !heartbeat? ( !ais? ( sys-cluster/openais ) ) =dev-lang/python-2*
 0
 http://hg.clusterlabs.org/pacemaker/stable-1.0/archive/Pacemaker-1.0.11.tar.bz2
diff --git a/metadata/cache/sys-cluster/pacemaker-1.1.4-r4 b/metadata/cache/sys-cluster/pacemaker-1.1.4-r4
index 243efedc0e26..823eaed45a31 100644
--- a/metadata/cache/sys-cluster/pacemaker-1.1.4-r4
+++ b/metadata/cache/sys-cluster/pacemaker-1.1.4-r4
@@ -1,4 +1,4 @@
-dev-libs/libxslt sys-cluster/cluster-glue sys-cluster/resource-agents heartbeat? ( >=sys-cluster/heartbeat-3.0.0 ) !heartbeat? ( sys-cluster/corosync ) smtp? ( net-libs/libesmtp ) snmp? ( net-analyzer/net-snmp ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool =dev-lang/python-2*
+dev-libs/libxslt sys-cluster/cluster-glue sys-cluster/resource-agents heartbeat? ( >=sys-cluster/heartbeat-3.0.0 ) !heartbeat? ( sys-cluster/corosync ) smtp? ( net-libs/libesmtp ) snmp? ( net-analyzer/net-snmp ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool =dev-lang/python-2*
 dev-libs/libxslt sys-cluster/cluster-glue sys-cluster/resource-agents heartbeat? ( >=sys-cluster/heartbeat-3.0.0 ) !heartbeat? ( sys-cluster/corosync ) smtp? ( net-libs/libesmtp ) snmp? ( net-analyzer/net-snmp ) =dev-lang/python-2*
 0
 http://hg.clusterlabs.org/pacemaker/1.1/archive/Pacemaker-1.1.4.tar.bz2
diff --git a/metadata/cache/sys-cluster/pacemaker-1.1.5 b/metadata/cache/sys-cluster/pacemaker-1.1.5
index 818eb1c6f9e5..abddd33f2ecf 100644
--- a/metadata/cache/sys-cluster/pacemaker-1.1.5
+++ b/metadata/cache/sys-cluster/pacemaker-1.1.5
@@ -1,4 +1,4 @@
-app-text/docbook-xsl-stylesheets dev-libs/libxslt sys-cluster/cluster-glue sys-cluster/resource-agents heartbeat? ( >=sys-cluster/heartbeat-3.0.0 ) !heartbeat? ( sys-cluster/corosync ) smtp? ( net-libs/libesmtp ) snmp? ( net-analyzer/net-snmp ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+app-text/docbook-xsl-stylesheets dev-libs/libxslt sys-cluster/cluster-glue sys-cluster/resource-agents heartbeat? ( >=sys-cluster/heartbeat-3.0.0 ) !heartbeat? ( sys-cluster/corosync ) smtp? ( net-libs/libesmtp ) snmp? ( net-analyzer/net-snmp ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 app-text/docbook-xsl-stylesheets dev-libs/libxslt sys-cluster/cluster-glue sys-cluster/resource-agents heartbeat? ( >=sys-cluster/heartbeat-3.0.0 ) !heartbeat? ( sys-cluster/corosync ) smtp? ( net-libs/libesmtp ) snmp? ( net-analyzer/net-snmp )
 0
 http://hg.clusterlabs.org/pacemaker/1.1/archive/Pacemaker-1.1.5.tar.bz2
diff --git a/metadata/cache/sys-cluster/pacemaker-1.1.6.1 b/metadata/cache/sys-cluster/pacemaker-1.1.6.1
index c43efbf8c69b..d8a8fc775617 100644
--- a/metadata/cache/sys-cluster/pacemaker-1.1.6.1
+++ b/metadata/cache/sys-cluster/pacemaker-1.1.6.1
@@ -1,4 +1,4 @@
-app-text/docbook-xsl-stylesheets dev-libs/libxslt sys-cluster/cluster-glue sys-cluster/resource-agents cman? ( sys-cluster/cman ) heartbeat? ( >=sys-cluster/heartbeat-3.0.0 ) !heartbeat? ( sys-cluster/corosync ) smtp? ( net-libs/libesmtp ) snmp? ( net-analyzer/net-snmp ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+app-text/docbook-xsl-stylesheets dev-libs/libxslt sys-cluster/cluster-glue sys-cluster/resource-agents cman? ( sys-cluster/cman ) heartbeat? ( >=sys-cluster/heartbeat-3.0.0 ) !heartbeat? ( sys-cluster/corosync ) smtp? ( net-libs/libesmtp ) snmp? ( net-analyzer/net-snmp ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 app-text/docbook-xsl-stylesheets dev-libs/libxslt sys-cluster/cluster-glue sys-cluster/resource-agents cman? ( sys-cluster/cman ) heartbeat? ( >=sys-cluster/heartbeat-3.0.0 ) !heartbeat? ( sys-cluster/corosync ) smtp? ( net-libs/libesmtp ) snmp? ( net-analyzer/net-snmp )
 0
 https://github.com/ClusterLabs/pacemaker/tarball/Pacemaker-1.1.6.1 -> pacemaker-1.1.6.1.tar.gz
diff --git a/metadata/cache/sys-cluster/pacemaker-gui-2.1.1 b/metadata/cache/sys-cluster/pacemaker-gui-2.1.1
index bab0ef18f7e7..27340296e276 100644
--- a/metadata/cache/sys-cluster/pacemaker-gui-2.1.1
+++ b/metadata/cache/sys-cluster/pacemaker-gui-2.1.1
@@ -1,4 +1,4 @@
-app-arch/bzip2 dev-libs/glib:2 dev-libs/libxslt dev-libs/openssl net-libs/gnutls sys-apps/util-linux sys-cluster/cluster-glue >=sys-cluster/pacemaker-1.1 heartbeat? ( sys-cluster/pacemaker[heartbeat] ) gtk? ( dev-python/pygtk ) sys-libs/ncurses sys-libs/pam sys-libs/zlib gtk? ( dev-lang/swig ) dev-util/pkgconfig nls? ( dev-util/intltool sys-devel/gettext ) =dev-lang/python-2* || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+app-arch/bzip2 dev-libs/glib:2 dev-libs/libxslt dev-libs/openssl net-libs/gnutls sys-apps/util-linux sys-cluster/cluster-glue >=sys-cluster/pacemaker-1.1 heartbeat? ( sys-cluster/pacemaker[heartbeat] ) gtk? ( dev-python/pygtk ) sys-libs/ncurses sys-libs/pam sys-libs/zlib gtk? ( dev-lang/swig ) dev-util/pkgconfig nls? ( dev-util/intltool sys-devel/gettext ) =dev-lang/python-2* || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 app-arch/bzip2 dev-libs/glib:2 dev-libs/libxslt dev-libs/openssl net-libs/gnutls sys-apps/util-linux sys-cluster/cluster-glue >=sys-cluster/pacemaker-1.1 heartbeat? ( sys-cluster/pacemaker[heartbeat] ) gtk? ( dev-python/pygtk ) sys-libs/ncurses sys-libs/pam sys-libs/zlib sys-devel/libtool =dev-lang/python-2*
 0
 https://github.com/gao-yan/pacemaker-mgmt/tarball/pacemaker-mgmt-2.1.1 -> pacemaker-gui-2.1.1.tar.gz
diff --git a/metadata/cache/sys-cluster/resource-agents-1.0.4-r1 b/metadata/cache/sys-cluster/resource-agents-1.0.4-r1
index 14dab72357ea..328841fd533b 100644
--- a/metadata/cache/sys-cluster/resource-agents-1.0.4-r1
+++ b/metadata/cache/sys-cluster/resource-agents-1.0.4-r1
@@ -1,4 +1,4 @@
-sys-apps/iproute2 sys-cluster/cluster-glue !<sys-cluster/heartbeat-3.0 libnet? ( net-libs/libnet:1.1 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+sys-apps/iproute2 sys-cluster/cluster-glue !<sys-cluster/heartbeat-3.0 libnet? ( net-libs/libnet:1.1 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 sys-apps/iproute2 sys-cluster/cluster-glue !<sys-cluster/heartbeat-3.0 libnet? ( net-libs/libnet:1.1 )
 0
 http://hg.linux-ha.org/agents/archive/agents-1.0.4.tar.bz2
diff --git a/metadata/cache/sys-cluster/torque-2.3.13 b/metadata/cache/sys-cluster/torque-2.3.13
index d0d2821b96e0..0c33488e3359 100644
--- a/metadata/cache/sys-cluster/torque-2.3.13
+++ b/metadata/cache/sys-cluster/torque-2.3.13
@@ -1,4 +1,4 @@
-sys-libs/ncurses sys-libs/readline tk? ( dev-lang/tk ) syslog? ( virtual/logger ) !games-util/qstat doc? ( drmaa? ( || ( <app-doc/doxygen-1.7.6.1[latex,-nodot] >=app-doc/doxygen-1.7.6.1[latex,dot] ) ) ) sys-apps/ed || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+sys-libs/ncurses sys-libs/readline tk? ( dev-lang/tk ) syslog? ( virtual/logger ) !games-util/qstat doc? ( drmaa? ( || ( <app-doc/doxygen-1.7.6.1[latex,-nodot] >=app-doc/doxygen-1.7.6.1[latex,dot] ) ) ) sys-apps/ed || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 sys-libs/ncurses sys-libs/readline tk? ( dev-lang/tk ) syslog? ( virtual/logger ) !games-util/qstat crypt? ( net-misc/openssh ) !crypt? ( net-misc/netkit-rsh )
 0
 http://www.adaptivecomputing.com/resources/downloads/torque/torque-2.3.13.tar.gz
diff --git a/metadata/cache/sys-cluster/torque-2.4.16 b/metadata/cache/sys-cluster/torque-2.4.16
index d5dae6a40e56..6b2397b8e0e1 100644
--- a/metadata/cache/sys-cluster/torque-2.4.16
+++ b/metadata/cache/sys-cluster/torque-2.4.16
@@ -1,4 +1,4 @@
-sys-libs/ncurses sys-libs/readline tk? ( dev-lang/tk ) syslog? ( virtual/logger ) !games-util/qstat doc? ( drmaa? ( || ( <app-doc/doxygen-1.7.6.1[latex,-nodot] >=app-doc/doxygen-1.7.6.1[latex,dot] ) ) ) sys-apps/ed || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+sys-libs/ncurses sys-libs/readline tk? ( dev-lang/tk ) syslog? ( virtual/logger ) !games-util/qstat doc? ( drmaa? ( || ( <app-doc/doxygen-1.7.6.1[latex,-nodot] >=app-doc/doxygen-1.7.6.1[latex,dot] ) ) ) sys-apps/ed || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 sys-libs/ncurses sys-libs/readline tk? ( dev-lang/tk ) syslog? ( virtual/logger ) !games-util/qstat crypt? ( net-misc/openssh ) !crypt? ( net-misc/netkit-rsh )
 0
 http://www.adaptivecomputing.com/resources/downloads/torque/torque-2.4.16.tar.gz
diff --git a/metadata/cache/sys-cluster/torque-3.0.3 b/metadata/cache/sys-cluster/torque-3.0.3
index e00d7ef3a703..8d8f34310c29 100644
--- a/metadata/cache/sys-cluster/torque-3.0.3
+++ b/metadata/cache/sys-cluster/torque-3.0.3
@@ -1,4 +1,4 @@
-sys-libs/ncurses sys-libs/readline munge? ( sys-auth/munge ) tk? ( dev-lang/tk ) syslog? ( virtual/logger ) !games-util/qstat sys-apps/ed !sys-cluster/slurm || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+sys-libs/ncurses sys-libs/readline munge? ( sys-auth/munge ) tk? ( dev-lang/tk ) syslog? ( virtual/logger ) !games-util/qstat sys-apps/ed !sys-cluster/slurm || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 sys-libs/ncurses sys-libs/readline munge? ( sys-auth/munge ) tk? ( dev-lang/tk ) syslog? ( virtual/logger ) !games-util/qstat crypt? ( net-misc/openssh ) !crypt? ( net-misc/netkit-rsh )
 0
 http://www.adaptivecomputing.com/resources/downloads/torque/torque-3.0.3.tar.gz
diff --git a/metadata/cache/sys-cluster/torque-3.0.4 b/metadata/cache/sys-cluster/torque-3.0.4
index 6026d60af8f4..4b8d414ec624 100644
--- a/metadata/cache/sys-cluster/torque-3.0.4
+++ b/metadata/cache/sys-cluster/torque-3.0.4
@@ -1,4 +1,4 @@
-sys-libs/ncurses sys-libs/readline munge? ( sys-auth/munge ) nvidia? ( >=x11-drivers/nvidia-drivers-275 ) tk? ( dev-lang/tk ) syslog? ( virtual/logger ) !games-util/qstat sys-apps/ed !sys-cluster/slurm || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+sys-libs/ncurses sys-libs/readline munge? ( sys-auth/munge ) nvidia? ( >=x11-drivers/nvidia-drivers-275 ) tk? ( dev-lang/tk ) syslog? ( virtual/logger ) !games-util/qstat sys-apps/ed !sys-cluster/slurm || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 sys-libs/ncurses sys-libs/readline munge? ( sys-auth/munge ) nvidia? ( >=x11-drivers/nvidia-drivers-275 ) tk? ( dev-lang/tk ) syslog? ( virtual/logger ) !games-util/qstat crypt? ( net-misc/openssh ) !crypt? ( net-misc/netkit-rsh )
 0
 http://www.adaptivecomputing.com/resources/downloads/torque/torque-3.0.4.tar.gz
diff --git a/metadata/cache/sys-cluster/vzctl-9999 b/metadata/cache/sys-cluster/vzctl-9999
index 8c5def0c8dc3..f71401d6ee8e 100644
--- a/metadata/cache/sys-cluster/vzctl-9999
+++ b/metadata/cache/sys-cluster/vzctl-9999
@@ -1,4 +1,4 @@
-net-firewall/iptables sys-apps/ed sys-apps/iproute2 sys-fs/vzquota || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
+net-firewall/iptables sys-apps/ed sys-apps/iproute2 sys-fs/vzquota || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
 net-firewall/iptables sys-apps/ed sys-apps/iproute2 sys-fs/vzquota bash-completion? ( app-admin/eselect )
 0
 
diff --git a/metadata/cache/sys-devel/ct-ng-1.14.0 b/metadata/cache/sys-devel/ct-ng-1.14.0
index 36528ce70563..2c8605c2e631 100644
--- a/metadata/cache/sys-devel/ct-ng-1.14.0
+++ b/metadata/cache/sys-devel/ct-ng-1.14.0
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 net-misc/curl dev-util/gperf dev-vcs/cvs dev-vcs/subversion
 0
 http://ymorin.is-a-geek.org/download/crosstool-ng/crosstool-ng-1.14.0.tar.bz2
diff --git a/metadata/cache/sys-devel/ct-ng-1.14.1 b/metadata/cache/sys-devel/ct-ng-1.14.1
index 8aa7c6e4a805..9ec38cd43c5b 100644
--- a/metadata/cache/sys-devel/ct-ng-1.14.1
+++ b/metadata/cache/sys-devel/ct-ng-1.14.1
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 net-misc/curl dev-util/gperf dev-vcs/cvs dev-vcs/subversion
 0
 http://ymorin.is-a-geek.org/download/crosstool-ng/crosstool-ng-1.14.1.tar.bz2
diff --git a/metadata/cache/sys-devel/distcc-3.2_rc1 b/metadata/cache/sys-devel/distcc-3.2_rc1
index 6158602faaeb..bc81481714e6 100644
--- a/metadata/cache/sys-devel/distcc-3.2_rc1
+++ b/metadata/cache/sys-devel/distcc-3.2_rc1
@@ -1,4 +1,4 @@
-dev-libs/popt avahi? ( >=net-dns/avahi-0.6[dbus] ) gnome? ( >=gnome-base/libgnome-2 >=gnome-base/libgnomeui-2 x11-libs/gtk+:2 x11-libs/pango ) gssapi? ( net-libs/libgssglue ) gtk? ( x11-libs/gtk+:2 ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
+dev-libs/popt avahi? ( >=net-dns/avahi-0.6[dbus] ) gnome? ( >=gnome-base/libgnome-2 >=gnome-base/libgnomeui-2 x11-libs/gtk+:2 x11-libs/pango ) gssapi? ( net-libs/libgssglue ) gtk? ( x11-libs/gtk+:2 ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
 dev-libs/popt avahi? ( >=net-dns/avahi-0.6[dbus] ) gnome? ( >=gnome-base/libgnome-2 >=gnome-base/libgnomeui-2 x11-libs/gtk+:2 x11-libs/pango ) gssapi? ( net-libs/libgssglue ) gtk? ( x11-libs/gtk+:2 ) !net-misc/pump >=sys-devel/gcc-config-1.4.1 selinux? ( sec-policy/selinux-distcc ) xinetd? ( sys-apps/xinetd ) || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
 0
 http://distcc.googlecode.com/files/distcc-3.2rc1.tar.bz2
diff --git a/metadata/cache/sys-devel/flex-2.5.35_p10 b/metadata/cache/sys-devel/flex-2.5.35_p10
index 761036a04b46..ffff6898d4a0 100644
--- a/metadata/cache/sys-devel/flex-2.5.35_p10
+++ b/metadata/cache/sys-devel/flex-2.5.35_p10
@@ -1,4 +1,4 @@
-sys-devel/m4 nls? ( sys-devel/gettext ) test? ( sys-devel/bison ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+sys-devel/m4 nls? ( sys-devel/gettext ) test? ( sys-devel/bison ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 sys-devel/m4
 0
 mirror://sourceforge/flex/flex-2.5.35.tar.bz2 mirror://debian/pool/main/f/flex/flex_2.5.35-10.diff.gz
diff --git a/metadata/cache/sys-devel/gcc-apple-4.2.1_p5566-r2 b/metadata/cache/sys-devel/gcc-apple-4.2.1_p5566-r2
index b4ec153e94c6..9eea34cd9546 100644
--- a/metadata/cache/sys-devel/gcc-apple-4.2.1_p5566-r2
+++ b/metadata/cache/sys-devel/gcc-apple-4.2.1_p5566-r2
@@ -1,4 +1,4 @@
->=sys-libs/zlib-1.1.4 >=sys-libs/ncurses-5.2-r2 nls? ( sys-devel/gettext ) >=sys-devel/gcc-config-1.3.12-r4 fortran? ( >=dev-libs/gmp-4.2.1 >=dev-libs/mpfr-2.2.0_p10 ) >=sys-apps/texinfo-4.2-r4 >=sys-devel/bison-1.875 sys-devel/binutils-apple >=dev-libs/mpfr-2.2.0_p10 sys-devel/gnuconfig >=sys-apps/sed-4 sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) ) virtual/libiconv >=sys-apps/texinfo-4.8 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=sys-libs/zlib-1.1.4 >=sys-libs/ncurses-5.2-r2 nls? ( sys-devel/gettext ) >=sys-devel/gcc-config-1.3.12-r4 fortran? ( >=dev-libs/gmp-4.2.1 >=dev-libs/mpfr-2.2.0_p10 ) >=sys-apps/texinfo-4.2-r4 >=sys-devel/bison-1.875 sys-devel/binutils-apple >=dev-libs/mpfr-2.2.0_p10 sys-devel/gnuconfig >=sys-apps/sed-4 sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) ) virtual/libiconv >=sys-apps/texinfo-4.8 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=sys-libs/zlib-1.1.4 >=sys-libs/ncurses-5.2-r2 nls? ( sys-devel/gettext ) >=sys-devel/gcc-config-1.3.12-r4 fortran? ( >=dev-libs/gmp-4.2.1 >=dev-libs/mpfr-2.2.0_p10 ) sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) ) virtual/libiconv
 42
 http://www.opensource.apple.com/darwinsource/tarballs/other/gcc_42-5566.tar.gz http://www.opensource.apple.com/darwinsource/tarballs/other/libstdcxx-16.tar.gz fortran? ( mirror://gnu/gcc/gcc-4.2.1/gcc-fortran-4.2.1.tar.bz2 )
diff --git a/metadata/cache/sys-devel/gcc-apple-4.2.1_p5574 b/metadata/cache/sys-devel/gcc-apple-4.2.1_p5574
index d3c90c521687..4bf30e63ff55 100644
--- a/metadata/cache/sys-devel/gcc-apple-4.2.1_p5574
+++ b/metadata/cache/sys-devel/gcc-apple-4.2.1_p5574
@@ -1,4 +1,4 @@
->=sys-libs/zlib-1.1.4 >=sys-libs/ncurses-5.2-r2 nls? ( sys-devel/gettext ) >=sys-devel/gcc-config-1.3.12-r4 fortran? ( >=dev-libs/gmp-4.2.1 >=dev-libs/mpfr-2.2.0_p10 ) >=sys-apps/texinfo-4.2-r4 >=sys-devel/bison-1.875 sys-devel/binutils-apple >=dev-libs/mpfr-2.2.0_p10 sys-devel/gnuconfig >=sys-apps/sed-4 sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) ) virtual/libiconv >=sys-apps/texinfo-4.8 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=sys-libs/zlib-1.1.4 >=sys-libs/ncurses-5.2-r2 nls? ( sys-devel/gettext ) >=sys-devel/gcc-config-1.3.12-r4 fortran? ( >=dev-libs/gmp-4.2.1 >=dev-libs/mpfr-2.2.0_p10 ) >=sys-apps/texinfo-4.2-r4 >=sys-devel/bison-1.875 sys-devel/binutils-apple >=dev-libs/mpfr-2.2.0_p10 sys-devel/gnuconfig >=sys-apps/sed-4 sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) ) virtual/libiconv >=sys-apps/texinfo-4.8 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=sys-libs/zlib-1.1.4 >=sys-libs/ncurses-5.2-r2 nls? ( sys-devel/gettext ) >=sys-devel/gcc-config-1.3.12-r4 fortran? ( >=dev-libs/gmp-4.2.1 >=dev-libs/mpfr-2.2.0_p10 ) sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) ) virtual/libiconv
 42
 http://www.opensource.apple.com/darwinsource/tarballs/other/gcc_42-5574.tar.gz http://www.opensource.apple.com/darwinsource/tarballs/other/libstdcxx-16.tar.gz fortran? ( mirror://gnu/gcc/gcc-4.2.1/gcc-fortran-4.2.1.tar.bz2 )
diff --git a/metadata/cache/sys-devel/gcc-apple-4.2.1_p5646 b/metadata/cache/sys-devel/gcc-apple-4.2.1_p5646
index 4da5f8beec16..6589adca9473 100644
--- a/metadata/cache/sys-devel/gcc-apple-4.2.1_p5646
+++ b/metadata/cache/sys-devel/gcc-apple-4.2.1_p5646
@@ -1,4 +1,4 @@
->=sys-libs/zlib-1.1.4 >=sys-libs/ncurses-5.2-r2 nls? ( sys-devel/gettext ) >=sys-devel/gcc-config-1.3.12-r4 fortran? ( >=dev-libs/gmp-4.2.1 >=dev-libs/mpfr-2.2.0_p10 ) >=sys-apps/texinfo-4.2-r4 >=sys-devel/bison-1.875 sys-devel/binutils-apple >=dev-libs/mpfr-2.2.0_p10 sys-devel/gnuconfig >=sys-apps/sed-4 sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) ) virtual/libiconv >=sys-apps/texinfo-4.8 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=sys-libs/zlib-1.1.4 >=sys-libs/ncurses-5.2-r2 nls? ( sys-devel/gettext ) >=sys-devel/gcc-config-1.3.12-r4 fortran? ( >=dev-libs/gmp-4.2.1 >=dev-libs/mpfr-2.2.0_p10 ) >=sys-apps/texinfo-4.2-r4 >=sys-devel/bison-1.875 sys-devel/binutils-apple >=dev-libs/mpfr-2.2.0_p10 sys-devel/gnuconfig >=sys-apps/sed-4 sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) ) virtual/libiconv >=sys-apps/texinfo-4.8 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=sys-libs/zlib-1.1.4 >=sys-libs/ncurses-5.2-r2 nls? ( sys-devel/gettext ) >=sys-devel/gcc-config-1.3.12-r4 fortran? ( >=dev-libs/gmp-4.2.1 >=dev-libs/mpfr-2.2.0_p10 ) sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) ) virtual/libiconv
 42
 http://www.opensource.apple.com/darwinsource/tarballs/other/gcc-5646.tar.gz http://www.opensource.apple.com/darwinsource/tarballs/other/libstdcxx-16.tar.gz http://www.opensource.apple.com/darwinsource/tarballs/other/libstdcxx-39.tar.gz fortran? ( mirror://gnu/gcc/gcc-4.2.1/gcc-fortran-4.2.1.tar.bz2 )
diff --git a/metadata/cache/sys-devel/gcc-apple-4.2.1_p5647 b/metadata/cache/sys-devel/gcc-apple-4.2.1_p5647
index 75f529a38c04..3c24f4066d12 100644
--- a/metadata/cache/sys-devel/gcc-apple-4.2.1_p5647
+++ b/metadata/cache/sys-devel/gcc-apple-4.2.1_p5647
@@ -1,4 +1,4 @@
->=sys-libs/zlib-1.1.4 >=sys-libs/ncurses-5.2-r2 nls? ( sys-devel/gettext ) >=sys-devel/gcc-config-1.3.12-r4 fortran? ( >=dev-libs/gmp-4.2.1 >=dev-libs/mpfr-2.2.0_p10 ) >=sys-apps/texinfo-4.2-r4 >=sys-devel/bison-1.875 sys-devel/binutils-apple >=dev-libs/mpfr-2.2.0_p10 sys-devel/gnuconfig >=sys-apps/sed-4 sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) ) virtual/libiconv >=sys-apps/texinfo-4.8 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=sys-libs/zlib-1.1.4 >=sys-libs/ncurses-5.2-r2 nls? ( sys-devel/gettext ) >=sys-devel/gcc-config-1.3.12-r4 fortran? ( >=dev-libs/gmp-4.2.1 >=dev-libs/mpfr-2.2.0_p10 ) >=sys-apps/texinfo-4.2-r4 >=sys-devel/bison-1.875 sys-devel/binutils-apple >=dev-libs/mpfr-2.2.0_p10 sys-devel/gnuconfig >=sys-apps/sed-4 sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) ) virtual/libiconv >=sys-apps/texinfo-4.8 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=sys-libs/zlib-1.1.4 >=sys-libs/ncurses-5.2-r2 nls? ( sys-devel/gettext ) >=sys-devel/gcc-config-1.3.12-r4 fortran? ( >=dev-libs/gmp-4.2.1 >=dev-libs/mpfr-2.2.0_p10 ) sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) ) virtual/libiconv
 42
 http://www.opensource.apple.com/darwinsource/tarballs/other/gcc-5646.1.tar.gz http://www.opensource.apple.com/darwinsource/tarballs/other/libstdcxx-16.tar.gz http://www.opensource.apple.com/darwinsource/tarballs/other/libstdcxx-39.tar.gz fortran? ( mirror://gnu/gcc/gcc-4.2.4/gcc-fortran-4.2.4.tar.bz2 )
diff --git a/metadata/cache/sys-devel/gcc-apple-4.2.1_p5659 b/metadata/cache/sys-devel/gcc-apple-4.2.1_p5659
index dc554258a848..b5f3d730d944 100644
--- a/metadata/cache/sys-devel/gcc-apple-4.2.1_p5659
+++ b/metadata/cache/sys-devel/gcc-apple-4.2.1_p5659
@@ -1,4 +1,4 @@
->=sys-libs/zlib-1.1.4 >=sys-libs/ncurses-5.2-r2 nls? ( sys-devel/gettext ) >=sys-devel/gcc-config-1.3.12-r4 fortran? ( >=dev-libs/gmp-4.2.1 >=dev-libs/mpfr-2.2.0_p10 ) >=sys-apps/texinfo-4.2-r4 >=sys-devel/bison-1.875 sys-devel/binutils-apple >=dev-libs/mpfr-2.2.0_p10 sys-devel/gnuconfig >=sys-apps/sed-4 sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) ) virtual/libiconv >=sys-apps/texinfo-4.8 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=sys-libs/zlib-1.1.4 >=sys-libs/ncurses-5.2-r2 nls? ( sys-devel/gettext ) >=sys-devel/gcc-config-1.3.12-r4 fortran? ( >=dev-libs/gmp-4.2.1 >=dev-libs/mpfr-2.2.0_p10 ) >=sys-apps/texinfo-4.2-r4 >=sys-devel/bison-1.875 sys-devel/binutils-apple >=dev-libs/mpfr-2.2.0_p10 sys-devel/gnuconfig >=sys-apps/sed-4 sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) ) virtual/libiconv >=sys-apps/texinfo-4.8 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=sys-libs/zlib-1.1.4 >=sys-libs/ncurses-5.2-r2 nls? ( sys-devel/gettext ) >=sys-devel/gcc-config-1.3.12-r4 fortran? ( >=dev-libs/gmp-4.2.1 >=dev-libs/mpfr-2.2.0_p10 ) sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) ) virtual/libiconv
 42
 http://www.opensource.apple.com/darwinsource/tarballs/other/gcc-5659.tar.gz http://www.opensource.apple.com/darwinsource/tarballs/other/libstdcxx-16.tar.gz http://www.opensource.apple.com/darwinsource/tarballs/other/libstdcxx-39.tar.gz fortran? ( mirror://gnu/gcc/gcc-4.2.4/gcc-fortran-4.2.4.tar.bz2 )
diff --git a/metadata/cache/sys-devel/gcc-apple-4.2.1_p5664 b/metadata/cache/sys-devel/gcc-apple-4.2.1_p5664
index cf81e169c311..cb4a44f55865 100644
--- a/metadata/cache/sys-devel/gcc-apple-4.2.1_p5664
+++ b/metadata/cache/sys-devel/gcc-apple-4.2.1_p5664
@@ -1,4 +1,4 @@
->=sys-libs/zlib-1.1.4 >=sys-libs/ncurses-5.2-r2 nls? ( sys-devel/gettext ) >=sys-devel/gcc-config-1.3.12-r4 fortran? ( >=dev-libs/gmp-4.2.1 >=dev-libs/mpfr-2.2.0_p10 ) >=sys-apps/texinfo-4.2-r4 >=sys-devel/bison-1.875 sys-devel/binutils-apple >=dev-libs/mpfr-2.2.0_p10 sys-devel/gnuconfig >=sys-apps/sed-4 sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) ) virtual/libiconv >=sys-apps/texinfo-4.8 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=sys-libs/zlib-1.1.4 >=sys-libs/ncurses-5.2-r2 nls? ( sys-devel/gettext ) >=sys-devel/gcc-config-1.3.12-r4 fortran? ( >=dev-libs/gmp-4.2.1 >=dev-libs/mpfr-2.2.0_p10 ) >=sys-apps/texinfo-4.2-r4 >=sys-devel/bison-1.875 sys-devel/binutils-apple >=dev-libs/mpfr-2.2.0_p10 sys-devel/gnuconfig >=sys-apps/sed-4 sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) ) virtual/libiconv >=sys-apps/texinfo-4.8 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=sys-libs/zlib-1.1.4 >=sys-libs/ncurses-5.2-r2 nls? ( sys-devel/gettext ) >=sys-devel/gcc-config-1.3.12-r4 fortran? ( >=dev-libs/gmp-4.2.1 >=dev-libs/mpfr-2.2.0_p10 ) sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) ) virtual/libiconv
 42
 http://www.opensource.apple.com/darwinsource/tarballs/other/gcc-5664.tar.gz http://www.opensource.apple.com/darwinsource/tarballs/other/libstdcxx-16.tar.gz http://www.opensource.apple.com/darwinsource/tarballs/other/libstdcxx-39.tar.gz fortran? ( mirror://gnu/gcc/gcc-4.2.4/gcc-fortran-4.2.4.tar.bz2 )
diff --git a/metadata/cache/sys-devel/gcc-apple-4.2.1_p5666 b/metadata/cache/sys-devel/gcc-apple-4.2.1_p5666
index 2f3f316905ca..90d573293d73 100644
--- a/metadata/cache/sys-devel/gcc-apple-4.2.1_p5666
+++ b/metadata/cache/sys-devel/gcc-apple-4.2.1_p5666
@@ -1,4 +1,4 @@
->=sys-libs/zlib-1.1.4 >=sys-libs/ncurses-5.2-r2 nls? ( sys-devel/gettext ) >=sys-devel/gcc-config-1.3.12-r4 fortran? ( >=dev-libs/gmp-4.2.1 >=dev-libs/mpfr-2.2.0_p10 ) >=sys-apps/texinfo-4.2-r4 >=sys-devel/bison-1.875 sys-devel/binutils-apple >=dev-libs/mpfr-2.2.0_p10 sys-devel/gnuconfig >=sys-apps/sed-4 sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) ) virtual/libiconv >=sys-apps/texinfo-4.8 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=sys-libs/zlib-1.1.4 >=sys-libs/ncurses-5.2-r2 nls? ( sys-devel/gettext ) >=sys-devel/gcc-config-1.3.12-r4 fortran? ( >=dev-libs/gmp-4.2.1 >=dev-libs/mpfr-2.2.0_p10 ) >=sys-apps/texinfo-4.2-r4 >=sys-devel/bison-1.875 sys-devel/binutils-apple >=dev-libs/mpfr-2.2.0_p10 sys-devel/gnuconfig >=sys-apps/sed-4 sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) ) virtual/libiconv >=sys-apps/texinfo-4.8 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=sys-libs/zlib-1.1.4 >=sys-libs/ncurses-5.2-r2 nls? ( sys-devel/gettext ) >=sys-devel/gcc-config-1.3.12-r4 fortran? ( >=dev-libs/gmp-4.2.1 >=dev-libs/mpfr-2.2.0_p10 ) sys-libs/zlib !build? ( nls? ( sys-devel/gettext ) ) virtual/libiconv
 42
 http://www.opensource.apple.com/darwinsource/tarballs/other/gcc-5666.3.tar.gz http://www.opensource.apple.com/darwinsource/tarballs/other/libstdcxx-16.tar.gz http://www.opensource.apple.com/darwinsource/tarballs/other/libstdcxx-39.tar.gz fortran? ( mirror://gnu/gcc/gcc-4.2.4/gcc-fortran-4.2.4.tar.bz2 )
diff --git a/metadata/cache/sys-devel/icecream-0.9.6-r1 b/metadata/cache/sys-devel/icecream-0.9.6-r1
index 01d884f3a6d1..2ff6067bbb98 100644
--- a/metadata/cache/sys-devel/icecream-0.9.6-r1
+++ b/metadata/cache/sys-devel/icecream-0.9.6-r1
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 ftp://ftp.suse.com/pub/projects/icecream/icecc-0.9.6.tar.bz2
diff --git a/metadata/cache/sys-devel/icecream-0.9.7 b/metadata/cache/sys-devel/icecream-0.9.7
index 757209464810..c730a8f38d3a 100644
--- a/metadata/cache/sys-devel/icecream-0.9.7
+++ b/metadata/cache/sys-devel/icecream-0.9.7
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 ftp://ftp.suse.com/pub/projects/icecream/icecc-0.9.7.tar.bz2
diff --git a/metadata/cache/sys-devel/libtool-2.2.10 b/metadata/cache/sys-devel/libtool-2.2.10
index 4759ab874c97..4680e5e81aa1 100644
--- a/metadata/cache/sys-devel/libtool-2.2.10
+++ b/metadata/cache/sys-devel/libtool-2.2.10
@@ -1,4 +1,4 @@
-sys-devel/gnuconfig >=sys-devel/autoconf-2.62 >=sys-devel/automake-1.10.1 !=sys-devel/automake-1.10 !=sys-devel/libtool-2*:1.5 test? ( !<sys-devel/binutils-2.20 ) app-arch/xz-utils || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68
+sys-devel/gnuconfig >=sys-devel/autoconf-2.62 >=sys-devel/automake-1.10.1 !=sys-devel/automake-1.10 !=sys-devel/libtool-2*:1.5 test? ( !<sys-devel/binutils-2.20 ) app-arch/xz-utils || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68
 sys-devel/gnuconfig >=sys-devel/autoconf-2.62 >=sys-devel/automake-1.10.1 !=sys-devel/automake-1.10 !=sys-devel/libtool-2*:1.5
 2
 mirror://gnu/libtool/libtool-2.2.10.tar.lzma
diff --git a/metadata/cache/sys-devel/libtool-2.4-r1 b/metadata/cache/sys-devel/libtool-2.4-r1
index a0f876adf1e5..e552d7cc5222 100644
--- a/metadata/cache/sys-devel/libtool-2.4-r1
+++ b/metadata/cache/sys-devel/libtool-2.4-r1
@@ -1,4 +1,4 @@
-sys-devel/gnuconfig !<sys-devel/autoconf-2.62:2.5 !<sys-devel/automake-1.11.1:1.11 !=sys-devel/libtool-2*:1.5 test? ( !<sys-devel/binutils-2.20 ) app-arch/xz-utils || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68
+sys-devel/gnuconfig !<sys-devel/autoconf-2.62:2.5 !<sys-devel/automake-1.11.1:1.11 !=sys-devel/libtool-2*:1.5 test? ( !<sys-devel/binutils-2.20 ) app-arch/xz-utils || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68
 sys-devel/gnuconfig !<sys-devel/autoconf-2.62:2.5 !<sys-devel/automake-1.11.1:1.11 !=sys-devel/libtool-2*:1.5
 2
 mirror://gnu/libtool/libtool-2.4.tar.xz
diff --git a/metadata/cache/sys-devel/libtool-2.4-r4 b/metadata/cache/sys-devel/libtool-2.4-r4
index 76c514fd1453..9fef1de01fb0 100644
--- a/metadata/cache/sys-devel/libtool-2.4-r4
+++ b/metadata/cache/sys-devel/libtool-2.4-r4
@@ -1,4 +1,4 @@
-sys-devel/gnuconfig !<sys-devel/autoconf-2.62:2.5 !<sys-devel/automake-1.11.1:1.11 !=sys-devel/libtool-2*:1.5 test? ( !<sys-devel/binutils-2.20 ) app-arch/xz-utils || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68
+sys-devel/gnuconfig !<sys-devel/autoconf-2.62:2.5 !<sys-devel/automake-1.11.1:1.11 !=sys-devel/libtool-2*:1.5 test? ( !<sys-devel/binutils-2.20 ) app-arch/xz-utils || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68
 sys-devel/gnuconfig !<sys-devel/autoconf-2.62:2.5 !<sys-devel/automake-1.11.1:1.11 !=sys-devel/libtool-2*:1.5
 2
 mirror://gnu/libtool/libtool-2.4.tar.xz
diff --git a/metadata/cache/sys-devel/libtool-2.4.2 b/metadata/cache/sys-devel/libtool-2.4.2
index 0ca40ee82b28..570f04ad1baa 100644
--- a/metadata/cache/sys-devel/libtool-2.4.2
+++ b/metadata/cache/sys-devel/libtool-2.4.2
@@ -1,4 +1,4 @@
-sys-devel/gnuconfig !<sys-devel/autoconf-2.62:2.5 !<sys-devel/automake-1.11.1:1.11 !=sys-devel/libtool-2*:1.5 test? ( !<sys-devel/binutils-2.20 ) app-arch/xz-utils || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68
+sys-devel/gnuconfig !<sys-devel/autoconf-2.62:2.5 !<sys-devel/automake-1.11.1:1.11 !=sys-devel/libtool-2*:1.5 test? ( !<sys-devel/binutils-2.20 ) app-arch/xz-utils || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68
 sys-devel/gnuconfig !<sys-devel/autoconf-2.62:2.5 !<sys-devel/automake-1.11.1:1.11 !=sys-devel/libtool-2*:1.5
 2
 mirror://gnu/libtool/libtool-2.4.2.tar.xz
diff --git a/metadata/cache/sys-devel/libtool-9999 b/metadata/cache/sys-devel/libtool-9999
index f77587e7927a..fbd633ce79a7 100644
--- a/metadata/cache/sys-devel/libtool-9999
+++ b/metadata/cache/sys-devel/libtool-9999
@@ -1,4 +1,4 @@
-sys-devel/gnuconfig >=sys-devel/autoconf-2.65 >=sys-devel/automake-1.11.1 test? ( !<sys-devel/binutils-2.20 ) app-arch/xz-utils sys-apps/help2man || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 dev-vcs/git
+sys-devel/gnuconfig >=sys-devel/autoconf-2.65 >=sys-devel/automake-1.11.1 test? ( !<sys-devel/binutils-2.20 ) app-arch/xz-utils sys-apps/help2man || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 dev-vcs/git
 sys-devel/gnuconfig >=sys-devel/autoconf-2.65 >=sys-devel/automake-1.11.1
 2
 
diff --git a/metadata/cache/sys-fs/archfs-0.5.6b b/metadata/cache/sys-fs/archfs-0.5.6b
index a52110d965dc..37038e9d87e9 100644
--- a/metadata/cache/sys-fs/archfs-0.5.6b
+++ b/metadata/cache/sys-fs/archfs-0.5.6b
@@ -1,4 +1,4 @@
-sys-fs/fuse || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+sys-fs/fuse || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 sys-fs/fuse app-backup/rdiff-backup
 0
 http://archfs.googlecode.com/files/archfs-0.5.6b.tar.gz
diff --git a/metadata/cache/sys-fs/chironfs-1.1.1 b/metadata/cache/sys-fs/chironfs-1.1.1
index c3338d15f9e6..3a4f93df7698 100644
--- a/metadata/cache/sys-fs/chironfs-1.1.1
+++ b/metadata/cache/sys-fs/chironfs-1.1.1
@@ -1,4 +1,4 @@
-sys-fs/fuse || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+sys-fs/fuse || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 sys-fs/fuse
 0
 http://chironfs.googlecode.com/files/chironfs-1.1.1.tar.gz
diff --git a/metadata/cache/sys-fs/copyfs-1.0.1 b/metadata/cache/sys-fs/copyfs-1.0.1
index 8ddb070a8a97..520d17c3b64d 100644
--- a/metadata/cache/sys-fs/copyfs-1.0.1
+++ b/metadata/cache/sys-fs/copyfs-1.0.1
@@ -1,4 +1,4 @@
->=sys-fs/fuse-2.0 sys-apps/attr || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=sys-fs/fuse-2.0 sys-apps/attr || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=sys-fs/fuse-2.0 sys-apps/attr
 0
 http://invaders.mars-attacks.org/~boklm/copyfs//copyfs-1.0.1.tar.bz2
diff --git a/metadata/cache/sys-fs/cryptsetup-1.1.2 b/metadata/cache/sys-fs/cryptsetup-1.1.2
index 9252e00e04bf..7a16be52fed9 100644
--- a/metadata/cache/sys-fs/cryptsetup-1.1.2
+++ b/metadata/cache/sys-fs/cryptsetup-1.1.2
@@ -1,4 +1,4 @@
->=sys-fs/lvm2-2.02.64 >=dev-libs/libgcrypt-1.1.42 >=dev-libs/libgpg-error-1.0-r1 >=dev-libs/popt-1.7 >=sys-fs/udev-124 || ( >=sys-libs/e2fsprogs-libs-1.41 <sys-fs/e2fsprogs-1.41 ) selinux? ( sys-libs/libselinux ) !sys-fs/cryptsetup-luks || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=sys-fs/lvm2-2.02.64 >=dev-libs/libgcrypt-1.1.42 >=dev-libs/libgpg-error-1.0-r1 >=dev-libs/popt-1.7 >=sys-fs/udev-124 || ( >=sys-libs/e2fsprogs-libs-1.41 <sys-fs/e2fsprogs-1.41 ) selinux? ( sys-libs/libselinux ) !sys-fs/cryptsetup-luks || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=sys-fs/lvm2-2.02.64 >=dev-libs/libgcrypt-1.1.42 >=dev-libs/libgpg-error-1.0-r1 >=dev-libs/popt-1.7 >=sys-fs/udev-124 || ( >=sys-libs/e2fsprogs-libs-1.41 <sys-fs/e2fsprogs-1.41 ) selinux? ( sys-libs/libselinux ) !sys-fs/cryptsetup-luks
 0
 http://cryptsetup.googlecode.com/files/cryptsetup-1.1.2.tar.bz2
diff --git a/metadata/cache/sys-fs/dmraid-1.0.0_rc16-r3 b/metadata/cache/sys-fs/dmraid-1.0.0_rc16-r3
index 846f28ae6080..91c7bd54e0ad 100644
--- a/metadata/cache/sys-fs/dmraid-1.0.0_rc16-r3
+++ b/metadata/cache/sys-fs/dmraid-1.0.0_rc16-r3
@@ -1,4 +1,4 @@
-|| ( >=sys-fs/lvm2-2.02.45 sys-fs/device-mapper ) klibc? ( dev-libs/klibc ) dietlibc? ( dev-libs/dietlibc ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+|| ( >=sys-fs/lvm2-2.02.45 sys-fs/device-mapper ) klibc? ( dev-libs/klibc ) dietlibc? ( dev-libs/dietlibc ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 || ( >=sys-fs/lvm2-2.02.45 sys-fs/device-mapper ) klibc? ( dev-libs/klibc ) dietlibc? ( dev-libs/dietlibc )
 0
 http://people.redhat.com/~heinzm/sw/dmraid/src/dmraid-1.0.0.rc16-3.tar.bz2
diff --git a/metadata/cache/sys-fs/ecryptfs-utils-91 b/metadata/cache/sys-fs/ecryptfs-utils-91
index b9088e1122ae..9c815827fcb2 100644
--- a/metadata/cache/sys-fs/ecryptfs-utils-91
+++ b/metadata/cache/sys-fs/ecryptfs-utils-91
@@ -1,4 +1,4 @@
->=sys-apps/keyutils-1.0 >=dev-libs/libgcrypt-1.2.0 dev-libs/nss gpg? ( app-crypt/gpgme ) gtk? ( x11-libs/gtk+:2 ) openssl? ( >=dev-libs/openssl-0.9.7 ) pam? ( sys-libs/pam ) pkcs11? ( >=dev-libs/openssl-0.9.7 >=dev-libs/pkcs11-helper-1.04 ) tpm? ( app-crypt/trousers ) >=dev-util/pkgconfig-0.9.0 sys-devel/gettext >=dev-util/intltool-0.41.0 python? ( dev-lang/swig ) python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=sys-apps/keyutils-1.0 >=dev-libs/libgcrypt-1.2.0 dev-libs/nss gpg? ( app-crypt/gpgme ) gtk? ( x11-libs/gtk+:2 ) openssl? ( >=dev-libs/openssl-0.9.7 ) pam? ( sys-libs/pam ) pkcs11? ( >=dev-libs/openssl-0.9.7 >=dev-libs/pkcs11-helper-1.04 ) tpm? ( app-crypt/trousers ) >=dev-util/pkgconfig-0.9.0 sys-devel/gettext >=dev-util/intltool-0.41.0 python? ( dev-lang/swig ) python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=sys-apps/keyutils-1.0 >=dev-libs/libgcrypt-1.2.0 dev-libs/nss gpg? ( app-crypt/gpgme ) gtk? ( x11-libs/gtk+:2 ) openssl? ( >=dev-libs/openssl-0.9.7 ) pam? ( sys-libs/pam ) pkcs11? ( >=dev-libs/openssl-0.9.7 >=dev-libs/pkcs11-helper-1.04 ) tpm? ( app-crypt/trousers ) python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) )
 0
 http://launchpad.net/ecryptfs/trunk/91/+download/ecryptfs-utils_91.orig.tar.gz
diff --git a/metadata/cache/sys-fs/ecryptfs-utils-92 b/metadata/cache/sys-fs/ecryptfs-utils-92
index e858a799e9e3..f519e192abd0 100644
--- a/metadata/cache/sys-fs/ecryptfs-utils-92
+++ b/metadata/cache/sys-fs/ecryptfs-utils-92
@@ -1,4 +1,4 @@
->=sys-apps/keyutils-1.0 >=dev-libs/libgcrypt-1.2.0 dev-libs/nss gpg? ( app-crypt/gpgme ) gtk? ( x11-libs/gtk+:2 ) openssl? ( >=dev-libs/openssl-0.9.7 ) pam? ( sys-libs/pam ) pkcs11? ( >=dev-libs/openssl-0.9.7 >=dev-libs/pkcs11-helper-1.04 ) tpm? ( app-crypt/trousers ) >=dev-util/pkgconfig-0.9.0 sys-devel/gettext >=dev-util/intltool-0.41.0 python? ( dev-lang/swig ) python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=sys-apps/keyutils-1.0 >=dev-libs/libgcrypt-1.2.0 dev-libs/nss gpg? ( app-crypt/gpgme ) gtk? ( x11-libs/gtk+:2 ) openssl? ( >=dev-libs/openssl-0.9.7 ) pam? ( sys-libs/pam ) pkcs11? ( >=dev-libs/openssl-0.9.7 >=dev-libs/pkcs11-helper-1.04 ) tpm? ( app-crypt/trousers ) >=dev-util/pkgconfig-0.9.0 sys-devel/gettext >=dev-util/intltool-0.41.0 python? ( dev-lang/swig ) python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=sys-apps/keyutils-1.0 >=dev-libs/libgcrypt-1.2.0 dev-libs/nss gpg? ( app-crypt/gpgme ) gtk? ( x11-libs/gtk+:2 ) openssl? ( >=dev-libs/openssl-0.9.7 ) pam? ( sys-libs/pam ) pkcs11? ( >=dev-libs/openssl-0.9.7 >=dev-libs/pkcs11-helper-1.04 ) tpm? ( app-crypt/trousers ) python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) )
 0
 http://launchpad.net/ecryptfs/trunk/92/+download/ecryptfs-utils_92.orig.tar.gz
diff --git a/metadata/cache/sys-fs/ecryptfs-utils-93 b/metadata/cache/sys-fs/ecryptfs-utils-93
index aadd897ed367..e5eec7fbb35a 100644
--- a/metadata/cache/sys-fs/ecryptfs-utils-93
+++ b/metadata/cache/sys-fs/ecryptfs-utils-93
@@ -1,4 +1,4 @@
->=sys-apps/keyutils-1.0 >=dev-libs/libgcrypt-1.2.0 dev-libs/nss gpg? ( app-crypt/gpgme ) gtk? ( x11-libs/gtk+:2 ) openssl? ( >=dev-libs/openssl-0.9.7 ) pam? ( sys-libs/pam ) pkcs11? ( >=dev-libs/openssl-0.9.7 >=dev-libs/pkcs11-helper-1.04 ) tpm? ( app-crypt/trousers ) >=dev-util/pkgconfig-0.9.0 sys-devel/gettext >=dev-util/intltool-0.41.0 python? ( dev-lang/swig ) python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=sys-apps/keyutils-1.0 >=dev-libs/libgcrypt-1.2.0 dev-libs/nss gpg? ( app-crypt/gpgme ) gtk? ( x11-libs/gtk+:2 ) openssl? ( >=dev-libs/openssl-0.9.7 ) pam? ( sys-libs/pam ) pkcs11? ( >=dev-libs/openssl-0.9.7 >=dev-libs/pkcs11-helper-1.04 ) tpm? ( app-crypt/trousers ) >=dev-util/pkgconfig-0.9.0 sys-devel/gettext >=dev-util/intltool-0.41.0 python? ( dev-lang/swig ) python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=sys-apps/keyutils-1.0 >=dev-libs/libgcrypt-1.2.0 dev-libs/nss gpg? ( app-crypt/gpgme ) gtk? ( x11-libs/gtk+:2 ) openssl? ( >=dev-libs/openssl-0.9.7 ) pam? ( sys-libs/pam ) pkcs11? ( >=dev-libs/openssl-0.9.7 >=dev-libs/pkcs11-helper-1.04 ) tpm? ( app-crypt/trousers ) python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) )
 0
 http://launchpad.net/ecryptfs/trunk/93/+download/ecryptfs-utils_93.orig.tar.gz
diff --git a/metadata/cache/sys-fs/ecryptfs-utils-95 b/metadata/cache/sys-fs/ecryptfs-utils-95
index c6bdfa971599..67f7af0df282 100644
--- a/metadata/cache/sys-fs/ecryptfs-utils-95
+++ b/metadata/cache/sys-fs/ecryptfs-utils-95
@@ -1,4 +1,4 @@
->=sys-apps/keyutils-1.0 >=dev-libs/libgcrypt-1.2.0 dev-libs/nss gpg? ( app-crypt/gpgme ) gtk? ( x11-libs/gtk+:2 ) openssl? ( >=dev-libs/openssl-0.9.7 ) pam? ( sys-libs/pam ) pkcs11? ( >=dev-libs/openssl-0.9.7 >=dev-libs/pkcs11-helper-1.04 ) tpm? ( app-crypt/trousers ) >=dev-util/pkgconfig-0.9.0 sys-devel/gettext >=dev-util/intltool-0.41.0 python? ( dev-lang/swig ) python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=sys-apps/keyutils-1.0 >=dev-libs/libgcrypt-1.2.0 dev-libs/nss gpg? ( app-crypt/gpgme ) gtk? ( x11-libs/gtk+:2 ) openssl? ( >=dev-libs/openssl-0.9.7 ) pam? ( sys-libs/pam ) pkcs11? ( >=dev-libs/openssl-0.9.7 >=dev-libs/pkcs11-helper-1.04 ) tpm? ( app-crypt/trousers ) >=dev-util/pkgconfig-0.9.0 sys-devel/gettext >=dev-util/intltool-0.41.0 python? ( dev-lang/swig ) python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=sys-apps/keyutils-1.0 >=dev-libs/libgcrypt-1.2.0 dev-libs/nss gpg? ( app-crypt/gpgme ) gtk? ( x11-libs/gtk+:2 ) openssl? ( >=dev-libs/openssl-0.9.7 ) pam? ( sys-libs/pam ) pkcs11? ( >=dev-libs/openssl-0.9.7 >=dev-libs/pkcs11-helper-1.04 ) tpm? ( app-crypt/trousers ) python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) )
 0
 http://launchpad.net/ecryptfs/trunk/95/+download/ecryptfs-utils_95.orig.tar.gz
diff --git a/metadata/cache/sys-fs/ecryptfs-utils-96 b/metadata/cache/sys-fs/ecryptfs-utils-96
index b4cfa06cc800..fc48e9a3cea2 100644
--- a/metadata/cache/sys-fs/ecryptfs-utils-96
+++ b/metadata/cache/sys-fs/ecryptfs-utils-96
@@ -1,4 +1,4 @@
->=sys-apps/keyutils-1.0 >=dev-libs/libgcrypt-1.2.0 dev-libs/nss gpg? ( app-crypt/gpgme ) gtk? ( x11-libs/gtk+:2 ) openssl? ( >=dev-libs/openssl-0.9.7 ) pam? ( sys-libs/pam ) pkcs11? ( >=dev-libs/openssl-0.9.7 >=dev-libs/pkcs11-helper-1.04 ) tpm? ( app-crypt/trousers ) >=dev-util/pkgconfig-0.9.0 sys-devel/gettext >=dev-util/intltool-0.41.0 python? ( dev-lang/swig ) python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=sys-apps/keyutils-1.0 >=dev-libs/libgcrypt-1.2.0 dev-libs/nss gpg? ( app-crypt/gpgme ) gtk? ( x11-libs/gtk+:2 ) openssl? ( >=dev-libs/openssl-0.9.7 ) pam? ( sys-libs/pam ) pkcs11? ( >=dev-libs/openssl-0.9.7 >=dev-libs/pkcs11-helper-1.04 ) tpm? ( app-crypt/trousers ) >=dev-util/pkgconfig-0.9.0 sys-devel/gettext >=dev-util/intltool-0.41.0 python? ( dev-lang/swig ) python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=sys-apps/keyutils-1.0 >=dev-libs/libgcrypt-1.2.0 dev-libs/nss gpg? ( app-crypt/gpgme ) gtk? ( x11-libs/gtk+:2 ) openssl? ( >=dev-libs/openssl-0.9.7 ) pam? ( sys-libs/pam ) pkcs11? ( >=dev-libs/openssl-0.9.7 >=dev-libs/pkcs11-helper-1.04 ) tpm? ( app-crypt/trousers ) python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) )
 0
 http://launchpad.net/ecryptfs/trunk/96/+download/ecryptfs-utils_96.orig.tar.gz
diff --git a/metadata/cache/sys-fs/gfs2-utils-3.1.2 b/metadata/cache/sys-fs/gfs2-utils-3.1.2
index 30630f67a0ff..38acc33fb69e 100644
--- a/metadata/cache/sys-fs/gfs2-utils-3.1.2
+++ b/metadata/cache/sys-fs/gfs2-utils-3.1.2
@@ -1,4 +1,4 @@
-sys-cluster/corosync sys-cluster/openais sys-cluster/liblogthread sys-cluster/libccs sys-cluster/libfence sys-cluster/libdlm sys-libs/ncurses dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+sys-cluster/corosync sys-cluster/openais sys-cluster/liblogthread sys-cluster/libccs sys-cluster/libfence sys-cluster/libdlm sys-libs/ncurses dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 sys-cluster/corosync sys-cluster/openais sys-cluster/liblogthread sys-cluster/libccs sys-cluster/libfence sys-cluster/libdlm sys-libs/ncurses
 0
 https://fedorahosted.org/releases/g/f/gfs2-utils/gfs2-utils-3.1.2.tar.gz
diff --git a/metadata/cache/sys-fs/lvm2-2.02.67 b/metadata/cache/sys-fs/lvm2-2.02.67
index 74d8c025cb51..d2ca4eae0056 100644
--- a/metadata/cache/sys-fs/lvm2-2.02.67
+++ b/metadata/cache/sys-fs/lvm2-2.02.67
@@ -1,4 +1,4 @@
-!!sys-fs/device-mapper clvm? ( =sys-cluster/dlm-2* cman? ( =sys-cluster/cman-2* ) ) || ( >=sys-fs/udev-151-r2 =sys-fs/udev-146-r3 ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+!!sys-fs/device-mapper clvm? ( =sys-cluster/dlm-2* cman? ( =sys-cluster/cman-2* ) ) || ( >=sys-fs/udev-151-r2 =sys-fs/udev-146-r3 ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 !!sys-fs/device-mapper clvm? ( =sys-cluster/dlm-2* cman? ( =sys-cluster/cman-2* ) ) || ( >=sys-fs/udev-151-r2 =sys-fs/udev-146-r3 ) !<sys-apps/openrc-0.4 !!sys-fs/lvm-user !!sys-fs/clvm >=sys-apps/util-linux-2.16
 0
 ftp://sources.redhat.com/pub/lvm2/LVM2.2.02.67.tgz ftp://sources.redhat.com/pub/lvm2/old/LVM2.2.02.67.tgz
diff --git a/metadata/cache/sys-fs/lvm2-2.02.67-r1 b/metadata/cache/sys-fs/lvm2-2.02.67-r1
index 74d8c025cb51..d2ca4eae0056 100644
--- a/metadata/cache/sys-fs/lvm2-2.02.67-r1
+++ b/metadata/cache/sys-fs/lvm2-2.02.67-r1
@@ -1,4 +1,4 @@
-!!sys-fs/device-mapper clvm? ( =sys-cluster/dlm-2* cman? ( =sys-cluster/cman-2* ) ) || ( >=sys-fs/udev-151-r2 =sys-fs/udev-146-r3 ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+!!sys-fs/device-mapper clvm? ( =sys-cluster/dlm-2* cman? ( =sys-cluster/cman-2* ) ) || ( >=sys-fs/udev-151-r2 =sys-fs/udev-146-r3 ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 !!sys-fs/device-mapper clvm? ( =sys-cluster/dlm-2* cman? ( =sys-cluster/cman-2* ) ) || ( >=sys-fs/udev-151-r2 =sys-fs/udev-146-r3 ) !<sys-apps/openrc-0.4 !!sys-fs/lvm-user !!sys-fs/clvm >=sys-apps/util-linux-2.16
 0
 ftp://sources.redhat.com/pub/lvm2/LVM2.2.02.67.tgz ftp://sources.redhat.com/pub/lvm2/old/LVM2.2.02.67.tgz
diff --git a/metadata/cache/sys-fs/lvm2-2.02.67-r2 b/metadata/cache/sys-fs/lvm2-2.02.67-r2
index a7c9d830aa47..6fda30642375 100644
--- a/metadata/cache/sys-fs/lvm2-2.02.67-r2
+++ b/metadata/cache/sys-fs/lvm2-2.02.67-r2
@@ -1,4 +1,4 @@
-!!sys-fs/device-mapper clvm? ( =sys-cluster/dlm-2* cman? ( =sys-cluster/cman-2* ) ) || ( >=sys-fs/udev-151-r2 =sys-fs/udev-146-r3 ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+!!sys-fs/device-mapper clvm? ( =sys-cluster/dlm-2* cman? ( =sys-cluster/cman-2* ) ) || ( >=sys-fs/udev-151-r2 =sys-fs/udev-146-r3 ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 !!sys-fs/device-mapper clvm? ( =sys-cluster/dlm-2* cman? ( =sys-cluster/cman-2* ) ) || ( >=sys-fs/udev-151-r2 =sys-fs/udev-146-r3 ) !<sys-apps/openrc-0.4 !!sys-fs/lvm-user !!sys-fs/clvm >=sys-apps/util-linux-2.16
 0
 ftp://sources.redhat.com/pub/lvm2/LVM2.2.02.67.tgz ftp://sources.redhat.com/pub/lvm2/old/LVM2.2.02.67.tgz
diff --git a/metadata/cache/sys-fs/lvm2-2.02.70 b/metadata/cache/sys-fs/lvm2-2.02.70
index f03ddd91eecc..c54915567f57 100644
--- a/metadata/cache/sys-fs/lvm2-2.02.70
+++ b/metadata/cache/sys-fs/lvm2-2.02.70
@@ -1,4 +1,4 @@
-!!sys-fs/device-mapper clvm? ( =sys-cluster/dlm-2* cman? ( =sys-cluster/cman-2* ) ) || ( >=sys-fs/udev-151-r2 =sys-fs/udev-146-r3 ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+!!sys-fs/device-mapper clvm? ( =sys-cluster/dlm-2* cman? ( =sys-cluster/cman-2* ) ) || ( >=sys-fs/udev-151-r2 =sys-fs/udev-146-r3 ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 !!sys-fs/device-mapper clvm? ( =sys-cluster/dlm-2* cman? ( =sys-cluster/cman-2* ) ) || ( >=sys-fs/udev-151-r2 =sys-fs/udev-146-r3 ) !<sys-apps/openrc-0.4 !!sys-fs/lvm-user !!sys-fs/clvm >=sys-apps/util-linux-2.16
 0
 ftp://sources.redhat.com/pub/lvm2/LVM2.2.02.70.tgz ftp://sources.redhat.com/pub/lvm2/old/LVM2.2.02.70.tgz
diff --git a/metadata/cache/sys-fs/lvm2-2.02.70-r1 b/metadata/cache/sys-fs/lvm2-2.02.70-r1
index f03ddd91eecc..c54915567f57 100644
--- a/metadata/cache/sys-fs/lvm2-2.02.70-r1
+++ b/metadata/cache/sys-fs/lvm2-2.02.70-r1
@@ -1,4 +1,4 @@
-!!sys-fs/device-mapper clvm? ( =sys-cluster/dlm-2* cman? ( =sys-cluster/cman-2* ) ) || ( >=sys-fs/udev-151-r2 =sys-fs/udev-146-r3 ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+!!sys-fs/device-mapper clvm? ( =sys-cluster/dlm-2* cman? ( =sys-cluster/cman-2* ) ) || ( >=sys-fs/udev-151-r2 =sys-fs/udev-146-r3 ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 !!sys-fs/device-mapper clvm? ( =sys-cluster/dlm-2* cman? ( =sys-cluster/cman-2* ) ) || ( >=sys-fs/udev-151-r2 =sys-fs/udev-146-r3 ) !<sys-apps/openrc-0.4 !!sys-fs/lvm-user !!sys-fs/clvm >=sys-apps/util-linux-2.16
 0
 ftp://sources.redhat.com/pub/lvm2/LVM2.2.02.70.tgz ftp://sources.redhat.com/pub/lvm2/old/LVM2.2.02.70.tgz
diff --git a/metadata/cache/sys-fs/lvm2-2.02.72 b/metadata/cache/sys-fs/lvm2-2.02.72
index 85be074051a2..dbff9ba16845 100644
--- a/metadata/cache/sys-fs/lvm2-2.02.72
+++ b/metadata/cache/sys-fs/lvm2-2.02.72
@@ -1,4 +1,4 @@
-!!sys-fs/device-mapper clvm? ( =sys-cluster/dlm-2* cman? ( =sys-cluster/cman-2* ) ) || ( >=sys-fs/udev-151-r2 =sys-fs/udev-146-r3 ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+!!sys-fs/device-mapper clvm? ( =sys-cluster/dlm-2* cman? ( =sys-cluster/cman-2* ) ) || ( >=sys-fs/udev-151-r2 =sys-fs/udev-146-r3 ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 !!sys-fs/device-mapper clvm? ( =sys-cluster/dlm-2* cman? ( =sys-cluster/cman-2* ) ) || ( >=sys-fs/udev-151-r2 =sys-fs/udev-146-r3 ) !<sys-apps/openrc-0.4 !!sys-fs/lvm-user !!sys-fs/clvm >=sys-apps/util-linux-2.16
 0
 ftp://sources.redhat.com/pub/lvm2/LVM2.2.02.72.tgz ftp://sources.redhat.com/pub/lvm2/old/LVM2.2.02.72.tgz
diff --git a/metadata/cache/sys-fs/lvm2-2.02.73 b/metadata/cache/sys-fs/lvm2-2.02.73
index df782b3f5280..9eb5b1c24055 100644
--- a/metadata/cache/sys-fs/lvm2-2.02.73
+++ b/metadata/cache/sys-fs/lvm2-2.02.73
@@ -1,4 +1,4 @@
-!!sys-fs/device-mapper clvm? ( =sys-cluster/dlm-2* cman? ( =sys-cluster/cman-2* ) ) >=sys-fs/udev-151-r4 dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+!!sys-fs/device-mapper clvm? ( =sys-cluster/dlm-2* cman? ( =sys-cluster/cman-2* ) ) >=sys-fs/udev-151-r4 dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 !!sys-fs/device-mapper clvm? ( =sys-cluster/dlm-2* cman? ( =sys-cluster/cman-2* ) ) >=sys-fs/udev-151-r4 !<sys-apps/openrc-0.4 !!sys-fs/lvm-user !!sys-fs/clvm >=sys-apps/util-linux-2.16 !<sys-fs/cryptsetup-1.1.2
 0
 ftp://sources.redhat.com/pub/lvm2/LVM2.2.02.73.tgz ftp://sources.redhat.com/pub/lvm2/old/LVM2.2.02.73.tgz
diff --git a/metadata/cache/sys-fs/lvm2-2.02.73-r1 b/metadata/cache/sys-fs/lvm2-2.02.73-r1
index 17ae09295d28..49c0d6fcbe53 100644
--- a/metadata/cache/sys-fs/lvm2-2.02.73-r1
+++ b/metadata/cache/sys-fs/lvm2-2.02.73-r1
@@ -1,4 +1,4 @@
-!!sys-fs/device-mapper readline? ( sys-libs/readline ) clvm? ( =sys-cluster/dlm-2* cman? ( =sys-cluster/cman-2* ) ) >=sys-fs/udev-151-r4 dev-util/pkgconfig >=sys-devel/binutils-2.20.1-r1 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+!!sys-fs/device-mapper readline? ( sys-libs/readline ) clvm? ( =sys-cluster/dlm-2* cman? ( =sys-cluster/cman-2* ) ) >=sys-fs/udev-151-r4 dev-util/pkgconfig >=sys-devel/binutils-2.20.1-r1 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 !!sys-fs/device-mapper readline? ( sys-libs/readline ) clvm? ( =sys-cluster/dlm-2* cman? ( =sys-cluster/cman-2* ) ) >=sys-fs/udev-151-r4 !<sys-apps/openrc-0.4 !!sys-fs/lvm-user !!sys-fs/clvm >=sys-apps/util-linux-2.16 !<sys-fs/cryptsetup-1.1.2
 0
 ftp://sources.redhat.com/pub/lvm2/LVM2.2.02.73.tgz ftp://sources.redhat.com/pub/lvm2/old/LVM2.2.02.73.tgz
diff --git a/metadata/cache/sys-fs/lvm2-2.02.74 b/metadata/cache/sys-fs/lvm2-2.02.74
index dccace873ea7..f1ad33759372 100644
--- a/metadata/cache/sys-fs/lvm2-2.02.74
+++ b/metadata/cache/sys-fs/lvm2-2.02.74
@@ -1,4 +1,4 @@
-!!sys-fs/device-mapper readline? ( sys-libs/readline ) clvm? ( =sys-cluster/dlm-2* cman? ( =sys-cluster/cman-2* ) ) >=sys-fs/udev-151-r4 dev-util/pkgconfig >=sys-devel/binutils-2.20.1-r1 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+!!sys-fs/device-mapper readline? ( sys-libs/readline ) clvm? ( =sys-cluster/dlm-2* cman? ( =sys-cluster/cman-2* ) ) >=sys-fs/udev-151-r4 dev-util/pkgconfig >=sys-devel/binutils-2.20.1-r1 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 !!sys-fs/device-mapper readline? ( sys-libs/readline ) clvm? ( =sys-cluster/dlm-2* cman? ( =sys-cluster/cman-2* ) ) >=sys-fs/udev-151-r4 !<sys-apps/openrc-0.4 !!sys-fs/lvm-user !!sys-fs/clvm >=sys-apps/util-linux-2.16 !<sys-fs/cryptsetup-1.1.2
 0
 ftp://sources.redhat.com/pub/lvm2/LVM2.2.02.74.tgz ftp://sources.redhat.com/pub/lvm2/old/LVM2.2.02.74.tgz
diff --git a/metadata/cache/sys-fs/lvm2-2.02.83 b/metadata/cache/sys-fs/lvm2-2.02.83
index 4e2329ac8444..b6326ef8166e 100644
--- a/metadata/cache/sys-fs/lvm2-2.02.83
+++ b/metadata/cache/sys-fs/lvm2-2.02.83
@@ -1,4 +1,4 @@
-!!sys-fs/device-mapper readline? ( sys-libs/readline ) clvm? ( =sys-cluster/dlm-2* cman? ( =sys-cluster/cman-2* ) ) >=sys-fs/udev-151-r4 dev-util/pkgconfig >=sys-devel/binutils-2.20.1-r1 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+!!sys-fs/device-mapper readline? ( sys-libs/readline ) clvm? ( =sys-cluster/dlm-2* cman? ( =sys-cluster/cman-2* ) ) >=sys-fs/udev-151-r4 dev-util/pkgconfig >=sys-devel/binutils-2.20.1-r1 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 !!sys-fs/device-mapper readline? ( sys-libs/readline ) clvm? ( =sys-cluster/dlm-2* cman? ( =sys-cluster/cman-2* ) ) >=sys-fs/udev-151-r4 !<sys-apps/openrc-0.4 !!sys-fs/lvm-user !!sys-fs/clvm >=sys-apps/util-linux-2.16 !<sys-fs/cryptsetup-1.1.2
 0
 ftp://sources.redhat.com/pub/lvm2/LVM2.2.02.83.tgz ftp://sources.redhat.com/pub/lvm2/old/LVM2.2.02.83.tgz
diff --git a/metadata/cache/sys-fs/lvm2-2.02.84 b/metadata/cache/sys-fs/lvm2-2.02.84
index 718d3425c101..6863cf8a03d9 100644
--- a/metadata/cache/sys-fs/lvm2-2.02.84
+++ b/metadata/cache/sys-fs/lvm2-2.02.84
@@ -1,4 +1,4 @@
-!!sys-fs/device-mapper readline? ( sys-libs/readline ) clvm? ( =sys-cluster/dlm-2* cman? ( =sys-cluster/cman-2* ) ) >=sys-fs/udev-151-r4 dev-util/pkgconfig >=sys-devel/binutils-2.20.1-r1 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+!!sys-fs/device-mapper readline? ( sys-libs/readline ) clvm? ( =sys-cluster/dlm-2* cman? ( =sys-cluster/cman-2* ) ) >=sys-fs/udev-151-r4 dev-util/pkgconfig >=sys-devel/binutils-2.20.1-r1 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 !!sys-fs/device-mapper readline? ( sys-libs/readline ) clvm? ( =sys-cluster/dlm-2* cman? ( =sys-cluster/cman-2* ) ) >=sys-fs/udev-151-r4 !<sys-apps/openrc-0.4 !!sys-fs/lvm-user !!sys-fs/clvm >=sys-apps/util-linux-2.16 !<sys-fs/cryptsetup-1.1.2
 0
 ftp://sources.redhat.com/pub/lvm2/LVM2.2.02.84.tgz ftp://sources.redhat.com/pub/lvm2/old/LVM2.2.02.84.tgz
diff --git a/metadata/cache/sys-fs/lvm2-2.02.85 b/metadata/cache/sys-fs/lvm2-2.02.85
index 5a055a06e4eb..ff473363ab49 100644
--- a/metadata/cache/sys-fs/lvm2-2.02.85
+++ b/metadata/cache/sys-fs/lvm2-2.02.85
@@ -1,4 +1,4 @@
-!!sys-fs/device-mapper readline? ( sys-libs/readline ) clvm? ( =sys-cluster/dlm-2* cman? ( =sys-cluster/cman-2* ) ) >=sys-fs/udev-151-r4 dev-util/pkgconfig >=sys-devel/binutils-2.20.1-r1 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+!!sys-fs/device-mapper readline? ( sys-libs/readline ) clvm? ( =sys-cluster/dlm-2* cman? ( =sys-cluster/cman-2* ) ) >=sys-fs/udev-151-r4 dev-util/pkgconfig >=sys-devel/binutils-2.20.1-r1 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 !!sys-fs/device-mapper readline? ( sys-libs/readline ) clvm? ( =sys-cluster/dlm-2* cman? ( =sys-cluster/cman-2* ) ) >=sys-fs/udev-151-r4 !<sys-apps/openrc-0.4 !!sys-fs/lvm-user !!sys-fs/clvm >=sys-apps/util-linux-2.16 !<sys-fs/cryptsetup-1.1.2
 0
 ftp://sources.redhat.com/pub/lvm2/LVM2.2.02.85.tgz ftp://sources.redhat.com/pub/lvm2/old/LVM2.2.02.85.tgz
diff --git a/metadata/cache/sys-fs/lvm2-2.02.88 b/metadata/cache/sys-fs/lvm2-2.02.88
index b3bac91bda6c..a610a27cdc5b 100644
--- a/metadata/cache/sys-fs/lvm2-2.02.88
+++ b/metadata/cache/sys-fs/lvm2-2.02.88
@@ -1,4 +1,4 @@
-!!sys-fs/device-mapper readline? ( sys-libs/readline ) clvm? ( =sys-cluster/dlm-2* cman? ( =sys-cluster/cman-2* ) ) >=sys-fs/udev-151-r4 dev-util/pkgconfig >=sys-devel/binutils-2.20.1-r1 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+!!sys-fs/device-mapper readline? ( sys-libs/readline ) clvm? ( =sys-cluster/dlm-2* cman? ( =sys-cluster/cman-2* ) ) >=sys-fs/udev-151-r4 dev-util/pkgconfig >=sys-devel/binutils-2.20.1-r1 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 !!sys-fs/device-mapper readline? ( sys-libs/readline ) clvm? ( =sys-cluster/dlm-2* cman? ( =sys-cluster/cman-2* ) ) >=sys-fs/udev-151-r4 !<sys-apps/openrc-0.4 !!sys-fs/lvm-user !!sys-fs/clvm >=sys-apps/util-linux-2.16 !<sys-fs/cryptsetup-1.1.2
 0
 ftp://sources.redhat.com/pub/lvm2/LVM2.2.02.88.tgz ftp://sources.redhat.com/pub/lvm2/old/LVM2.2.02.88.tgz
diff --git a/metadata/cache/sys-fs/lvm2-2.02.92 b/metadata/cache/sys-fs/lvm2-2.02.92
index c4c49f6a4351..8bad3bf1b27f 100644
--- a/metadata/cache/sys-fs/lvm2-2.02.92
+++ b/metadata/cache/sys-fs/lvm2-2.02.92
@@ -1,4 +1,4 @@
-!!sys-fs/device-mapper readline? ( sys-libs/readline ) clvm? ( =sys-cluster/dlm-2* cman? ( =sys-cluster/cman-2* ) ) >=sys-fs/udev-151-r4 dev-util/pkgconfig >=sys-devel/binutils-2.20.1-r1 static? ( || ( >=sys-fs/udev-181[static-libs] <sys-fs/udev-181 ) ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+!!sys-fs/device-mapper readline? ( sys-libs/readline ) clvm? ( =sys-cluster/dlm-2* cman? ( =sys-cluster/cman-2* ) ) >=sys-fs/udev-151-r4 dev-util/pkgconfig >=sys-devel/binutils-2.20.1-r1 static? ( || ( >=sys-fs/udev-181[static-libs] <sys-fs/udev-181 ) ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 !!sys-fs/device-mapper readline? ( sys-libs/readline ) clvm? ( =sys-cluster/dlm-2* cman? ( =sys-cluster/cman-2* ) ) >=sys-fs/udev-151-r4 !<sys-apps/openrc-0.4 !!sys-fs/lvm-user !!sys-fs/clvm >=sys-apps/util-linux-2.16 !<sys-fs/cryptsetup-1.1.2
 0
 ftp://sources.redhat.com/pub/lvm2/LVM2.2.02.92.tgz ftp://sources.redhat.com/pub/lvm2/old/LVM2.2.02.92.tgz
diff --git a/metadata/cache/sys-fs/lvm2-2.02.93 b/metadata/cache/sys-fs/lvm2-2.02.93
index eb52f84bec10..ab1961c774fa 100644
--- a/metadata/cache/sys-fs/lvm2-2.02.93
+++ b/metadata/cache/sys-fs/lvm2-2.02.93
@@ -1,4 +1,4 @@
-!!sys-fs/device-mapper readline? ( sys-libs/readline ) clvm? ( =sys-cluster/dlm-2* cman? ( =sys-cluster/cman-2* ) ) >=sys-fs/udev-151-r4 dev-util/pkgconfig >=sys-devel/binutils-2.20.1-r1 static? ( || ( >=sys-fs/udev-181[static-libs] <sys-fs/udev-181 ) ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+!!sys-fs/device-mapper readline? ( sys-libs/readline ) clvm? ( =sys-cluster/dlm-2* cman? ( =sys-cluster/cman-2* ) ) >=sys-fs/udev-151-r4 dev-util/pkgconfig >=sys-devel/binutils-2.20.1-r1 static? ( || ( >=sys-fs/udev-181[static-libs] <sys-fs/udev-181 ) ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 !!sys-fs/device-mapper readline? ( sys-libs/readline ) clvm? ( =sys-cluster/dlm-2* cman? ( =sys-cluster/cman-2* ) ) >=sys-fs/udev-151-r4 !<sys-apps/openrc-0.4 !!sys-fs/lvm-user !!sys-fs/clvm >=sys-apps/util-linux-2.16 !<sys-fs/cryptsetup-1.1.2
 0
 ftp://sources.redhat.com/pub/lvm2/LVM2.2.02.93.tgz ftp://sources.redhat.com/pub/lvm2/old/LVM2.2.02.93.tgz
diff --git a/metadata/cache/sys-fs/lvm2-2.02.93-r1 b/metadata/cache/sys-fs/lvm2-2.02.93-r1
index fb47eebe14ac..9d146882e776 100644
--- a/metadata/cache/sys-fs/lvm2-2.02.93-r1
+++ b/metadata/cache/sys-fs/lvm2-2.02.93-r1
@@ -1,4 +1,4 @@
-!!sys-fs/device-mapper readline? ( sys-libs/readline ) clvm? ( =sys-cluster/dlm-2* cman? ( =sys-cluster/cman-2* ) ) >=sys-fs/udev-151-r4 dev-util/pkgconfig >=sys-devel/binutils-2.20.1-r1 static? ( || ( >=sys-fs/udev-181[static-libs] <sys-fs/udev-181 ) ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+!!sys-fs/device-mapper readline? ( sys-libs/readline ) clvm? ( =sys-cluster/dlm-2* cman? ( =sys-cluster/cman-2* ) ) >=sys-fs/udev-151-r4 dev-util/pkgconfig >=sys-devel/binutils-2.20.1-r1 static? ( || ( >=sys-fs/udev-181[static-libs] <sys-fs/udev-181 ) ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 !!sys-fs/device-mapper readline? ( sys-libs/readline ) clvm? ( =sys-cluster/dlm-2* cman? ( =sys-cluster/cman-2* ) ) >=sys-fs/udev-151-r4 !<sys-apps/openrc-0.4 !!sys-fs/lvm-user !!sys-fs/clvm >=sys-apps/util-linux-2.16 !<sys-fs/cryptsetup-1.1.2
 0
 ftp://sources.redhat.com/pub/lvm2/LVM2.2.02.93.tgz ftp://sources.redhat.com/pub/lvm2/old/LVM2.2.02.93.tgz
diff --git a/metadata/cache/sys-fs/mtools-4.0.15 b/metadata/cache/sys-fs/mtools-4.0.15
index baafa9a313ad..55d028eea745 100644
--- a/metadata/cache/sys-fs/mtools-4.0.15
+++ b/metadata/cache/sys-fs/mtools-4.0.15
@@ -1,4 +1,4 @@
-X? ( x11-libs/libICE x11-libs/libXau x11-libs/libSM x11-libs/libX11 x11-libs/libXt ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+X? ( x11-libs/libICE x11-libs/libXau x11-libs/libSM x11-libs/libX11 x11-libs/libXt ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 X? ( x11-libs/libICE x11-libs/libXau x11-libs/libSM x11-libs/libX11 x11-libs/libXt )
 0
 mirror://gnu/mtools/mtools-4.0.15.tar.bz2
diff --git a/metadata/cache/sys-fs/mtools-4.0.16 b/metadata/cache/sys-fs/mtools-4.0.16
index 34a4d144260e..c227711e367f 100644
--- a/metadata/cache/sys-fs/mtools-4.0.16
+++ b/metadata/cache/sys-fs/mtools-4.0.16
@@ -1,4 +1,4 @@
-X? ( x11-libs/libICE x11-libs/libXau x11-libs/libSM x11-libs/libX11 x11-libs/libXt ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+X? ( x11-libs/libICE x11-libs/libXau x11-libs/libSM x11-libs/libX11 x11-libs/libXt ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 X? ( x11-libs/libICE x11-libs/libXau x11-libs/libSM x11-libs/libX11 x11-libs/libXt )
 0
 mirror://gnu/mtools/mtools-4.0.16.tar.bz2
diff --git a/metadata/cache/sys-fs/ntfsprogs-2.0.0-r3 b/metadata/cache/sys-fs/ntfsprogs-2.0.0-r3
index ee38ef5d7316..4c00d7e95836 100644
--- a/metadata/cache/sys-fs/ntfsprogs-2.0.0-r3
+++ b/metadata/cache/sys-fs/ntfsprogs-2.0.0-r3
@@ -1,4 +1,4 @@
-fuse? ( >=sys-fs/fuse-2.7.0 ) crypt? ( >=dev-libs/libgcrypt-1.2.0 >=net-libs/gnutls-1.2.8 >=dev-libs/libconfig-1.0.1 ) gnome? ( >=dev-libs/glib-2.0 >=gnome-base/gnome-vfs-2.0 ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+fuse? ( >=sys-fs/fuse-2.7.0 ) crypt? ( >=dev-libs/libgcrypt-1.2.0 >=net-libs/gnutls-1.2.8 >=dev-libs/libconfig-1.0.1 ) gnome? ( >=dev-libs/glib-2.0 >=gnome-base/gnome-vfs-2.0 ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 fuse? ( >=sys-fs/fuse-2.7.0 ) crypt? ( >=dev-libs/libgcrypt-1.2.0 >=net-libs/gnutls-1.2.8 >=dev-libs/libconfig-1.0.1 ) gnome? ( >=dev-libs/glib-2.0 >=gnome-base/gnome-vfs-2.0 )
 0
 mirror://sourceforge/linux-ntfs/ntfsprogs-2.0.0.tar.gz
diff --git a/metadata/cache/sys-fs/ocfs2-tools-1.6.4-r1 b/metadata/cache/sys-fs/ocfs2-tools-1.6.4-r1
index 99e046a5d644..2e1d41ee143d 100644
--- a/metadata/cache/sys-fs/ocfs2-tools-1.6.4-r1
+++ b/metadata/cache/sys-fs/ocfs2-tools-1.6.4-r1
@@ -1,4 +1,4 @@
-sys-apps/util-linux sys-cluster/libcman external? ( sys-cluster/libdlm <sys-cluster/pacemaker-1.1[-heartbeat] ) sys-fs/e2fsprogs sys-libs/ncurses sys-libs/readline sys-process/psmisc gtk? ( dev-python/pygtk ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool gtk? ( =dev-lang/python-2* )
+sys-apps/util-linux sys-cluster/libcman external? ( sys-cluster/libdlm <sys-cluster/pacemaker-1.1[-heartbeat] ) sys-fs/e2fsprogs sys-libs/ncurses sys-libs/readline sys-process/psmisc gtk? ( dev-python/pygtk ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool gtk? ( =dev-lang/python-2* )
 sys-apps/util-linux sys-cluster/libcman external? ( sys-cluster/libdlm <sys-cluster/pacemaker-1.1[-heartbeat] ) sys-fs/e2fsprogs sys-libs/ncurses sys-libs/readline sys-process/psmisc gtk? ( dev-python/pygtk ) gtk? ( =dev-lang/python-2* )
 0
 http://oss.oracle.com/projects/ocfs2-tools/dist/files/source/v1.6/ocfs2-tools-1.6.4.tar.gz
diff --git a/metadata/cache/sys-fs/quotatool-1.4.11 b/metadata/cache/sys-fs/quotatool-1.4.11
index 8ff27b79681a..b2d719d9468e 100644
--- a/metadata/cache/sys-fs/quotatool-1.4.11
+++ b/metadata/cache/sys-fs/quotatool-1.4.11
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 sys-fs/quota
 0
 http://quotatool.ekenberg.se/quotatool-1.4.11.tar.gz
diff --git a/metadata/cache/sys-fs/quotatool-1.4.12 b/metadata/cache/sys-fs/quotatool-1.4.12
index 2df2cc64f297..89a12bd86a00 100644
--- a/metadata/cache/sys-fs/quotatool-1.4.12
+++ b/metadata/cache/sys-fs/quotatool-1.4.12
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 sys-fs/quota
 0
 http://quotatool.ekenberg.se/quotatool-1.4.12.tar.gz
diff --git a/metadata/cache/sys-fs/rar2fs-1.14.0 b/metadata/cache/sys-fs/rar2fs-1.14.0
index fa7c507341ce..6874529d9d6c 100644
--- a/metadata/cache/sys-fs/rar2fs-1.14.0
+++ b/metadata/cache/sys-fs/rar2fs-1.14.0
@@ -1,4 +1,4 @@
->=app-arch/unrar-4.1.4-r2 sys-fs/fuse || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=app-arch/unrar-4.1.4-r2 sys-fs/fuse || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=app-arch/unrar-4.1.4-r2 sys-fs/fuse
 0
 http://rar2fs.googlecode.com/files/rar2fs-1.14.0.tar.gz
diff --git a/metadata/cache/sys-fs/s3backer-1.2.2-r2 b/metadata/cache/sys-fs/s3backer-1.2.2-r2
index 30789a33a79c..812ec343bbdd 100644
--- a/metadata/cache/sys-fs/s3backer-1.2.2-r2
+++ b/metadata/cache/sys-fs/s3backer-1.2.2-r2
@@ -1,4 +1,4 @@
-net-misc/curl sys-fs/fuse sys-libs/zlib dev-libs/expat dev-libs/openssl || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+net-misc/curl sys-fs/fuse sys-libs/zlib dev-libs/expat dev-libs/openssl || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 net-misc/curl sys-fs/fuse sys-libs/zlib dev-libs/expat dev-libs/openssl
 0
 http://s3backer.googlecode.com/files/s3backer-1.2.2.tar.gz
diff --git a/metadata/cache/sys-fs/s3backer-1.3.2 b/metadata/cache/sys-fs/s3backer-1.3.2
index 39f107b7ecf3..60240e901bc8 100644
--- a/metadata/cache/sys-fs/s3backer-1.3.2
+++ b/metadata/cache/sys-fs/s3backer-1.3.2
@@ -1,4 +1,4 @@
-net-misc/curl sys-fs/fuse sys-libs/zlib dev-libs/expat dev-libs/openssl || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+net-misc/curl sys-fs/fuse sys-libs/zlib dev-libs/expat dev-libs/openssl || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 net-misc/curl sys-fs/fuse sys-libs/zlib dev-libs/expat dev-libs/openssl
 0
 http://s3backer.googlecode.com/files/s3backer-1.3.2.tar.gz
diff --git a/metadata/cache/sys-fs/treesize-0.54.1 b/metadata/cache/sys-fs/treesize-0.54.1
index 275b2cd3d74a..36cabb368cc0 100644
--- a/metadata/cache/sys-fs/treesize-0.54.1
+++ b/metadata/cache/sys-fs/treesize-0.54.1
@@ -1,4 +1,4 @@
-x11-libs/gtk+:2 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+x11-libs/gtk+:2 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 x11-libs/gtk+:2
 0
 mirror://sourceforge/treesize/treesize-0.54.1-src.tbz2
diff --git a/metadata/cache/sys-fs/udev-9999 b/metadata/cache/sys-fs/udev-9999
index 73601f5727de..c4789a705170 100644
--- a/metadata/cache/sys-fs/udev-9999
+++ b/metadata/cache/sys-fs/udev-9999
@@ -1,4 +1,4 @@
-selinux? ( sys-libs/libselinux ) gudev? ( dev-libs/glib:2 ) introspection? ( dev-libs/gobject-introspection ) >=sys-apps/kmod-5 >=sys-apps/util-linux-2.20 >=sys-libs/glibc-2.10 keymap? ( dev-util/gperf ) dev-util/pkgconfig virtual/os-headers !<sys-kernel/linux-headers-2.6.34 dev-util/gtk-doc test? ( app-text/tree ) dev-vcs/git || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool !<sys-apps/systemd-29-r4 !=sys-apps/systemd-37-r1
+selinux? ( sys-libs/libselinux ) gudev? ( dev-libs/glib:2 ) introspection? ( dev-libs/gobject-introspection ) >=sys-apps/kmod-5 >=sys-apps/util-linux-2.20 >=sys-libs/glibc-2.10 keymap? ( dev-util/gperf ) dev-util/pkgconfig virtual/os-headers !<sys-kernel/linux-headers-2.6.34 dev-util/gtk-doc test? ( app-text/tree ) dev-vcs/git || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool !<sys-apps/systemd-29-r4 !=sys-apps/systemd-37-r1
 selinux? ( sys-libs/libselinux ) gudev? ( dev-libs/glib:2 ) introspection? ( dev-libs/gobject-introspection ) >=sys-apps/kmod-5 >=sys-apps/util-linux-2.20 >=sys-libs/glibc-2.10 hwdb? ( >=sys-apps/usbutils-0.82 || ( >=sys-apps/pciutils-3.1.9-r1[-compress-db] <sys-apps/pciutils-3.1.9-r1[-zlib] ) ) openrc? ( >=sys-fs/udev-init-scripts-10 !<sys-apps/openrc-0.9.9 ) !<sys-fs/udev-init-scripts-10 !sys-apps/coldplug !<sys-fs/lvm2-2.02.45 !sys-fs/device-mapper !<sys-kernel/dracut-017-r1 !<sys-kernel/genkernel-3.4.25
 0
 
diff --git a/metadata/cache/sys-fs/udev-init-scripts-10 b/metadata/cache/sys-fs/udev-init-scripts-10
index 9706aa431e58..f5da9609825c 100644
--- a/metadata/cache/sys-fs/udev-init-scripts-10
+++ b/metadata/cache/sys-fs/udev-init-scripts-10
@@ -2,7 +2,7 @@
 !<sys-fs/udev-182 >=sys-fs/udev-182 sys-apps/openrc
 0
 mirror://gentoo/udev-init-scripts-10.tar.bz2
-
+test
 http://www.gentoo.org
 GPL-2
 udev startup scripts for openrc
diff --git a/metadata/cache/sys-fs/udisks-glue-1.3.2 b/metadata/cache/sys-fs/udisks-glue-1.3.2
index feea43015910..5595677e3ab4 100644
--- a/metadata/cache/sys-fs/udisks-glue-1.3.2
+++ b/metadata/cache/sys-fs/udisks-glue-1.3.2
@@ -1,4 +1,4 @@
->=dev-libs/dbus-glib-0.92 dev-libs/glib:2 dev-libs/confuse dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-libs/dbus-glib-0.92 dev-libs/glib:2 dev-libs/confuse dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=dev-libs/dbus-glib-0.92 dev-libs/glib:2 dev-libs/confuse sys-fs/udisks
 0
 https://github.com/fernandotcl/udisks-glue/tarball/release-1.3.2 -> udisks-glue-1.3.2.tar.gz
diff --git a/metadata/cache/sys-fs/udisks-glue-1.3.3 b/metadata/cache/sys-fs/udisks-glue-1.3.3
index 62460819e11a..52bbb0ce759f 100644
--- a/metadata/cache/sys-fs/udisks-glue-1.3.3
+++ b/metadata/cache/sys-fs/udisks-glue-1.3.3
@@ -1,4 +1,4 @@
->=dev-libs/dbus-glib-0.92 >=dev-libs/glib-2 dev-libs/confuse dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-libs/dbus-glib-0.92 >=dev-libs/glib-2 dev-libs/confuse dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=dev-libs/dbus-glib-0.92 >=dev-libs/glib-2 dev-libs/confuse sys-fs/udisks
 0
 http://github.com/fernandotcl/udisks-glue/tarball/release-1.3.3 -> udisks-glue-1.3.3.tar.gz
diff --git a/metadata/cache/sys-fs/udisks-glue-1.3.4 b/metadata/cache/sys-fs/udisks-glue-1.3.4
index a843513250e3..2a5c1905370f 100644
--- a/metadata/cache/sys-fs/udisks-glue-1.3.4
+++ b/metadata/cache/sys-fs/udisks-glue-1.3.4
@@ -1,4 +1,4 @@
->=dev-libs/dbus-glib-0.92 >=dev-libs/glib-2 dev-libs/confuse dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-libs/dbus-glib-0.92 >=dev-libs/glib-2 dev-libs/confuse dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=dev-libs/dbus-glib-0.92 >=dev-libs/glib-2 dev-libs/confuse sys-fs/udisks
 0
 http://github.com/fernandotcl/udisks-glue/tarball/release-1.3.4 -> udisks-glue-1.3.4.tar.gz
diff --git a/metadata/cache/sys-kernel/genkernel-3.4.26 b/metadata/cache/sys-kernel/genkernel-3.4.26
new file mode 100644
index 000000000000..fdc57fae0834
--- /dev/null
+++ b/metadata/cache/sys-kernel/genkernel-3.4.26
@@ -0,0 +1,22 @@
+sys-fs/e2fsprogs selinux? ( sys-libs/libselinux )
+sys-fs/e2fsprogs selinux? ( sys-libs/libselinux ) app-arch/cpio app-misc/pax-utils !<sys-apps/openrc-0.9.9 bash-completion? ( app-admin/eselect )
+0
+mirror://gentoo/genkernel-3.4.26.tar.bz2 http://wolf31o2.org/sources/genkernel/genkernel-3.4.26.tar.bz2 http://people.redhat.com/~heinzm/sw/dmraid/src/dmraid-1.0.0.rc16-3.tar.bz2 http://people.redhat.com/~heinzm/sw/dmraid/src/old/dmraid-1.0.0.rc16-3.tar.bz2 mirror://kernel/linux/utils/raid/mdadm/mdadm-3.1.5.tar.bz2 ftp://sources.redhat.com/pub/lvm2/LVM2.2.02.88.tgz ftp://sources.redhat.com/pub/lvm2/old/LVM2.2.02.88.tgz http://www.busybox.net/downloads/busybox-1.19.3.tar.bz2 mirror://kernel/linux/kernel/people/mnc/open-iscsi/releases/open-iscsi-2.0-872.tar.gz mirror://sourceforge/e2fsprogs/e2fsprogs-1.42.tar.gz mirror://sourceforge/fuse/fuse-2.8.6.tar.gz http://podgorny.cz/unionfs-fuse/releases/unionfs-fuse-0.24.tar.bz2 mirror://gnupg/gnupg/gnupg-1.4.11.tar.bz2
+
+http://www.gentoo.org
+GPL-2
+Gentoo automatic kernel building scripts
+~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+bash-completion eutils multilib toolchain-funcs user
+ibm selinux bash-completion
+
+bash-completion? ( app-shells/bash-completion )
+
+
+
+compile install postinst unpack
+
+
+
+
+
diff --git a/metadata/cache/sys-kernel/hardened-sources-3.1.10 b/metadata/cache/sys-kernel/hardened-sources-3.1.10
deleted file mode 100644
index 3be4e0206b37..000000000000
--- a/metadata/cache/sys-kernel/hardened-sources-3.1.10
+++ /dev/null
@@ -1,22 +0,0 @@
-!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
->=sys-devel/gcc-4.5 !build? ( >=sys-libs/ncurses-5.2 sys-devel/make )
-3.1.10
-mirror://kernel/linux/kernel/v3.x/linux-3.1.tar.bz2 deblob? ( http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.1.N/deblob-3.1 http://www.fsfla.org/svnwiki/selibre/linux-libre//download/releases/LATEST-3.1.N/deblob-check -> deblob-check-3.1 ) http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-3.1.10-1.extras.tar.bz2 mirror://gentoo/genpatches-3.1-12.base.tar.bz2 mirror://gentoo/genpatches-3.1-12.extras.tar.bz2
-binchecks strip
-http://www.gentoo.org/proj/en/hardened/
-GPL-2 !deblob? ( freedist )
-Hardened kernel sources (kernel series 3.1)
-~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
-eutils kernel-2 multilib toolchain-funcs user versionator
-deblob symlink build deblob
-
-!build? ( virtual/dev-manager )
-
-4
-
-compile install postinst postrm preinst setup test unpack
-
-
-
-
-
diff --git a/metadata/cache/sys-kernel/linuxwacom-module-0.8.8_p10 b/metadata/cache/sys-kernel/linuxwacom-module-0.8.8_p10
index 25bab0ad5095..30e4f9fbc0b7 100644
--- a/metadata/cache/sys-kernel/linuxwacom-module-0.8.8_p10
+++ b/metadata/cache/sys-kernel/linuxwacom-module-0.8.8_p10
@@ -1,4 +1,4 @@
-sys-fs/udev sys-libs/ncurses dev-util/pkgconfig usb? ( >=sys-kernel/linux-headers-2.6 ) kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+sys-fs/udev sys-libs/ncurses dev-util/pkgconfig usb? ( >=sys-kernel/linux-headers-2.6 ) kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 sys-fs/udev sys-libs/ncurses kernel_linux? ( virtual/modutils )
 0
 mirror://sourceforge/linuxwacom/linuxwacom-0.8.8-10.tar.bz2
diff --git a/metadata/cache/sys-libs/db-5.0.21-r1 b/metadata/cache/sys-libs/db-5.0.21-r1
index 61a85b4b3f2c..7a308fb1b66e 100644
--- a/metadata/cache/sys-libs/db-5.0.21-r1
+++ b/metadata/cache/sys-libs/db-5.0.21-r1
@@ -1,4 +1,4 @@
-tcl? ( >=dev-lang/tcl-8.4 ) test? ( >=dev-lang/tcl-8.4 ) java? ( >=virtual/jdk-1.5 ) >=sys-devel/binutils-2.16.1 test? ( >=dev-lang/tcl-8.4 ) java? ( >=dev-java/java-config-2.1.9-r1 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+tcl? ( >=dev-lang/tcl-8.4 ) test? ( >=dev-lang/tcl-8.4 ) java? ( >=virtual/jdk-1.5 ) >=sys-devel/binutils-2.16.1 test? ( >=dev-lang/tcl-8.4 ) java? ( >=dev-java/java-config-2.1.9-r1 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 tcl? ( dev-lang/tcl ) java? ( >=virtual/jre-1.5 ) java? ( >=dev-java/java-config-2.1.9-r1 )
 5.0
 http://download.oracle.com/berkeley-db/db-5.0.21.tar.gz
diff --git a/metadata/cache/sys-libs/db-5.0.26 b/metadata/cache/sys-libs/db-5.0.26
index 52ed74177eb9..ccf04e650c1a 100644
--- a/metadata/cache/sys-libs/db-5.0.26
+++ b/metadata/cache/sys-libs/db-5.0.26
@@ -1,4 +1,4 @@
-tcl? ( >=dev-lang/tcl-8.4 ) test? ( >=dev-lang/tcl-8.4 ) java? ( >=virtual/jdk-1.5 ) >=sys-devel/binutils-2.16.1 test? ( >=dev-lang/tcl-8.4 ) java? ( >=dev-java/java-config-2.1.9-r1 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+tcl? ( >=dev-lang/tcl-8.4 ) test? ( >=dev-lang/tcl-8.4 ) java? ( >=virtual/jdk-1.5 ) >=sys-devel/binutils-2.16.1 test? ( >=dev-lang/tcl-8.4 ) java? ( >=dev-java/java-config-2.1.9-r1 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 tcl? ( dev-lang/tcl ) java? ( >=virtual/jre-1.5 ) java? ( >=dev-java/java-config-2.1.9-r1 )
 5.0
 http://download.oracle.com/berkeley-db/db-5.0.26.tar.gz
diff --git a/metadata/cache/sys-libs/db-5.0.32 b/metadata/cache/sys-libs/db-5.0.32
index 85126b3d36b8..02b9ac7f6ed9 100644
--- a/metadata/cache/sys-libs/db-5.0.32
+++ b/metadata/cache/sys-libs/db-5.0.32
@@ -1,4 +1,4 @@
-tcl? ( >=dev-lang/tcl-8.4 ) test? ( >=dev-lang/tcl-8.4 ) java? ( >=virtual/jdk-1.5 ) >=sys-devel/binutils-2.16.1 test? ( >=dev-lang/tcl-8.4 ) java? ( >=dev-java/java-config-2.1.9-r1 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+tcl? ( >=dev-lang/tcl-8.4 ) test? ( >=dev-lang/tcl-8.4 ) java? ( >=virtual/jdk-1.5 ) >=sys-devel/binutils-2.16.1 test? ( >=dev-lang/tcl-8.4 ) java? ( >=dev-java/java-config-2.1.9-r1 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 tcl? ( dev-lang/tcl ) java? ( >=virtual/jre-1.5 ) java? ( >=dev-java/java-config-2.1.9-r1 )
 5.0
 http://download.oracle.com/berkeley-db/db-5.0.32.tar.gz
diff --git a/metadata/cache/sys-libs/db-5.1.19-r2 b/metadata/cache/sys-libs/db-5.1.19-r2
index c8c6697dc4ec..bc860f3dfb14 100644
--- a/metadata/cache/sys-libs/db-5.1.19-r2
+++ b/metadata/cache/sys-libs/db-5.1.19-r2
@@ -1,4 +1,4 @@
-tcl? ( >=dev-lang/tcl-8.4 ) test? ( >=dev-lang/tcl-8.4 ) java? ( >=virtual/jdk-1.5 ) >=sys-devel/binutils-2.16.1 test? ( >=dev-lang/tcl-8.4 ) java? ( >=dev-java/java-config-2.1.9-r1 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+tcl? ( >=dev-lang/tcl-8.4 ) test? ( >=dev-lang/tcl-8.4 ) java? ( >=virtual/jdk-1.5 ) >=sys-devel/binutils-2.16.1 test? ( >=dev-lang/tcl-8.4 ) java? ( >=dev-java/java-config-2.1.9-r1 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 tcl? ( dev-lang/tcl ) java? ( >=virtual/jre-1.5 ) java? ( >=dev-java/java-config-2.1.9-r1 )
 5.1
 http://download.oracle.com/berkeley-db/db-5.1.19.tar.gz
diff --git a/metadata/cache/sys-libs/db-5.1.25 b/metadata/cache/sys-libs/db-5.1.25
index 70a113215b50..268cb9ae5780 100644
--- a/metadata/cache/sys-libs/db-5.1.25
+++ b/metadata/cache/sys-libs/db-5.1.25
@@ -1,4 +1,4 @@
-tcl? ( >=dev-lang/tcl-8.4 ) test? ( >=dev-lang/tcl-8.4 ) java? ( >=virtual/jdk-1.5 ) >=sys-devel/binutils-2.16.1 test? ( >=dev-lang/tcl-8.4 ) java? ( >=dev-java/java-config-2.1.9-r1 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+tcl? ( >=dev-lang/tcl-8.4 ) test? ( >=dev-lang/tcl-8.4 ) java? ( >=virtual/jdk-1.5 ) >=sys-devel/binutils-2.16.1 test? ( >=dev-lang/tcl-8.4 ) java? ( >=dev-java/java-config-2.1.9-r1 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 tcl? ( dev-lang/tcl ) java? ( >=virtual/jre-1.5 ) java? ( >=dev-java/java-config-2.1.9-r1 )
 5.1
 http://download.oracle.com/berkeley-db/db-5.1.25.tar.gz
diff --git a/metadata/cache/sys-libs/db-5.1.29 b/metadata/cache/sys-libs/db-5.1.29
index b5773b464de8..834d953c2468 100644
--- a/metadata/cache/sys-libs/db-5.1.29
+++ b/metadata/cache/sys-libs/db-5.1.29
@@ -1,4 +1,4 @@
-tcl? ( >=dev-lang/tcl-8.4 ) test? ( >=dev-lang/tcl-8.4 ) java? ( >=virtual/jdk-1.5 ) >=sys-devel/binutils-2.16.1 test? ( >=dev-lang/tcl-8.4 ) java? ( >=dev-java/java-config-2.1.9-r1 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+tcl? ( >=dev-lang/tcl-8.4 ) test? ( >=dev-lang/tcl-8.4 ) java? ( >=virtual/jdk-1.5 ) >=sys-devel/binutils-2.16.1 test? ( >=dev-lang/tcl-8.4 ) java? ( >=dev-java/java-config-2.1.9-r1 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 tcl? ( dev-lang/tcl ) java? ( >=virtual/jre-1.5 ) java? ( >=dev-java/java-config-2.1.9-r1 )
 5.1
 http://download.oracle.com/berkeley-db/db-5.1.29.tar.gz
diff --git a/metadata/cache/sys-libs/db-5.2.28 b/metadata/cache/sys-libs/db-5.2.28
index 88c6bcc92392..36172a1bc4a1 100644
--- a/metadata/cache/sys-libs/db-5.2.28
+++ b/metadata/cache/sys-libs/db-5.2.28
@@ -1,4 +1,4 @@
-tcl? ( >=dev-lang/tcl-8.4 ) test? ( >=dev-lang/tcl-8.4 ) java? ( >=virtual/jdk-1.5 ) >=sys-devel/binutils-2.16.1 test? ( >=dev-lang/tcl-8.4 ) java? ( >=dev-java/java-config-2.1.9-r1 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+tcl? ( >=dev-lang/tcl-8.4 ) test? ( >=dev-lang/tcl-8.4 ) java? ( >=virtual/jdk-1.5 ) >=sys-devel/binutils-2.16.1 test? ( >=dev-lang/tcl-8.4 ) java? ( >=dev-java/java-config-2.1.9-r1 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 tcl? ( dev-lang/tcl ) java? ( >=virtual/jre-1.5 ) java? ( >=dev-java/java-config-2.1.9-r1 )
 5.2
 http://download.oracle.com/berkeley-db/db-5.2.28.tar.gz
diff --git a/metadata/cache/sys-libs/db-5.2.36 b/metadata/cache/sys-libs/db-5.2.36
index 5bea1a2f423e..641eaaa26f5d 100644
--- a/metadata/cache/sys-libs/db-5.2.36
+++ b/metadata/cache/sys-libs/db-5.2.36
@@ -1,4 +1,4 @@
-tcl? ( >=dev-lang/tcl-8.4 ) test? ( >=dev-lang/tcl-8.4 ) java? ( >=virtual/jdk-1.5 ) >=sys-devel/binutils-2.16.1 test? ( >=dev-lang/tcl-8.4 ) java? ( >=dev-java/java-config-2.1.9-r1 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+tcl? ( >=dev-lang/tcl-8.4 ) test? ( >=dev-lang/tcl-8.4 ) java? ( >=virtual/jdk-1.5 ) >=sys-devel/binutils-2.16.1 test? ( >=dev-lang/tcl-8.4 ) java? ( >=dev-java/java-config-2.1.9-r1 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 tcl? ( dev-lang/tcl ) java? ( >=virtual/jre-1.5 ) java? ( >=dev-java/java-config-2.1.9-r1 )
 5.2
 http://download.oracle.com/berkeley-db/db-5.2.36.tar.gz
diff --git a/metadata/cache/sys-libs/freeipmi-1.0.10 b/metadata/cache/sys-libs/freeipmi-1.0.10
index 68d80c7025be..1f46775716ec 100644
--- a/metadata/cache/sys-libs/freeipmi-1.0.10
+++ b/metadata/cache/sys-libs/freeipmi-1.0.10
@@ -1,4 +1,4 @@
-dev-libs/libgcrypt virtual/os-headers || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-libs/libgcrypt virtual/os-headers || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-libs/libgcrypt sys-apps/openrc
 0
 mirror://gnu/freeipmi/freeipmi-1.0.10.tar.gz http://ftp.gluster.com/pub/freeipmi/1.0.10/freeipmi-1.0.10.tar.gz
diff --git a/metadata/cache/sys-libs/freeipmi-1.0.8 b/metadata/cache/sys-libs/freeipmi-1.0.8
index 45174f6f801b..ce0fa78a1687 100644
--- a/metadata/cache/sys-libs/freeipmi-1.0.8
+++ b/metadata/cache/sys-libs/freeipmi-1.0.8
@@ -1,4 +1,4 @@
-dev-libs/libgcrypt virtual/os-headers || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-libs/libgcrypt virtual/os-headers || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-libs/libgcrypt sys-apps/openrc
 0
 mirror://gnu/freeipmi/freeipmi-1.0.8.tar.gz http://ftp.gluster.com/pub/freeipmi/1.0.8/freeipmi-1.0.8.tar.gz
diff --git a/metadata/cache/sys-libs/freeipmi-1.0.9 b/metadata/cache/sys-libs/freeipmi-1.0.9
index 49b162025e0e..eda21407dbb9 100644
--- a/metadata/cache/sys-libs/freeipmi-1.0.9
+++ b/metadata/cache/sys-libs/freeipmi-1.0.9
@@ -1,4 +1,4 @@
-dev-libs/libgcrypt virtual/os-headers || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-libs/libgcrypt virtual/os-headers || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-libs/libgcrypt sys-apps/openrc
 0
 mirror://gnu/freeipmi/freeipmi-1.0.9.tar.gz http://ftp.gluster.com/pub/freeipmi/1.0.9/freeipmi-1.0.9.tar.gz
diff --git a/metadata/cache/sys-libs/freeipmi-1.1.1 b/metadata/cache/sys-libs/freeipmi-1.1.1
index aedb3b7a6d0a..1d9b6df83398 100644
--- a/metadata/cache/sys-libs/freeipmi-1.1.1
+++ b/metadata/cache/sys-libs/freeipmi-1.1.1
@@ -1,4 +1,4 @@
-dev-libs/libgcrypt virtual/os-headers || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-libs/libgcrypt virtual/os-headers || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-libs/libgcrypt sys-apps/openrc
 0
 mirror://gnu/freeipmi/freeipmi-1.1.1.tar.gz http://ftp.gluster.com/pub/freeipmi/1.1.1/freeipmi-1.1.1.tar.gz
diff --git a/metadata/cache/sys-libs/libcap-ng-0.6.2 b/metadata/cache/sys-libs/libcap-ng-0.6.2
index 274893aec036..e27ba924a468 100644
--- a/metadata/cache/sys-libs/libcap-ng-0.6.2
+++ b/metadata/cache/sys-libs/libcap-ng-0.6.2
@@ -1,4 +1,4 @@
-sys-apps/attr python? ( dev-lang/python ) sys-kernel/linux-headers python? ( dev-lang/swig ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+sys-apps/attr python? ( dev-lang/python ) sys-kernel/linux-headers python? ( dev-lang/swig ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 sys-apps/attr python? ( dev-lang/python )
 0
 http://people.redhat.com/sgrubb/libcap-ng/libcap-ng-0.6.2.tar.gz
diff --git a/metadata/cache/sys-libs/libcap-ng-0.6.4 b/metadata/cache/sys-libs/libcap-ng-0.6.4
index 918dd0f2d44b..713b730ed09f 100644
--- a/metadata/cache/sys-libs/libcap-ng-0.6.4
+++ b/metadata/cache/sys-libs/libcap-ng-0.6.4
@@ -1,4 +1,4 @@
-sys-apps/attr python? ( dev-lang/python ) sys-kernel/linux-headers python? ( dev-lang/swig ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+sys-apps/attr python? ( dev-lang/python ) sys-kernel/linux-headers python? ( dev-lang/swig ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 sys-apps/attr python? ( dev-lang/python )
 0
 http://people.redhat.com/sgrubb/libcap-ng/libcap-ng-0.6.4.tar.gz
diff --git a/metadata/cache/sys-libs/libcap-ng-0.6.5 b/metadata/cache/sys-libs/libcap-ng-0.6.5
index fea90ed78757..ef62d48b5fdb 100644
--- a/metadata/cache/sys-libs/libcap-ng-0.6.5
+++ b/metadata/cache/sys-libs/libcap-ng-0.6.5
@@ -1,4 +1,4 @@
-sys-apps/attr python? ( dev-lang/python ) sys-kernel/linux-headers python? ( dev-lang/swig ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+sys-apps/attr python? ( dev-lang/python ) sys-kernel/linux-headers python? ( dev-lang/swig ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 sys-apps/attr python? ( dev-lang/python )
 0
 http://people.redhat.com/sgrubb/libcap-ng/libcap-ng-0.6.5.tar.gz
diff --git a/metadata/cache/sys-libs/libcap-ng-0.6.6 b/metadata/cache/sys-libs/libcap-ng-0.6.6
index a897edaf7d24..85782f8e412c 100644
--- a/metadata/cache/sys-libs/libcap-ng-0.6.6
+++ b/metadata/cache/sys-libs/libcap-ng-0.6.6
@@ -1,4 +1,4 @@
-sys-apps/attr python? ( dev-lang/python ) sys-kernel/linux-headers python? ( >=dev-lang/swig-2 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+sys-apps/attr python? ( dev-lang/python ) sys-kernel/linux-headers python? ( >=dev-lang/swig-2 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 sys-apps/attr python? ( dev-lang/python )
 0
 http://people.redhat.com/sgrubb/libcap-ng/libcap-ng-0.6.6.tar.gz
diff --git a/metadata/cache/sys-libs/libnih-1.0.3 b/metadata/cache/sys-libs/libnih-1.0.3
index 8795e9ad0988..f08028e0e092 100644
--- a/metadata/cache/sys-libs/libnih-1.0.3
+++ b/metadata/cache/sys-libs/libnih-1.0.3
@@ -1,4 +1,4 @@
-dbus? ( dev-libs/expat >=sys-apps/dbus-1.2.16 ) sys-devel/gettext dev-util/pkgconfig test? ( dev-util/valgrind ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dbus? ( dev-libs/expat >=sys-apps/dbus-1.2.16 ) sys-devel/gettext dev-util/pkgconfig test? ( dev-util/valgrind ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dbus? ( dev-libs/expat >=sys-apps/dbus-1.2.16 )
 0
 http://launchpad.net/libnih/1.0/1.0.3/+download/libnih-1.0.3.tar.gz
diff --git a/metadata/cache/sys-libs/libsmbios-2.2.26 b/metadata/cache/sys-libs/libsmbios-2.2.26
index f6bf579f6cd9..16c171196108 100644
--- a/metadata/cache/sys-libs/libsmbios-2.2.26
+++ b/metadata/cache/sys-libs/libsmbios-2.2.26
@@ -1,4 +1,4 @@
-dev-libs/libxml2 sys-libs/zlib nls? ( virtual/libintl ) >=dev-util/pkgconfig-0.9.0 doc? ( app-doc/doxygen ) graphviz? ( media-gfx/graphviz ) nls? ( sys-devel/gettext ) test? ( >=dev-util/cppunit-1.9.6 ) python? ( || ( =dev-lang/python-3.2* =dev-lang/python-3.1* =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-libs/libxml2 sys-libs/zlib nls? ( virtual/libintl ) >=dev-util/pkgconfig-0.9.0 doc? ( app-doc/doxygen ) graphviz? ( media-gfx/graphviz ) nls? ( sys-devel/gettext ) test? ( >=dev-util/cppunit-1.9.6 ) python? ( || ( =dev-lang/python-3.2* =dev-lang/python-3.1* =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-libs/libxml2 sys-libs/zlib nls? ( virtual/libintl ) python? ( || ( =dev-lang/python-3.2* =dev-lang/python-3.1* =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) )
 0
 http://linux.dell.com/libsmbios/download/libsmbios/libsmbios-2.2.26/libsmbios-2.2.26.tar.bz2
diff --git a/metadata/cache/sys-libs/libsmbios-2.2.28 b/metadata/cache/sys-libs/libsmbios-2.2.28
index a128d5c660dc..fddfce79a7a5 100644
--- a/metadata/cache/sys-libs/libsmbios-2.2.28
+++ b/metadata/cache/sys-libs/libsmbios-2.2.28
@@ -1,4 +1,4 @@
-dev-libs/libxml2 sys-libs/zlib nls? ( virtual/libintl ) >=dev-util/pkgconfig-0.9.0 doc? ( app-doc/doxygen ) graphviz? ( media-gfx/graphviz ) nls? ( sys-devel/gettext ) test? ( >=dev-util/cppunit-1.9.6 ) python? ( || ( =dev-lang/python-3.2* =dev-lang/python-3.1* =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-libs/libxml2 sys-libs/zlib nls? ( virtual/libintl ) >=dev-util/pkgconfig-0.9.0 doc? ( app-doc/doxygen ) graphviz? ( media-gfx/graphviz ) nls? ( sys-devel/gettext ) test? ( >=dev-util/cppunit-1.9.6 ) python? ( || ( =dev-lang/python-3.2* =dev-lang/python-3.1* =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-libs/libxml2 sys-libs/zlib nls? ( virtual/libintl ) python? ( || ( =dev-lang/python-3.2* =dev-lang/python-3.1* =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) )
 0
 http://linux.dell.com/libsmbios/download/libsmbios/libsmbios-2.2.28/libsmbios-2.2.28.tar.bz2
diff --git a/metadata/cache/sys-libs/libunwind-0.99-r1 b/metadata/cache/sys-libs/libunwind-0.99-r1
index 1ac50d7b05f7..9d3cf136e8f6 100644
--- a/metadata/cache/sys-libs/libunwind-0.99-r1
+++ b/metadata/cache/sys-libs/libunwind-0.99-r1
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 7
 http://download.savannah.nongnu.org/releases/libunwind/libunwind-0.99.tar.gz
diff --git a/metadata/cache/sys-libs/libunwind-1.0 b/metadata/cache/sys-libs/libunwind-1.0
index 8c45fd5ca313..e38bfca8016b 100644
--- a/metadata/cache/sys-libs/libunwind-1.0
+++ b/metadata/cache/sys-libs/libunwind-1.0
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 7
 http://download.savannah.nongnu.org/releases/libunwind/libunwind-1.0.tar.gz
diff --git a/metadata/cache/sys-libs/libunwind-1.0.1 b/metadata/cache/sys-libs/libunwind-1.0.1
index 3987c03b5b5e..f65d3dd881a7 100644
--- a/metadata/cache/sys-libs/libunwind-1.0.1
+++ b/metadata/cache/sys-libs/libunwind-1.0.1
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 7
 http://download.savannah.nongnu.org/releases/libunwind/libunwind-1.0.1.tar.gz
diff --git a/metadata/cache/sys-libs/talloc-1.3.0 b/metadata/cache/sys-libs/talloc-1.3.0
index dbaddd65694d..63ba847b5ac0 100644
--- a/metadata/cache/sys-libs/talloc-1.3.0
+++ b/metadata/cache/sys-libs/talloc-1.3.0
@@ -1,4 +1,4 @@
-!<net-fs/samba-libs-3.4 app-text/docbook-xml-dtd:4.2 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+!<net-fs/samba-libs-3.4 app-text/docbook-xml-dtd:4.2 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 !<net-fs/samba-libs-3.4 app-text/docbook-xml-dtd:4.2
 0
 http://samba.org/ftp/talloc/talloc-1.3.0.tar.gz
diff --git a/metadata/cache/sys-libs/talloc-1.3.1 b/metadata/cache/sys-libs/talloc-1.3.1
index beba8fc19e74..3790e47f2aca 100644
--- a/metadata/cache/sys-libs/talloc-1.3.1
+++ b/metadata/cache/sys-libs/talloc-1.3.1
@@ -1,4 +1,4 @@
-!<net-fs/samba-libs-3.4 app-text/docbook-xml-dtd:4.2 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+!<net-fs/samba-libs-3.4 app-text/docbook-xml-dtd:4.2 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 !<net-fs/samba-libs-3.4 app-text/docbook-xml-dtd:4.2
 0
 http://samba.org/ftp/talloc/talloc-1.3.1.tar.gz
diff --git a/metadata/cache/sys-libs/talloc-2.0.0-r1 b/metadata/cache/sys-libs/talloc-2.0.0-r1
index cbd5f9a03679..c01309c9bd89 100644
--- a/metadata/cache/sys-libs/talloc-2.0.0-r1
+++ b/metadata/cache/sys-libs/talloc-2.0.0-r1
@@ -1,4 +1,4 @@
-!<net-fs/samba-3.3 doc? ( app-text/docbook-xml-dtd:4.2 ) !<net-fs/samba-libs-3.4 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+!<net-fs/samba-3.3 doc? ( app-text/docbook-xml-dtd:4.2 ) !<net-fs/samba-libs-3.4 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 !<net-fs/samba-3.3 doc? ( app-text/docbook-xml-dtd:4.2 ) !<net-fs/samba-libs-3.4
 0
 http://samba.org/ftp/talloc/talloc-2.0.0.tar.gz
diff --git a/metadata/cache/sys-libs/talloc-2.0.1 b/metadata/cache/sys-libs/talloc-2.0.1
index 1a8f39e53087..2db044e96607 100644
--- a/metadata/cache/sys-libs/talloc-2.0.1
+++ b/metadata/cache/sys-libs/talloc-2.0.1
@@ -1,4 +1,4 @@
-!<net-fs/samba-3.3 doc? ( app-text/docbook-xml-dtd:4.2 ) !<net-fs/samba-libs-3.4 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+!<net-fs/samba-3.3 doc? ( app-text/docbook-xml-dtd:4.2 ) !<net-fs/samba-libs-3.4 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 !<net-fs/samba-3.3 doc? ( app-text/docbook-xml-dtd:4.2 ) !<net-fs/samba-libs-3.4
 0
 http://samba.org/ftp/talloc/talloc-2.0.1.tar.gz
diff --git a/metadata/cache/sys-libs/talloc-2.0.1-r1 b/metadata/cache/sys-libs/talloc-2.0.1-r1
index 54498b8aa527..583a48cb7aa4 100644
--- a/metadata/cache/sys-libs/talloc-2.0.1-r1
+++ b/metadata/cache/sys-libs/talloc-2.0.1-r1
@@ -1,4 +1,4 @@
-doc? ( app-text/docbook-xml-dtd:4.2 dev-libs/libxslt ) swig? ( dev-lang/swig ) !<net-fs/samba-libs-3.4 !<net-fs/samba-3.3 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+doc? ( app-text/docbook-xml-dtd:4.2 dev-libs/libxslt ) swig? ( dev-lang/swig ) !<net-fs/samba-libs-3.4 !<net-fs/samba-3.3 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 http://samba.org/ftp/talloc/talloc-2.0.1.tar.gz
diff --git a/metadata/cache/sys-libs/talloc-2.0.1-r2 b/metadata/cache/sys-libs/talloc-2.0.1-r2
index 54498b8aa527..583a48cb7aa4 100644
--- a/metadata/cache/sys-libs/talloc-2.0.1-r2
+++ b/metadata/cache/sys-libs/talloc-2.0.1-r2
@@ -1,4 +1,4 @@
-doc? ( app-text/docbook-xml-dtd:4.2 dev-libs/libxslt ) swig? ( dev-lang/swig ) !<net-fs/samba-libs-3.4 !<net-fs/samba-3.3 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+doc? ( app-text/docbook-xml-dtd:4.2 dev-libs/libxslt ) swig? ( dev-lang/swig ) !<net-fs/samba-libs-3.4 !<net-fs/samba-3.3 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 http://samba.org/ftp/talloc/talloc-2.0.1.tar.gz
diff --git a/metadata/cache/sys-libs/tdb-1.2.1 b/metadata/cache/sys-libs/tdb-1.2.1
index d4c4ec3989ca..57d62e1e2478 100644
--- a/metadata/cache/sys-libs/tdb-1.2.1
+++ b/metadata/cache/sys-libs/tdb-1.2.1
@@ -1,4 +1,4 @@
-!<net-fs/samba-libs-3.4 !<net-fs/samba-3.3 app-text/docbook-xsl-stylesheets dev-libs/libxslt || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) )
+!<net-fs/samba-libs-3.4 !<net-fs/samba-3.3 app-text/docbook-xsl-stylesheets dev-libs/libxslt || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) )
 !!<sys-libs/tdb-1.2.1 python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) )
 0
 http://samba.org/ftp/tdb/tdb-1.2.1.tar.gz
diff --git a/metadata/cache/sys-libs/tdb-1.2.1-r1 b/metadata/cache/sys-libs/tdb-1.2.1-r1
index 3fc273dc97dd..1be06f9b3668 100644
--- a/metadata/cache/sys-libs/tdb-1.2.1-r1
+++ b/metadata/cache/sys-libs/tdb-1.2.1-r1
@@ -1,4 +1,4 @@
-!<net-fs/samba-3.3 app-text/docbook-xsl-stylesheets dev-libs/libxslt || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) )
+!<net-fs/samba-3.3 app-text/docbook-xsl-stylesheets dev-libs/libxslt || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) )
 python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) )
 0
 http://samba.org/ftp/tdb/tdb-1.2.1.tar.gz
diff --git a/metadata/cache/sys-libs/tdb-1.2.7-r1 b/metadata/cache/sys-libs/tdb-1.2.7-r1
index 764b22c82c3b..666336bd49d2 100644
--- a/metadata/cache/sys-libs/tdb-1.2.7-r1
+++ b/metadata/cache/sys-libs/tdb-1.2.7-r1
@@ -1,4 +1,4 @@
-!<net-fs/samba-3.3 app-text/docbook-xsl-stylesheets dev-libs/libxslt dev-libs/popt || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( =dev-lang/python-2* )
+!<net-fs/samba-3.3 app-text/docbook-xsl-stylesheets dev-libs/libxslt dev-libs/popt || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( =dev-lang/python-2* )
 python? ( =dev-lang/python-2* )
 0
 http://samba.org/ftp/tdb/tdb-1.2.7.tar.gz mirror://gentoo/tdb-1.2.7-patches.tar.gz
diff --git a/metadata/cache/sys-power/nut-2.6.0-r1 b/metadata/cache/sys-power/nut-2.6.0-r1
index e9fadf53e96c..c82ee7b67e56 100644
--- a/metadata/cache/sys-power/nut-2.6.0-r1
+++ b/metadata/cache/sys-power/nut-2.6.0-r1
@@ -1,4 +1,4 @@
-cgi? ( >=media-libs/gd-2[png] ) snmp? ( net-analyzer/net-snmp ) usb? ( virtual/libusb:0 ) ssl? ( >=dev-libs/openssl-1 ) tcpd? ( sys-apps/tcp-wrappers ) xml? ( >=net-libs/neon-0.25.0 ) >=sys-fs/udev-114 >=sys-apps/sed-4 dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+cgi? ( >=media-libs/gd-2[png] ) snmp? ( net-analyzer/net-snmp ) usb? ( virtual/libusb:0 ) ssl? ( >=dev-libs/openssl-1 ) tcpd? ( sys-apps/tcp-wrappers ) xml? ( >=net-libs/neon-0.25.0 ) >=sys-fs/udev-114 >=sys-apps/sed-4 dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 cgi? ( >=media-libs/gd-2[png] ) snmp? ( net-analyzer/net-snmp ) usb? ( virtual/libusb:0 ) ssl? ( >=dev-libs/openssl-1 ) tcpd? ( sys-apps/tcp-wrappers ) xml? ( >=net-libs/neon-0.25.0 ) >=sys-fs/udev-114 bash-completion? ( app-admin/eselect )
 0
 http://random.networkupstools.org/source/2.6/nut-2.6.0.tar.gz http://www.networkupstools.org/source/2.6/nut-2.6.0.tar.gz
diff --git a/metadata/cache/sys-power/nut-2.6.2 b/metadata/cache/sys-power/nut-2.6.2
index 6578c3c64d77..7dbb621b34c1 100644
--- a/metadata/cache/sys-power/nut-2.6.2
+++ b/metadata/cache/sys-power/nut-2.6.2
@@ -1,4 +1,4 @@
-cgi? ( >=media-libs/gd-2[png] ) snmp? ( net-analyzer/net-snmp ) usb? ( virtual/libusb:0 ) ssl? ( >=dev-libs/openssl-1 ) tcpd? ( sys-apps/tcp-wrappers ) xml? ( >=net-libs/neon-0.25.0 ) >=sys-fs/udev-114 >=sys-apps/sed-4 dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+cgi? ( >=media-libs/gd-2[png] ) snmp? ( net-analyzer/net-snmp ) usb? ( virtual/libusb:0 ) ssl? ( >=dev-libs/openssl-1 ) tcpd? ( sys-apps/tcp-wrappers ) xml? ( >=net-libs/neon-0.25.0 ) >=sys-fs/udev-114 >=sys-apps/sed-4 dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 cgi? ( >=media-libs/gd-2[png] ) snmp? ( net-analyzer/net-snmp ) usb? ( virtual/libusb:0 ) ssl? ( >=dev-libs/openssl-1 ) tcpd? ( sys-apps/tcp-wrappers ) xml? ( >=net-libs/neon-0.25.0 ) >=sys-fs/udev-114 bash-completion? ( app-admin/eselect )
 0
 http://random.networkupstools.org/source/2.6/nut-2.6.2.tar.gz http://www.networkupstools.org/source/2.6/nut-2.6.2.tar.gz
diff --git a/metadata/cache/sys-power/nvclock-0.8_beta4-r4 b/metadata/cache/sys-power/nvclock-0.8_beta4-r4
index a2475e133331..df46dead54a9 100644
--- a/metadata/cache/sys-power/nvclock-0.8_beta4-r4
+++ b/metadata/cache/sys-power/nvclock-0.8_beta4-r4
@@ -1,4 +1,4 @@
-gtk? ( x11-libs/gtk+:2 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+gtk? ( x11-libs/gtk+:2 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 gtk? ( x11-libs/gtk+:2 )
 0
 http://www.linuxhardware.org/nvclock/nvclock0.8b4.tar.gz
diff --git a/metadata/cache/sys-power/nvclock-0.8_p20110102-r1 b/metadata/cache/sys-power/nvclock-0.8_p20110102-r1
index 57d9077716ae..fa7a2f394595 100644
--- a/metadata/cache/sys-power/nvclock-0.8_p20110102-r1
+++ b/metadata/cache/sys-power/nvclock-0.8_p20110102-r1
@@ -1,4 +1,4 @@
-gtk? ( x11-libs/gtk+:2 ) nvcontrol? ( x11-libs/libX11 x11-libs/libXext ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+gtk? ( x11-libs/gtk+:2 ) nvcontrol? ( x11-libs/libX11 x11-libs/libXext ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 gtk? ( x11-libs/gtk+:2 ) nvcontrol? ( x11-libs/libX11 x11-libs/libXext )
 0
 mirror://gentoo/nvclock-0.8_p20110102.tar.bz2
diff --git a/metadata/cache/sys-power/suspend-1.0 b/metadata/cache/sys-power/suspend-1.0
index 1ec3e2fe0522..f4bf1ea66552 100644
--- a/metadata/cache/sys-power/suspend-1.0
+++ b/metadata/cache/sys-power/suspend-1.0
@@ -1,4 +1,4 @@
->=dev-libs/lzo-2[static-libs] fbsplash? ( >=media-gfx/splashutils-1.5.2 ) crypt? ( dev-libs/libgcrypt[static-libs] dev-libs/libgpg-error[static-libs] ) x86? ( dev-libs/libx86 ) amd64? ( dev-libs/libx86 ) x86? ( dev-libs/libx86 >=sys-apps/pciutils-2.2.4 ) amd64? ( dev-libs/libx86 >=sys-apps/pciutils-2.2.4 ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-libs/lzo-2[static-libs] fbsplash? ( >=media-gfx/splashutils-1.5.2 ) crypt? ( dev-libs/libgcrypt[static-libs] dev-libs/libgpg-error[static-libs] ) x86? ( dev-libs/libx86 ) amd64? ( dev-libs/libx86 ) x86? ( dev-libs/libx86 >=sys-apps/pciutils-2.2.4 ) amd64? ( dev-libs/libx86 >=sys-apps/pciutils-2.2.4 ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=dev-libs/lzo-2[static-libs] fbsplash? ( >=media-gfx/splashutils-1.5.2 ) crypt? ( dev-libs/libgcrypt[static-libs] dev-libs/libgpg-error[static-libs] ) x86? ( dev-libs/libx86 ) amd64? ( dev-libs/libx86 )
 0
 mirror://sourceforge/suspend/suspend-utils-1.0.tar.bz2
diff --git a/metadata/cache/sys-process/acct-6.5.5-r2 b/metadata/cache/sys-process/acct-6.5.5-r2
index b6c132f7cbf5..ffecdef77054 100644
--- a/metadata/cache/sys-process/acct-6.5.5-r2
+++ b/metadata/cache/sys-process/acct-6.5.5-r2
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 mirror://gnu/acct/acct-6.5.5.tar.gz
diff --git a/metadata/cache/sys-process/at-3.1.13 b/metadata/cache/sys-process/at-3.1.13
index 2cb2c2283e49..d63f2759cf4f 100644
--- a/metadata/cache/sys-process/at-3.1.13
+++ b/metadata/cache/sys-process/at-3.1.13
@@ -1,4 +1,4 @@
-virtual/mta >=sys-devel/autoconf-2.64 sys-devel/bison >=sys-devel/flex-2.5.4a pam? ( virtual/pam ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+virtual/mta >=sys-devel/autoconf-2.64 sys-devel/bison >=sys-devel/flex-2.5.4a pam? ( virtual/pam ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 virtual/mta virtual/logger
 0
 mirror://debian/pool/main/a/at/at_3.1.13.orig.tar.gz
diff --git a/metadata/cache/sys-process/at-3.1.13-r1 b/metadata/cache/sys-process/at-3.1.13-r1
index 66f85c11db44..6dd8e1375e6e 100644
--- a/metadata/cache/sys-process/at-3.1.13-r1
+++ b/metadata/cache/sys-process/at-3.1.13-r1
@@ -1,4 +1,4 @@
-virtual/mta >=sys-devel/autoconf-2.64 sys-devel/bison >=sys-devel/flex-2.5.4a pam? ( virtual/pam ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+virtual/mta >=sys-devel/autoconf-2.64 sys-devel/bison >=sys-devel/flex-2.5.4a pam? ( virtual/pam ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 virtual/mta virtual/logger
 0
 mirror://debian/pool/main/a/at/at_3.1.13.orig.tar.gz
diff --git a/metadata/cache/sys-process/audit-1.7.17 b/metadata/cache/sys-process/audit-1.7.17
index f80a02c2a8db..b2e5ff8649e9 100644
--- a/metadata/cache/sys-process/audit-1.7.17
+++ b/metadata/cache/sys-process/audit-1.7.17
@@ -1,4 +1,4 @@
-ldap? ( net-nds/openldap ) dev-lang/swig >=sys-kernel/linux-headers-2.6.23 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool =dev-lang/python-2*
+ldap? ( net-nds/openldap ) dev-lang/swig >=sys-kernel/linux-headers-2.6.23 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool =dev-lang/python-2*
 ldap? ( net-nds/openldap ) =dev-lang/python-2*
 0
 http://people.redhat.com/sgrubb/audit/audit-1.7.17.tar.gz
diff --git a/metadata/cache/sys-process/audit-1.7.4 b/metadata/cache/sys-process/audit-1.7.4
index c903c9fb5458..2b38ee8ed709 100644
--- a/metadata/cache/sys-process/audit-1.7.4
+++ b/metadata/cache/sys-process/audit-1.7.4
@@ -1,4 +1,4 @@
-ldap? ( net-nds/openldap ) dev-lang/swig >=sys-kernel/linux-headers-2.6.23 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool =dev-lang/python-2*
+ldap? ( net-nds/openldap ) dev-lang/swig >=sys-kernel/linux-headers-2.6.23 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool =dev-lang/python-2*
 ldap? ( net-nds/openldap ) =dev-lang/python-2*
 0
 http://people.redhat.com/sgrubb/audit/audit-1.7.4.tar.gz
diff --git a/metadata/cache/sys-process/audit-2.0.5 b/metadata/cache/sys-process/audit-2.0.5
index f5a80aedeb5b..21f8ca0e968d 100644
--- a/metadata/cache/sys-process/audit-2.0.5
+++ b/metadata/cache/sys-process/audit-2.0.5
@@ -1,4 +1,4 @@
-ldap? ( net-nds/openldap ) prelude? ( dev-libs/libprelude ) sys-libs/libcap-ng dev-lang/swig >=sys-kernel/linux-headers-2.6.34 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool =dev-lang/python-2*
+ldap? ( net-nds/openldap ) prelude? ( dev-libs/libprelude ) sys-libs/libcap-ng dev-lang/swig >=sys-kernel/linux-headers-2.6.34 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool =dev-lang/python-2*
 ldap? ( net-nds/openldap ) prelude? ( dev-libs/libprelude ) sys-libs/libcap-ng =dev-lang/python-2*
 0
 http://people.redhat.com/sgrubb/audit/audit-2.0.5.tar.gz
diff --git a/metadata/cache/sys-process/audit-2.1.3 b/metadata/cache/sys-process/audit-2.1.3
index 7a3f3f098a01..aefdb9969c02 100644
--- a/metadata/cache/sys-process/audit-2.1.3
+++ b/metadata/cache/sys-process/audit-2.1.3
@@ -1,4 +1,4 @@
-ldap? ( net-nds/openldap ) prelude? ( dev-libs/libprelude ) sys-libs/libcap-ng dev-lang/swig >=sys-kernel/linux-headers-2.6.34 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool =dev-lang/python-2*
+ldap? ( net-nds/openldap ) prelude? ( dev-libs/libprelude ) sys-libs/libcap-ng dev-lang/swig >=sys-kernel/linux-headers-2.6.34 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool =dev-lang/python-2*
 ldap? ( net-nds/openldap ) prelude? ( dev-libs/libprelude ) sys-libs/libcap-ng =dev-lang/python-2*
 0
 http://people.redhat.com/sgrubb/audit/audit-2.1.3.tar.gz
diff --git a/metadata/cache/sys-process/audit-2.1.3-r1 b/metadata/cache/sys-process/audit-2.1.3-r1
index 46db4401daa6..5face8f448d1 100644
--- a/metadata/cache/sys-process/audit-2.1.3-r1
+++ b/metadata/cache/sys-process/audit-2.1.3-r1
@@ -1,4 +1,4 @@
-ldap? ( net-nds/openldap ) prelude? ( dev-libs/libprelude ) sys-libs/libcap-ng python? ( dev-lang/swig ) >=sys-kernel/linux-headers-2.6.34 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( =dev-lang/python-2* )
+ldap? ( net-nds/openldap ) prelude? ( dev-libs/libprelude ) sys-libs/libcap-ng python? ( dev-lang/swig ) >=sys-kernel/linux-headers-2.6.34 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( =dev-lang/python-2* )
 ldap? ( net-nds/openldap ) prelude? ( dev-libs/libprelude ) sys-libs/libcap-ng python? ( =dev-lang/python-2* )
 0
 http://people.redhat.com/sgrubb/audit/audit-2.1.3.tar.gz
diff --git a/metadata/cache/sys-process/htop-0.8.3 b/metadata/cache/sys-process/htop-0.8.3
deleted file mode 100644
index 007b64cfb370..000000000000
--- a/metadata/cache/sys-process/htop-0.8.3
+++ /dev/null
@@ -1,22 +0,0 @@
-sys-libs/ncurses[unicode]
-sys-libs/ncurses[unicode]
-0
-mirror://sourceforge/htop/htop-0.8.3.tar.gz
-
-http://htop.sourceforge.net
-GPL-2
-interactive process viewer
-alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux
-eutils flag-o-matic multilib toolchain-funcs user
-debug
-
-
-
-3
-
-configure install prepare setup
-
-
-
-
-
diff --git a/metadata/cache/sys-process/htop-0.9 b/metadata/cache/sys-process/htop-0.9
deleted file mode 100644
index 2da53485c0b7..000000000000
--- a/metadata/cache/sys-process/htop-0.9
+++ /dev/null
@@ -1,22 +0,0 @@
-sys-libs/ncurses[unicode?]
-sys-libs/ncurses[unicode?]
-0
-mirror://sourceforge/htop/htop-0.9.tar.gz
-
-http://htop.sourceforge.net
-BSD GPL-2
-interactive process viewer
-alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux
-eutils flag-o-matic multilib toolchain-funcs user
-debug elibc_FreeBSD kernel_linux openvz unicode vserver
-
-
-
-3
-
-configure install prepare setup
-
-
-
-
-
diff --git a/metadata/cache/sys-process/htop-0.9-r1 b/metadata/cache/sys-process/htop-0.9-r1
deleted file mode 100644
index e65372de853a..000000000000
--- a/metadata/cache/sys-process/htop-0.9-r1
+++ /dev/null
@@ -1,22 +0,0 @@
-sys-libs/ncurses[unicode?] || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
-sys-libs/ncurses[unicode?]
-0
-mirror://sourceforge/htop/htop-0.9.tar.gz
-
-http://htop.sourceforge.net
-BSD GPL-2
-interactive process viewer
-~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux
-autotools eutils flag-o-matic libtool multilib toolchain-funcs user
-debug elibc_FreeBSD kernel_linux openvz unicode vserver
-
-
-
-4
-
-configure prepare setup
-
-
-
-
-
diff --git a/metadata/cache/sys-process/htop-0.9-r2 b/metadata/cache/sys-process/htop-0.9-r2
index 4cd98eeba5ab..ceca7fed75d3 100644
--- a/metadata/cache/sys-process/htop-0.9-r2
+++ b/metadata/cache/sys-process/htop-0.9-r2
@@ -1,4 +1,4 @@
-sys-libs/ncurses[unicode?] || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+sys-libs/ncurses[unicode?] || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 sys-libs/ncurses[unicode?]
 0
 mirror://sourceforge/htop/htop-0.9.tar.gz
diff --git a/metadata/cache/sys-process/htop-1.0 b/metadata/cache/sys-process/htop-1.0
deleted file mode 100644
index 8920aff28421..000000000000
--- a/metadata/cache/sys-process/htop-1.0
+++ /dev/null
@@ -1,22 +0,0 @@
-sys-libs/ncurses[unicode?] || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
-sys-libs/ncurses[unicode?]
-0
-mirror://sourceforge/htop/htop-1.0.tar.gz
-
-http://htop.sourceforge.net
-BSD GPL-2
-interactive process viewer
-~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux
-autotools eutils flag-o-matic libtool multilib toolchain-funcs user
-elibc_FreeBSD kernel_linux openvz unicode vserver
-
-
-
-4
-
-configure prepare setup
-
-
-
-
-
diff --git a/metadata/cache/sys-process/htop-1.0.1 b/metadata/cache/sys-process/htop-1.0.1
index 5e3d7ac1a484..9f3d3349e5f6 100644
--- a/metadata/cache/sys-process/htop-1.0.1
+++ b/metadata/cache/sys-process/htop-1.0.1
@@ -1,4 +1,4 @@
-sys-libs/ncurses[unicode?] || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+sys-libs/ncurses[unicode?] || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 sys-libs/ncurses[unicode?]
 0
 mirror://sourceforge/htop/htop-1.0.1.tar.gz
diff --git a/metadata/cache/sys-process/procps-3.3.2_p2-r1 b/metadata/cache/sys-process/procps-3.3.2_p2-r1
index 8fddfaaf2862..63b4ae991006 100644
--- a/metadata/cache/sys-process/procps-3.3.2_p2-r1
+++ b/metadata/cache/sys-process/procps-3.3.2_p2-r1
@@ -1,4 +1,4 @@
-ncurses? ( >=sys-libs/ncurses-5.2-r2[unicode?] ) ncurses? ( dev-util/pkgconfig ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+ncurses? ( >=sys-libs/ncurses-5.2-r2[unicode?] ) ncurses? ( dev-util/pkgconfig ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 ncurses? ( >=sys-libs/ncurses-5.2-r2[unicode?] )
 0
 mirror://debian/pool/main/p/procps/procps_3.3.2.orig.tar.gz mirror://debian/pool/main/p/procps/procps_3.3.2-2.debian.tar.gz
diff --git a/metadata/cache/sys-process/psmisc-22.14 b/metadata/cache/sys-process/psmisc-22.14
index 7720c00def6e..a7c2eddc4831 100644
--- a/metadata/cache/sys-process/psmisc-22.14
+++ b/metadata/cache/sys-process/psmisc-22.14
@@ -1,4 +1,4 @@
->=sys-libs/ncurses-5.2-r2 selinux? ( sys-libs/libselinux ) sys-devel/libtool nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=sys-libs/ncurses-5.2-r2 selinux? ( sys-libs/libselinux ) sys-devel/libtool nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=sys-libs/ncurses-5.2-r2 selinux? ( sys-libs/libselinux )
 0
 mirror://sourceforge/psmisc/psmisc-22.14.tar.gz
diff --git a/metadata/cache/virtual/perl-Module-Pluggable-3.900.0-r1 b/metadata/cache/virtual/perl-Module-Pluggable-3.900.0-r1
index 86d581d1fe96..6151ec126fd0 100644
--- a/metadata/cache/virtual/perl-Module-Pluggable-3.900.0-r1
+++ b/metadata/cache/virtual/perl-Module-Pluggable-3.900.0-r1
@@ -6,7 +6,7 @@
 
 
 Virtual for Module-Pluggable
-alpha amd64 ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
+alpha amd64 ~hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
 
 
 
diff --git a/metadata/cache/www-apache/mod_auth_nufw-2.2.2 b/metadata/cache/www-apache/mod_auth_nufw-2.2.2
index d052989150b1..b5b85b325a7a 100644
--- a/metadata/cache/www-apache/mod_auth_nufw-2.2.2
+++ b/metadata/cache/www-apache/mod_auth_nufw-2.2.2
@@ -1,4 +1,4 @@
-mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-server ) =www-servers/apache-2.2* || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-server ) =www-servers/apache-2.2* || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-server ) =www-servers/apache-2.2*
 0
 http://software.inl.fr/releases/mod_auth_nufw/mod_auth_nufw-2.2.2.tar.bz2
diff --git a/metadata/cache/www-apache/mod_caucho-4.0.13 b/metadata/cache/www-apache/mod_caucho-4.0.13
index bf16ec63ccbd..a51ed49fd94a 100644
--- a/metadata/cache/www-apache/mod_caucho-4.0.13
+++ b/metadata/cache/www-apache/mod_caucho-4.0.13
@@ -1,4 +1,4 @@
-app-arch/unzip =www-servers/apache-2* || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+app-arch/unzip =www-servers/apache-2* || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 =www-servers/apache-2*
 0
 http://www.caucho.com/download/resin-4.0.13-src.zip mirror://gentoo/resin-gentoo-patches-4.0.13.tar.bz2
diff --git a/metadata/cache/www-apache/mod_caucho-4.0.14 b/metadata/cache/www-apache/mod_caucho-4.0.14
index 7af6bd305254..322d889ed5e1 100644
--- a/metadata/cache/www-apache/mod_caucho-4.0.14
+++ b/metadata/cache/www-apache/mod_caucho-4.0.14
@@ -1,4 +1,4 @@
-app-arch/unzip =www-servers/apache-2* || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+app-arch/unzip =www-servers/apache-2* || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 =www-servers/apache-2*
 0
 http://www.caucho.com/download/resin-4.0.14-src.zip mirror://gentoo/resin-gentoo-patches-4.0.14.tar.bz2
diff --git a/metadata/cache/www-apache/mod_caucho-4.0.15 b/metadata/cache/www-apache/mod_caucho-4.0.15
index 1ca2bdcd1ea2..82d20bed9f59 100644
--- a/metadata/cache/www-apache/mod_caucho-4.0.15
+++ b/metadata/cache/www-apache/mod_caucho-4.0.15
@@ -1,4 +1,4 @@
-app-arch/unzip =www-servers/apache-2* || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+app-arch/unzip =www-servers/apache-2* || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 =www-servers/apache-2*
 0
 http://www.caucho.com/download/resin-4.0.15-src.zip mirror://gentoo/resin-gentoo-patches-4.0.15.tar.bz2
diff --git a/metadata/cache/www-apache/mod_caucho-4.0.22 b/metadata/cache/www-apache/mod_caucho-4.0.22
index 1551115026a8..c70ab9f4ba4f 100644
--- a/metadata/cache/www-apache/mod_caucho-4.0.22
+++ b/metadata/cache/www-apache/mod_caucho-4.0.22
@@ -1,4 +1,4 @@
-app-arch/unzip =www-servers/apache-2* || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+app-arch/unzip =www-servers/apache-2* || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 =www-servers/apache-2*
 0
 http://www.caucho.com/download/resin-4.0.22-src.zip mirror://gentoo/resin-gentoo-patches-4.0.22.tar.bz2
diff --git a/metadata/cache/www-apache/mod_caucho-4.0.25 b/metadata/cache/www-apache/mod_caucho-4.0.25
index 76e3aa242121..89de8a3a01e4 100644
--- a/metadata/cache/www-apache/mod_caucho-4.0.25
+++ b/metadata/cache/www-apache/mod_caucho-4.0.25
@@ -1,4 +1,4 @@
-app-arch/unzip =www-servers/apache-2* || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+app-arch/unzip =www-servers/apache-2* || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 =www-servers/apache-2*
 0
 http://www.caucho.com/download/resin-4.0.25-src.zip mirror://gentoo/resin-gentoo-patches-4.0.25.tar.bz2
diff --git a/metadata/cache/www-apache/mod_caucho-4.0.26 b/metadata/cache/www-apache/mod_caucho-4.0.26
index a8ddfce3ac6d..f3060bd14711 100644
--- a/metadata/cache/www-apache/mod_caucho-4.0.26
+++ b/metadata/cache/www-apache/mod_caucho-4.0.26
@@ -1,4 +1,4 @@
-app-arch/unzip =www-servers/apache-2* || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+app-arch/unzip =www-servers/apache-2* || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 =www-servers/apache-2*
 0
 http://www.caucho.com/download/resin-4.0.26-src.zip mirror://gentoo/resin-gentoo-patches-4.0.26.tar.bz2
diff --git a/metadata/cache/www-apache/mod_cplusplus-2.0.1 b/metadata/cache/www-apache/mod_cplusplus-2.0.1
index d08dae4c0944..c60d0540c34d 100644
--- a/metadata/cache/www-apache/mod_cplusplus-2.0.1
+++ b/metadata/cache/www-apache/mod_cplusplus-2.0.1
@@ -1,4 +1,4 @@
-=www-servers/apache-2* || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+=www-servers/apache-2* || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 =www-servers/apache-2*
 0
 mirror://sourceforge/modcplusplus/modcplusplus-2.0.1.tar.gz
diff --git a/metadata/cache/www-apache/mod_nss-1.0.8-r1 b/metadata/cache/www-apache/mod_nss-1.0.8-r1
index 65d4fc41e8ac..4830b11f49e0 100644
--- a/metadata/cache/www-apache/mod_nss-1.0.8-r1
+++ b/metadata/cache/www-apache/mod_nss-1.0.8-r1
@@ -1,4 +1,4 @@
->=dev-libs/nss-3.11.4 >=dev-libs/nspr-4.6.4 dev-util/pkgconfig sys-apps/sed =www-servers/apache-2* || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-libs/nss-3.11.4 >=dev-libs/nspr-4.6.4 dev-util/pkgconfig sys-apps/sed =www-servers/apache-2* || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=dev-libs/nss-3.11.4 >=dev-libs/nspr-4.6.4 net-dns/bind-tools =www-servers/apache-2*
 0
 http://directory.fedoraproject.org/sources/mod_nss-1.0.8.tar.gz
diff --git a/metadata/cache/www-apache/mod_python-3.3.1-r1 b/metadata/cache/www-apache/mod_python-3.3.1-r1
index 1ec31a083da9..8337583134b2 100644
--- a/metadata/cache/www-apache/mod_python-3.3.1-r1
+++ b/metadata/cache/www-apache/mod_python-3.3.1-r1
@@ -1,4 +1,4 @@
-=www-servers/apache-2* || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool =dev-lang/python-2*
+=www-servers/apache-2* || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool =dev-lang/python-2*
 =www-servers/apache-2* =dev-lang/python-2*
 0
 mirror://apache/httpd/modpython/mod_python-3.3.1.tgz
diff --git a/metadata/cache/www-apache/mod_security-2.5.12 b/metadata/cache/www-apache/mod_security-2.5.12
index dd4773f2e5fa..c59c439c7e2f 100644
--- a/metadata/cache/www-apache/mod_security-2.5.12
+++ b/metadata/cache/www-apache/mod_security-2.5.12
@@ -1,4 +1,4 @@
-dev-libs/libxml2 perl? ( dev-perl/libwww-perl ) lua? ( >=dev-lang/lua-5.1 ) www-servers/apache[apache2_modules_unique_id] =www-servers/apache-2* || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-libs/libxml2 perl? ( dev-perl/libwww-perl ) lua? ( >=dev-lang/lua-5.1 ) www-servers/apache[apache2_modules_unique_id] =www-servers/apache-2* || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-libs/libxml2 perl? ( dev-perl/libwww-perl ) lua? ( >=dev-lang/lua-5.1 ) www-servers/apache[apache2_modules_unique_id] =www-servers/apache-2*
 0
 http://www.modsecurity.org/download/modsecurity-apache_2.5.12.tar.gz
diff --git a/metadata/cache/www-apache/mod_security-2.6.1 b/metadata/cache/www-apache/mod_security-2.6.1
index 72287d80c558..2450dd14ed85 100644
--- a/metadata/cache/www-apache/mod_security-2.6.1
+++ b/metadata/cache/www-apache/mod_security-2.6.1
@@ -1,4 +1,4 @@
->=dev-libs/libxml2-2.7.8 dev-libs/libpcre lua? ( >=dev-lang/lua-5.1 ) curl? ( >=net-misc/curl-7.15.1 ) www-servers/apache[apache2_modules_unique_id] =www-servers/apache-2* || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-libs/libxml2-2.7.8 dev-libs/libpcre lua? ( >=dev-lang/lua-5.1 ) curl? ( >=net-misc/curl-7.15.1 ) www-servers/apache[apache2_modules_unique_id] =www-servers/apache-2* || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=dev-libs/libxml2-2.7.8 dev-libs/libpcre lua? ( >=dev-lang/lua-5.1 ) curl? ( >=net-misc/curl-7.15.1 ) www-servers/apache[apache2_modules_unique_id] geoip? ( dev-libs/geoip ) =www-servers/apache-2*
 0
 mirror://sourceforge/project/mod-security/modsecurity-apache/2.6.1/modsecurity-apache_2.6.1.tar.gz
diff --git a/metadata/cache/www-apache/mod_security-2.6.3 b/metadata/cache/www-apache/mod_security-2.6.3
index 95658be70c0a..c7b31338d621 100644
--- a/metadata/cache/www-apache/mod_security-2.6.3
+++ b/metadata/cache/www-apache/mod_security-2.6.3
@@ -1,4 +1,4 @@
->=dev-libs/libxml2-2.7.8 dev-libs/libpcre lua? ( >=dev-lang/lua-5.1 ) curl? ( >=net-misc/curl-7.15.1 ) www-servers/apache[apache2_modules_unique_id] =www-servers/apache-2* || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-libs/libxml2-2.7.8 dev-libs/libpcre lua? ( >=dev-lang/lua-5.1 ) curl? ( >=net-misc/curl-7.15.1 ) www-servers/apache[apache2_modules_unique_id] =www-servers/apache-2* || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=dev-libs/libxml2-2.7.8 dev-libs/libpcre lua? ( >=dev-lang/lua-5.1 ) curl? ( >=net-misc/curl-7.15.1 ) www-servers/apache[apache2_modules_unique_id] geoip? ( dev-libs/geoip ) =www-servers/apache-2*
 0
 mirror://sourceforge/project/mod-security/modsecurity-apache/2.6.3/modsecurity-apache_2.6.3.tar.gz
diff --git a/metadata/cache/www-apache/mod_security-2.6.4 b/metadata/cache/www-apache/mod_security-2.6.4
deleted file mode 100644
index 345f0c8efb53..000000000000
--- a/metadata/cache/www-apache/mod_security-2.6.4
+++ /dev/null
@@ -1,22 +0,0 @@
->=dev-libs/libxml2-2.7.8 dev-libs/libpcre lua? ( >=dev-lang/lua-5.1 ) curl? ( >=net-misc/curl-7.15.1 ) www-servers/apache[apache2_modules_unique_id] =www-servers/apache-2* || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
->=dev-libs/libxml2-2.7.8 dev-libs/libpcre lua? ( >=dev-lang/lua-5.1 ) curl? ( >=net-misc/curl-7.15.1 ) www-servers/apache[apache2_modules_unique_id] geoip? ( dev-libs/geoip ) =www-servers/apache-2*
-0
-mirror://sourceforge/project/mod-security/modsecurity-apache/2.6.4/modsecurity-apache_2.6.4.tar.gz
-test
-http://www.modsecurity.org/
-Apache-2.0
-Web application firewall and Intrusion Detection System for Apache.
-~amd64 ~ppc ~sparc ~x86
-apache-module autotools depend.apache eutils libtool multilib toolchain-funcs user
-geoip curl lua
-
-www-apache/modsecurity-crs
-
-4
-
-compile configure install postinst prepare setup test
-
-
-
-
-
diff --git a/metadata/cache/www-apache/mod_security-2.6.2 b/metadata/cache/www-apache/mod_security-2.6.5
similarity index 88%
rename from metadata/cache/www-apache/mod_security-2.6.2
rename to metadata/cache/www-apache/mod_security-2.6.5
index bf86f18581e5..76d290dda952 100644
--- a/metadata/cache/www-apache/mod_security-2.6.2
+++ b/metadata/cache/www-apache/mod_security-2.6.5
@@ -1,7 +1,7 @@
->=dev-libs/libxml2-2.7.8 dev-libs/libpcre lua? ( >=dev-lang/lua-5.1 ) curl? ( >=net-misc/curl-7.15.1 ) www-servers/apache[apache2_modules_unique_id] =www-servers/apache-2* || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-libs/libxml2-2.7.8 dev-libs/libpcre lua? ( >=dev-lang/lua-5.1 ) curl? ( >=net-misc/curl-7.15.1 ) www-servers/apache[apache2_modules_unique_id] =www-servers/apache-2* || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=dev-libs/libxml2-2.7.8 dev-libs/libpcre lua? ( >=dev-lang/lua-5.1 ) curl? ( >=net-misc/curl-7.15.1 ) www-servers/apache[apache2_modules_unique_id] geoip? ( dev-libs/geoip ) =www-servers/apache-2*
 0
-mirror://sourceforge/project/mod-security/modsecurity-apache/2.6.2/modsecurity-apache_2.6.2.tar.gz
+mirror://sourceforge/project/mod-security/modsecurity-apache/2.6.5/modsecurity-apache_2.6.5.tar.gz
 test
 http://www.modsecurity.org/
 Apache-2.0
diff --git a/metadata/cache/www-apps/389-dsgw-1.1.5 b/metadata/cache/www-apps/389-dsgw-1.1.5
index fd2199bd7513..86b71f2b5472 100644
--- a/metadata/cache/www-apps/389-dsgw-1.1.5
+++ b/metadata/cache/www-apps/389-dsgw-1.1.5
@@ -1,4 +1,4 @@
-adminserver? ( net-nds/389-admin ) dev-libs/nspr dev-libs/nss dev-libs/cyrus-sasl dev-libs/mozldap dev-libs/icu dev-libs/389-adminutil || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+adminserver? ( net-nds/389-admin ) dev-libs/nspr dev-libs/nss dev-libs/cyrus-sasl dev-libs/mozldap dev-libs/icu dev-libs/389-adminutil || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 adminserver? ( net-nds/389-admin ) dev-libs/nspr dev-libs/nss dev-libs/cyrus-sasl dev-libs/mozldap dev-libs/icu dev-libs/389-adminutil dev-perl/perl-mozldap virtual/perl-CGI
 0
 http://directory.fedoraproject.org/sources/389-dsgw-1.1.5.tar.bz2
diff --git a/metadata/cache/www-apps/389-dsgw-1.1.6 b/metadata/cache/www-apps/389-dsgw-1.1.6
index bc01b79ba445..6f6fc2a9e0ed 100644
--- a/metadata/cache/www-apps/389-dsgw-1.1.6
+++ b/metadata/cache/www-apps/389-dsgw-1.1.6
@@ -1,4 +1,4 @@
-adminserver? ( net-nds/389-admin ) dev-libs/nspr dev-libs/nss dev-libs/cyrus-sasl dev-libs/mozldap dev-libs/icu dev-libs/389-adminutil || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+adminserver? ( net-nds/389-admin ) dev-libs/nspr dev-libs/nss dev-libs/cyrus-sasl dev-libs/mozldap dev-libs/icu dev-libs/389-adminutil || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 adminserver? ( net-nds/389-admin ) dev-libs/nspr dev-libs/nss dev-libs/cyrus-sasl dev-libs/mozldap dev-libs/icu dev-libs/389-adminutil dev-perl/perl-mozldap virtual/perl-CGI
 0
 http://directory.fedoraproject.org/sources/389-dsgw-1.1.6.tar.bz2
diff --git a/metadata/cache/www-apps/389-dsgw-1.1.7 b/metadata/cache/www-apps/389-dsgw-1.1.7
index f43cef9ac545..8c8881422b89 100644
--- a/metadata/cache/www-apps/389-dsgw-1.1.7
+++ b/metadata/cache/www-apps/389-dsgw-1.1.7
@@ -1,4 +1,4 @@
-adminserver? ( net-nds/389-admin ) dev-libs/nspr dev-libs/nss dev-libs/cyrus-sasl dev-libs/mozldap dev-libs/icu dev-libs/389-adminutil || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+adminserver? ( net-nds/389-admin ) dev-libs/nspr dev-libs/nss dev-libs/cyrus-sasl dev-libs/mozldap dev-libs/icu dev-libs/389-adminutil || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 adminserver? ( net-nds/389-admin ) dev-libs/nspr dev-libs/nss dev-libs/cyrus-sasl dev-libs/mozldap dev-libs/icu dev-libs/389-adminutil dev-perl/perl-mozldap virtual/perl-CGI
 0
 http://directory.fedoraproject.org/sources/389-dsgw-1.1.7.tar.bz2
diff --git a/metadata/cache/www-client/chromium-17.0.963.83 b/metadata/cache/www-client/chromium-17.0.963.83
new file mode 100644
index 000000000000..86acddc61cb5
--- /dev/null
+++ b/metadata/cache/www-client/chromium-17.0.963.83
@@ -0,0 +1,22 @@
+app-arch/bzip2 cups? ( dev-libs/libgcrypt >=net-print/cups-1.3.11 ) >=dev-lang/v8-3.7.6 dev-libs/dbus-glib dev-libs/elfutils >=dev-libs/icu-4.4.1 >=dev-libs/libevent-1.4.13 dev-libs/libxml2[icu] dev-libs/libxslt >=dev-libs/nss-3.12.3 gnome? ( >=gnome-base/gconf-2.24.0 ) gnome-keyring? ( >=gnome-base/gnome-keyring-2.28.2 ) >=media-libs/alsa-lib-1.0.19 media-libs/flac virtual/jpeg media-libs/libpng >=media-libs/libwebp-0.1.2 media-libs/speex pulseaudio? ( media-sound/pulseaudio ) sys-libs/zlib x11-libs/gtk+:2 x11-libs/libXinerama x11-libs/libXScrnSaver x11-libs/libXtst kerberos? ( virtual/krb5 ) >=dev-lang/nacl-toolchain-newlib-0_p7311 dev-lang/perl dev-lang/yasm dev-python/simplejson >=dev-util/gperf-3.0.3 >=dev-util/pkgconfig-0.23 >=sys-devel/bison-2.4.3 sys-devel/flex >=sys-devel/make-3.81-r2 test? ( dev-python/pyftpdlib ) >=sys-apps/sed-4 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+app-arch/bzip2 cups? ( dev-libs/libgcrypt >=net-print/cups-1.3.11 ) >=dev-lang/v8-3.7.6 dev-libs/dbus-glib dev-libs/elfutils >=dev-libs/icu-4.4.1 >=dev-libs/libevent-1.4.13 dev-libs/libxml2[icu] dev-libs/libxslt >=dev-libs/nss-3.12.3 gnome? ( >=gnome-base/gconf-2.24.0 ) gnome-keyring? ( >=gnome-base/gnome-keyring-2.28.2 ) >=media-libs/alsa-lib-1.0.19 media-libs/flac virtual/jpeg media-libs/libpng >=media-libs/libwebp-0.1.2 media-libs/speex pulseaudio? ( media-sound/pulseaudio ) sys-libs/zlib x11-libs/gtk+:2 x11-libs/libXinerama x11-libs/libXScrnSaver x11-libs/libXtst kerberos? ( virtual/krb5 ) !=www-client/chromium-9999 x11-misc/xdg-utils virtual/ttf-fonts || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
+0
+http://commondatastorage.googleapis.com/chromium-browser-official/chromium-17.0.963.83.tar.bz2
+
+http://chromium.org/
+BSD
+Open-source version of Google Chrome web browser
+~amd64 ~x86
+eutils fdo-mime flag-o-matic gnome2-utils linux-info multilib pax-utils portability python toolchain-funcs user versionator virtualx
+bindist cups custom-cflags gnome gnome-keyring kerberos pulseaudio linguas_am linguas_ar linguas_bg linguas_bn linguas_ca linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_es linguas_es_LA linguas_et linguas_fa linguas_fi linguas_fil linguas_fr linguas_gu linguas_he linguas_hi linguas_hr linguas_hu linguas_id linguas_it linguas_ja linguas_kn linguas_ko linguas_lt linguas_lv linguas_ml linguas_mr linguas_nb linguas_nl linguas_pl linguas_pt_BR linguas_pt_PT linguas_ro linguas_ru linguas_sk linguas_sl linguas_sr linguas_sv linguas_sw linguas_ta linguas_te linguas_th linguas_tr linguas_uk linguas_vi linguas_zh_CN linguas_zh_TW test
+
+
+
+4
+
+compile configure install postinst postrm preinst prepare setup test
+
+
+
+
+
diff --git a/metadata/cache/www-client/downman-0.0.5-r1 b/metadata/cache/www-client/downman-0.0.5-r1
index 73e33059e806..f0b7e9fe30bf 100644
--- a/metadata/cache/www-client/downman-0.0.5-r1
+++ b/metadata/cache/www-client/downman-0.0.5-r1
@@ -1,4 +1,4 @@
-x11-libs/gtk+:2 >=gnome-base/libgnome-2 >=gnome-base/libgnomeui-2 gnome-base/libglade:2.0 dev-libs/libxml2:2 dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+x11-libs/gtk+:2 >=gnome-base/libgnome-2 >=gnome-base/libgnomeui-2 gnome-base/libglade:2.0 dev-libs/libxml2:2 dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 x11-libs/gtk+:2 >=gnome-base/libgnome-2 >=gnome-base/libgnomeui-2 gnome-base/libglade:2.0 dev-libs/libxml2:2
 0
 mirror://sourceforge/downman/downman-0.0.5.tar.gz
diff --git a/metadata/cache/www-client/elinks-0.11.7 b/metadata/cache/www-client/elinks-0.11.7
index bc8d56366c3c..5eebe1c8ab1c 100644
--- a/metadata/cache/www-client/elinks-0.11.7
+++ b/metadata/cache/www-client/elinks-0.11.7
@@ -1,4 +1,4 @@
->=dev-libs/expat-1.95.4 bzip2? ( >=app-arch/bzip2-1.0.2 ) ssl? ( >=dev-libs/openssl-0.9.6g ) X? ( x11-libs/libX11 x11-libs/libXt ) lua? ( >=dev-lang/lua-5 ) gpm? ( >=sys-libs/ncurses-5.2 >=sys-libs/gpm-1.20.0-r5 ) guile? ( >=dev-scheme/guile-1.6.4-r1[deprecated,discouraged] ) idn? ( net-dns/libidn ) perl? ( sys-devel/libperl ) ruby? ( dev-lang/ruby dev-ruby/rubygems ) javascript? ( <=dev-lang/spidermonkey-1.8 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-libs/expat-1.95.4 bzip2? ( >=app-arch/bzip2-1.0.2 ) ssl? ( >=dev-libs/openssl-0.9.6g ) X? ( x11-libs/libX11 x11-libs/libXt ) lua? ( >=dev-lang/lua-5 ) gpm? ( >=sys-libs/ncurses-5.2 >=sys-libs/gpm-1.20.0-r5 ) guile? ( >=dev-scheme/guile-1.6.4-r1[deprecated,discouraged] ) idn? ( net-dns/libidn ) perl? ( sys-devel/libperl ) ruby? ( dev-lang/ruby dev-ruby/rubygems ) javascript? ( <=dev-lang/spidermonkey-1.8 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=dev-libs/expat-1.95.4 bzip2? ( >=app-arch/bzip2-1.0.2 ) ssl? ( >=dev-libs/openssl-0.9.6g ) X? ( x11-libs/libX11 x11-libs/libXt ) lua? ( >=dev-lang/lua-5 ) gpm? ( >=sys-libs/ncurses-5.2 >=sys-libs/gpm-1.20.0-r5 ) guile? ( >=dev-scheme/guile-1.6.4-r1[deprecated,discouraged] ) idn? ( net-dns/libidn ) perl? ( sys-devel/libperl ) ruby? ( dev-lang/ruby dev-ruby/rubygems ) javascript? ( <=dev-lang/spidermonkey-1.8 )
 0
 http://elinks.or.cz/download/elinks-0.11.7.tar.bz2 http://dev.gentoo.org/~spock/portage/distfiles/elinks-0.10.4.conf.bz2
diff --git a/metadata/cache/www-client/elinks-0.12_pre5 b/metadata/cache/www-client/elinks-0.12_pre5
index 9c7a80dd0b12..d6b18a9caee4 100644
--- a/metadata/cache/www-client/elinks-0.12_pre5
+++ b/metadata/cache/www-client/elinks-0.12_pre5
@@ -1,4 +1,4 @@
-dev-libs/boehm-gc >=dev-libs/expat-1.95.4 bzip2? ( >=app-arch/bzip2-1.0.2 ) ssl? ( >=dev-libs/openssl-0.9.6g ) X? ( x11-libs/libX11 x11-libs/libXt ) zlib? ( >=sys-libs/zlib-1.1.4 ) lua? ( >=dev-lang/lua-5 ) gpm? ( >=sys-libs/ncurses-5.2 >=sys-libs/gpm-1.20.0-r5 ) guile? ( >=dev-scheme/guile-1.6.4-r1[deprecated,discouraged] ) idn? ( net-dns/libidn ) perl? ( sys-devel/libperl ) ruby? ( dev-lang/ruby dev-ruby/rubygems ) samba? ( net-fs/samba ) javascript? ( <=dev-lang/spidermonkey-1.8 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-libs/boehm-gc >=dev-libs/expat-1.95.4 bzip2? ( >=app-arch/bzip2-1.0.2 ) ssl? ( >=dev-libs/openssl-0.9.6g ) X? ( x11-libs/libX11 x11-libs/libXt ) zlib? ( >=sys-libs/zlib-1.1.4 ) lua? ( >=dev-lang/lua-5 ) gpm? ( >=sys-libs/ncurses-5.2 >=sys-libs/gpm-1.20.0-r5 ) guile? ( >=dev-scheme/guile-1.6.4-r1[deprecated,discouraged] ) idn? ( net-dns/libidn ) perl? ( sys-devel/libperl ) ruby? ( dev-lang/ruby dev-ruby/rubygems ) samba? ( net-fs/samba ) javascript? ( <=dev-lang/spidermonkey-1.8 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-libs/boehm-gc >=dev-libs/expat-1.95.4 bzip2? ( >=app-arch/bzip2-1.0.2 ) ssl? ( >=dev-libs/openssl-0.9.6g ) X? ( x11-libs/libX11 x11-libs/libXt ) zlib? ( >=sys-libs/zlib-1.1.4 ) lua? ( >=dev-lang/lua-5 ) gpm? ( >=sys-libs/ncurses-5.2 >=sys-libs/gpm-1.20.0-r5 ) guile? ( >=dev-scheme/guile-1.6.4-r1[deprecated,discouraged] ) idn? ( net-dns/libidn ) perl? ( sys-devel/libperl ) ruby? ( dev-lang/ruby dev-ruby/rubygems ) samba? ( net-fs/samba ) javascript? ( <=dev-lang/spidermonkey-1.8 )
 0
 http://elinks.or.cz/download/elinks-0.12pre5.tar.bz2 http://dev.gentoo.org/~spock/portage/distfiles/elinks-0.10.4.conf.bz2
diff --git a/metadata/cache/www-client/elinks-0.12_pre5-r1 b/metadata/cache/www-client/elinks-0.12_pre5-r1
index da958f826567..4d69e4259e9a 100644
--- a/metadata/cache/www-client/elinks-0.12_pre5-r1
+++ b/metadata/cache/www-client/elinks-0.12_pre5-r1
@@ -1,4 +1,4 @@
-dev-libs/boehm-gc >=dev-libs/expat-1.95.4 bzip2? ( >=app-arch/bzip2-1.0.2 ) ssl? ( >=dev-libs/openssl-0.9.6g ) X? ( x11-libs/libX11 x11-libs/libXt ) zlib? ( >=sys-libs/zlib-1.1.4 ) lua? ( >=dev-lang/lua-5 ) gpm? ( >=sys-libs/ncurses-5.2 >=sys-libs/gpm-1.20.0-r5 ) guile? ( >=dev-scheme/guile-1.6.4-r1[deprecated,discouraged] ) idn? ( net-dns/libidn ) perl? ( sys-devel/libperl ) ruby? ( dev-lang/ruby dev-ruby/rubygems ) samba? ( net-fs/samba ) javascript? ( <dev-lang/spidermonkey-1.8.5 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-libs/boehm-gc >=dev-libs/expat-1.95.4 bzip2? ( >=app-arch/bzip2-1.0.2 ) ssl? ( >=dev-libs/openssl-0.9.6g ) X? ( x11-libs/libX11 x11-libs/libXt ) zlib? ( >=sys-libs/zlib-1.1.4 ) lua? ( >=dev-lang/lua-5 ) gpm? ( >=sys-libs/ncurses-5.2 >=sys-libs/gpm-1.20.0-r5 ) guile? ( >=dev-scheme/guile-1.6.4-r1[deprecated,discouraged] ) idn? ( net-dns/libidn ) perl? ( sys-devel/libperl ) ruby? ( dev-lang/ruby dev-ruby/rubygems ) samba? ( net-fs/samba ) javascript? ( <dev-lang/spidermonkey-1.8.5 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-libs/boehm-gc >=dev-libs/expat-1.95.4 bzip2? ( >=app-arch/bzip2-1.0.2 ) ssl? ( >=dev-libs/openssl-0.9.6g ) X? ( x11-libs/libX11 x11-libs/libXt ) zlib? ( >=sys-libs/zlib-1.1.4 ) lua? ( >=dev-lang/lua-5 ) gpm? ( >=sys-libs/ncurses-5.2 >=sys-libs/gpm-1.20.0-r5 ) guile? ( >=dev-scheme/guile-1.6.4-r1[deprecated,discouraged] ) idn? ( net-dns/libidn ) perl? ( sys-devel/libperl ) ruby? ( dev-lang/ruby dev-ruby/rubygems ) samba? ( net-fs/samba ) javascript? ( <dev-lang/spidermonkey-1.8.5 )
 0
 http://elinks.or.cz/download/elinks-0.12pre5.tar.bz2 http://dev.gentoo.org/~spock/portage/distfiles/elinks-0.10.4.conf.bz2
diff --git a/metadata/cache/www-client/epiphany-2.30.6-r1 b/metadata/cache/www-client/epiphany-2.30.6-r1
index 35f4b93f82e1..3ca835b41dec 100644
--- a/metadata/cache/www-client/epiphany-2.30.6-r1
+++ b/metadata/cache/www-client/epiphany-2.30.6-r1
@@ -1,4 +1,4 @@
->=dev-libs/glib-2.19.7:2 >=x11-libs/gtk+-2.19.5:2[introspection?] >=dev-libs/libxml2-2.6.12:2 >=dev-libs/libxslt-1.1.7 >=x11-libs/startup-notification-0.5 >=x11-libs/libnotify-0.4 >=dev-libs/dbus-glib-0.71 >=gnome-base/gconf-2:2 >=app-text/iso-codes-0.35 >=net-libs/webkit-gtk-1.2.3:2[introspection?] >=net-libs/libsoup-gnome-2.29.91:2.4 >=gnome-base/gnome-keyring-2.26 x11-libs/libICE x11-libs/libSM >=app-misc/ca-certificates-20080514-r2 x11-themes/gnome-icon-theme avahi? ( >=net-dns/avahi-0.6.22 ) introspection? ( >=dev-libs/gobject-introspection-0.6.7 ) networkmanager? ( net-misc/networkmanager ) nss? ( dev-libs/nss ) app-text/scrollkeeper >=dev-util/pkgconfig-0.9 >=dev-util/intltool-0.40 >=app-text/gnome-doc-utils-0.3.2 doc? ( >=dev-util/gtk-doc-1 ) gnome-base/gnome-common >=sys-apps/sed-4 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-libs/glib-2.19.7:2 >=x11-libs/gtk+-2.19.5:2[introspection?] >=dev-libs/libxml2-2.6.12:2 >=dev-libs/libxslt-1.1.7 >=x11-libs/startup-notification-0.5 >=x11-libs/libnotify-0.4 >=dev-libs/dbus-glib-0.71 >=gnome-base/gconf-2:2 >=app-text/iso-codes-0.35 >=net-libs/webkit-gtk-1.2.3:2[introspection?] >=net-libs/libsoup-gnome-2.29.91:2.4 >=gnome-base/gnome-keyring-2.26 x11-libs/libICE x11-libs/libSM >=app-misc/ca-certificates-20080514-r2 x11-themes/gnome-icon-theme avahi? ( >=net-dns/avahi-0.6.22 ) introspection? ( >=dev-libs/gobject-introspection-0.6.7 ) networkmanager? ( net-misc/networkmanager ) nss? ( dev-libs/nss ) app-text/scrollkeeper >=dev-util/pkgconfig-0.9 >=dev-util/intltool-0.40 >=app-text/gnome-doc-utils-0.3.2 doc? ( >=dev-util/gtk-doc-1 ) gnome-base/gnome-common >=sys-apps/sed-4 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=dev-libs/glib-2.19.7:2 >=x11-libs/gtk+-2.19.5:2[introspection?] >=dev-libs/libxml2-2.6.12:2 >=dev-libs/libxslt-1.1.7 >=x11-libs/startup-notification-0.5 >=x11-libs/libnotify-0.4 >=dev-libs/dbus-glib-0.71 >=gnome-base/gconf-2:2 >=app-text/iso-codes-0.35 >=net-libs/webkit-gtk-1.2.3:2[introspection?] >=net-libs/libsoup-gnome-2.29.91:2.4 >=gnome-base/gnome-keyring-2.26 x11-libs/libICE x11-libs/libSM >=app-misc/ca-certificates-20080514-r2 x11-themes/gnome-icon-theme avahi? ( >=net-dns/avahi-0.6.22 ) introspection? ( >=dev-libs/gobject-introspection-0.6.7 ) networkmanager? ( net-misc/networkmanager ) nss? ( dev-libs/nss )
 0
 mirror://gnome/sources/epiphany/2.30/epiphany-2.30.6.tar.bz2
diff --git a/metadata/cache/www-client/epiphany-3.2.1-r1 b/metadata/cache/www-client/epiphany-3.2.1-r1
index 6db94b53ab99..3bb5a7fd6894 100644
--- a/metadata/cache/www-client/epiphany-3.2.1-r1
+++ b/metadata/cache/www-client/epiphany-3.2.1-r1
@@ -1,4 +1,4 @@
->=dev-libs/glib-2.30.0:2 >=x11-libs/gtk+-3.0.2:3[introspection?] >=dev-libs/libxml2-2.6.12:2 >=dev-libs/libxslt-1.1.7 >=app-text/iso-codes-0.35 >=net-libs/webkit-gtk-1.6.1:3[introspection?] >=net-libs/libsoup-gnome-2.33.1:2.4 >=gnome-base/gnome-keyring-2.26.0 >=gnome-base/gsettings-desktop-schemas-0.0.1 >=x11-libs/libnotify-0.5.1 x11-libs/libICE x11-libs/libSM x11-libs/libX11 app-misc/ca-certificates x11-themes/gnome-icon-theme avahi? ( >=net-dns/avahi-0.6.22 ) introspection? ( >=dev-libs/gobject-introspection-0.9.5 ) nss? ( dev-libs/nss ) app-text/gnome-doc-utils >=dev-util/gdbus-codegen-2.30.0 >=dev-util/intltool-0.40 dev-util/pkgconfig sys-apps/paxctl sys-devel/gettext doc? ( >=dev-util/gtk-doc-1 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
+>=dev-libs/glib-2.30.0:2 >=x11-libs/gtk+-3.0.2:3[introspection?] >=dev-libs/libxml2-2.6.12:2 >=dev-libs/libxslt-1.1.7 >=app-text/iso-codes-0.35 >=net-libs/webkit-gtk-1.6.1:3[introspection?] >=net-libs/libsoup-gnome-2.33.1:2.4 >=gnome-base/gnome-keyring-2.26.0 >=gnome-base/gsettings-desktop-schemas-0.0.1 >=x11-libs/libnotify-0.5.1 x11-libs/libICE x11-libs/libSM x11-libs/libX11 app-misc/ca-certificates x11-themes/gnome-icon-theme avahi? ( >=net-dns/avahi-0.6.22 ) introspection? ( >=dev-libs/gobject-introspection-0.9.5 ) nss? ( dev-libs/nss ) app-text/gnome-doc-utils >=dev-util/gdbus-codegen-2.30.0 >=dev-util/intltool-0.40 dev-util/pkgconfig sys-apps/paxctl sys-devel/gettext doc? ( >=dev-util/gtk-doc-1 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
 >=dev-libs/glib-2.30.0:2 >=x11-libs/gtk+-3.0.2:3[introspection?] >=dev-libs/libxml2-2.6.12:2 >=dev-libs/libxslt-1.1.7 >=app-text/iso-codes-0.35 >=net-libs/webkit-gtk-1.6.1:3[introspection?] >=net-libs/libsoup-gnome-2.33.1:2.4 >=gnome-base/gnome-keyring-2.26.0 >=gnome-base/gsettings-desktop-schemas-0.0.1 >=x11-libs/libnotify-0.5.1 x11-libs/libICE x11-libs/libSM x11-libs/libX11 app-misc/ca-certificates x11-themes/gnome-icon-theme avahi? ( >=net-dns/avahi-0.6.22 ) introspection? ( >=dev-libs/gobject-introspection-0.9.5 ) nss? ( dev-libs/nss ) x11-themes/gnome-icon-theme-symbolic networkmanager? ( >=net-misc/networkmanager-0.8.997 )
 0
 mirror://gnome/sources/epiphany/3.2/epiphany-3.2.1.tar.xz
diff --git a/metadata/cache/www-client/epiphany-extensions-3.2.0-r1 b/metadata/cache/www-client/epiphany-extensions-3.2.0-r1
index 8d98f577c3ee..3072fba5c418 100644
--- a/metadata/cache/www-client/epiphany-extensions-3.2.0-r1
+++ b/metadata/cache/www-client/epiphany-extensions-3.2.0-r1
@@ -1,4 +1,4 @@
->=www-client/epiphany-3.2.0 app-text/opensp >=dev-libs/glib-2.26.0:2 >=dev-libs/libxml2-2.6:2 >=x11-libs/gtk+-2.90.4:3 net-libs/webkit-gtk:3 dbus? ( >=dev-libs/dbus-glib-0.34 sys-apps/dbus ) pcre? ( >=dev-libs/libpcre-3.9-r2 ) >=dev-util/intltool-0.40 >=dev-util/pkgconfig-0.20 >=app-text/gnome-doc-utils-0.3.2 gnome-base/gnome-common || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
+>=www-client/epiphany-3.2.0 app-text/opensp >=dev-libs/glib-2.26.0:2 >=dev-libs/libxml2-2.6:2 >=x11-libs/gtk+-2.90.4:3 net-libs/webkit-gtk:3 dbus? ( >=dev-libs/dbus-glib-0.34 sys-apps/dbus ) pcre? ( >=dev-libs/libpcre-3.9-r2 ) >=dev-util/intltool-0.40 >=dev-util/pkgconfig-0.20 >=app-text/gnome-doc-utils-0.3.2 gnome-base/gnome-common || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
 >=www-client/epiphany-3.2.0 app-text/opensp >=dev-libs/glib-2.26.0:2 >=dev-libs/libxml2-2.6:2 >=x11-libs/gtk+-2.90.4:3 net-libs/webkit-gtk:3 dbus? ( >=dev-libs/dbus-glib-0.34 sys-apps/dbus ) pcre? ( >=dev-libs/libpcre-3.9-r2 )
 0
 mirror://gnome/sources/epiphany-extensions/3.2/epiphany-extensions-3.2.0.tar.xz
diff --git a/metadata/cache/www-client/firefox-10.0 b/metadata/cache/www-client/firefox-10.0
index 6153d7d81592..9b6e727d9187 100644
--- a/metadata/cache/www-client/firefox-10.0
+++ b/metadata/cache/www-client/firefox-10.0
@@ -1,4 +1,4 @@
->=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.13.1 >=dev-libs/nspr-4.8.8 >=dev-libs/glib-2.26:2 >=media-libs/mesa-7.10 media-libs/libpng[apng] virtual/libffi system-sqlite? ( >=dev-db/sqlite-3.7.7.1[fts3,secure-delete,threadsafe,unlock-notify,debug=] ) webm? ( >=media-libs/libvpx-0.9.7 media-libs/alsa-lib ) crashreporter? ( net-misc/curl ) selinux? ( sec-policy/selinux-mozilla ) dev-util/pkgconfig pgo? ( =dev-lang/python-2*[sqlite] >=sys-devel/gcc-4.5 ) webm? ( x86? ( >=dev-lang/yasm-1.1 ) amd64? ( >=dev-lang/yasm-1.1 ) ) >=sys-apps/sed-4 x11-libs/libXrender x11-libs/libXt x11-libs/libXmu >=sys-libs/zlib-1.1.4 dev-util/pkgconfig =dev-lang/python-2*[threads] app-arch/zip app-arch/unzip >=app-text/hunspell-1.2 dev-libs/expat >=dev-libs/libIDL-0.8.0 >=dev-libs/libevent-1.4.7 >=x11-libs/cairo-1.8[X] >=x11-libs/gtk+-2.8.6:2 >=x11-libs/pango-1.10.1[X] virtual/jpeg virtual/freedesktop-icon-theme alsa? ( media-libs/alsa-lib ) dbus? ( >=dev-libs/dbus-glib-0.72 ) libnotify? ( >=x11-libs/libnotify-0.4 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) wifi? ( net-wireless/wireless-tools ) || ( >=sys-devel/automake-1.11.1 ) =sys-devel/autoconf-2.1* sys-devel/libtool pgo? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) app-arch/unzip
+>=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.13.1 >=dev-libs/nspr-4.8.8 >=dev-libs/glib-2.26:2 >=media-libs/mesa-7.10 media-libs/libpng[apng] virtual/libffi system-sqlite? ( >=dev-db/sqlite-3.7.7.1[fts3,secure-delete,threadsafe,unlock-notify,debug=] ) webm? ( >=media-libs/libvpx-0.9.7 media-libs/alsa-lib ) crashreporter? ( net-misc/curl ) selinux? ( sec-policy/selinux-mozilla ) dev-util/pkgconfig pgo? ( =dev-lang/python-2*[sqlite] >=sys-devel/gcc-4.5 ) webm? ( x86? ( >=dev-lang/yasm-1.1 ) amd64? ( >=dev-lang/yasm-1.1 ) ) >=sys-apps/sed-4 x11-libs/libXrender x11-libs/libXt x11-libs/libXmu >=sys-libs/zlib-1.1.4 dev-util/pkgconfig =dev-lang/python-2*[threads] app-arch/zip app-arch/unzip >=app-text/hunspell-1.2 dev-libs/expat >=dev-libs/libIDL-0.8.0 >=dev-libs/libevent-1.4.7 >=x11-libs/cairo-1.8[X] >=x11-libs/gtk+-2.8.6:2 >=x11-libs/pango-1.10.1[X] virtual/jpeg virtual/freedesktop-icon-theme alsa? ( media-libs/alsa-lib ) dbus? ( >=dev-libs/dbus-glib-0.72 ) libnotify? ( >=x11-libs/libnotify-0.4 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) wifi? ( net-wireless/wireless-tools ) || ( >=sys-devel/automake-1.11.1:1.11 ) =sys-devel/autoconf-2.1* sys-devel/libtool pgo? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) app-arch/unzip
 >=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.13.1 >=dev-libs/nspr-4.8.8 >=dev-libs/glib-2.26:2 >=media-libs/mesa-7.10 media-libs/libpng[apng] virtual/libffi system-sqlite? ( >=dev-db/sqlite-3.7.7.1[fts3,secure-delete,threadsafe,unlock-notify,debug=] ) webm? ( >=media-libs/libvpx-0.9.7 media-libs/alsa-lib ) crashreporter? ( net-misc/curl ) selinux? ( sec-policy/selinux-mozilla ) x11-libs/libXrender x11-libs/libXt x11-libs/libXmu >=sys-libs/zlib-1.1.4 app-arch/zip app-arch/unzip >=app-text/hunspell-1.2 dev-libs/expat >=dev-libs/libIDL-0.8.0 >=dev-libs/libevent-1.4.7 >=x11-libs/cairo-1.8[X] >=x11-libs/gtk+-2.8.6:2 >=x11-libs/pango-1.10.1[X] virtual/jpeg virtual/freedesktop-icon-theme alsa? ( media-libs/alsa-lib ) dbus? ( >=dev-libs/dbus-glib-0.72 ) libnotify? ( >=x11-libs/libnotify-0.4 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) wifi? ( net-wireless/wireless-tools )
 0
 linguas_af? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/af.xpi -> firefox-10.0-af.xpi ) linguas_ak? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/ak.xpi -> firefox-10.0-ak.xpi ) linguas_ar? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/ar.xpi -> firefox-10.0-ar.xpi ) linguas_as? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/as.xpi -> firefox-10.0-as.xpi ) linguas_ast? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/ast.xpi -> firefox-10.0-ast.xpi ) linguas_be? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/be.xpi -> firefox-10.0-be.xpi ) linguas_bg? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/bg.xpi -> firefox-10.0-bg.xpi ) linguas_bn_BD? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/bn-BD.xpi -> firefox-10.0-bn-BD.xpi ) linguas_bn_IN? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/bn-IN.xpi -> firefox-10.0-bn-IN.xpi ) linguas_br? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/br.xpi -> firefox-10.0-br.xpi ) linguas_bs? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/bs.xpi -> firefox-10.0-bs.xpi ) linguas_ca? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/ca.xpi -> firefox-10.0-ca.xpi ) linguas_cs? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/cs.xpi -> firefox-10.0-cs.xpi ) linguas_csb? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/csb.xpi -> firefox-10.0-csb.xpi ) linguas_cy? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/cy.xpi -> firefox-10.0-cy.xpi ) linguas_da? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/da.xpi -> firefox-10.0-da.xpi ) linguas_de? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/de.xpi -> firefox-10.0-de.xpi ) linguas_el? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/el.xpi -> firefox-10.0-el.xpi ) linguas_en_GB? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/en-GB.xpi -> firefox-10.0-en-GB.xpi ) linguas_en_ZA? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/en-ZA.xpi -> firefox-10.0-en-ZA.xpi ) linguas_eo? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/eo.xpi -> firefox-10.0-eo.xpi ) linguas_es_AR? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/es-AR.xpi -> firefox-10.0-es-AR.xpi ) linguas_es_CL? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/es-CL.xpi -> firefox-10.0-es-CL.xpi ) linguas_es_ES? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/es-ES.xpi -> firefox-10.0-es-ES.xpi ) linguas_es_MX? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/es-MX.xpi -> firefox-10.0-es-MX.xpi ) linguas_et? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/et.xpi -> firefox-10.0-et.xpi ) linguas_eu? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/eu.xpi -> firefox-10.0-eu.xpi ) linguas_fa? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/fa.xpi -> firefox-10.0-fa.xpi ) linguas_fi? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/fi.xpi -> firefox-10.0-fi.xpi ) linguas_fr? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/fr.xpi -> firefox-10.0-fr.xpi ) linguas_fy_NL? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/fy-NL.xpi -> firefox-10.0-fy-NL.xpi ) linguas_ga_IE? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/ga-IE.xpi -> firefox-10.0-ga-IE.xpi ) linguas_gd? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/gd.xpi -> firefox-10.0-gd.xpi ) linguas_gl? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/gl.xpi -> firefox-10.0-gl.xpi ) linguas_gu_IN? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/gu-IN.xpi -> firefox-10.0-gu-IN.xpi ) linguas_he? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/he.xpi -> firefox-10.0-he.xpi ) linguas_hi_IN? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/hi-IN.xpi -> firefox-10.0-hi-IN.xpi ) linguas_hr? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/hr.xpi -> firefox-10.0-hr.xpi ) linguas_hu? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/hu.xpi -> firefox-10.0-hu.xpi ) linguas_hy_AM? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/hy-AM.xpi -> firefox-10.0-hy-AM.xpi ) linguas_id? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/id.xpi -> firefox-10.0-id.xpi ) linguas_is? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/is.xpi -> firefox-10.0-is.xpi ) linguas_it? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/it.xpi -> firefox-10.0-it.xpi ) linguas_ja? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/ja.xpi -> firefox-10.0-ja.xpi ) linguas_kk? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/kk.xpi -> firefox-10.0-kk.xpi ) linguas_kn? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/kn.xpi -> firefox-10.0-kn.xpi ) linguas_ko? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/ko.xpi -> firefox-10.0-ko.xpi ) linguas_ku? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/ku.xpi -> firefox-10.0-ku.xpi ) linguas_lg? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/lg.xpi -> firefox-10.0-lg.xpi ) linguas_lt? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/lt.xpi -> firefox-10.0-lt.xpi ) linguas_lv? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/lv.xpi -> firefox-10.0-lv.xpi ) linguas_mai? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/mai.xpi -> firefox-10.0-mai.xpi ) linguas_mk? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/mk.xpi -> firefox-10.0-mk.xpi ) linguas_ml? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/ml.xpi -> firefox-10.0-ml.xpi ) linguas_mr? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/mr.xpi -> firefox-10.0-mr.xpi ) linguas_nb_NO? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/nb-NO.xpi -> firefox-10.0-nb-NO.xpi ) linguas_nl? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/nl.xpi -> firefox-10.0-nl.xpi ) linguas_nn_NO? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/nn-NO.xpi -> firefox-10.0-nn-NO.xpi ) linguas_nso? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/nso.xpi -> firefox-10.0-nso.xpi ) linguas_or? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/or.xpi -> firefox-10.0-or.xpi ) linguas_pa_IN? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/pa-IN.xpi -> firefox-10.0-pa-IN.xpi ) linguas_pl? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/pl.xpi -> firefox-10.0-pl.xpi ) linguas_pt_BR? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/pt-BR.xpi -> firefox-10.0-pt-BR.xpi ) linguas_pt_PT? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/pt-PT.xpi -> firefox-10.0-pt-PT.xpi ) linguas_rm? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/rm.xpi -> firefox-10.0-rm.xpi ) linguas_ro? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/ro.xpi -> firefox-10.0-ro.xpi ) linguas_ru? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/ru.xpi -> firefox-10.0-ru.xpi ) linguas_si? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/si.xpi -> firefox-10.0-si.xpi ) linguas_sk? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/sk.xpi -> firefox-10.0-sk.xpi ) linguas_sl? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/sl.xpi -> firefox-10.0-sl.xpi ) linguas_son? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/son.xpi -> firefox-10.0-son.xpi ) linguas_sq? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/sq.xpi -> firefox-10.0-sq.xpi ) linguas_sr? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/sr.xpi -> firefox-10.0-sr.xpi ) linguas_sv_SE? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/sv-SE.xpi -> firefox-10.0-sv-SE.xpi ) linguas_ta? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/ta.xpi -> firefox-10.0-ta.xpi ) linguas_ta_LK? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/ta-LK.xpi -> firefox-10.0-ta-LK.xpi ) linguas_te? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/te.xpi -> firefox-10.0-te.xpi ) linguas_th? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/th.xpi -> firefox-10.0-th.xpi ) linguas_tr? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/tr.xpi -> firefox-10.0-tr.xpi ) linguas_uk? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/uk.xpi -> firefox-10.0-uk.xpi ) linguas_vi? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/vi.xpi -> firefox-10.0-vi.xpi ) linguas_zh_CN? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/zh-CN.xpi -> firefox-10.0-zh-CN.xpi ) linguas_zh_TW? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/zh-TW.xpi -> firefox-10.0-zh-TW.xpi ) linguas_zu? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0/linux-i686/xpi/zu.xpi -> firefox-10.0-zu.xpi ) http://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-10.0-patches-0.4.tar.xz ftp://ftp.mozilla.org/pub/firefox/releases//10.0/source/firefox-10.0.source.tar.bz2
diff --git a/metadata/cache/www-client/firefox-10.0.1 b/metadata/cache/www-client/firefox-10.0.1
index 01d0dd3ab0a8..a554840ce00f 100644
--- a/metadata/cache/www-client/firefox-10.0.1
+++ b/metadata/cache/www-client/firefox-10.0.1
@@ -1,4 +1,4 @@
->=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.13.1 >=dev-libs/nspr-4.8.8 >=dev-libs/glib-2.26:2 >=media-libs/mesa-7.10 media-libs/libpng[apng] virtual/libffi system-sqlite? ( >=dev-db/sqlite-3.7.7.1[fts3,secure-delete,threadsafe,unlock-notify,debug=] ) webm? ( ~media-libs/libvpx-0.9.7 media-libs/alsa-lib ) crashreporter? ( net-misc/curl ) selinux? ( sec-policy/selinux-mozilla ) dev-util/pkgconfig pgo? ( =dev-lang/python-2*[sqlite] >=sys-devel/gcc-4.5 ) webm? ( x86? ( >=dev-lang/yasm-1.1 ) amd64? ( >=dev-lang/yasm-1.1 ) ) >=sys-apps/sed-4 x11-libs/libXrender x11-libs/libXt x11-libs/libXmu >=sys-libs/zlib-1.1.4 dev-util/pkgconfig =dev-lang/python-2*[threads] app-arch/zip app-arch/unzip >=app-text/hunspell-1.2 dev-libs/expat >=dev-libs/libIDL-0.8.0 >=dev-libs/libevent-1.4.7 >=x11-libs/cairo-1.8[X] >=x11-libs/gtk+-2.8.6:2 >=x11-libs/pango-1.10.1[X] virtual/jpeg virtual/freedesktop-icon-theme alsa? ( media-libs/alsa-lib ) dbus? ( >=dev-libs/dbus-glib-0.72 ) libnotify? ( >=x11-libs/libnotify-0.4 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) wifi? ( net-wireless/wireless-tools ) || ( >=sys-devel/automake-1.11.1 ) =sys-devel/autoconf-2.1* sys-devel/libtool pgo? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) app-arch/unzip
+>=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.13.1 >=dev-libs/nspr-4.8.8 >=dev-libs/glib-2.26:2 >=media-libs/mesa-7.10 media-libs/libpng[apng] virtual/libffi system-sqlite? ( >=dev-db/sqlite-3.7.7.1[fts3,secure-delete,threadsafe,unlock-notify,debug=] ) webm? ( ~media-libs/libvpx-0.9.7 media-libs/alsa-lib ) crashreporter? ( net-misc/curl ) selinux? ( sec-policy/selinux-mozilla ) dev-util/pkgconfig pgo? ( =dev-lang/python-2*[sqlite] >=sys-devel/gcc-4.5 ) webm? ( x86? ( >=dev-lang/yasm-1.1 ) amd64? ( >=dev-lang/yasm-1.1 ) ) >=sys-apps/sed-4 x11-libs/libXrender x11-libs/libXt x11-libs/libXmu >=sys-libs/zlib-1.1.4 dev-util/pkgconfig =dev-lang/python-2*[threads] app-arch/zip app-arch/unzip >=app-text/hunspell-1.2 dev-libs/expat >=dev-libs/libIDL-0.8.0 >=dev-libs/libevent-1.4.7 >=x11-libs/cairo-1.8[X] >=x11-libs/gtk+-2.8.6:2 >=x11-libs/pango-1.10.1[X] virtual/jpeg virtual/freedesktop-icon-theme alsa? ( media-libs/alsa-lib ) dbus? ( >=dev-libs/dbus-glib-0.72 ) libnotify? ( >=x11-libs/libnotify-0.4 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) wifi? ( net-wireless/wireless-tools ) || ( >=sys-devel/automake-1.11.1:1.11 ) =sys-devel/autoconf-2.1* sys-devel/libtool pgo? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) app-arch/unzip
 >=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.13.1 >=dev-libs/nspr-4.8.8 >=dev-libs/glib-2.26:2 >=media-libs/mesa-7.10 media-libs/libpng[apng] virtual/libffi system-sqlite? ( >=dev-db/sqlite-3.7.7.1[fts3,secure-delete,threadsafe,unlock-notify,debug=] ) webm? ( ~media-libs/libvpx-0.9.7 media-libs/alsa-lib ) crashreporter? ( net-misc/curl ) selinux? ( sec-policy/selinux-mozilla ) x11-libs/libXrender x11-libs/libXt x11-libs/libXmu >=sys-libs/zlib-1.1.4 app-arch/zip app-arch/unzip >=app-text/hunspell-1.2 dev-libs/expat >=dev-libs/libIDL-0.8.0 >=dev-libs/libevent-1.4.7 >=x11-libs/cairo-1.8[X] >=x11-libs/gtk+-2.8.6:2 >=x11-libs/pango-1.10.1[X] virtual/jpeg virtual/freedesktop-icon-theme alsa? ( media-libs/alsa-lib ) dbus? ( >=dev-libs/dbus-glib-0.72 ) libnotify? ( >=x11-libs/libnotify-0.4 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) wifi? ( net-wireless/wireless-tools )
 0
 linguas_af? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/af.xpi -> firefox-10.0.1-af.xpi ) linguas_ak? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/ak.xpi -> firefox-10.0.1-ak.xpi ) linguas_ar? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/ar.xpi -> firefox-10.0.1-ar.xpi ) linguas_as? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/as.xpi -> firefox-10.0.1-as.xpi ) linguas_ast? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/ast.xpi -> firefox-10.0.1-ast.xpi ) linguas_be? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/be.xpi -> firefox-10.0.1-be.xpi ) linguas_bg? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/bg.xpi -> firefox-10.0.1-bg.xpi ) linguas_bn_BD? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/bn-BD.xpi -> firefox-10.0.1-bn-BD.xpi ) linguas_bn_IN? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/bn-IN.xpi -> firefox-10.0.1-bn-IN.xpi ) linguas_br? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/br.xpi -> firefox-10.0.1-br.xpi ) linguas_bs? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/bs.xpi -> firefox-10.0.1-bs.xpi ) linguas_ca? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/ca.xpi -> firefox-10.0.1-ca.xpi ) linguas_cs? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/cs.xpi -> firefox-10.0.1-cs.xpi ) linguas_csb? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/csb.xpi -> firefox-10.0.1-csb.xpi ) linguas_cy? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/cy.xpi -> firefox-10.0.1-cy.xpi ) linguas_da? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/da.xpi -> firefox-10.0.1-da.xpi ) linguas_de? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/de.xpi -> firefox-10.0.1-de.xpi ) linguas_el? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/el.xpi -> firefox-10.0.1-el.xpi ) linguas_en_GB? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/en-GB.xpi -> firefox-10.0.1-en-GB.xpi ) linguas_en_ZA? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/en-ZA.xpi -> firefox-10.0.1-en-ZA.xpi ) linguas_eo? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/eo.xpi -> firefox-10.0.1-eo.xpi ) linguas_es_AR? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/es-AR.xpi -> firefox-10.0.1-es-AR.xpi ) linguas_es_CL? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/es-CL.xpi -> firefox-10.0.1-es-CL.xpi ) linguas_es_ES? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/es-ES.xpi -> firefox-10.0.1-es-ES.xpi ) linguas_es_MX? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/es-MX.xpi -> firefox-10.0.1-es-MX.xpi ) linguas_et? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/et.xpi -> firefox-10.0.1-et.xpi ) linguas_eu? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/eu.xpi -> firefox-10.0.1-eu.xpi ) linguas_fa? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/fa.xpi -> firefox-10.0.1-fa.xpi ) linguas_fi? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/fi.xpi -> firefox-10.0.1-fi.xpi ) linguas_fr? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/fr.xpi -> firefox-10.0.1-fr.xpi ) linguas_fy_NL? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/fy-NL.xpi -> firefox-10.0.1-fy-NL.xpi ) linguas_ga_IE? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/ga-IE.xpi -> firefox-10.0.1-ga-IE.xpi ) linguas_gd? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/gd.xpi -> firefox-10.0.1-gd.xpi ) linguas_gl? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/gl.xpi -> firefox-10.0.1-gl.xpi ) linguas_gu_IN? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/gu-IN.xpi -> firefox-10.0.1-gu-IN.xpi ) linguas_he? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/he.xpi -> firefox-10.0.1-he.xpi ) linguas_hi_IN? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/hi-IN.xpi -> firefox-10.0.1-hi-IN.xpi ) linguas_hr? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/hr.xpi -> firefox-10.0.1-hr.xpi ) linguas_hu? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/hu.xpi -> firefox-10.0.1-hu.xpi ) linguas_hy_AM? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/hy-AM.xpi -> firefox-10.0.1-hy-AM.xpi ) linguas_id? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/id.xpi -> firefox-10.0.1-id.xpi ) linguas_is? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/is.xpi -> firefox-10.0.1-is.xpi ) linguas_it? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/it.xpi -> firefox-10.0.1-it.xpi ) linguas_ja? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/ja.xpi -> firefox-10.0.1-ja.xpi ) linguas_kk? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/kk.xpi -> firefox-10.0.1-kk.xpi ) linguas_kn? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/kn.xpi -> firefox-10.0.1-kn.xpi ) linguas_ko? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/ko.xpi -> firefox-10.0.1-ko.xpi ) linguas_ku? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/ku.xpi -> firefox-10.0.1-ku.xpi ) linguas_lg? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/lg.xpi -> firefox-10.0.1-lg.xpi ) linguas_lt? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/lt.xpi -> firefox-10.0.1-lt.xpi ) linguas_lv? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/lv.xpi -> firefox-10.0.1-lv.xpi ) linguas_mai? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/mai.xpi -> firefox-10.0.1-mai.xpi ) linguas_mk? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/mk.xpi -> firefox-10.0.1-mk.xpi ) linguas_ml? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/ml.xpi -> firefox-10.0.1-ml.xpi ) linguas_mr? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/mr.xpi -> firefox-10.0.1-mr.xpi ) linguas_nb_NO? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/nb-NO.xpi -> firefox-10.0.1-nb-NO.xpi ) linguas_nl? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/nl.xpi -> firefox-10.0.1-nl.xpi ) linguas_nn_NO? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/nn-NO.xpi -> firefox-10.0.1-nn-NO.xpi ) linguas_nso? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/nso.xpi -> firefox-10.0.1-nso.xpi ) linguas_or? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/or.xpi -> firefox-10.0.1-or.xpi ) linguas_pa_IN? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/pa-IN.xpi -> firefox-10.0.1-pa-IN.xpi ) linguas_pl? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/pl.xpi -> firefox-10.0.1-pl.xpi ) linguas_pt_BR? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/pt-BR.xpi -> firefox-10.0.1-pt-BR.xpi ) linguas_pt_PT? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/pt-PT.xpi -> firefox-10.0.1-pt-PT.xpi ) linguas_rm? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/rm.xpi -> firefox-10.0.1-rm.xpi ) linguas_ro? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/ro.xpi -> firefox-10.0.1-ro.xpi ) linguas_ru? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/ru.xpi -> firefox-10.0.1-ru.xpi ) linguas_si? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/si.xpi -> firefox-10.0.1-si.xpi ) linguas_sk? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/sk.xpi -> firefox-10.0.1-sk.xpi ) linguas_sl? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/sl.xpi -> firefox-10.0.1-sl.xpi ) linguas_son? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/son.xpi -> firefox-10.0.1-son.xpi ) linguas_sq? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/sq.xpi -> firefox-10.0.1-sq.xpi ) linguas_sr? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/sr.xpi -> firefox-10.0.1-sr.xpi ) linguas_sv_SE? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/sv-SE.xpi -> firefox-10.0.1-sv-SE.xpi ) linguas_ta? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/ta.xpi -> firefox-10.0.1-ta.xpi ) linguas_ta_LK? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/ta-LK.xpi -> firefox-10.0.1-ta-LK.xpi ) linguas_te? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/te.xpi -> firefox-10.0.1-te.xpi ) linguas_th? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/th.xpi -> firefox-10.0.1-th.xpi ) linguas_tr? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/tr.xpi -> firefox-10.0.1-tr.xpi ) linguas_uk? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/uk.xpi -> firefox-10.0.1-uk.xpi ) linguas_vi? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/vi.xpi -> firefox-10.0.1-vi.xpi ) linguas_zh_CN? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/zh-CN.xpi -> firefox-10.0.1-zh-CN.xpi ) linguas_zh_TW? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/zh-TW.xpi -> firefox-10.0.1-zh-TW.xpi ) linguas_zu? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/zu.xpi -> firefox-10.0.1-zu.xpi ) http://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-10.0-patches-0.5.tar.xz ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/source/firefox-10.0.1.source.tar.bz2
diff --git a/metadata/cache/www-client/firefox-10.0.1-r1 b/metadata/cache/www-client/firefox-10.0.1-r1
index 908658b279a7..a7082710242f 100644
--- a/metadata/cache/www-client/firefox-10.0.1-r1
+++ b/metadata/cache/www-client/firefox-10.0.1-r1
@@ -1,4 +1,4 @@
->=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.13.1 >=dev-libs/nspr-4.8.8 >=dev-libs/glib-2.26:2 >=media-libs/mesa-7.10 media-libs/libpng[apng] virtual/libffi system-sqlite? ( >=dev-db/sqlite-3.7.7.1[fts3,secure-delete,threadsafe,unlock-notify,debug=] ) webm? ( >=media-libs/libvpx-1.0.0 media-libs/alsa-lib ) crashreporter? ( net-misc/curl ) selinux? ( sec-policy/selinux-mozilla ) dev-util/pkgconfig pgo? ( =dev-lang/python-2*[sqlite] >=sys-devel/gcc-4.5 ) webm? ( x86? ( >=dev-lang/yasm-1.1 ) amd64? ( >=dev-lang/yasm-1.1 ) ) >=sys-apps/sed-4 x11-libs/libXrender x11-libs/libXt x11-libs/libXmu >=sys-libs/zlib-1.1.4 dev-util/pkgconfig =dev-lang/python-2*[threads] app-arch/zip app-arch/unzip >=app-text/hunspell-1.2 dev-libs/expat >=dev-libs/libIDL-0.8.0 >=dev-libs/libevent-1.4.7 >=x11-libs/cairo-1.8[X] >=x11-libs/gtk+-2.8.6:2 >=x11-libs/pango-1.10.1[X] virtual/jpeg virtual/freedesktop-icon-theme alsa? ( media-libs/alsa-lib ) dbus? ( >=dev-libs/dbus-glib-0.72 ) libnotify? ( >=x11-libs/libnotify-0.4 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) wifi? ( net-wireless/wireless-tools ) || ( >=sys-devel/automake-1.11.1 ) =sys-devel/autoconf-2.1* sys-devel/libtool pgo? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) app-arch/unzip
+>=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.13.1 >=dev-libs/nspr-4.8.8 >=dev-libs/glib-2.26:2 >=media-libs/mesa-7.10 media-libs/libpng[apng] virtual/libffi system-sqlite? ( >=dev-db/sqlite-3.7.7.1[fts3,secure-delete,threadsafe,unlock-notify,debug=] ) webm? ( >=media-libs/libvpx-1.0.0 media-libs/alsa-lib ) crashreporter? ( net-misc/curl ) selinux? ( sec-policy/selinux-mozilla ) dev-util/pkgconfig pgo? ( =dev-lang/python-2*[sqlite] >=sys-devel/gcc-4.5 ) webm? ( x86? ( >=dev-lang/yasm-1.1 ) amd64? ( >=dev-lang/yasm-1.1 ) ) >=sys-apps/sed-4 x11-libs/libXrender x11-libs/libXt x11-libs/libXmu >=sys-libs/zlib-1.1.4 dev-util/pkgconfig =dev-lang/python-2*[threads] app-arch/zip app-arch/unzip >=app-text/hunspell-1.2 dev-libs/expat >=dev-libs/libIDL-0.8.0 >=dev-libs/libevent-1.4.7 >=x11-libs/cairo-1.8[X] >=x11-libs/gtk+-2.8.6:2 >=x11-libs/pango-1.10.1[X] virtual/jpeg virtual/freedesktop-icon-theme alsa? ( media-libs/alsa-lib ) dbus? ( >=dev-libs/dbus-glib-0.72 ) libnotify? ( >=x11-libs/libnotify-0.4 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) wifi? ( net-wireless/wireless-tools ) || ( >=sys-devel/automake-1.11.1:1.11 ) =sys-devel/autoconf-2.1* sys-devel/libtool pgo? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) app-arch/unzip
 >=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.13.1 >=dev-libs/nspr-4.8.8 >=dev-libs/glib-2.26:2 >=media-libs/mesa-7.10 media-libs/libpng[apng] virtual/libffi system-sqlite? ( >=dev-db/sqlite-3.7.7.1[fts3,secure-delete,threadsafe,unlock-notify,debug=] ) webm? ( >=media-libs/libvpx-1.0.0 media-libs/alsa-lib ) crashreporter? ( net-misc/curl ) selinux? ( sec-policy/selinux-mozilla ) x11-libs/libXrender x11-libs/libXt x11-libs/libXmu >=sys-libs/zlib-1.1.4 app-arch/zip app-arch/unzip >=app-text/hunspell-1.2 dev-libs/expat >=dev-libs/libIDL-0.8.0 >=dev-libs/libevent-1.4.7 >=x11-libs/cairo-1.8[X] >=x11-libs/gtk+-2.8.6:2 >=x11-libs/pango-1.10.1[X] virtual/jpeg virtual/freedesktop-icon-theme alsa? ( media-libs/alsa-lib ) dbus? ( >=dev-libs/dbus-glib-0.72 ) libnotify? ( >=x11-libs/libnotify-0.4 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) wifi? ( net-wireless/wireless-tools )
 0
 linguas_af? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/af.xpi -> firefox-10.0.1-af.xpi ) linguas_ak? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/ak.xpi -> firefox-10.0.1-ak.xpi ) linguas_ar? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/ar.xpi -> firefox-10.0.1-ar.xpi ) linguas_as? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/as.xpi -> firefox-10.0.1-as.xpi ) linguas_ast? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/ast.xpi -> firefox-10.0.1-ast.xpi ) linguas_be? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/be.xpi -> firefox-10.0.1-be.xpi ) linguas_bg? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/bg.xpi -> firefox-10.0.1-bg.xpi ) linguas_bn_BD? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/bn-BD.xpi -> firefox-10.0.1-bn-BD.xpi ) linguas_bn_IN? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/bn-IN.xpi -> firefox-10.0.1-bn-IN.xpi ) linguas_br? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/br.xpi -> firefox-10.0.1-br.xpi ) linguas_bs? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/bs.xpi -> firefox-10.0.1-bs.xpi ) linguas_ca? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/ca.xpi -> firefox-10.0.1-ca.xpi ) linguas_cs? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/cs.xpi -> firefox-10.0.1-cs.xpi ) linguas_csb? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/csb.xpi -> firefox-10.0.1-csb.xpi ) linguas_cy? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/cy.xpi -> firefox-10.0.1-cy.xpi ) linguas_da? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/da.xpi -> firefox-10.0.1-da.xpi ) linguas_de? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/de.xpi -> firefox-10.0.1-de.xpi ) linguas_el? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/el.xpi -> firefox-10.0.1-el.xpi ) linguas_en_GB? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/en-GB.xpi -> firefox-10.0.1-en-GB.xpi ) linguas_en_ZA? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/en-ZA.xpi -> firefox-10.0.1-en-ZA.xpi ) linguas_eo? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/eo.xpi -> firefox-10.0.1-eo.xpi ) linguas_es_AR? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/es-AR.xpi -> firefox-10.0.1-es-AR.xpi ) linguas_es_CL? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/es-CL.xpi -> firefox-10.0.1-es-CL.xpi ) linguas_es_ES? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/es-ES.xpi -> firefox-10.0.1-es-ES.xpi ) linguas_es_MX? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/es-MX.xpi -> firefox-10.0.1-es-MX.xpi ) linguas_et? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/et.xpi -> firefox-10.0.1-et.xpi ) linguas_eu? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/eu.xpi -> firefox-10.0.1-eu.xpi ) linguas_fa? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/fa.xpi -> firefox-10.0.1-fa.xpi ) linguas_fi? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/fi.xpi -> firefox-10.0.1-fi.xpi ) linguas_fr? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/fr.xpi -> firefox-10.0.1-fr.xpi ) linguas_fy_NL? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/fy-NL.xpi -> firefox-10.0.1-fy-NL.xpi ) linguas_ga_IE? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/ga-IE.xpi -> firefox-10.0.1-ga-IE.xpi ) linguas_gd? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/gd.xpi -> firefox-10.0.1-gd.xpi ) linguas_gl? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/gl.xpi -> firefox-10.0.1-gl.xpi ) linguas_gu_IN? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/gu-IN.xpi -> firefox-10.0.1-gu-IN.xpi ) linguas_he? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/he.xpi -> firefox-10.0.1-he.xpi ) linguas_hi_IN? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/hi-IN.xpi -> firefox-10.0.1-hi-IN.xpi ) linguas_hr? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/hr.xpi -> firefox-10.0.1-hr.xpi ) linguas_hu? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/hu.xpi -> firefox-10.0.1-hu.xpi ) linguas_hy_AM? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/hy-AM.xpi -> firefox-10.0.1-hy-AM.xpi ) linguas_id? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/id.xpi -> firefox-10.0.1-id.xpi ) linguas_is? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/is.xpi -> firefox-10.0.1-is.xpi ) linguas_it? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/it.xpi -> firefox-10.0.1-it.xpi ) linguas_ja? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/ja.xpi -> firefox-10.0.1-ja.xpi ) linguas_kk? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/kk.xpi -> firefox-10.0.1-kk.xpi ) linguas_kn? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/kn.xpi -> firefox-10.0.1-kn.xpi ) linguas_ko? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/ko.xpi -> firefox-10.0.1-ko.xpi ) linguas_ku? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/ku.xpi -> firefox-10.0.1-ku.xpi ) linguas_lg? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/lg.xpi -> firefox-10.0.1-lg.xpi ) linguas_lt? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/lt.xpi -> firefox-10.0.1-lt.xpi ) linguas_lv? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/lv.xpi -> firefox-10.0.1-lv.xpi ) linguas_mai? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/mai.xpi -> firefox-10.0.1-mai.xpi ) linguas_mk? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/mk.xpi -> firefox-10.0.1-mk.xpi ) linguas_ml? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/ml.xpi -> firefox-10.0.1-ml.xpi ) linguas_mr? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/mr.xpi -> firefox-10.0.1-mr.xpi ) linguas_nb_NO? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/nb-NO.xpi -> firefox-10.0.1-nb-NO.xpi ) linguas_nl? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/nl.xpi -> firefox-10.0.1-nl.xpi ) linguas_nn_NO? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/nn-NO.xpi -> firefox-10.0.1-nn-NO.xpi ) linguas_nso? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/nso.xpi -> firefox-10.0.1-nso.xpi ) linguas_or? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/or.xpi -> firefox-10.0.1-or.xpi ) linguas_pa_IN? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/pa-IN.xpi -> firefox-10.0.1-pa-IN.xpi ) linguas_pl? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/pl.xpi -> firefox-10.0.1-pl.xpi ) linguas_pt_BR? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/pt-BR.xpi -> firefox-10.0.1-pt-BR.xpi ) linguas_pt_PT? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/pt-PT.xpi -> firefox-10.0.1-pt-PT.xpi ) linguas_rm? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/rm.xpi -> firefox-10.0.1-rm.xpi ) linguas_ro? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/ro.xpi -> firefox-10.0.1-ro.xpi ) linguas_ru? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/ru.xpi -> firefox-10.0.1-ru.xpi ) linguas_si? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/si.xpi -> firefox-10.0.1-si.xpi ) linguas_sk? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/sk.xpi -> firefox-10.0.1-sk.xpi ) linguas_sl? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/sl.xpi -> firefox-10.0.1-sl.xpi ) linguas_son? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/son.xpi -> firefox-10.0.1-son.xpi ) linguas_sq? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/sq.xpi -> firefox-10.0.1-sq.xpi ) linguas_sr? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/sr.xpi -> firefox-10.0.1-sr.xpi ) linguas_sv_SE? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/sv-SE.xpi -> firefox-10.0.1-sv-SE.xpi ) linguas_ta? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/ta.xpi -> firefox-10.0.1-ta.xpi ) linguas_ta_LK? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/ta-LK.xpi -> firefox-10.0.1-ta-LK.xpi ) linguas_te? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/te.xpi -> firefox-10.0.1-te.xpi ) linguas_th? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/th.xpi -> firefox-10.0.1-th.xpi ) linguas_tr? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/tr.xpi -> firefox-10.0.1-tr.xpi ) linguas_uk? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/uk.xpi -> firefox-10.0.1-uk.xpi ) linguas_vi? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/vi.xpi -> firefox-10.0.1-vi.xpi ) linguas_zh_CN? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/zh-CN.xpi -> firefox-10.0.1-zh-CN.xpi ) linguas_zh_TW? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/zh-TW.xpi -> firefox-10.0.1-zh-TW.xpi ) linguas_zu? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/linux-i686/xpi/zu.xpi -> firefox-10.0.1-zu.xpi ) http://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-10.0-patches-0.6.tar.xz ftp://ftp.mozilla.org/pub/firefox/releases//10.0.1/source/firefox-10.0.1.source.tar.bz2
diff --git a/metadata/cache/www-client/firefox-10.0.3 b/metadata/cache/www-client/firefox-10.0.3
index 2cfd080b33da..c6e2ce297f5c 100644
--- a/metadata/cache/www-client/firefox-10.0.3
+++ b/metadata/cache/www-client/firefox-10.0.3
@@ -1,4 +1,4 @@
->=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.13.1 >=dev-libs/nspr-4.8.8 >=dev-libs/glib-2.26:2 >=media-libs/mesa-7.10 media-libs/libpng[apng] virtual/libffi system-sqlite? ( >=dev-db/sqlite-3.7.7.1[fts3,secure-delete,threadsafe,unlock-notify,debug=] ) webm? ( >=media-libs/libvpx-1.0.0 media-libs/alsa-lib ) crashreporter? ( net-misc/curl ) selinux? ( sec-policy/selinux-mozilla ) dev-util/pkgconfig pgo? ( =dev-lang/python-2*[sqlite] >=sys-devel/gcc-4.5 ) webm? ( x86? ( >=dev-lang/yasm-1.1 ) amd64? ( >=dev-lang/yasm-1.1 ) ) >=sys-apps/sed-4 x11-libs/libXrender x11-libs/libXt x11-libs/libXmu >=sys-libs/zlib-1.1.4 dev-util/pkgconfig =dev-lang/python-2*[threads] app-arch/zip app-arch/unzip >=app-text/hunspell-1.2 dev-libs/expat >=dev-libs/libIDL-0.8.0 >=dev-libs/libevent-1.4.7 >=x11-libs/cairo-1.8[X] >=x11-libs/gtk+-2.8.6:2 >=x11-libs/pango-1.10.1[X] virtual/jpeg virtual/freedesktop-icon-theme alsa? ( media-libs/alsa-lib ) dbus? ( >=dev-libs/dbus-glib-0.72 ) libnotify? ( >=x11-libs/libnotify-0.4 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) wifi? ( net-wireless/wireless-tools ) || ( >=sys-devel/automake-1.11.1 ) =sys-devel/autoconf-2.1* sys-devel/libtool pgo? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) app-arch/unzip
+>=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.13.1 >=dev-libs/nspr-4.8.8 >=dev-libs/glib-2.26:2 >=media-libs/mesa-7.10 media-libs/libpng[apng] virtual/libffi system-sqlite? ( >=dev-db/sqlite-3.7.7.1[fts3,secure-delete,threadsafe,unlock-notify,debug=] ) webm? ( >=media-libs/libvpx-1.0.0 media-libs/alsa-lib ) crashreporter? ( net-misc/curl ) selinux? ( sec-policy/selinux-mozilla ) dev-util/pkgconfig pgo? ( =dev-lang/python-2*[sqlite] >=sys-devel/gcc-4.5 ) webm? ( x86? ( >=dev-lang/yasm-1.1 ) amd64? ( >=dev-lang/yasm-1.1 ) ) >=sys-apps/sed-4 x11-libs/libXrender x11-libs/libXt x11-libs/libXmu >=sys-libs/zlib-1.1.4 dev-util/pkgconfig =dev-lang/python-2*[threads] app-arch/zip app-arch/unzip >=app-text/hunspell-1.2 dev-libs/expat >=dev-libs/libIDL-0.8.0 >=dev-libs/libevent-1.4.7 >=x11-libs/cairo-1.8[X] >=x11-libs/gtk+-2.8.6:2 >=x11-libs/pango-1.10.1[X] virtual/jpeg virtual/freedesktop-icon-theme alsa? ( media-libs/alsa-lib ) dbus? ( >=dev-libs/dbus-glib-0.72 ) libnotify? ( >=x11-libs/libnotify-0.4 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) wifi? ( net-wireless/wireless-tools ) || ( >=sys-devel/automake-1.11.1:1.11 ) =sys-devel/autoconf-2.1* sys-devel/libtool pgo? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) app-arch/unzip
 >=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.13.1 >=dev-libs/nspr-4.8.8 >=dev-libs/glib-2.26:2 >=media-libs/mesa-7.10 media-libs/libpng[apng] virtual/libffi system-sqlite? ( >=dev-db/sqlite-3.7.7.1[fts3,secure-delete,threadsafe,unlock-notify,debug=] ) webm? ( >=media-libs/libvpx-1.0.0 media-libs/alsa-lib ) crashreporter? ( net-misc/curl ) selinux? ( sec-policy/selinux-mozilla ) x11-libs/libXrender x11-libs/libXt x11-libs/libXmu >=sys-libs/zlib-1.1.4 app-arch/zip app-arch/unzip >=app-text/hunspell-1.2 dev-libs/expat >=dev-libs/libIDL-0.8.0 >=dev-libs/libevent-1.4.7 >=x11-libs/cairo-1.8[X] >=x11-libs/gtk+-2.8.6:2 >=x11-libs/pango-1.10.1[X] virtual/jpeg virtual/freedesktop-icon-theme alsa? ( media-libs/alsa-lib ) dbus? ( >=dev-libs/dbus-glib-0.72 ) libnotify? ( >=x11-libs/libnotify-0.4 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) wifi? ( net-wireless/wireless-tools )
 0
 linguas_af? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.3esr/linux-i686/xpi/af.xpi -> firefox-10.0.3esr-af.xpi ) linguas_ak? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.3esr/linux-i686/xpi/ak.xpi -> firefox-10.0.3esr-ak.xpi ) linguas_ar? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.3esr/linux-i686/xpi/ar.xpi -> firefox-10.0.3esr-ar.xpi ) linguas_as? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.3esr/linux-i686/xpi/as.xpi -> firefox-10.0.3esr-as.xpi ) linguas_ast? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.3esr/linux-i686/xpi/ast.xpi -> firefox-10.0.3esr-ast.xpi ) linguas_be? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.3esr/linux-i686/xpi/be.xpi -> firefox-10.0.3esr-be.xpi ) linguas_bg? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.3esr/linux-i686/xpi/bg.xpi -> firefox-10.0.3esr-bg.xpi ) linguas_bn_BD? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.3esr/linux-i686/xpi/bn-BD.xpi -> firefox-10.0.3esr-bn-BD.xpi ) linguas_bn_IN? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.3esr/linux-i686/xpi/bn-IN.xpi -> firefox-10.0.3esr-bn-IN.xpi ) linguas_br? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.3esr/linux-i686/xpi/br.xpi -> firefox-10.0.3esr-br.xpi ) linguas_bs? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.3esr/linux-i686/xpi/bs.xpi -> firefox-10.0.3esr-bs.xpi ) linguas_ca? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.3esr/linux-i686/xpi/ca.xpi -> firefox-10.0.3esr-ca.xpi ) linguas_cs? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.3esr/linux-i686/xpi/cs.xpi -> firefox-10.0.3esr-cs.xpi ) linguas_csb? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.3esr/linux-i686/xpi/csb.xpi -> firefox-10.0.3esr-csb.xpi ) linguas_cy? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.3esr/linux-i686/xpi/cy.xpi -> firefox-10.0.3esr-cy.xpi ) linguas_da? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.3esr/linux-i686/xpi/da.xpi -> firefox-10.0.3esr-da.xpi ) linguas_de? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.3esr/linux-i686/xpi/de.xpi -> firefox-10.0.3esr-de.xpi ) linguas_el? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.3esr/linux-i686/xpi/el.xpi -> firefox-10.0.3esr-el.xpi ) linguas_en_GB? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.3esr/linux-i686/xpi/en-GB.xpi -> firefox-10.0.3esr-en-GB.xpi ) linguas_en_ZA? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.3esr/linux-i686/xpi/en-ZA.xpi -> firefox-10.0.3esr-en-ZA.xpi ) linguas_eo? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.3esr/linux-i686/xpi/eo.xpi -> firefox-10.0.3esr-eo.xpi ) linguas_es_AR? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.3esr/linux-i686/xpi/es-AR.xpi -> firefox-10.0.3esr-es-AR.xpi ) linguas_es_CL? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.3esr/linux-i686/xpi/es-CL.xpi -> firefox-10.0.3esr-es-CL.xpi ) linguas_es_ES? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.3esr/linux-i686/xpi/es-ES.xpi -> firefox-10.0.3esr-es-ES.xpi ) linguas_es_MX? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.3esr/linux-i686/xpi/es-MX.xpi -> firefox-10.0.3esr-es-MX.xpi ) linguas_et? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.3esr/linux-i686/xpi/et.xpi -> firefox-10.0.3esr-et.xpi ) linguas_eu? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.3esr/linux-i686/xpi/eu.xpi -> firefox-10.0.3esr-eu.xpi ) linguas_fa? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.3esr/linux-i686/xpi/fa.xpi -> firefox-10.0.3esr-fa.xpi ) linguas_fi? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.3esr/linux-i686/xpi/fi.xpi -> firefox-10.0.3esr-fi.xpi ) linguas_fr? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.3esr/linux-i686/xpi/fr.xpi -> firefox-10.0.3esr-fr.xpi ) linguas_fy_NL? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.3esr/linux-i686/xpi/fy-NL.xpi -> firefox-10.0.3esr-fy-NL.xpi ) linguas_ga_IE? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.3esr/linux-i686/xpi/ga-IE.xpi -> firefox-10.0.3esr-ga-IE.xpi ) linguas_gd? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.3esr/linux-i686/xpi/gd.xpi -> firefox-10.0.3esr-gd.xpi ) linguas_gl? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.3esr/linux-i686/xpi/gl.xpi -> firefox-10.0.3esr-gl.xpi ) linguas_gu_IN? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.3esr/linux-i686/xpi/gu-IN.xpi -> firefox-10.0.3esr-gu-IN.xpi ) linguas_he? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.3esr/linux-i686/xpi/he.xpi -> firefox-10.0.3esr-he.xpi ) linguas_hi_IN? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.3esr/linux-i686/xpi/hi-IN.xpi -> firefox-10.0.3esr-hi-IN.xpi ) linguas_hr? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.3esr/linux-i686/xpi/hr.xpi -> firefox-10.0.3esr-hr.xpi ) linguas_hu? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.3esr/linux-i686/xpi/hu.xpi -> firefox-10.0.3esr-hu.xpi ) linguas_hy_AM? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.3esr/linux-i686/xpi/hy-AM.xpi -> firefox-10.0.3esr-hy-AM.xpi ) linguas_id? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.3esr/linux-i686/xpi/id.xpi -> firefox-10.0.3esr-id.xpi ) linguas_is? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.3esr/linux-i686/xpi/is.xpi -> firefox-10.0.3esr-is.xpi ) linguas_it? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.3esr/linux-i686/xpi/it.xpi -> firefox-10.0.3esr-it.xpi ) linguas_ja? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.3esr/linux-i686/xpi/ja.xpi -> firefox-10.0.3esr-ja.xpi ) linguas_kk? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.3esr/linux-i686/xpi/kk.xpi -> firefox-10.0.3esr-kk.xpi ) linguas_kn? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.3esr/linux-i686/xpi/kn.xpi -> firefox-10.0.3esr-kn.xpi ) linguas_ko? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.3esr/linux-i686/xpi/ko.xpi -> firefox-10.0.3esr-ko.xpi ) linguas_ku? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.3esr/linux-i686/xpi/ku.xpi -> firefox-10.0.3esr-ku.xpi ) linguas_lg? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.3esr/linux-i686/xpi/lg.xpi -> firefox-10.0.3esr-lg.xpi ) linguas_lt? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.3esr/linux-i686/xpi/lt.xpi -> firefox-10.0.3esr-lt.xpi ) linguas_lv? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.3esr/linux-i686/xpi/lv.xpi -> firefox-10.0.3esr-lv.xpi ) linguas_mai? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.3esr/linux-i686/xpi/mai.xpi -> firefox-10.0.3esr-mai.xpi ) linguas_mk? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.3esr/linux-i686/xpi/mk.xpi -> firefox-10.0.3esr-mk.xpi ) linguas_ml? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.3esr/linux-i686/xpi/ml.xpi -> firefox-10.0.3esr-ml.xpi ) linguas_mr? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.3esr/linux-i686/xpi/mr.xpi -> firefox-10.0.3esr-mr.xpi ) linguas_nb_NO? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.3esr/linux-i686/xpi/nb-NO.xpi -> firefox-10.0.3esr-nb-NO.xpi ) linguas_nl? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.3esr/linux-i686/xpi/nl.xpi -> firefox-10.0.3esr-nl.xpi ) linguas_nn_NO? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.3esr/linux-i686/xpi/nn-NO.xpi -> firefox-10.0.3esr-nn-NO.xpi ) linguas_nso? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.3esr/linux-i686/xpi/nso.xpi -> firefox-10.0.3esr-nso.xpi ) linguas_or? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.3esr/linux-i686/xpi/or.xpi -> firefox-10.0.3esr-or.xpi ) linguas_pa_IN? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.3esr/linux-i686/xpi/pa-IN.xpi -> firefox-10.0.3esr-pa-IN.xpi ) linguas_pl? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.3esr/linux-i686/xpi/pl.xpi -> firefox-10.0.3esr-pl.xpi ) linguas_pt_BR? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.3esr/linux-i686/xpi/pt-BR.xpi -> firefox-10.0.3esr-pt-BR.xpi ) linguas_pt_PT? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.3esr/linux-i686/xpi/pt-PT.xpi -> firefox-10.0.3esr-pt-PT.xpi ) linguas_rm? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.3esr/linux-i686/xpi/rm.xpi -> firefox-10.0.3esr-rm.xpi ) linguas_ro? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.3esr/linux-i686/xpi/ro.xpi -> firefox-10.0.3esr-ro.xpi ) linguas_ru? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.3esr/linux-i686/xpi/ru.xpi -> firefox-10.0.3esr-ru.xpi ) linguas_si? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.3esr/linux-i686/xpi/si.xpi -> firefox-10.0.3esr-si.xpi ) linguas_sk? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.3esr/linux-i686/xpi/sk.xpi -> firefox-10.0.3esr-sk.xpi ) linguas_sl? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.3esr/linux-i686/xpi/sl.xpi -> firefox-10.0.3esr-sl.xpi ) linguas_son? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.3esr/linux-i686/xpi/son.xpi -> firefox-10.0.3esr-son.xpi ) linguas_sq? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.3esr/linux-i686/xpi/sq.xpi -> firefox-10.0.3esr-sq.xpi ) linguas_sr? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.3esr/linux-i686/xpi/sr.xpi -> firefox-10.0.3esr-sr.xpi ) linguas_sv_SE? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.3esr/linux-i686/xpi/sv-SE.xpi -> firefox-10.0.3esr-sv-SE.xpi ) linguas_ta? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.3esr/linux-i686/xpi/ta.xpi -> firefox-10.0.3esr-ta.xpi ) linguas_ta_LK? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.3esr/linux-i686/xpi/ta-LK.xpi -> firefox-10.0.3esr-ta-LK.xpi ) linguas_te? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.3esr/linux-i686/xpi/te.xpi -> firefox-10.0.3esr-te.xpi ) linguas_th? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.3esr/linux-i686/xpi/th.xpi -> firefox-10.0.3esr-th.xpi ) linguas_tr? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.3esr/linux-i686/xpi/tr.xpi -> firefox-10.0.3esr-tr.xpi ) linguas_uk? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.3esr/linux-i686/xpi/uk.xpi -> firefox-10.0.3esr-uk.xpi ) linguas_vi? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.3esr/linux-i686/xpi/vi.xpi -> firefox-10.0.3esr-vi.xpi ) linguas_zh_CN? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.3esr/linux-i686/xpi/zh-CN.xpi -> firefox-10.0.3esr-zh-CN.xpi ) linguas_zh_TW? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.3esr/linux-i686/xpi/zh-TW.xpi -> firefox-10.0.3esr-zh-TW.xpi ) linguas_zu? ( ftp://ftp.mozilla.org/pub/firefox/releases//10.0.3esr/linux-i686/xpi/zu.xpi -> firefox-10.0.3esr-zu.xpi ) http://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-10.0-patches-0.6.tar.xz ftp://ftp.mozilla.org/pub/firefox/releases//10.0.3esr/source/firefox-10.0.3esr.source.tar.bz2
diff --git a/metadata/cache/www-client/firefox-11.0 b/metadata/cache/www-client/firefox-11.0
index eb84f3834465..ba37c69c90c3 100644
--- a/metadata/cache/www-client/firefox-11.0
+++ b/metadata/cache/www-client/firefox-11.0
@@ -1,4 +1,4 @@
->=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.13.3 >=dev-libs/nspr-4.9 >=dev-libs/glib-2.26:2 >=media-libs/mesa-7.10 media-libs/libpng[apng] virtual/libffi system-sqlite? ( >=dev-db/sqlite-3.7.7.1[fts3,secure-delete,threadsafe,unlock-notify,debug=] ) webm? ( >=media-libs/libvpx-1.0.0 media-libs/alsa-lib ) crashreporter? ( net-misc/curl ) selinux? ( sec-policy/selinux-mozilla ) dev-util/pkgconfig pgo? ( =dev-lang/python-2*[sqlite] >=sys-devel/gcc-4.5 ) webm? ( x86? ( >=dev-lang/yasm-1.1 ) amd64? ( >=dev-lang/yasm-1.1 ) virtual/opengl ) >=sys-apps/sed-4 x11-libs/libXrender x11-libs/libXt x11-libs/libXmu >=sys-libs/zlib-1.1.4 dev-util/pkgconfig =dev-lang/python-2*[threads] app-arch/zip app-arch/unzip >=app-text/hunspell-1.2 dev-libs/expat >=dev-libs/libIDL-0.8.0 >=dev-libs/libevent-1.4.7 >=x11-libs/cairo-1.8[X] >=x11-libs/gtk+-2.8.6:2 >=x11-libs/pango-1.10.1[X] virtual/jpeg virtual/freedesktop-icon-theme alsa? ( media-libs/alsa-lib ) dbus? ( >=dev-libs/dbus-glib-0.72 ) libnotify? ( >=x11-libs/libnotify-0.4 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) wifi? ( net-wireless/wireless-tools ) || ( >=sys-devel/automake-1.11.1 ) =sys-devel/autoconf-2.1* sys-devel/libtool pgo? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) app-arch/unzip
+>=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.13.3 >=dev-libs/nspr-4.9 >=dev-libs/glib-2.26:2 >=media-libs/mesa-7.10 media-libs/libpng[apng] virtual/libffi system-sqlite? ( >=dev-db/sqlite-3.7.7.1[fts3,secure-delete,threadsafe,unlock-notify,debug=] ) webm? ( >=media-libs/libvpx-1.0.0 media-libs/alsa-lib ) crashreporter? ( net-misc/curl ) selinux? ( sec-policy/selinux-mozilla ) dev-util/pkgconfig pgo? ( =dev-lang/python-2*[sqlite] >=sys-devel/gcc-4.5 ) webm? ( x86? ( >=dev-lang/yasm-1.1 ) amd64? ( >=dev-lang/yasm-1.1 ) virtual/opengl ) >=sys-apps/sed-4 x11-libs/libXrender x11-libs/libXt x11-libs/libXmu >=sys-libs/zlib-1.1.4 dev-util/pkgconfig =dev-lang/python-2*[threads] app-arch/zip app-arch/unzip >=app-text/hunspell-1.2 dev-libs/expat >=dev-libs/libIDL-0.8.0 >=dev-libs/libevent-1.4.7 >=x11-libs/cairo-1.8[X] >=x11-libs/gtk+-2.8.6:2 >=x11-libs/pango-1.10.1[X] virtual/jpeg virtual/freedesktop-icon-theme alsa? ( media-libs/alsa-lib ) dbus? ( >=dev-libs/dbus-glib-0.72 ) libnotify? ( >=x11-libs/libnotify-0.4 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) wifi? ( net-wireless/wireless-tools ) || ( >=sys-devel/automake-1.11.1:1.11 ) =sys-devel/autoconf-2.1* sys-devel/libtool pgo? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) app-arch/unzip
 >=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.13.3 >=dev-libs/nspr-4.9 >=dev-libs/glib-2.26:2 >=media-libs/mesa-7.10 media-libs/libpng[apng] virtual/libffi system-sqlite? ( >=dev-db/sqlite-3.7.7.1[fts3,secure-delete,threadsafe,unlock-notify,debug=] ) webm? ( >=media-libs/libvpx-1.0.0 media-libs/alsa-lib ) crashreporter? ( net-misc/curl ) selinux? ( sec-policy/selinux-mozilla ) x11-libs/libXrender x11-libs/libXt x11-libs/libXmu >=sys-libs/zlib-1.1.4 app-arch/zip app-arch/unzip >=app-text/hunspell-1.2 dev-libs/expat >=dev-libs/libIDL-0.8.0 >=dev-libs/libevent-1.4.7 >=x11-libs/cairo-1.8[X] >=x11-libs/gtk+-2.8.6:2 >=x11-libs/pango-1.10.1[X] virtual/jpeg virtual/freedesktop-icon-theme alsa? ( media-libs/alsa-lib ) dbus? ( >=dev-libs/dbus-glib-0.72 ) libnotify? ( >=x11-libs/libnotify-0.4 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) wifi? ( net-wireless/wireless-tools )
 0
 linguas_af? ( ftp://ftp.mozilla.org/pub/firefox/releases//11.0/linux-i686/xpi/af.xpi -> firefox-11.0-af.xpi ) linguas_ak? ( ftp://ftp.mozilla.org/pub/firefox/releases//11.0/linux-i686/xpi/ak.xpi -> firefox-11.0-ak.xpi ) linguas_ar? ( ftp://ftp.mozilla.org/pub/firefox/releases//11.0/linux-i686/xpi/ar.xpi -> firefox-11.0-ar.xpi ) linguas_as? ( ftp://ftp.mozilla.org/pub/firefox/releases//11.0/linux-i686/xpi/as.xpi -> firefox-11.0-as.xpi ) linguas_ast? ( ftp://ftp.mozilla.org/pub/firefox/releases//11.0/linux-i686/xpi/ast.xpi -> firefox-11.0-ast.xpi ) linguas_be? ( ftp://ftp.mozilla.org/pub/firefox/releases//11.0/linux-i686/xpi/be.xpi -> firefox-11.0-be.xpi ) linguas_bg? ( ftp://ftp.mozilla.org/pub/firefox/releases//11.0/linux-i686/xpi/bg.xpi -> firefox-11.0-bg.xpi ) linguas_bn_BD? ( ftp://ftp.mozilla.org/pub/firefox/releases//11.0/linux-i686/xpi/bn-BD.xpi -> firefox-11.0-bn-BD.xpi ) linguas_bn_IN? ( ftp://ftp.mozilla.org/pub/firefox/releases//11.0/linux-i686/xpi/bn-IN.xpi -> firefox-11.0-bn-IN.xpi ) linguas_br? ( ftp://ftp.mozilla.org/pub/firefox/releases//11.0/linux-i686/xpi/br.xpi -> firefox-11.0-br.xpi ) linguas_bs? ( ftp://ftp.mozilla.org/pub/firefox/releases//11.0/linux-i686/xpi/bs.xpi -> firefox-11.0-bs.xpi ) linguas_ca? ( ftp://ftp.mozilla.org/pub/firefox/releases//11.0/linux-i686/xpi/ca.xpi -> firefox-11.0-ca.xpi ) linguas_cs? ( ftp://ftp.mozilla.org/pub/firefox/releases//11.0/linux-i686/xpi/cs.xpi -> firefox-11.0-cs.xpi ) linguas_csb? ( ftp://ftp.mozilla.org/pub/firefox/releases//11.0/linux-i686/xpi/csb.xpi -> firefox-11.0-csb.xpi ) linguas_cy? ( ftp://ftp.mozilla.org/pub/firefox/releases//11.0/linux-i686/xpi/cy.xpi -> firefox-11.0-cy.xpi ) linguas_da? ( ftp://ftp.mozilla.org/pub/firefox/releases//11.0/linux-i686/xpi/da.xpi -> firefox-11.0-da.xpi ) linguas_de? ( ftp://ftp.mozilla.org/pub/firefox/releases//11.0/linux-i686/xpi/de.xpi -> firefox-11.0-de.xpi ) linguas_el? ( ftp://ftp.mozilla.org/pub/firefox/releases//11.0/linux-i686/xpi/el.xpi -> firefox-11.0-el.xpi ) linguas_en_GB? ( ftp://ftp.mozilla.org/pub/firefox/releases//11.0/linux-i686/xpi/en-GB.xpi -> firefox-11.0-en-GB.xpi ) linguas_en_ZA? ( ftp://ftp.mozilla.org/pub/firefox/releases//11.0/linux-i686/xpi/en-ZA.xpi -> firefox-11.0-en-ZA.xpi ) linguas_eo? ( ftp://ftp.mozilla.org/pub/firefox/releases//11.0/linux-i686/xpi/eo.xpi -> firefox-11.0-eo.xpi ) linguas_es_AR? ( ftp://ftp.mozilla.org/pub/firefox/releases//11.0/linux-i686/xpi/es-AR.xpi -> firefox-11.0-es-AR.xpi ) linguas_es_CL? ( ftp://ftp.mozilla.org/pub/firefox/releases//11.0/linux-i686/xpi/es-CL.xpi -> firefox-11.0-es-CL.xpi ) linguas_es_ES? ( ftp://ftp.mozilla.org/pub/firefox/releases//11.0/linux-i686/xpi/es-ES.xpi -> firefox-11.0-es-ES.xpi ) linguas_es_MX? ( ftp://ftp.mozilla.org/pub/firefox/releases//11.0/linux-i686/xpi/es-MX.xpi -> firefox-11.0-es-MX.xpi ) linguas_et? ( ftp://ftp.mozilla.org/pub/firefox/releases//11.0/linux-i686/xpi/et.xpi -> firefox-11.0-et.xpi ) linguas_eu? ( ftp://ftp.mozilla.org/pub/firefox/releases//11.0/linux-i686/xpi/eu.xpi -> firefox-11.0-eu.xpi ) linguas_fa? ( ftp://ftp.mozilla.org/pub/firefox/releases//11.0/linux-i686/xpi/fa.xpi -> firefox-11.0-fa.xpi ) linguas_fi? ( ftp://ftp.mozilla.org/pub/firefox/releases//11.0/linux-i686/xpi/fi.xpi -> firefox-11.0-fi.xpi ) linguas_fr? ( ftp://ftp.mozilla.org/pub/firefox/releases//11.0/linux-i686/xpi/fr.xpi -> firefox-11.0-fr.xpi ) linguas_fy_NL? ( ftp://ftp.mozilla.org/pub/firefox/releases//11.0/linux-i686/xpi/fy-NL.xpi -> firefox-11.0-fy-NL.xpi ) linguas_ga_IE? ( ftp://ftp.mozilla.org/pub/firefox/releases//11.0/linux-i686/xpi/ga-IE.xpi -> firefox-11.0-ga-IE.xpi ) linguas_gd? ( ftp://ftp.mozilla.org/pub/firefox/releases//11.0/linux-i686/xpi/gd.xpi -> firefox-11.0-gd.xpi ) linguas_gl? ( ftp://ftp.mozilla.org/pub/firefox/releases//11.0/linux-i686/xpi/gl.xpi -> firefox-11.0-gl.xpi ) linguas_gu_IN? ( ftp://ftp.mozilla.org/pub/firefox/releases//11.0/linux-i686/xpi/gu-IN.xpi -> firefox-11.0-gu-IN.xpi ) linguas_he? ( ftp://ftp.mozilla.org/pub/firefox/releases//11.0/linux-i686/xpi/he.xpi -> firefox-11.0-he.xpi ) linguas_hi_IN? ( ftp://ftp.mozilla.org/pub/firefox/releases//11.0/linux-i686/xpi/hi-IN.xpi -> firefox-11.0-hi-IN.xpi ) linguas_hr? ( ftp://ftp.mozilla.org/pub/firefox/releases//11.0/linux-i686/xpi/hr.xpi -> firefox-11.0-hr.xpi ) linguas_hu? ( ftp://ftp.mozilla.org/pub/firefox/releases//11.0/linux-i686/xpi/hu.xpi -> firefox-11.0-hu.xpi ) linguas_hy_AM? ( ftp://ftp.mozilla.org/pub/firefox/releases//11.0/linux-i686/xpi/hy-AM.xpi -> firefox-11.0-hy-AM.xpi ) linguas_id? ( ftp://ftp.mozilla.org/pub/firefox/releases//11.0/linux-i686/xpi/id.xpi -> firefox-11.0-id.xpi ) linguas_is? ( ftp://ftp.mozilla.org/pub/firefox/releases//11.0/linux-i686/xpi/is.xpi -> firefox-11.0-is.xpi ) linguas_it? ( ftp://ftp.mozilla.org/pub/firefox/releases//11.0/linux-i686/xpi/it.xpi -> firefox-11.0-it.xpi ) linguas_ja? ( ftp://ftp.mozilla.org/pub/firefox/releases//11.0/linux-i686/xpi/ja.xpi -> firefox-11.0-ja.xpi ) linguas_kk? ( ftp://ftp.mozilla.org/pub/firefox/releases//11.0/linux-i686/xpi/kk.xpi -> firefox-11.0-kk.xpi ) linguas_kn? ( ftp://ftp.mozilla.org/pub/firefox/releases//11.0/linux-i686/xpi/kn.xpi -> firefox-11.0-kn.xpi ) linguas_ko? ( ftp://ftp.mozilla.org/pub/firefox/releases//11.0/linux-i686/xpi/ko.xpi -> firefox-11.0-ko.xpi ) linguas_ku? ( ftp://ftp.mozilla.org/pub/firefox/releases//11.0/linux-i686/xpi/ku.xpi -> firefox-11.0-ku.xpi ) linguas_lg? ( ftp://ftp.mozilla.org/pub/firefox/releases//11.0/linux-i686/xpi/lg.xpi -> firefox-11.0-lg.xpi ) linguas_lt? ( ftp://ftp.mozilla.org/pub/firefox/releases//11.0/linux-i686/xpi/lt.xpi -> firefox-11.0-lt.xpi ) linguas_lv? ( ftp://ftp.mozilla.org/pub/firefox/releases//11.0/linux-i686/xpi/lv.xpi -> firefox-11.0-lv.xpi ) linguas_mai? ( ftp://ftp.mozilla.org/pub/firefox/releases//11.0/linux-i686/xpi/mai.xpi -> firefox-11.0-mai.xpi ) linguas_mk? ( ftp://ftp.mozilla.org/pub/firefox/releases//11.0/linux-i686/xpi/mk.xpi -> firefox-11.0-mk.xpi ) linguas_ml? ( ftp://ftp.mozilla.org/pub/firefox/releases//11.0/linux-i686/xpi/ml.xpi -> firefox-11.0-ml.xpi ) linguas_mr? ( ftp://ftp.mozilla.org/pub/firefox/releases//11.0/linux-i686/xpi/mr.xpi -> firefox-11.0-mr.xpi ) linguas_nb_NO? ( ftp://ftp.mozilla.org/pub/firefox/releases//11.0/linux-i686/xpi/nb-NO.xpi -> firefox-11.0-nb-NO.xpi ) linguas_nl? ( ftp://ftp.mozilla.org/pub/firefox/releases//11.0/linux-i686/xpi/nl.xpi -> firefox-11.0-nl.xpi ) linguas_nn_NO? ( ftp://ftp.mozilla.org/pub/firefox/releases//11.0/linux-i686/xpi/nn-NO.xpi -> firefox-11.0-nn-NO.xpi ) linguas_nso? ( ftp://ftp.mozilla.org/pub/firefox/releases//11.0/linux-i686/xpi/nso.xpi -> firefox-11.0-nso.xpi ) linguas_or? ( ftp://ftp.mozilla.org/pub/firefox/releases//11.0/linux-i686/xpi/or.xpi -> firefox-11.0-or.xpi ) linguas_pa_IN? ( ftp://ftp.mozilla.org/pub/firefox/releases//11.0/linux-i686/xpi/pa-IN.xpi -> firefox-11.0-pa-IN.xpi ) linguas_pl? ( ftp://ftp.mozilla.org/pub/firefox/releases//11.0/linux-i686/xpi/pl.xpi -> firefox-11.0-pl.xpi ) linguas_pt_BR? ( ftp://ftp.mozilla.org/pub/firefox/releases//11.0/linux-i686/xpi/pt-BR.xpi -> firefox-11.0-pt-BR.xpi ) linguas_pt_PT? ( ftp://ftp.mozilla.org/pub/firefox/releases//11.0/linux-i686/xpi/pt-PT.xpi -> firefox-11.0-pt-PT.xpi ) linguas_rm? ( ftp://ftp.mozilla.org/pub/firefox/releases//11.0/linux-i686/xpi/rm.xpi -> firefox-11.0-rm.xpi ) linguas_ro? ( ftp://ftp.mozilla.org/pub/firefox/releases//11.0/linux-i686/xpi/ro.xpi -> firefox-11.0-ro.xpi ) linguas_ru? ( ftp://ftp.mozilla.org/pub/firefox/releases//11.0/linux-i686/xpi/ru.xpi -> firefox-11.0-ru.xpi ) linguas_si? ( ftp://ftp.mozilla.org/pub/firefox/releases//11.0/linux-i686/xpi/si.xpi -> firefox-11.0-si.xpi ) linguas_sk? ( ftp://ftp.mozilla.org/pub/firefox/releases//11.0/linux-i686/xpi/sk.xpi -> firefox-11.0-sk.xpi ) linguas_sl? ( ftp://ftp.mozilla.org/pub/firefox/releases//11.0/linux-i686/xpi/sl.xpi -> firefox-11.0-sl.xpi ) linguas_son? ( ftp://ftp.mozilla.org/pub/firefox/releases//11.0/linux-i686/xpi/son.xpi -> firefox-11.0-son.xpi ) linguas_sq? ( ftp://ftp.mozilla.org/pub/firefox/releases//11.0/linux-i686/xpi/sq.xpi -> firefox-11.0-sq.xpi ) linguas_sr? ( ftp://ftp.mozilla.org/pub/firefox/releases//11.0/linux-i686/xpi/sr.xpi -> firefox-11.0-sr.xpi ) linguas_sv_SE? ( ftp://ftp.mozilla.org/pub/firefox/releases//11.0/linux-i686/xpi/sv-SE.xpi -> firefox-11.0-sv-SE.xpi ) linguas_ta? ( ftp://ftp.mozilla.org/pub/firefox/releases//11.0/linux-i686/xpi/ta.xpi -> firefox-11.0-ta.xpi ) linguas_ta_LK? ( ftp://ftp.mozilla.org/pub/firefox/releases//11.0/linux-i686/xpi/ta-LK.xpi -> firefox-11.0-ta-LK.xpi ) linguas_te? ( ftp://ftp.mozilla.org/pub/firefox/releases//11.0/linux-i686/xpi/te.xpi -> firefox-11.0-te.xpi ) linguas_th? ( ftp://ftp.mozilla.org/pub/firefox/releases//11.0/linux-i686/xpi/th.xpi -> firefox-11.0-th.xpi ) linguas_tr? ( ftp://ftp.mozilla.org/pub/firefox/releases//11.0/linux-i686/xpi/tr.xpi -> firefox-11.0-tr.xpi ) linguas_uk? ( ftp://ftp.mozilla.org/pub/firefox/releases//11.0/linux-i686/xpi/uk.xpi -> firefox-11.0-uk.xpi ) linguas_vi? ( ftp://ftp.mozilla.org/pub/firefox/releases//11.0/linux-i686/xpi/vi.xpi -> firefox-11.0-vi.xpi ) linguas_zh_CN? ( ftp://ftp.mozilla.org/pub/firefox/releases//11.0/linux-i686/xpi/zh-CN.xpi -> firefox-11.0-zh-CN.xpi ) linguas_zh_TW? ( ftp://ftp.mozilla.org/pub/firefox/releases//11.0/linux-i686/xpi/zh-TW.xpi -> firefox-11.0-zh-TW.xpi ) linguas_zu? ( ftp://ftp.mozilla.org/pub/firefox/releases//11.0/linux-i686/xpi/zu.xpi -> firefox-11.0-zu.xpi ) http://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-11.0-patches-0.1.tar.xz ftp://ftp.mozilla.org/pub/firefox/releases//11.0/source/firefox-11.0.source.tar.bz2
diff --git a/metadata/cache/www-client/firefox-3.6.20 b/metadata/cache/www-client/firefox-3.6.20
index 4b11c5bff1af..3f0ca8ca6ff7 100644
--- a/metadata/cache/www-client/firefox-3.6.20
+++ b/metadata/cache/www-client/firefox-3.6.20
@@ -1,4 +1,4 @@
->=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.12.8 >=dev-libs/nspr-4.8.6 >=app-text/hunspell-1.2 system-sqlite? ( >=dev-db/sqlite-3.7.4[fts3,secure-delete] ) alsa? ( media-libs/alsa-lib ) >=x11-libs/cairo-1.8.8[X] gnome? ( >=gnome-base/gnome-vfs-2.16.3 >=gnome-base/libgnomeui-2.16.1 >=gnome-base/gconf-2.16.0 >=gnome-base/libgnome-2.16.0 ) wifi? ( net-wireless/wireless-tools ) libnotify? ( >=x11-libs/libnotify-0.4 ) ~net-libs/xulrunner-1.9.2.20[ipc=,java=,wifi=,libnotify=,system-sqlite=] java? ( >=virtual/jdk-1.4 ) =dev-lang/python-2*[threads] dev-util/pkgconfig x11-libs/libXrender x11-libs/libXt x11-libs/libXmu >=sys-libs/zlib-1.1.4 dev-util/pkgconfig =dev-lang/python-2*[threads] app-arch/zip app-arch/unzip >=app-text/hunspell-1.2 dev-libs/expat >=dev-libs/libIDL-0.8.0 >=dev-libs/libevent-1.4.7 >=x11-libs/cairo-1.8[X] >=x11-libs/gtk+-2.8.6:2 >=x11-libs/pango-1.10.1[X] virtual/jpeg virtual/freedesktop-icon-theme alsa? ( media-libs/alsa-lib ) dbus? ( >=dev-libs/dbus-glib-0.72 ) libnotify? ( >=x11-libs/libnotify-0.4 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) wifi? ( net-wireless/wireless-tools ) || ( >=sys-devel/automake-1.11.1 ) =sys-devel/autoconf-2.1* sys-devel/libtool app-arch/unzip java? ( >=dev-java/java-config-2.1.9-r1 )
+>=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.12.8 >=dev-libs/nspr-4.8.6 >=app-text/hunspell-1.2 system-sqlite? ( >=dev-db/sqlite-3.7.4[fts3,secure-delete] ) alsa? ( media-libs/alsa-lib ) >=x11-libs/cairo-1.8.8[X] gnome? ( >=gnome-base/gnome-vfs-2.16.3 >=gnome-base/libgnomeui-2.16.1 >=gnome-base/gconf-2.16.0 >=gnome-base/libgnome-2.16.0 ) wifi? ( net-wireless/wireless-tools ) libnotify? ( >=x11-libs/libnotify-0.4 ) ~net-libs/xulrunner-1.9.2.20[ipc=,java=,wifi=,libnotify=,system-sqlite=] java? ( >=virtual/jdk-1.4 ) =dev-lang/python-2*[threads] dev-util/pkgconfig x11-libs/libXrender x11-libs/libXt x11-libs/libXmu >=sys-libs/zlib-1.1.4 dev-util/pkgconfig =dev-lang/python-2*[threads] app-arch/zip app-arch/unzip >=app-text/hunspell-1.2 dev-libs/expat >=dev-libs/libIDL-0.8.0 >=dev-libs/libevent-1.4.7 >=x11-libs/cairo-1.8[X] >=x11-libs/gtk+-2.8.6:2 >=x11-libs/pango-1.10.1[X] virtual/jpeg virtual/freedesktop-icon-theme alsa? ( media-libs/alsa-lib ) dbus? ( >=dev-libs/dbus-glib-0.72 ) libnotify? ( >=x11-libs/libnotify-0.4 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) wifi? ( net-wireless/wireless-tools ) || ( >=sys-devel/automake-1.11.1:1.11 ) =sys-devel/autoconf-2.1* sys-devel/libtool app-arch/unzip java? ( >=dev-java/java-config-2.1.9-r1 )
 >=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.12.8 >=dev-libs/nspr-4.8.6 >=app-text/hunspell-1.2 system-sqlite? ( >=dev-db/sqlite-3.7.4[fts3,secure-delete] ) alsa? ( media-libs/alsa-lib ) >=x11-libs/cairo-1.8.8[X] gnome? ( >=gnome-base/gnome-vfs-2.16.3 >=gnome-base/libgnomeui-2.16.1 >=gnome-base/gconf-2.16.0 >=gnome-base/libgnome-2.16.0 ) wifi? ( net-wireless/wireless-tools ) libnotify? ( >=x11-libs/libnotify-0.4 ) ~net-libs/xulrunner-1.9.2.20[ipc=,java=,wifi=,libnotify=,system-sqlite=] java? ( >=virtual/jre-1.4 ) x11-libs/libXrender x11-libs/libXt x11-libs/libXmu >=sys-libs/zlib-1.1.4 app-arch/zip app-arch/unzip >=app-text/hunspell-1.2 dev-libs/expat >=dev-libs/libIDL-0.8.0 >=dev-libs/libevent-1.4.7 >=x11-libs/cairo-1.8[X] >=x11-libs/gtk+-2.8.6:2 >=x11-libs/pango-1.10.1[X] virtual/jpeg virtual/freedesktop-icon-theme alsa? ( media-libs/alsa-lib ) dbus? ( >=dev-libs/dbus-glib-0.72 ) libnotify? ( >=x11-libs/libnotify-0.4 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) wifi? ( net-wireless/wireless-tools ) java? ( >=dev-java/java-config-2.1.9-r1 )
 0
 http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.20/source/firefox-3.6.20.source.tar.bz2 http://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-3.6-patches-0.4.tar.bz2 linguas_af? ( http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.20/linux-i686/xpi/af.xpi -> firefox-3.6.20-af.xpi ) linguas_ar? ( http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.20/linux-i686/xpi/ar.xpi -> firefox-3.6.20-ar.xpi ) linguas_as? ( http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.20/linux-i686/xpi/as.xpi -> firefox-3.6.20-as.xpi ) linguas_be? ( http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.20/linux-i686/xpi/be.xpi -> firefox-3.6.20-be.xpi ) linguas_bg? ( http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.20/linux-i686/xpi/bg.xpi -> firefox-3.6.20-bg.xpi ) linguas_bn_BD? ( http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.20/linux-i686/xpi/bn-BD.xpi -> firefox-3.6.20-bn-BD.xpi ) linguas_bn? ( http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.20/linux-i686/xpi/bn-BD.xpi -> firefox-3.6.20-bn-BD.xpi ) linguas_bn_IN? ( http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.20/linux-i686/xpi/bn-IN.xpi -> firefox-3.6.20-bn-IN.xpi ) linguas_bn? ( http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.20/linux-i686/xpi/bn-IN.xpi -> firefox-3.6.20-bn-IN.xpi ) linguas_ca? ( http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.20/linux-i686/xpi/ca.xpi -> firefox-3.6.20-ca.xpi ) linguas_cs? ( http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.20/linux-i686/xpi/cs.xpi -> firefox-3.6.20-cs.xpi ) linguas_cy? ( http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.20/linux-i686/xpi/cy.xpi -> firefox-3.6.20-cy.xpi ) linguas_da? ( http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.20/linux-i686/xpi/da.xpi -> firefox-3.6.20-da.xpi ) linguas_de? ( http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.20/linux-i686/xpi/de.xpi -> firefox-3.6.20-de.xpi ) linguas_el? ( http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.20/linux-i686/xpi/el.xpi -> firefox-3.6.20-el.xpi ) linguas_en_GB? ( http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.20/linux-i686/xpi/en-GB.xpi -> firefox-3.6.20-en-GB.xpi ) linguas_eo? ( http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.20/linux-i686/xpi/eo.xpi -> firefox-3.6.20-eo.xpi ) linguas_es_AR? ( http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.20/linux-i686/xpi/es-AR.xpi -> firefox-3.6.20-es-AR.xpi ) linguas_es_CL? ( http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.20/linux-i686/xpi/es-CL.xpi -> firefox-3.6.20-es-CL.xpi ) linguas_es_ES? ( http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.20/linux-i686/xpi/es-ES.xpi -> firefox-3.6.20-es-ES.xpi ) linguas_es? ( http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.20/linux-i686/xpi/es-ES.xpi -> firefox-3.6.20-es-ES.xpi ) linguas_es_MX? ( http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.20/linux-i686/xpi/es-MX.xpi -> firefox-3.6.20-es-MX.xpi ) linguas_et? ( http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.20/linux-i686/xpi/et.xpi -> firefox-3.6.20-et.xpi ) linguas_eu? ( http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.20/linux-i686/xpi/eu.xpi -> firefox-3.6.20-eu.xpi ) linguas_fa? ( http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.20/linux-i686/xpi/fa.xpi -> firefox-3.6.20-fa.xpi ) linguas_fi? ( http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.20/linux-i686/xpi/fi.xpi -> firefox-3.6.20-fi.xpi ) linguas_fr? ( http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.20/linux-i686/xpi/fr.xpi -> firefox-3.6.20-fr.xpi ) linguas_fy_NL? ( http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.20/linux-i686/xpi/fy-NL.xpi -> firefox-3.6.20-fy-NL.xpi ) linguas_fy? ( http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.20/linux-i686/xpi/fy-NL.xpi -> firefox-3.6.20-fy-NL.xpi ) linguas_ga_IE? ( http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.20/linux-i686/xpi/ga-IE.xpi -> firefox-3.6.20-ga-IE.xpi ) linguas_ga? ( http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.20/linux-i686/xpi/ga-IE.xpi -> firefox-3.6.20-ga-IE.xpi ) linguas_gl? ( http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.20/linux-i686/xpi/gl.xpi -> firefox-3.6.20-gl.xpi ) linguas_gu_IN? ( http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.20/linux-i686/xpi/gu-IN.xpi -> firefox-3.6.20-gu-IN.xpi ) linguas_gu? ( http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.20/linux-i686/xpi/gu-IN.xpi -> firefox-3.6.20-gu-IN.xpi ) linguas_he? ( http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.20/linux-i686/xpi/he.xpi -> firefox-3.6.20-he.xpi ) linguas_hi_IN? ( http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.20/linux-i686/xpi/hi-IN.xpi -> firefox-3.6.20-hi-IN.xpi ) linguas_hi? ( http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.20/linux-i686/xpi/hi-IN.xpi -> firefox-3.6.20-hi-IN.xpi ) linguas_hr? ( http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.20/linux-i686/xpi/hr.xpi -> firefox-3.6.20-hr.xpi ) linguas_hu? ( http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.20/linux-i686/xpi/hu.xpi -> firefox-3.6.20-hu.xpi ) linguas_id? ( http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.20/linux-i686/xpi/id.xpi -> firefox-3.6.20-id.xpi ) linguas_is? ( http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.20/linux-i686/xpi/is.xpi -> firefox-3.6.20-is.xpi ) linguas_it? ( http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.20/linux-i686/xpi/it.xpi -> firefox-3.6.20-it.xpi ) linguas_ja? ( http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.20/linux-i686/xpi/ja.xpi -> firefox-3.6.20-ja.xpi ) linguas_ka? ( http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.20/linux-i686/xpi/ka.xpi -> firefox-3.6.20-ka.xpi ) linguas_kk? ( http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.20/linux-i686/xpi/kk.xpi -> firefox-3.6.20-kk.xpi ) linguas_kn? ( http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.20/linux-i686/xpi/kn.xpi -> firefox-3.6.20-kn.xpi ) linguas_ko? ( http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.20/linux-i686/xpi/ko.xpi -> firefox-3.6.20-ko.xpi ) linguas_ku? ( http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.20/linux-i686/xpi/ku.xpi -> firefox-3.6.20-ku.xpi ) linguas_lt? ( http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.20/linux-i686/xpi/lt.xpi -> firefox-3.6.20-lt.xpi ) linguas_lv? ( http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.20/linux-i686/xpi/lv.xpi -> firefox-3.6.20-lv.xpi ) linguas_mk? ( http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.20/linux-i686/xpi/mk.xpi -> firefox-3.6.20-mk.xpi ) linguas_ml? ( http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.20/linux-i686/xpi/ml.xpi -> firefox-3.6.20-ml.xpi ) linguas_mr? ( http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.20/linux-i686/xpi/mr.xpi -> firefox-3.6.20-mr.xpi ) linguas_nb_NO? ( http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.20/linux-i686/xpi/nb-NO.xpi -> firefox-3.6.20-nb-NO.xpi ) linguas_nb? ( http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.20/linux-i686/xpi/nb-NO.xpi -> firefox-3.6.20-nb-NO.xpi ) linguas_nl? ( http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.20/linux-i686/xpi/nl.xpi -> firefox-3.6.20-nl.xpi ) linguas_nn_NO? ( http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.20/linux-i686/xpi/nn-NO.xpi -> firefox-3.6.20-nn-NO.xpi ) linguas_nn? ( http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.20/linux-i686/xpi/nn-NO.xpi -> firefox-3.6.20-nn-NO.xpi ) linguas_oc? ( http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.20/linux-i686/xpi/oc.xpi -> firefox-3.6.20-oc.xpi ) linguas_or? ( http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.20/linux-i686/xpi/or.xpi -> firefox-3.6.20-or.xpi ) linguas_pa_IN? ( http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.20/linux-i686/xpi/pa-IN.xpi -> firefox-3.6.20-pa-IN.xpi ) linguas_pa? ( http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.20/linux-i686/xpi/pa-IN.xpi -> firefox-3.6.20-pa-IN.xpi ) linguas_pl? ( http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.20/linux-i686/xpi/pl.xpi -> firefox-3.6.20-pl.xpi ) linguas_pt_BR? ( http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.20/linux-i686/xpi/pt-BR.xpi -> firefox-3.6.20-pt-BR.xpi ) linguas_pt_PT? ( http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.20/linux-i686/xpi/pt-PT.xpi -> firefox-3.6.20-pt-PT.xpi ) linguas_pt? ( http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.20/linux-i686/xpi/pt-PT.xpi -> firefox-3.6.20-pt-PT.xpi ) linguas_rm? ( http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.20/linux-i686/xpi/rm.xpi -> firefox-3.6.20-rm.xpi ) linguas_ro? ( http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.20/linux-i686/xpi/ro.xpi -> firefox-3.6.20-ro.xpi ) linguas_ru? ( http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.20/linux-i686/xpi/ru.xpi -> firefox-3.6.20-ru.xpi ) linguas_si? ( http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.20/linux-i686/xpi/si.xpi -> firefox-3.6.20-si.xpi ) linguas_sk? ( http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.20/linux-i686/xpi/sk.xpi -> firefox-3.6.20-sk.xpi ) linguas_sl? ( http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.20/linux-i686/xpi/sl.xpi -> firefox-3.6.20-sl.xpi ) linguas_sq? ( http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.20/linux-i686/xpi/sq.xpi -> firefox-3.6.20-sq.xpi ) linguas_sr? ( http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.20/linux-i686/xpi/sr.xpi -> firefox-3.6.20-sr.xpi ) linguas_sv_SE? ( http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.20/linux-i686/xpi/sv-SE.xpi -> firefox-3.6.20-sv-SE.xpi ) linguas_sv? ( http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.20/linux-i686/xpi/sv-SE.xpi -> firefox-3.6.20-sv-SE.xpi ) linguas_ta? ( http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.20/linux-i686/xpi/ta.xpi -> firefox-3.6.20-ta.xpi ) linguas_ta_LK? ( http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.20/linux-i686/xpi/ta-LK.xpi -> firefox-3.6.20-ta-LK.xpi ) linguas_ta? ( http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.20/linux-i686/xpi/ta-LK.xpi -> firefox-3.6.20-ta-LK.xpi ) linguas_te? ( http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.20/linux-i686/xpi/te.xpi -> firefox-3.6.20-te.xpi ) linguas_th? ( http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.20/linux-i686/xpi/th.xpi -> firefox-3.6.20-th.xpi ) linguas_tr? ( http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.20/linux-i686/xpi/tr.xpi -> firefox-3.6.20-tr.xpi ) linguas_uk? ( http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.20/linux-i686/xpi/uk.xpi -> firefox-3.6.20-uk.xpi ) linguas_vi? ( http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.20/linux-i686/xpi/vi.xpi -> firefox-3.6.20-vi.xpi ) linguas_zh_CN? ( http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.20/linux-i686/xpi/zh-CN.xpi -> firefox-3.6.20-zh-CN.xpi ) linguas_zh_TW? ( http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.20/linux-i686/xpi/zh-TW.xpi -> firefox-3.6.20-zh-TW.xpi )
diff --git a/metadata/cache/www-client/firefox-3.6.22 b/metadata/cache/www-client/firefox-3.6.22
index 24555e89734a..31a6a567794e 100644
--- a/metadata/cache/www-client/firefox-3.6.22
+++ b/metadata/cache/www-client/firefox-3.6.22
@@ -1,4 +1,4 @@
->=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.12.8 >=dev-libs/nspr-4.8.6 >=app-text/hunspell-1.2 system-sqlite? ( >=dev-db/sqlite-3.7.4[fts3,secure-delete] ) alsa? ( media-libs/alsa-lib ) >=x11-libs/cairo-1.8.8[X] gnome? ( >=gnome-base/gnome-vfs-2.16.3 >=gnome-base/libgnomeui-2.16.1 >=gnome-base/gconf-2.16.0 >=gnome-base/libgnome-2.16.0 ) wifi? ( net-wireless/wireless-tools ) libnotify? ( >=x11-libs/libnotify-0.4 ) ~net-libs/xulrunner-1.9.2.22[ipc=,java=,wifi=,libnotify=,system-sqlite=] java? ( >=virtual/jdk-1.4 ) =dev-lang/python-2*[threads] dev-util/pkgconfig x11-libs/libXrender x11-libs/libXt x11-libs/libXmu >=sys-libs/zlib-1.1.4 dev-util/pkgconfig =dev-lang/python-2*[threads] app-arch/zip app-arch/unzip >=app-text/hunspell-1.2 dev-libs/expat >=dev-libs/libIDL-0.8.0 >=dev-libs/libevent-1.4.7 >=x11-libs/cairo-1.8[X] >=x11-libs/gtk+-2.8.6:2 >=x11-libs/pango-1.10.1[X] virtual/jpeg virtual/freedesktop-icon-theme alsa? ( media-libs/alsa-lib ) dbus? ( >=dev-libs/dbus-glib-0.72 ) libnotify? ( >=x11-libs/libnotify-0.4 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) wifi? ( net-wireless/wireless-tools ) || ( >=sys-devel/automake-1.11.1 ) =sys-devel/autoconf-2.1* sys-devel/libtool app-arch/unzip java? ( >=dev-java/java-config-2.1.9-r1 )
+>=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.12.8 >=dev-libs/nspr-4.8.6 >=app-text/hunspell-1.2 system-sqlite? ( >=dev-db/sqlite-3.7.4[fts3,secure-delete] ) alsa? ( media-libs/alsa-lib ) >=x11-libs/cairo-1.8.8[X] gnome? ( >=gnome-base/gnome-vfs-2.16.3 >=gnome-base/libgnomeui-2.16.1 >=gnome-base/gconf-2.16.0 >=gnome-base/libgnome-2.16.0 ) wifi? ( net-wireless/wireless-tools ) libnotify? ( >=x11-libs/libnotify-0.4 ) ~net-libs/xulrunner-1.9.2.22[ipc=,java=,wifi=,libnotify=,system-sqlite=] java? ( >=virtual/jdk-1.4 ) =dev-lang/python-2*[threads] dev-util/pkgconfig x11-libs/libXrender x11-libs/libXt x11-libs/libXmu >=sys-libs/zlib-1.1.4 dev-util/pkgconfig =dev-lang/python-2*[threads] app-arch/zip app-arch/unzip >=app-text/hunspell-1.2 dev-libs/expat >=dev-libs/libIDL-0.8.0 >=dev-libs/libevent-1.4.7 >=x11-libs/cairo-1.8[X] >=x11-libs/gtk+-2.8.6:2 >=x11-libs/pango-1.10.1[X] virtual/jpeg virtual/freedesktop-icon-theme alsa? ( media-libs/alsa-lib ) dbus? ( >=dev-libs/dbus-glib-0.72 ) libnotify? ( >=x11-libs/libnotify-0.4 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) wifi? ( net-wireless/wireless-tools ) || ( >=sys-devel/automake-1.11.1:1.11 ) =sys-devel/autoconf-2.1* sys-devel/libtool app-arch/unzip java? ( >=dev-java/java-config-2.1.9-r1 )
 >=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.12.8 >=dev-libs/nspr-4.8.6 >=app-text/hunspell-1.2 system-sqlite? ( >=dev-db/sqlite-3.7.4[fts3,secure-delete] ) alsa? ( media-libs/alsa-lib ) >=x11-libs/cairo-1.8.8[X] gnome? ( >=gnome-base/gnome-vfs-2.16.3 >=gnome-base/libgnomeui-2.16.1 >=gnome-base/gconf-2.16.0 >=gnome-base/libgnome-2.16.0 ) wifi? ( net-wireless/wireless-tools ) libnotify? ( >=x11-libs/libnotify-0.4 ) ~net-libs/xulrunner-1.9.2.22[ipc=,java=,wifi=,libnotify=,system-sqlite=] java? ( >=virtual/jre-1.4 ) x11-libs/libXrender x11-libs/libXt x11-libs/libXmu >=sys-libs/zlib-1.1.4 app-arch/zip app-arch/unzip >=app-text/hunspell-1.2 dev-libs/expat >=dev-libs/libIDL-0.8.0 >=dev-libs/libevent-1.4.7 >=x11-libs/cairo-1.8[X] >=x11-libs/gtk+-2.8.6:2 >=x11-libs/pango-1.10.1[X] virtual/jpeg virtual/freedesktop-icon-theme alsa? ( media-libs/alsa-lib ) dbus? ( >=dev-libs/dbus-glib-0.72 ) libnotify? ( >=x11-libs/libnotify-0.4 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) wifi? ( net-wireless/wireless-tools ) java? ( >=dev-java/java-config-2.1.9-r1 )
 0
 http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.22/source/firefox-3.6.22.source.tar.bz2 http://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-3.6-patches-0.4.tar.bz2 linguas_af? ( http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.22/linux-i686/xpi/af.xpi -> firefox-3.6.22-af.xpi ) linguas_ar? ( http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.22/linux-i686/xpi/ar.xpi -> firefox-3.6.22-ar.xpi ) linguas_as? ( http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.22/linux-i686/xpi/as.xpi -> firefox-3.6.22-as.xpi ) linguas_be? ( http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.22/linux-i686/xpi/be.xpi -> firefox-3.6.22-be.xpi ) linguas_bg? ( http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.22/linux-i686/xpi/bg.xpi -> firefox-3.6.22-bg.xpi ) linguas_bn_BD? ( http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.22/linux-i686/xpi/bn-BD.xpi -> firefox-3.6.22-bn-BD.xpi ) linguas_bn? ( http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.22/linux-i686/xpi/bn-BD.xpi -> firefox-3.6.22-bn-BD.xpi ) linguas_bn_IN? ( http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.22/linux-i686/xpi/bn-IN.xpi -> firefox-3.6.22-bn-IN.xpi ) linguas_bn? ( http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.22/linux-i686/xpi/bn-IN.xpi -> firefox-3.6.22-bn-IN.xpi ) linguas_ca? ( http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.22/linux-i686/xpi/ca.xpi -> firefox-3.6.22-ca.xpi ) linguas_cs? ( http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.22/linux-i686/xpi/cs.xpi -> firefox-3.6.22-cs.xpi ) linguas_cy? ( http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.22/linux-i686/xpi/cy.xpi -> firefox-3.6.22-cy.xpi ) linguas_da? ( http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.22/linux-i686/xpi/da.xpi -> firefox-3.6.22-da.xpi ) linguas_de? ( http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.22/linux-i686/xpi/de.xpi -> firefox-3.6.22-de.xpi ) linguas_el? ( http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.22/linux-i686/xpi/el.xpi -> firefox-3.6.22-el.xpi ) linguas_en_GB? ( http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.22/linux-i686/xpi/en-GB.xpi -> firefox-3.6.22-en-GB.xpi ) linguas_eo? ( http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.22/linux-i686/xpi/eo.xpi -> firefox-3.6.22-eo.xpi ) linguas_es_AR? ( http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.22/linux-i686/xpi/es-AR.xpi -> firefox-3.6.22-es-AR.xpi ) linguas_es_CL? ( http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.22/linux-i686/xpi/es-CL.xpi -> firefox-3.6.22-es-CL.xpi ) linguas_es_ES? ( http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.22/linux-i686/xpi/es-ES.xpi -> firefox-3.6.22-es-ES.xpi ) linguas_es? ( http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.22/linux-i686/xpi/es-ES.xpi -> firefox-3.6.22-es-ES.xpi ) linguas_es_MX? ( http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.22/linux-i686/xpi/es-MX.xpi -> firefox-3.6.22-es-MX.xpi ) linguas_et? ( http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.22/linux-i686/xpi/et.xpi -> firefox-3.6.22-et.xpi ) linguas_eu? ( http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.22/linux-i686/xpi/eu.xpi -> firefox-3.6.22-eu.xpi ) linguas_fa? ( http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.22/linux-i686/xpi/fa.xpi -> firefox-3.6.22-fa.xpi ) linguas_fi? ( http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.22/linux-i686/xpi/fi.xpi -> firefox-3.6.22-fi.xpi ) linguas_fr? ( http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.22/linux-i686/xpi/fr.xpi -> firefox-3.6.22-fr.xpi ) linguas_fy_NL? ( http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.22/linux-i686/xpi/fy-NL.xpi -> firefox-3.6.22-fy-NL.xpi ) linguas_fy? ( http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.22/linux-i686/xpi/fy-NL.xpi -> firefox-3.6.22-fy-NL.xpi ) linguas_ga_IE? ( http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.22/linux-i686/xpi/ga-IE.xpi -> firefox-3.6.22-ga-IE.xpi ) linguas_ga? ( http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.22/linux-i686/xpi/ga-IE.xpi -> firefox-3.6.22-ga-IE.xpi ) linguas_gl? ( http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.22/linux-i686/xpi/gl.xpi -> firefox-3.6.22-gl.xpi ) linguas_gu_IN? ( http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.22/linux-i686/xpi/gu-IN.xpi -> firefox-3.6.22-gu-IN.xpi ) linguas_gu? ( http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.22/linux-i686/xpi/gu-IN.xpi -> firefox-3.6.22-gu-IN.xpi ) linguas_he? ( http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.22/linux-i686/xpi/he.xpi -> firefox-3.6.22-he.xpi ) linguas_hi_IN? ( http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.22/linux-i686/xpi/hi-IN.xpi -> firefox-3.6.22-hi-IN.xpi ) linguas_hi? ( http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.22/linux-i686/xpi/hi-IN.xpi -> firefox-3.6.22-hi-IN.xpi ) linguas_hr? ( http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.22/linux-i686/xpi/hr.xpi -> firefox-3.6.22-hr.xpi ) linguas_hu? ( http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.22/linux-i686/xpi/hu.xpi -> firefox-3.6.22-hu.xpi ) linguas_id? ( http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.22/linux-i686/xpi/id.xpi -> firefox-3.6.22-id.xpi ) linguas_is? ( http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.22/linux-i686/xpi/is.xpi -> firefox-3.6.22-is.xpi ) linguas_it? ( http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.22/linux-i686/xpi/it.xpi -> firefox-3.6.22-it.xpi ) linguas_ja? ( http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.22/linux-i686/xpi/ja.xpi -> firefox-3.6.22-ja.xpi ) linguas_ka? ( http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.22/linux-i686/xpi/ka.xpi -> firefox-3.6.22-ka.xpi ) linguas_kk? ( http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.22/linux-i686/xpi/kk.xpi -> firefox-3.6.22-kk.xpi ) linguas_kn? ( http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.22/linux-i686/xpi/kn.xpi -> firefox-3.6.22-kn.xpi ) linguas_ko? ( http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.22/linux-i686/xpi/ko.xpi -> firefox-3.6.22-ko.xpi ) linguas_ku? ( http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.22/linux-i686/xpi/ku.xpi -> firefox-3.6.22-ku.xpi ) linguas_lt? ( http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.22/linux-i686/xpi/lt.xpi -> firefox-3.6.22-lt.xpi ) linguas_lv? ( http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.22/linux-i686/xpi/lv.xpi -> firefox-3.6.22-lv.xpi ) linguas_mk? ( http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.22/linux-i686/xpi/mk.xpi -> firefox-3.6.22-mk.xpi ) linguas_ml? ( http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.22/linux-i686/xpi/ml.xpi -> firefox-3.6.22-ml.xpi ) linguas_mr? ( http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.22/linux-i686/xpi/mr.xpi -> firefox-3.6.22-mr.xpi ) linguas_nb_NO? ( http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.22/linux-i686/xpi/nb-NO.xpi -> firefox-3.6.22-nb-NO.xpi ) linguas_nb? ( http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.22/linux-i686/xpi/nb-NO.xpi -> firefox-3.6.22-nb-NO.xpi ) linguas_nl? ( http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.22/linux-i686/xpi/nl.xpi -> firefox-3.6.22-nl.xpi ) linguas_nn_NO? ( http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.22/linux-i686/xpi/nn-NO.xpi -> firefox-3.6.22-nn-NO.xpi ) linguas_nn? ( http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.22/linux-i686/xpi/nn-NO.xpi -> firefox-3.6.22-nn-NO.xpi ) linguas_oc? ( http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.22/linux-i686/xpi/oc.xpi -> firefox-3.6.22-oc.xpi ) linguas_or? ( http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.22/linux-i686/xpi/or.xpi -> firefox-3.6.22-or.xpi ) linguas_pa_IN? ( http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.22/linux-i686/xpi/pa-IN.xpi -> firefox-3.6.22-pa-IN.xpi ) linguas_pa? ( http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.22/linux-i686/xpi/pa-IN.xpi -> firefox-3.6.22-pa-IN.xpi ) linguas_pl? ( http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.22/linux-i686/xpi/pl.xpi -> firefox-3.6.22-pl.xpi ) linguas_pt_BR? ( http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.22/linux-i686/xpi/pt-BR.xpi -> firefox-3.6.22-pt-BR.xpi ) linguas_pt_PT? ( http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.22/linux-i686/xpi/pt-PT.xpi -> firefox-3.6.22-pt-PT.xpi ) linguas_pt? ( http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.22/linux-i686/xpi/pt-PT.xpi -> firefox-3.6.22-pt-PT.xpi ) linguas_rm? ( http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.22/linux-i686/xpi/rm.xpi -> firefox-3.6.22-rm.xpi ) linguas_ro? ( http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.22/linux-i686/xpi/ro.xpi -> firefox-3.6.22-ro.xpi ) linguas_ru? ( http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.22/linux-i686/xpi/ru.xpi -> firefox-3.6.22-ru.xpi ) linguas_si? ( http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.22/linux-i686/xpi/si.xpi -> firefox-3.6.22-si.xpi ) linguas_sk? ( http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.22/linux-i686/xpi/sk.xpi -> firefox-3.6.22-sk.xpi ) linguas_sl? ( http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.22/linux-i686/xpi/sl.xpi -> firefox-3.6.22-sl.xpi ) linguas_sq? ( http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.22/linux-i686/xpi/sq.xpi -> firefox-3.6.22-sq.xpi ) linguas_sr? ( http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.22/linux-i686/xpi/sr.xpi -> firefox-3.6.22-sr.xpi ) linguas_sv_SE? ( http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.22/linux-i686/xpi/sv-SE.xpi -> firefox-3.6.22-sv-SE.xpi ) linguas_sv? ( http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.22/linux-i686/xpi/sv-SE.xpi -> firefox-3.6.22-sv-SE.xpi ) linguas_ta? ( http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.22/linux-i686/xpi/ta.xpi -> firefox-3.6.22-ta.xpi ) linguas_ta_LK? ( http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.22/linux-i686/xpi/ta-LK.xpi -> firefox-3.6.22-ta-LK.xpi ) linguas_ta? ( http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.22/linux-i686/xpi/ta-LK.xpi -> firefox-3.6.22-ta-LK.xpi ) linguas_te? ( http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.22/linux-i686/xpi/te.xpi -> firefox-3.6.22-te.xpi ) linguas_th? ( http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.22/linux-i686/xpi/th.xpi -> firefox-3.6.22-th.xpi ) linguas_tr? ( http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.22/linux-i686/xpi/tr.xpi -> firefox-3.6.22-tr.xpi ) linguas_uk? ( http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.22/linux-i686/xpi/uk.xpi -> firefox-3.6.22-uk.xpi ) linguas_vi? ( http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.22/linux-i686/xpi/vi.xpi -> firefox-3.6.22-vi.xpi ) linguas_zh_CN? ( http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.22/linux-i686/xpi/zh-CN.xpi -> firefox-3.6.22-zh-CN.xpi ) linguas_zh_TW? ( http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.6.22/linux-i686/xpi/zh-TW.xpi -> firefox-3.6.22-zh-TW.xpi )
diff --git a/metadata/cache/www-client/firefox-8.0 b/metadata/cache/www-client/firefox-8.0
index 0f2f20923df5..58e75a853ec8 100644
--- a/metadata/cache/www-client/firefox-8.0
+++ b/metadata/cache/www-client/firefox-8.0
@@ -1,4 +1,4 @@
->=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.12.10 >=dev-libs/nspr-4.8.8 >=dev-libs/glib-2.26:2 >=media-libs/mesa-7.10 media-libs/libpng[apng] virtual/libffi system-sqlite? ( >=dev-db/sqlite-3.7.4[fts3,secure-delete,threadsafe,unlock-notify,debug=] ) webm? ( media-libs/libvpx media-libs/alsa-lib ) crashreporter? ( net-misc/curl ) dev-util/pkgconfig pgo? ( =dev-lang/python-2*[sqlite] >=sys-devel/gcc-4.5 ) webm? ( x86? ( >=dev-lang/yasm-1.1 ) amd64? ( >=dev-lang/yasm-1.1 ) ) >=sys-apps/sed-4 x11-libs/libXrender x11-libs/libXt x11-libs/libXmu >=sys-libs/zlib-1.1.4 dev-util/pkgconfig =dev-lang/python-2*[threads] app-arch/zip app-arch/unzip >=app-text/hunspell-1.2 dev-libs/expat >=dev-libs/libIDL-0.8.0 >=dev-libs/libevent-1.4.7 >=x11-libs/cairo-1.8[X] >=x11-libs/gtk+-2.8.6:2 >=x11-libs/pango-1.10.1[X] virtual/jpeg virtual/freedesktop-icon-theme alsa? ( media-libs/alsa-lib ) dbus? ( >=dev-libs/dbus-glib-0.72 ) libnotify? ( >=x11-libs/libnotify-0.4 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) wifi? ( net-wireless/wireless-tools ) || ( >=sys-devel/automake-1.11.1 ) =sys-devel/autoconf-2.1* sys-devel/libtool app-arch/unzip pgo? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+>=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.12.10 >=dev-libs/nspr-4.8.8 >=dev-libs/glib-2.26:2 >=media-libs/mesa-7.10 media-libs/libpng[apng] virtual/libffi system-sqlite? ( >=dev-db/sqlite-3.7.4[fts3,secure-delete,threadsafe,unlock-notify,debug=] ) webm? ( media-libs/libvpx media-libs/alsa-lib ) crashreporter? ( net-misc/curl ) dev-util/pkgconfig pgo? ( =dev-lang/python-2*[sqlite] >=sys-devel/gcc-4.5 ) webm? ( x86? ( >=dev-lang/yasm-1.1 ) amd64? ( >=dev-lang/yasm-1.1 ) ) >=sys-apps/sed-4 x11-libs/libXrender x11-libs/libXt x11-libs/libXmu >=sys-libs/zlib-1.1.4 dev-util/pkgconfig =dev-lang/python-2*[threads] app-arch/zip app-arch/unzip >=app-text/hunspell-1.2 dev-libs/expat >=dev-libs/libIDL-0.8.0 >=dev-libs/libevent-1.4.7 >=x11-libs/cairo-1.8[X] >=x11-libs/gtk+-2.8.6:2 >=x11-libs/pango-1.10.1[X] virtual/jpeg virtual/freedesktop-icon-theme alsa? ( media-libs/alsa-lib ) dbus? ( >=dev-libs/dbus-glib-0.72 ) libnotify? ( >=x11-libs/libnotify-0.4 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) wifi? ( net-wireless/wireless-tools ) || ( >=sys-devel/automake-1.11.1:1.11 ) =sys-devel/autoconf-2.1* sys-devel/libtool app-arch/unzip pgo? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 >=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.12.10 >=dev-libs/nspr-4.8.8 >=dev-libs/glib-2.26:2 >=media-libs/mesa-7.10 media-libs/libpng[apng] virtual/libffi system-sqlite? ( >=dev-db/sqlite-3.7.4[fts3,secure-delete,threadsafe,unlock-notify,debug=] ) webm? ( media-libs/libvpx media-libs/alsa-lib ) crashreporter? ( net-misc/curl ) x11-libs/libXrender x11-libs/libXt x11-libs/libXmu >=sys-libs/zlib-1.1.4 app-arch/zip app-arch/unzip >=app-text/hunspell-1.2 dev-libs/expat >=dev-libs/libIDL-0.8.0 >=dev-libs/libevent-1.4.7 >=x11-libs/cairo-1.8[X] >=x11-libs/gtk+-2.8.6:2 >=x11-libs/pango-1.10.1[X] virtual/jpeg virtual/freedesktop-icon-theme alsa? ( media-libs/alsa-lib ) dbus? ( >=dev-libs/dbus-glib-0.72 ) libnotify? ( >=x11-libs/libnotify-0.4 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) wifi? ( net-wireless/wireless-tools )
 0
 http://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-8.0-patches-0.2.tar.xz ftp://ftp.mozilla.org/pub/firefox/releases//8.0/source/firefox-8.0.source.tar.bz2 linguas_af? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/af.xpi -> firefox-8.0-af.xpi ) linguas_ak? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/ak.xpi -> firefox-8.0-ak.xpi ) linguas_ar? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/ar.xpi -> firefox-8.0-ar.xpi ) linguas_ast? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/ast.xpi -> firefox-8.0-ast.xpi ) linguas_be? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/be.xpi -> firefox-8.0-be.xpi ) linguas_bg? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/bg.xpi -> firefox-8.0-bg.xpi ) linguas_bn_BD? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/bn-BD.xpi -> firefox-8.0-bn-BD.xpi ) linguas_bn? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/bn-BD.xpi -> firefox-8.0-bn-BD.xpi ) linguas_bn_IN? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/bn-IN.xpi -> firefox-8.0-bn-IN.xpi ) linguas_bn? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/bn-IN.xpi -> firefox-8.0-bn-IN.xpi ) linguas_br? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/br.xpi -> firefox-8.0-br.xpi ) linguas_bs? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/bs.xpi -> firefox-8.0-bs.xpi ) linguas_ca? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/ca.xpi -> firefox-8.0-ca.xpi ) linguas_cs? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/cs.xpi -> firefox-8.0-cs.xpi ) linguas_cy? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/cy.xpi -> firefox-8.0-cy.xpi ) linguas_da? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/da.xpi -> firefox-8.0-da.xpi ) linguas_de? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/de.xpi -> firefox-8.0-de.xpi ) linguas_el? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/el.xpi -> firefox-8.0-el.xpi ) linguas_en_GB? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/en-GB.xpi -> firefox-8.0-en-GB.xpi ) linguas_en_ZA? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/en-ZA.xpi -> firefox-8.0-en-ZA.xpi ) linguas_eo? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/eo.xpi -> firefox-8.0-eo.xpi ) linguas_es_AR? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/es-AR.xpi -> firefox-8.0-es-AR.xpi ) linguas_es? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/es-AR.xpi -> firefox-8.0-es-AR.xpi ) linguas_es_CL? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/es-CL.xpi -> firefox-8.0-es-CL.xpi ) linguas_es? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/es-CL.xpi -> firefox-8.0-es-CL.xpi ) linguas_es_ES? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/es-ES.xpi -> firefox-8.0-es-ES.xpi ) linguas_es? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/es-ES.xpi -> firefox-8.0-es-ES.xpi ) linguas_es_MX? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/es-MX.xpi -> firefox-8.0-es-MX.xpi ) linguas_es? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/es-MX.xpi -> firefox-8.0-es-MX.xpi ) linguas_et? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/et.xpi -> firefox-8.0-et.xpi ) linguas_eu? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/eu.xpi -> firefox-8.0-eu.xpi ) linguas_fa? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/fa.xpi -> firefox-8.0-fa.xpi ) linguas_fi? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/fi.xpi -> firefox-8.0-fi.xpi ) linguas_fr? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/fr.xpi -> firefox-8.0-fr.xpi ) linguas_fy_NL? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/fy-NL.xpi -> firefox-8.0-fy-NL.xpi ) linguas_fy? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/fy-NL.xpi -> firefox-8.0-fy-NL.xpi ) linguas_ga_IE? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/ga-IE.xpi -> firefox-8.0-ga-IE.xpi ) linguas_ga? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/ga-IE.xpi -> firefox-8.0-ga-IE.xpi ) linguas_gd? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/gd.xpi -> firefox-8.0-gd.xpi ) linguas_gl? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/gl.xpi -> firefox-8.0-gl.xpi ) linguas_gu_IN? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/gu-IN.xpi -> firefox-8.0-gu-IN.xpi ) linguas_gu? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/gu-IN.xpi -> firefox-8.0-gu-IN.xpi ) linguas_he? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/he.xpi -> firefox-8.0-he.xpi ) linguas_hi_IN? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/hi-IN.xpi -> firefox-8.0-hi-IN.xpi ) linguas_hi? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/hi-IN.xpi -> firefox-8.0-hi-IN.xpi ) linguas_hr? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/hr.xpi -> firefox-8.0-hr.xpi ) linguas_hu? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/hu.xpi -> firefox-8.0-hu.xpi ) linguas_hy_AM? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/hy-AM.xpi -> firefox-8.0-hy-AM.xpi ) linguas_hy? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/hy-AM.xpi -> firefox-8.0-hy-AM.xpi ) linguas_id? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/id.xpi -> firefox-8.0-id.xpi ) linguas_is? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/is.xpi -> firefox-8.0-is.xpi ) linguas_it? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/it.xpi -> firefox-8.0-it.xpi ) linguas_ja? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/ja.xpi -> firefox-8.0-ja.xpi ) linguas_kk? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/kk.xpi -> firefox-8.0-kk.xpi ) linguas_kn? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/kn.xpi -> firefox-8.0-kn.xpi ) linguas_ko? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/ko.xpi -> firefox-8.0-ko.xpi ) linguas_ku? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/ku.xpi -> firefox-8.0-ku.xpi ) linguas_lg? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/lg.xpi -> firefox-8.0-lg.xpi ) linguas_lt? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/lt.xpi -> firefox-8.0-lt.xpi ) linguas_lv? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/lv.xpi -> firefox-8.0-lv.xpi ) linguas_mai? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/mai.xpi -> firefox-8.0-mai.xpi ) linguas_mk? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/mk.xpi -> firefox-8.0-mk.xpi ) linguas_ml? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/ml.xpi -> firefox-8.0-ml.xpi ) linguas_mr? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/mr.xpi -> firefox-8.0-mr.xpi ) linguas_nb_NO? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/nb-NO.xpi -> firefox-8.0-nb-NO.xpi ) linguas_nb? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/nb-NO.xpi -> firefox-8.0-nb-NO.xpi ) linguas_nl? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/nl.xpi -> firefox-8.0-nl.xpi ) linguas_nn_NO? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/nn-NO.xpi -> firefox-8.0-nn-NO.xpi ) linguas_nn? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/nn-NO.xpi -> firefox-8.0-nn-NO.xpi ) linguas_nso? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/nso.xpi -> firefox-8.0-nso.xpi ) linguas_or? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/or.xpi -> firefox-8.0-or.xpi ) linguas_pa_IN? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/pa-IN.xpi -> firefox-8.0-pa-IN.xpi ) linguas_pa? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/pa-IN.xpi -> firefox-8.0-pa-IN.xpi ) linguas_pl? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/pl.xpi -> firefox-8.0-pl.xpi ) linguas_pt_BR? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/pt-BR.xpi -> firefox-8.0-pt-BR.xpi ) linguas_pt? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/pt-BR.xpi -> firefox-8.0-pt-BR.xpi ) linguas_pt_PT? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/pt-PT.xpi -> firefox-8.0-pt-PT.xpi ) linguas_pt? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/pt-PT.xpi -> firefox-8.0-pt-PT.xpi ) linguas_rm? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/rm.xpi -> firefox-8.0-rm.xpi ) linguas_ro? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/ro.xpi -> firefox-8.0-ro.xpi ) linguas_ru? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/ru.xpi -> firefox-8.0-ru.xpi ) linguas_si? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/si.xpi -> firefox-8.0-si.xpi ) linguas_sk? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/sk.xpi -> firefox-8.0-sk.xpi ) linguas_sl? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/sl.xpi -> firefox-8.0-sl.xpi ) linguas_son? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/son.xpi -> firefox-8.0-son.xpi ) linguas_sq? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/sq.xpi -> firefox-8.0-sq.xpi ) linguas_sr? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/sr.xpi -> firefox-8.0-sr.xpi ) linguas_sv_SE? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/sv-SE.xpi -> firefox-8.0-sv-SE.xpi ) linguas_sv? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/sv-SE.xpi -> firefox-8.0-sv-SE.xpi ) linguas_ta? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/ta.xpi -> firefox-8.0-ta.xpi ) linguas_ta_LK? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/ta-LK.xpi -> firefox-8.0-ta-LK.xpi ) linguas_te? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/te.xpi -> firefox-8.0-te.xpi ) linguas_th? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/th.xpi -> firefox-8.0-th.xpi ) linguas_tr? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/tr.xpi -> firefox-8.0-tr.xpi ) linguas_uk? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/uk.xpi -> firefox-8.0-uk.xpi ) linguas_vi? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/vi.xpi -> firefox-8.0-vi.xpi ) linguas_zh_CN? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/zh-CN.xpi -> firefox-8.0-zh-CN.xpi ) linguas_zh? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/zh-CN.xpi -> firefox-8.0-zh-CN.xpi ) linguas_zh_TW? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/zh-TW.xpi -> firefox-8.0-zh-TW.xpi ) linguas_zh? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/zh-TW.xpi -> firefox-8.0-zh-TW.xpi ) linguas_zu? ( ftp://ftp.mozilla.org/pub/firefox/releases//8.0/linux-i686/xpi/zu.xpi -> firefox-8.0-zu.xpi )
diff --git a/metadata/cache/www-client/firefox-9.0 b/metadata/cache/www-client/firefox-9.0
index 1645261e5b1c..e041aea50322 100644
--- a/metadata/cache/www-client/firefox-9.0
+++ b/metadata/cache/www-client/firefox-9.0
@@ -1,4 +1,4 @@
->=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.13.1 >=dev-libs/nspr-4.8.8 >=dev-libs/glib-2.26:2 >=media-libs/mesa-7.10 media-libs/libpng[apng] virtual/libffi system-sqlite? ( >=dev-db/sqlite-3.7.7.1[fts3,secure-delete,threadsafe,unlock-notify,debug=] ) webm? ( media-libs/libvpx media-libs/alsa-lib ) crashreporter? ( net-misc/curl ) dev-util/pkgconfig pgo? ( =dev-lang/python-2*[sqlite] >=sys-devel/gcc-4.5 ) webm? ( x86? ( >=dev-lang/yasm-1.1 ) amd64? ( >=dev-lang/yasm-1.1 ) ) >=sys-apps/sed-4 x11-libs/libXrender x11-libs/libXt x11-libs/libXmu >=sys-libs/zlib-1.1.4 dev-util/pkgconfig =dev-lang/python-2*[threads] app-arch/zip app-arch/unzip >=app-text/hunspell-1.2 dev-libs/expat >=dev-libs/libIDL-0.8.0 >=dev-libs/libevent-1.4.7 >=x11-libs/cairo-1.8[X] >=x11-libs/gtk+-2.8.6:2 >=x11-libs/pango-1.10.1[X] virtual/jpeg virtual/freedesktop-icon-theme alsa? ( media-libs/alsa-lib ) dbus? ( >=dev-libs/dbus-glib-0.72 ) libnotify? ( >=x11-libs/libnotify-0.4 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) wifi? ( net-wireless/wireless-tools ) || ( >=sys-devel/automake-1.11.1 ) =sys-devel/autoconf-2.1* sys-devel/libtool app-arch/unzip pgo? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+>=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.13.1 >=dev-libs/nspr-4.8.8 >=dev-libs/glib-2.26:2 >=media-libs/mesa-7.10 media-libs/libpng[apng] virtual/libffi system-sqlite? ( >=dev-db/sqlite-3.7.7.1[fts3,secure-delete,threadsafe,unlock-notify,debug=] ) webm? ( media-libs/libvpx media-libs/alsa-lib ) crashreporter? ( net-misc/curl ) dev-util/pkgconfig pgo? ( =dev-lang/python-2*[sqlite] >=sys-devel/gcc-4.5 ) webm? ( x86? ( >=dev-lang/yasm-1.1 ) amd64? ( >=dev-lang/yasm-1.1 ) ) >=sys-apps/sed-4 x11-libs/libXrender x11-libs/libXt x11-libs/libXmu >=sys-libs/zlib-1.1.4 dev-util/pkgconfig =dev-lang/python-2*[threads] app-arch/zip app-arch/unzip >=app-text/hunspell-1.2 dev-libs/expat >=dev-libs/libIDL-0.8.0 >=dev-libs/libevent-1.4.7 >=x11-libs/cairo-1.8[X] >=x11-libs/gtk+-2.8.6:2 >=x11-libs/pango-1.10.1[X] virtual/jpeg virtual/freedesktop-icon-theme alsa? ( media-libs/alsa-lib ) dbus? ( >=dev-libs/dbus-glib-0.72 ) libnotify? ( >=x11-libs/libnotify-0.4 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) wifi? ( net-wireless/wireless-tools ) || ( >=sys-devel/automake-1.11.1:1.11 ) =sys-devel/autoconf-2.1* sys-devel/libtool app-arch/unzip pgo? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 >=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.13.1 >=dev-libs/nspr-4.8.8 >=dev-libs/glib-2.26:2 >=media-libs/mesa-7.10 media-libs/libpng[apng] virtual/libffi system-sqlite? ( >=dev-db/sqlite-3.7.7.1[fts3,secure-delete,threadsafe,unlock-notify,debug=] ) webm? ( media-libs/libvpx media-libs/alsa-lib ) crashreporter? ( net-misc/curl ) x11-libs/libXrender x11-libs/libXt x11-libs/libXmu >=sys-libs/zlib-1.1.4 app-arch/zip app-arch/unzip >=app-text/hunspell-1.2 dev-libs/expat >=dev-libs/libIDL-0.8.0 >=dev-libs/libevent-1.4.7 >=x11-libs/cairo-1.8[X] >=x11-libs/gtk+-2.8.6:2 >=x11-libs/pango-1.10.1[X] virtual/jpeg virtual/freedesktop-icon-theme alsa? ( media-libs/alsa-lib ) dbus? ( >=dev-libs/dbus-glib-0.72 ) libnotify? ( >=x11-libs/libnotify-0.4 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) wifi? ( net-wireless/wireless-tools )
 0
 http://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-9.0-patches-0.5.tar.xz ftp://ftp.mozilla.org/pub/firefox/releases//9.0/source/firefox-9.0.source.tar.bz2 linguas_af? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/af.xpi -> firefox-9.0-af.xpi ) linguas_ak? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/ak.xpi -> firefox-9.0-ak.xpi ) linguas_ar? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/ar.xpi -> firefox-9.0-ar.xpi ) linguas_ast? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/ast.xpi -> firefox-9.0-ast.xpi ) linguas_be? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/be.xpi -> firefox-9.0-be.xpi ) linguas_bg? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/bg.xpi -> firefox-9.0-bg.xpi ) linguas_bn_BD? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/bn-BD.xpi -> firefox-9.0-bn-BD.xpi ) linguas_bn? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/bn-BD.xpi -> firefox-9.0-bn-BD.xpi ) linguas_bn_IN? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/bn-IN.xpi -> firefox-9.0-bn-IN.xpi ) linguas_bn? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/bn-IN.xpi -> firefox-9.0-bn-IN.xpi ) linguas_br? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/br.xpi -> firefox-9.0-br.xpi ) linguas_bs? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/bs.xpi -> firefox-9.0-bs.xpi ) linguas_ca? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/ca.xpi -> firefox-9.0-ca.xpi ) linguas_cs? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/cs.xpi -> firefox-9.0-cs.xpi ) linguas_cy? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/cy.xpi -> firefox-9.0-cy.xpi ) linguas_da? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/da.xpi -> firefox-9.0-da.xpi ) linguas_de? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/de.xpi -> firefox-9.0-de.xpi ) linguas_el? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/el.xpi -> firefox-9.0-el.xpi ) linguas_en_GB? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/en-GB.xpi -> firefox-9.0-en-GB.xpi ) linguas_en_ZA? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/en-ZA.xpi -> firefox-9.0-en-ZA.xpi ) linguas_eo? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/eo.xpi -> firefox-9.0-eo.xpi ) linguas_es_AR? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/es-AR.xpi -> firefox-9.0-es-AR.xpi ) linguas_es? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/es-AR.xpi -> firefox-9.0-es-AR.xpi ) linguas_es_CL? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/es-CL.xpi -> firefox-9.0-es-CL.xpi ) linguas_es? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/es-CL.xpi -> firefox-9.0-es-CL.xpi ) linguas_es_ES? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/es-ES.xpi -> firefox-9.0-es-ES.xpi ) linguas_es? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/es-ES.xpi -> firefox-9.0-es-ES.xpi ) linguas_es_MX? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/es-MX.xpi -> firefox-9.0-es-MX.xpi ) linguas_es? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/es-MX.xpi -> firefox-9.0-es-MX.xpi ) linguas_et? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/et.xpi -> firefox-9.0-et.xpi ) linguas_eu? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/eu.xpi -> firefox-9.0-eu.xpi ) linguas_fa? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/fa.xpi -> firefox-9.0-fa.xpi ) linguas_fi? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/fi.xpi -> firefox-9.0-fi.xpi ) linguas_fr? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/fr.xpi -> firefox-9.0-fr.xpi ) linguas_fy_NL? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/fy-NL.xpi -> firefox-9.0-fy-NL.xpi ) linguas_fy? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/fy-NL.xpi -> firefox-9.0-fy-NL.xpi ) linguas_ga_IE? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/ga-IE.xpi -> firefox-9.0-ga-IE.xpi ) linguas_ga? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/ga-IE.xpi -> firefox-9.0-ga-IE.xpi ) linguas_gd? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/gd.xpi -> firefox-9.0-gd.xpi ) linguas_gl? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/gl.xpi -> firefox-9.0-gl.xpi ) linguas_gu_IN? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/gu-IN.xpi -> firefox-9.0-gu-IN.xpi ) linguas_gu? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/gu-IN.xpi -> firefox-9.0-gu-IN.xpi ) linguas_he? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/he.xpi -> firefox-9.0-he.xpi ) linguas_hi_IN? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/hi-IN.xpi -> firefox-9.0-hi-IN.xpi ) linguas_hi? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/hi-IN.xpi -> firefox-9.0-hi-IN.xpi ) linguas_hr? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/hr.xpi -> firefox-9.0-hr.xpi ) linguas_hu? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/hu.xpi -> firefox-9.0-hu.xpi ) linguas_hy_AM? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/hy-AM.xpi -> firefox-9.0-hy-AM.xpi ) linguas_hy? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/hy-AM.xpi -> firefox-9.0-hy-AM.xpi ) linguas_id? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/id.xpi -> firefox-9.0-id.xpi ) linguas_is? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/is.xpi -> firefox-9.0-is.xpi ) linguas_it? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/it.xpi -> firefox-9.0-it.xpi ) linguas_ja? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/ja.xpi -> firefox-9.0-ja.xpi ) linguas_kk? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/kk.xpi -> firefox-9.0-kk.xpi ) linguas_kn? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/kn.xpi -> firefox-9.0-kn.xpi ) linguas_ko? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/ko.xpi -> firefox-9.0-ko.xpi ) linguas_ku? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/ku.xpi -> firefox-9.0-ku.xpi ) linguas_lg? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/lg.xpi -> firefox-9.0-lg.xpi ) linguas_lt? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/lt.xpi -> firefox-9.0-lt.xpi ) linguas_lv? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/lv.xpi -> firefox-9.0-lv.xpi ) linguas_mai? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/mai.xpi -> firefox-9.0-mai.xpi ) linguas_mk? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/mk.xpi -> firefox-9.0-mk.xpi ) linguas_ml? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/ml.xpi -> firefox-9.0-ml.xpi ) linguas_mr? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/mr.xpi -> firefox-9.0-mr.xpi ) linguas_nb_NO? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/nb-NO.xpi -> firefox-9.0-nb-NO.xpi ) linguas_nb? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/nb-NO.xpi -> firefox-9.0-nb-NO.xpi ) linguas_nl? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/nl.xpi -> firefox-9.0-nl.xpi ) linguas_nn_NO? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/nn-NO.xpi -> firefox-9.0-nn-NO.xpi ) linguas_nn? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/nn-NO.xpi -> firefox-9.0-nn-NO.xpi ) linguas_nso? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/nso.xpi -> firefox-9.0-nso.xpi ) linguas_or? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/or.xpi -> firefox-9.0-or.xpi ) linguas_pa_IN? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/pa-IN.xpi -> firefox-9.0-pa-IN.xpi ) linguas_pa? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/pa-IN.xpi -> firefox-9.0-pa-IN.xpi ) linguas_pl? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/pl.xpi -> firefox-9.0-pl.xpi ) linguas_pt_BR? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/pt-BR.xpi -> firefox-9.0-pt-BR.xpi ) linguas_pt? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/pt-BR.xpi -> firefox-9.0-pt-BR.xpi ) linguas_pt_PT? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/pt-PT.xpi -> firefox-9.0-pt-PT.xpi ) linguas_pt? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/pt-PT.xpi -> firefox-9.0-pt-PT.xpi ) linguas_rm? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/rm.xpi -> firefox-9.0-rm.xpi ) linguas_ro? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/ro.xpi -> firefox-9.0-ro.xpi ) linguas_ru? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/ru.xpi -> firefox-9.0-ru.xpi ) linguas_si? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/si.xpi -> firefox-9.0-si.xpi ) linguas_sk? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/sk.xpi -> firefox-9.0-sk.xpi ) linguas_sl? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/sl.xpi -> firefox-9.0-sl.xpi ) linguas_son? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/son.xpi -> firefox-9.0-son.xpi ) linguas_sq? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/sq.xpi -> firefox-9.0-sq.xpi ) linguas_sr? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/sr.xpi -> firefox-9.0-sr.xpi ) linguas_sv_SE? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/sv-SE.xpi -> firefox-9.0-sv-SE.xpi ) linguas_sv? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/sv-SE.xpi -> firefox-9.0-sv-SE.xpi ) linguas_ta? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/ta.xpi -> firefox-9.0-ta.xpi ) linguas_ta_LK? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/ta-LK.xpi -> firefox-9.0-ta-LK.xpi ) linguas_te? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/te.xpi -> firefox-9.0-te.xpi ) linguas_th? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/th.xpi -> firefox-9.0-th.xpi ) linguas_tr? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/tr.xpi -> firefox-9.0-tr.xpi ) linguas_uk? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/uk.xpi -> firefox-9.0-uk.xpi ) linguas_vi? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/vi.xpi -> firefox-9.0-vi.xpi ) linguas_zh_CN? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/zh-CN.xpi -> firefox-9.0-zh-CN.xpi ) linguas_zh? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/zh-CN.xpi -> firefox-9.0-zh-CN.xpi ) linguas_zh_TW? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/zh-TW.xpi -> firefox-9.0-zh-TW.xpi ) linguas_zh? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/zh-TW.xpi -> firefox-9.0-zh-TW.xpi ) linguas_zu? ( ftp://ftp.mozilla.org/pub/firefox/releases//9.0/linux-i686/xpi/zu.xpi -> firefox-9.0-zu.xpi )
diff --git a/metadata/cache/www-client/firefox-bin-10.0.3 b/metadata/cache/www-client/firefox-bin-10.0.3
new file mode 100644
index 000000000000..4a326372f6cd
--- /dev/null
+++ b/metadata/cache/www-client/firefox-bin-10.0.3
@@ -0,0 +1,22 @@
+app-arch/unzip >=sys-apps/sed-4 app-arch/unzip
+dev-libs/dbus-glib virtual/freedesktop-icon-theme x11-libs/libXrender x11-libs/libXt x11-libs/libXmu >=x11-libs/gtk+-2.2:2 >=media-libs/alsa-lib-1.0.16
+0
+linguas_af? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.3esr/linux-i686/xpi/af.xpi -> firefox-10.0.3esr-af.xpi ) linguas_ak? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.3esr/linux-i686/xpi/ak.xpi -> firefox-10.0.3esr-ak.xpi ) linguas_ar? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.3esr/linux-i686/xpi/ar.xpi -> firefox-10.0.3esr-ar.xpi ) linguas_as? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.3esr/linux-i686/xpi/as.xpi -> firefox-10.0.3esr-as.xpi ) linguas_ast? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.3esr/linux-i686/xpi/ast.xpi -> firefox-10.0.3esr-ast.xpi ) linguas_be? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.3esr/linux-i686/xpi/be.xpi -> firefox-10.0.3esr-be.xpi ) linguas_bg? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.3esr/linux-i686/xpi/bg.xpi -> firefox-10.0.3esr-bg.xpi ) linguas_bn_BD? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.3esr/linux-i686/xpi/bn-BD.xpi -> firefox-10.0.3esr-bn-BD.xpi ) linguas_bn_IN? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.3esr/linux-i686/xpi/bn-IN.xpi -> firefox-10.0.3esr-bn-IN.xpi ) linguas_br? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.3esr/linux-i686/xpi/br.xpi -> firefox-10.0.3esr-br.xpi ) linguas_bs? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.3esr/linux-i686/xpi/bs.xpi -> firefox-10.0.3esr-bs.xpi ) linguas_ca? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.3esr/linux-i686/xpi/ca.xpi -> firefox-10.0.3esr-ca.xpi ) linguas_cs? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.3esr/linux-i686/xpi/cs.xpi -> firefox-10.0.3esr-cs.xpi ) linguas_csb? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.3esr/linux-i686/xpi/csb.xpi -> firefox-10.0.3esr-csb.xpi ) linguas_cy? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.3esr/linux-i686/xpi/cy.xpi -> firefox-10.0.3esr-cy.xpi ) linguas_da? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.3esr/linux-i686/xpi/da.xpi -> firefox-10.0.3esr-da.xpi ) linguas_de? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.3esr/linux-i686/xpi/de.xpi -> firefox-10.0.3esr-de.xpi ) linguas_el? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.3esr/linux-i686/xpi/el.xpi -> firefox-10.0.3esr-el.xpi ) linguas_en_GB? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.3esr/linux-i686/xpi/en-GB.xpi -> firefox-10.0.3esr-en-GB.xpi ) linguas_en_ZA? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.3esr/linux-i686/xpi/en-ZA.xpi -> firefox-10.0.3esr-en-ZA.xpi ) linguas_eo? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.3esr/linux-i686/xpi/eo.xpi -> firefox-10.0.3esr-eo.xpi ) linguas_es_AR? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.3esr/linux-i686/xpi/es-AR.xpi -> firefox-10.0.3esr-es-AR.xpi ) linguas_es_CL? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.3esr/linux-i686/xpi/es-CL.xpi -> firefox-10.0.3esr-es-CL.xpi ) linguas_es_ES? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.3esr/linux-i686/xpi/es-ES.xpi -> firefox-10.0.3esr-es-ES.xpi ) linguas_es_MX? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.3esr/linux-i686/xpi/es-MX.xpi -> firefox-10.0.3esr-es-MX.xpi ) linguas_et? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.3esr/linux-i686/xpi/et.xpi -> firefox-10.0.3esr-et.xpi ) linguas_eu? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.3esr/linux-i686/xpi/eu.xpi -> firefox-10.0.3esr-eu.xpi ) linguas_fa? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.3esr/linux-i686/xpi/fa.xpi -> firefox-10.0.3esr-fa.xpi ) linguas_fi? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.3esr/linux-i686/xpi/fi.xpi -> firefox-10.0.3esr-fi.xpi ) linguas_fr? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.3esr/linux-i686/xpi/fr.xpi -> firefox-10.0.3esr-fr.xpi ) linguas_fy_NL? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.3esr/linux-i686/xpi/fy-NL.xpi -> firefox-10.0.3esr-fy-NL.xpi ) linguas_ga_IE? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.3esr/linux-i686/xpi/ga-IE.xpi -> firefox-10.0.3esr-ga-IE.xpi ) linguas_gd? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.3esr/linux-i686/xpi/gd.xpi -> firefox-10.0.3esr-gd.xpi ) linguas_gl? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.3esr/linux-i686/xpi/gl.xpi -> firefox-10.0.3esr-gl.xpi ) linguas_gu_IN? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.3esr/linux-i686/xpi/gu-IN.xpi -> firefox-10.0.3esr-gu-IN.xpi ) linguas_he? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.3esr/linux-i686/xpi/he.xpi -> firefox-10.0.3esr-he.xpi ) linguas_hi_IN? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.3esr/linux-i686/xpi/hi-IN.xpi -> firefox-10.0.3esr-hi-IN.xpi ) linguas_hr? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.3esr/linux-i686/xpi/hr.xpi -> firefox-10.0.3esr-hr.xpi ) linguas_hu? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.3esr/linux-i686/xpi/hu.xpi -> firefox-10.0.3esr-hu.xpi ) linguas_hy_AM? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.3esr/linux-i686/xpi/hy-AM.xpi -> firefox-10.0.3esr-hy-AM.xpi ) linguas_id? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.3esr/linux-i686/xpi/id.xpi -> firefox-10.0.3esr-id.xpi ) linguas_is? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.3esr/linux-i686/xpi/is.xpi -> firefox-10.0.3esr-is.xpi ) linguas_it? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.3esr/linux-i686/xpi/it.xpi -> firefox-10.0.3esr-it.xpi ) linguas_ja? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.3esr/linux-i686/xpi/ja.xpi -> firefox-10.0.3esr-ja.xpi ) linguas_kk? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.3esr/linux-i686/xpi/kk.xpi -> firefox-10.0.3esr-kk.xpi ) linguas_kn? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.3esr/linux-i686/xpi/kn.xpi -> firefox-10.0.3esr-kn.xpi ) linguas_ko? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.3esr/linux-i686/xpi/ko.xpi -> firefox-10.0.3esr-ko.xpi ) linguas_ku? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.3esr/linux-i686/xpi/ku.xpi -> firefox-10.0.3esr-ku.xpi ) linguas_lg? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.3esr/linux-i686/xpi/lg.xpi -> firefox-10.0.3esr-lg.xpi ) linguas_lt? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.3esr/linux-i686/xpi/lt.xpi -> firefox-10.0.3esr-lt.xpi ) linguas_lv? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.3esr/linux-i686/xpi/lv.xpi -> firefox-10.0.3esr-lv.xpi ) linguas_mai? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.3esr/linux-i686/xpi/mai.xpi -> firefox-10.0.3esr-mai.xpi ) linguas_mk? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.3esr/linux-i686/xpi/mk.xpi -> firefox-10.0.3esr-mk.xpi ) linguas_ml? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.3esr/linux-i686/xpi/ml.xpi -> firefox-10.0.3esr-ml.xpi ) linguas_mr? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.3esr/linux-i686/xpi/mr.xpi -> firefox-10.0.3esr-mr.xpi ) linguas_nb_NO? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.3esr/linux-i686/xpi/nb-NO.xpi -> firefox-10.0.3esr-nb-NO.xpi ) linguas_nl? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.3esr/linux-i686/xpi/nl.xpi -> firefox-10.0.3esr-nl.xpi ) linguas_nn_NO? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.3esr/linux-i686/xpi/nn-NO.xpi -> firefox-10.0.3esr-nn-NO.xpi ) linguas_nso? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.3esr/linux-i686/xpi/nso.xpi -> firefox-10.0.3esr-nso.xpi ) linguas_or? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.3esr/linux-i686/xpi/or.xpi -> firefox-10.0.3esr-or.xpi ) linguas_pa_IN? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.3esr/linux-i686/xpi/pa-IN.xpi -> firefox-10.0.3esr-pa-IN.xpi ) linguas_pl? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.3esr/linux-i686/xpi/pl.xpi -> firefox-10.0.3esr-pl.xpi ) linguas_pt_BR? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.3esr/linux-i686/xpi/pt-BR.xpi -> firefox-10.0.3esr-pt-BR.xpi ) linguas_pt_PT? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.3esr/linux-i686/xpi/pt-PT.xpi -> firefox-10.0.3esr-pt-PT.xpi ) linguas_rm? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.3esr/linux-i686/xpi/rm.xpi -> firefox-10.0.3esr-rm.xpi ) linguas_ro? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.3esr/linux-i686/xpi/ro.xpi -> firefox-10.0.3esr-ro.xpi ) linguas_ru? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.3esr/linux-i686/xpi/ru.xpi -> firefox-10.0.3esr-ru.xpi ) linguas_si? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.3esr/linux-i686/xpi/si.xpi -> firefox-10.0.3esr-si.xpi ) linguas_sk? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.3esr/linux-i686/xpi/sk.xpi -> firefox-10.0.3esr-sk.xpi ) linguas_sl? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.3esr/linux-i686/xpi/sl.xpi -> firefox-10.0.3esr-sl.xpi ) linguas_son? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.3esr/linux-i686/xpi/son.xpi -> firefox-10.0.3esr-son.xpi ) linguas_sq? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.3esr/linux-i686/xpi/sq.xpi -> firefox-10.0.3esr-sq.xpi ) linguas_sr? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.3esr/linux-i686/xpi/sr.xpi -> firefox-10.0.3esr-sr.xpi ) linguas_sv_SE? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.3esr/linux-i686/xpi/sv-SE.xpi -> firefox-10.0.3esr-sv-SE.xpi ) linguas_ta? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.3esr/linux-i686/xpi/ta.xpi -> firefox-10.0.3esr-ta.xpi ) linguas_ta_LK? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.3esr/linux-i686/xpi/ta-LK.xpi -> firefox-10.0.3esr-ta-LK.xpi ) linguas_te? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.3esr/linux-i686/xpi/te.xpi -> firefox-10.0.3esr-te.xpi ) linguas_th? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.3esr/linux-i686/xpi/th.xpi -> firefox-10.0.3esr-th.xpi ) linguas_tr? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.3esr/linux-i686/xpi/tr.xpi -> firefox-10.0.3esr-tr.xpi ) linguas_uk? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.3esr/linux-i686/xpi/uk.xpi -> firefox-10.0.3esr-uk.xpi ) linguas_vi? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.3esr/linux-i686/xpi/vi.xpi -> firefox-10.0.3esr-vi.xpi ) linguas_zh_CN? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.3esr/linux-i686/xpi/zh-CN.xpi -> firefox-10.0.3esr-zh-CN.xpi ) linguas_zh_TW? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.3esr/linux-i686/xpi/zh-TW.xpi -> firefox-10.0.3esr-zh-TW.xpi ) linguas_zu? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases//10.0.3esr/linux-i686/xpi/zu.xpi -> firefox-10.0.3esr-zu.xpi ) amd64? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/10.0.3esr/linux-x86_64/en-US/firefox-10.0.3esr.tar.bz2 -> firefox-bin_x86_64-10.0.3.tar.bz2 ) x86? ( ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/10.0.3esr/linux-i686/en-US/firefox-10.0.3esr.tar.bz2 -> firefox-bin_i686-10.0.3.tar.bz2 )
+strip mirror binchecks
+http://www.mozilla.com/firefox
+|| ( MPL-1.1 GPL-2 LGPL-2.1 )
+Firefox Web Browser
+-* ~amd64 ~x86
+eutils fdo-mime gnome2-utils mozextension mozlinguas multilib nsplugins pax-utils toolchain-funcs user
+startup-notification linguas_af linguas_ak linguas_ar linguas_as linguas_ast linguas_be linguas_bg linguas_bn_BD linguas_bn_IN linguas_br linguas_bs linguas_ca linguas_cs linguas_csb linguas_cy linguas_da linguas_de linguas_el linguas_en_GB linguas_en_ZA linguas_eo linguas_es_AR linguas_es_CL linguas_es_ES linguas_es_MX linguas_et linguas_eu linguas_fa linguas_fi linguas_fr linguas_fy_NL linguas_ga_IE linguas_gd linguas_gl linguas_gu_IN linguas_he linguas_hi_IN linguas_hr linguas_hu linguas_hy_AM linguas_id linguas_is linguas_it linguas_ja linguas_kk linguas_kn linguas_ko linguas_ku linguas_lg linguas_lt linguas_lv linguas_mai linguas_mk linguas_ml linguas_mr linguas_nb_NO linguas_nl linguas_nn_NO linguas_nso linguas_or linguas_pa_IN linguas_pl linguas_pt_BR linguas_pt_PT linguas_rm linguas_ro linguas_ru linguas_si linguas_sk linguas_sl linguas_son linguas_sq linguas_sr linguas_sv_SE linguas_ta linguas_ta_LK linguas_te linguas_th linguas_tr linguas_uk linguas_vi linguas_zh_CN linguas_zh_TW linguas_zu
+
+
+
+4
+
+install postinst postrm preinst unpack
+
+
+
+
+
diff --git a/metadata/cache/www-client/galeon-2.0.7-r2 b/metadata/cache/www-client/galeon-2.0.7-r2
index 5bc7c84ba80b..d6ac68667ba3 100644
--- a/metadata/cache/www-client/galeon-2.0.7-r2
+++ b/metadata/cache/www-client/galeon-2.0.7-r2
@@ -1,4 +1,4 @@
->=net-libs/xulrunner-1.9.2:1.9 >=x11-libs/gtk+-2.12.0:2 >=dev-libs/libxml2-2.6.6:2 >=gnome-base/libgnomeui-2.5.2 >=gnome-base/gnome-vfs-2:2 >=gnome-base/gnome-desktop-2.10.0:2 >=gnome-base/libglade-2.3.1:2.0 app-text/rarian dev-util/pkgconfig >=dev-util/intltool-0.30 >=sys-devel/gettext-0.11 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+>=net-libs/xulrunner-1.9.2:1.9 >=x11-libs/gtk+-2.12.0:2 >=dev-libs/libxml2-2.6.6:2 >=gnome-base/libgnomeui-2.5.2 >=gnome-base/gnome-vfs-2:2 >=gnome-base/gnome-desktop-2.10.0:2 >=gnome-base/libglade-2.3.1:2.0 app-text/rarian dev-util/pkgconfig >=dev-util/intltool-0.30 >=sys-devel/gettext-0.11 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 >=net-libs/xulrunner-1.9.2:1.9 >=x11-libs/gtk+-2.12.0:2 >=dev-libs/libxml2-2.6.6:2 >=gnome-base/libgnomeui-2.5.2 >=gnome-base/gnome-vfs-2:2 >=gnome-base/gnome-desktop-2.10.0:2 >=gnome-base/libglade-2.3.1:2.0
 0
 mirror://sourceforge/galeon/galeon-2.0.7.tar.bz2 mirror://gentoo/galeon-2.0.7-patches-r1.tar.bz2
diff --git a/metadata/cache/www-client/google-chrome-17.0.963.79_p125985 b/metadata/cache/www-client/google-chrome-17.0.963.83_p127885
similarity index 92%
rename from metadata/cache/www-client/google-chrome-17.0.963.79_p125985
rename to metadata/cache/www-client/google-chrome-17.0.963.83_p127885
index a0d49e6f4465..8a15b38fcac6 100644
--- a/metadata/cache/www-client/google-chrome-17.0.963.79_p125985
+++ b/metadata/cache/www-client/google-chrome-17.0.963.83_p127885
@@ -1,7 +1,7 @@
 >=sys-apps/sed-4
 app-arch/bzip2 app-misc/ca-certificates media-libs/alsa-lib dev-libs/atk dev-libs/dbus-glib dev-libs/expat dev-libs/glib:2 dev-libs/libxslt dev-libs/nspr dev-libs/nss gnome-base/gconf:2 media-libs/fontconfig media-libs/freetype net-print/cups media-libs/libpng:1.2 sys-apps/dbus || ( >=sys-devel/gcc-4.4.0[-nocxx] >=sys-devel/gcc-4.4.0[cxx] ) sys-libs/zlib x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/libXScrnSaver x11-libs/libX11 x11-libs/libXrender x11-libs/libXext x11-libs/pango x11-misc/xdg-utils !www-client/google-chrome:0 !www-client/google-chrome:beta !www-client/google-chrome:unstable
 stable
-amd64? ( http://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_17.0.963.79-r125985_amd64.deb ) x86? ( http://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_17.0.963.79-r125985_i386.deb )
+amd64? ( http://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_17.0.963.83-r127885_amd64.deb ) x86? ( http://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_17.0.963.83-r127885_i386.deb )
 mirror strip
 http://www.google.com/chrome
 google-chrome
diff --git a/metadata/cache/www-client/icecat-10.0-r1 b/metadata/cache/www-client/icecat-10.0-r1
index cd1f29eea3ab..6e43ee721d73 100644
--- a/metadata/cache/www-client/icecat-10.0-r1
+++ b/metadata/cache/www-client/icecat-10.0-r1
@@ -1,4 +1,4 @@
->=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.13.1 >=dev-libs/nspr-4.8.8 >=dev-libs/glib-2.26:2 >=media-libs/mesa-7.10 media-libs/libpng[apng] virtual/libffi system-sqlite? ( >=dev-db/sqlite-3.7.7.1[fts3,secure-delete,threadsafe,unlock-notify,debug=] ) webm? ( >=media-libs/libvpx-0.9.7 media-libs/alsa-lib ) crashreporter? ( net-misc/curl ) selinux? ( sec-policy/selinux-mozilla ) dev-util/pkgconfig pgo? ( =dev-lang/python-2*[sqlite] >=sys-devel/gcc-4.5 ) webm? ( x86? ( >=dev-lang/yasm-1.1 ) amd64? ( >=dev-lang/yasm-1.1 ) ) >=sys-apps/sed-4 x11-libs/libXrender x11-libs/libXt x11-libs/libXmu >=sys-libs/zlib-1.1.4 dev-util/pkgconfig =dev-lang/python-2*[threads] app-arch/zip app-arch/unzip >=app-text/hunspell-1.2 dev-libs/expat >=dev-libs/libIDL-0.8.0 >=dev-libs/libevent-1.4.7 >=x11-libs/cairo-1.8[X] >=x11-libs/gtk+-2.8.6:2 >=x11-libs/pango-1.10.1[X] virtual/jpeg virtual/freedesktop-icon-theme alsa? ( media-libs/alsa-lib ) dbus? ( >=dev-libs/dbus-glib-0.72 ) libnotify? ( >=x11-libs/libnotify-0.4 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) wifi? ( net-wireless/wireless-tools ) || ( >=sys-devel/automake-1.11.1 ) =sys-devel/autoconf-2.1* sys-devel/libtool pgo? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) app-arch/unzip
+>=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.13.1 >=dev-libs/nspr-4.8.8 >=dev-libs/glib-2.26:2 >=media-libs/mesa-7.10 media-libs/libpng[apng] virtual/libffi system-sqlite? ( >=dev-db/sqlite-3.7.7.1[fts3,secure-delete,threadsafe,unlock-notify,debug=] ) webm? ( >=media-libs/libvpx-0.9.7 media-libs/alsa-lib ) crashreporter? ( net-misc/curl ) selinux? ( sec-policy/selinux-mozilla ) dev-util/pkgconfig pgo? ( =dev-lang/python-2*[sqlite] >=sys-devel/gcc-4.5 ) webm? ( x86? ( >=dev-lang/yasm-1.1 ) amd64? ( >=dev-lang/yasm-1.1 ) ) >=sys-apps/sed-4 x11-libs/libXrender x11-libs/libXt x11-libs/libXmu >=sys-libs/zlib-1.1.4 dev-util/pkgconfig =dev-lang/python-2*[threads] app-arch/zip app-arch/unzip >=app-text/hunspell-1.2 dev-libs/expat >=dev-libs/libIDL-0.8.0 >=dev-libs/libevent-1.4.7 >=x11-libs/cairo-1.8[X] >=x11-libs/gtk+-2.8.6:2 >=x11-libs/pango-1.10.1[X] virtual/jpeg virtual/freedesktop-icon-theme alsa? ( media-libs/alsa-lib ) dbus? ( >=dev-libs/dbus-glib-0.72 ) libnotify? ( >=x11-libs/libnotify-0.4 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) wifi? ( net-wireless/wireless-tools ) || ( >=sys-devel/automake-1.11.1:1.11 ) =sys-devel/autoconf-2.1* sys-devel/libtool pgo? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) app-arch/unzip
 >=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.13.1 >=dev-libs/nspr-4.8.8 >=dev-libs/glib-2.26:2 >=media-libs/mesa-7.10 media-libs/libpng[apng] virtual/libffi system-sqlite? ( >=dev-db/sqlite-3.7.7.1[fts3,secure-delete,threadsafe,unlock-notify,debug=] ) webm? ( >=media-libs/libvpx-0.9.7 media-libs/alsa-lib ) crashreporter? ( net-misc/curl ) selinux? ( sec-policy/selinux-mozilla ) x11-libs/libXrender x11-libs/libXt x11-libs/libXmu >=sys-libs/zlib-1.1.4 app-arch/zip app-arch/unzip >=app-text/hunspell-1.2 dev-libs/expat >=dev-libs/libIDL-0.8.0 >=dev-libs/libevent-1.4.7 >=x11-libs/cairo-1.8[X] >=x11-libs/gtk+-2.8.6:2 >=x11-libs/pango-1.10.1[X] virtual/jpeg virtual/freedesktop-icon-theme alsa? ( media-libs/alsa-lib ) dbus? ( >=dev-libs/dbus-glib-0.72 ) libnotify? ( >=x11-libs/libnotify-0.4 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) wifi? ( net-wireless/wireless-tools )
 0
 linguas_af? ( ftp://ftp.mozilla.org/pub/firefox/releases/10.0.1/linux-i686/xpi/af.xpi -> icecat-10.0-af.xpi ) linguas_ak? ( ftp://ftp.mozilla.org/pub/firefox/releases/10.0.1/linux-i686/xpi/ak.xpi -> icecat-10.0-ak.xpi ) linguas_ar? ( ftp://ftp.mozilla.org/pub/firefox/releases/10.0.1/linux-i686/xpi/ar.xpi -> icecat-10.0-ar.xpi ) linguas_as? ( ftp://ftp.mozilla.org/pub/firefox/releases/10.0.1/linux-i686/xpi/as.xpi -> icecat-10.0-as.xpi ) linguas_ast? ( ftp://ftp.mozilla.org/pub/firefox/releases/10.0.1/linux-i686/xpi/ast.xpi -> icecat-10.0-ast.xpi ) linguas_be? ( ftp://ftp.mozilla.org/pub/firefox/releases/10.0.1/linux-i686/xpi/be.xpi -> icecat-10.0-be.xpi ) linguas_bg? ( ftp://ftp.mozilla.org/pub/firefox/releases/10.0.1/linux-i686/xpi/bg.xpi -> icecat-10.0-bg.xpi ) linguas_bn_BD? ( ftp://ftp.mozilla.org/pub/firefox/releases/10.0.1/linux-i686/xpi/bn-BD.xpi -> icecat-10.0-bn-BD.xpi ) linguas_bn_IN? ( ftp://ftp.mozilla.org/pub/firefox/releases/10.0.1/linux-i686/xpi/bn-IN.xpi -> icecat-10.0-bn-IN.xpi ) linguas_br? ( ftp://ftp.mozilla.org/pub/firefox/releases/10.0.1/linux-i686/xpi/br.xpi -> icecat-10.0-br.xpi ) linguas_bs? ( ftp://ftp.mozilla.org/pub/firefox/releases/10.0.1/linux-i686/xpi/bs.xpi -> icecat-10.0-bs.xpi ) linguas_ca? ( ftp://ftp.mozilla.org/pub/firefox/releases/10.0.1/linux-i686/xpi/ca.xpi -> icecat-10.0-ca.xpi ) linguas_cs? ( ftp://ftp.mozilla.org/pub/firefox/releases/10.0.1/linux-i686/xpi/cs.xpi -> icecat-10.0-cs.xpi ) linguas_csb? ( ftp://ftp.mozilla.org/pub/firefox/releases/10.0.1/linux-i686/xpi/csb.xpi -> icecat-10.0-csb.xpi ) linguas_cy? ( ftp://ftp.mozilla.org/pub/firefox/releases/10.0.1/linux-i686/xpi/cy.xpi -> icecat-10.0-cy.xpi ) linguas_da? ( ftp://ftp.mozilla.org/pub/firefox/releases/10.0.1/linux-i686/xpi/da.xpi -> icecat-10.0-da.xpi ) linguas_de? ( ftp://ftp.mozilla.org/pub/firefox/releases/10.0.1/linux-i686/xpi/de.xpi -> icecat-10.0-de.xpi ) linguas_el? ( ftp://ftp.mozilla.org/pub/firefox/releases/10.0.1/linux-i686/xpi/el.xpi -> icecat-10.0-el.xpi ) linguas_en_GB? ( ftp://ftp.mozilla.org/pub/firefox/releases/10.0.1/linux-i686/xpi/en-GB.xpi -> icecat-10.0-en-GB.xpi ) linguas_en_ZA? ( ftp://ftp.mozilla.org/pub/firefox/releases/10.0.1/linux-i686/xpi/en-ZA.xpi -> icecat-10.0-en-ZA.xpi ) linguas_eo? ( ftp://ftp.mozilla.org/pub/firefox/releases/10.0.1/linux-i686/xpi/eo.xpi -> icecat-10.0-eo.xpi ) linguas_es_AR? ( ftp://ftp.mozilla.org/pub/firefox/releases/10.0.1/linux-i686/xpi/es-AR.xpi -> icecat-10.0-es-AR.xpi ) linguas_es_CL? ( ftp://ftp.mozilla.org/pub/firefox/releases/10.0.1/linux-i686/xpi/es-CL.xpi -> icecat-10.0-es-CL.xpi ) linguas_es_ES? ( ftp://ftp.mozilla.org/pub/firefox/releases/10.0.1/linux-i686/xpi/es-ES.xpi -> icecat-10.0-es-ES.xpi ) linguas_es_MX? ( ftp://ftp.mozilla.org/pub/firefox/releases/10.0.1/linux-i686/xpi/es-MX.xpi -> icecat-10.0-es-MX.xpi ) linguas_et? ( ftp://ftp.mozilla.org/pub/firefox/releases/10.0.1/linux-i686/xpi/et.xpi -> icecat-10.0-et.xpi ) linguas_eu? ( ftp://ftp.mozilla.org/pub/firefox/releases/10.0.1/linux-i686/xpi/eu.xpi -> icecat-10.0-eu.xpi ) linguas_fa? ( ftp://ftp.mozilla.org/pub/firefox/releases/10.0.1/linux-i686/xpi/fa.xpi -> icecat-10.0-fa.xpi ) linguas_fi? ( ftp://ftp.mozilla.org/pub/firefox/releases/10.0.1/linux-i686/xpi/fi.xpi -> icecat-10.0-fi.xpi ) linguas_fr? ( ftp://ftp.mozilla.org/pub/firefox/releases/10.0.1/linux-i686/xpi/fr.xpi -> icecat-10.0-fr.xpi ) linguas_fy_NL? ( ftp://ftp.mozilla.org/pub/firefox/releases/10.0.1/linux-i686/xpi/fy-NL.xpi -> icecat-10.0-fy-NL.xpi ) linguas_ga_IE? ( ftp://ftp.mozilla.org/pub/firefox/releases/10.0.1/linux-i686/xpi/ga-IE.xpi -> icecat-10.0-ga-IE.xpi ) linguas_gd? ( ftp://ftp.mozilla.org/pub/firefox/releases/10.0.1/linux-i686/xpi/gd.xpi -> icecat-10.0-gd.xpi ) linguas_gl? ( ftp://ftp.mozilla.org/pub/firefox/releases/10.0.1/linux-i686/xpi/gl.xpi -> icecat-10.0-gl.xpi ) linguas_gu_IN? ( ftp://ftp.mozilla.org/pub/firefox/releases/10.0.1/linux-i686/xpi/gu-IN.xpi -> icecat-10.0-gu-IN.xpi ) linguas_he? ( ftp://ftp.mozilla.org/pub/firefox/releases/10.0.1/linux-i686/xpi/he.xpi -> icecat-10.0-he.xpi ) linguas_hi_IN? ( ftp://ftp.mozilla.org/pub/firefox/releases/10.0.1/linux-i686/xpi/hi-IN.xpi -> icecat-10.0-hi-IN.xpi ) linguas_hr? ( ftp://ftp.mozilla.org/pub/firefox/releases/10.0.1/linux-i686/xpi/hr.xpi -> icecat-10.0-hr.xpi ) linguas_hu? ( ftp://ftp.mozilla.org/pub/firefox/releases/10.0.1/linux-i686/xpi/hu.xpi -> icecat-10.0-hu.xpi ) linguas_hy_AM? ( ftp://ftp.mozilla.org/pub/firefox/releases/10.0.1/linux-i686/xpi/hy-AM.xpi -> icecat-10.0-hy-AM.xpi ) linguas_id? ( ftp://ftp.mozilla.org/pub/firefox/releases/10.0.1/linux-i686/xpi/id.xpi -> icecat-10.0-id.xpi ) linguas_is? ( ftp://ftp.mozilla.org/pub/firefox/releases/10.0.1/linux-i686/xpi/is.xpi -> icecat-10.0-is.xpi ) linguas_it? ( ftp://ftp.mozilla.org/pub/firefox/releases/10.0.1/linux-i686/xpi/it.xpi -> icecat-10.0-it.xpi ) linguas_ja? ( ftp://ftp.mozilla.org/pub/firefox/releases/10.0.1/linux-i686/xpi/ja.xpi -> icecat-10.0-ja.xpi ) linguas_kk? ( ftp://ftp.mozilla.org/pub/firefox/releases/10.0.1/linux-i686/xpi/kk.xpi -> icecat-10.0-kk.xpi ) linguas_kn? ( ftp://ftp.mozilla.org/pub/firefox/releases/10.0.1/linux-i686/xpi/kn.xpi -> icecat-10.0-kn.xpi ) linguas_ko? ( ftp://ftp.mozilla.org/pub/firefox/releases/10.0.1/linux-i686/xpi/ko.xpi -> icecat-10.0-ko.xpi ) linguas_ku? ( ftp://ftp.mozilla.org/pub/firefox/releases/10.0.1/linux-i686/xpi/ku.xpi -> icecat-10.0-ku.xpi ) linguas_lg? ( ftp://ftp.mozilla.org/pub/firefox/releases/10.0.1/linux-i686/xpi/lg.xpi -> icecat-10.0-lg.xpi ) linguas_lt? ( ftp://ftp.mozilla.org/pub/firefox/releases/10.0.1/linux-i686/xpi/lt.xpi -> icecat-10.0-lt.xpi ) linguas_lv? ( ftp://ftp.mozilla.org/pub/firefox/releases/10.0.1/linux-i686/xpi/lv.xpi -> icecat-10.0-lv.xpi ) linguas_mai? ( ftp://ftp.mozilla.org/pub/firefox/releases/10.0.1/linux-i686/xpi/mai.xpi -> icecat-10.0-mai.xpi ) linguas_mk? ( ftp://ftp.mozilla.org/pub/firefox/releases/10.0.1/linux-i686/xpi/mk.xpi -> icecat-10.0-mk.xpi ) linguas_ml? ( ftp://ftp.mozilla.org/pub/firefox/releases/10.0.1/linux-i686/xpi/ml.xpi -> icecat-10.0-ml.xpi ) linguas_mr? ( ftp://ftp.mozilla.org/pub/firefox/releases/10.0.1/linux-i686/xpi/mr.xpi -> icecat-10.0-mr.xpi ) linguas_nb_NO? ( ftp://ftp.mozilla.org/pub/firefox/releases/10.0.1/linux-i686/xpi/nb-NO.xpi -> icecat-10.0-nb-NO.xpi ) linguas_nl? ( ftp://ftp.mozilla.org/pub/firefox/releases/10.0.1/linux-i686/xpi/nl.xpi -> icecat-10.0-nl.xpi ) linguas_nn_NO? ( ftp://ftp.mozilla.org/pub/firefox/releases/10.0.1/linux-i686/xpi/nn-NO.xpi -> icecat-10.0-nn-NO.xpi ) linguas_nso? ( ftp://ftp.mozilla.org/pub/firefox/releases/10.0.1/linux-i686/xpi/nso.xpi -> icecat-10.0-nso.xpi ) linguas_or? ( ftp://ftp.mozilla.org/pub/firefox/releases/10.0.1/linux-i686/xpi/or.xpi -> icecat-10.0-or.xpi ) linguas_pa_IN? ( ftp://ftp.mozilla.org/pub/firefox/releases/10.0.1/linux-i686/xpi/pa-IN.xpi -> icecat-10.0-pa-IN.xpi ) linguas_pl? ( ftp://ftp.mozilla.org/pub/firefox/releases/10.0.1/linux-i686/xpi/pl.xpi -> icecat-10.0-pl.xpi ) linguas_pt_BR? ( ftp://ftp.mozilla.org/pub/firefox/releases/10.0.1/linux-i686/xpi/pt-BR.xpi -> icecat-10.0-pt-BR.xpi ) linguas_pt_PT? ( ftp://ftp.mozilla.org/pub/firefox/releases/10.0.1/linux-i686/xpi/pt-PT.xpi -> icecat-10.0-pt-PT.xpi ) linguas_rm? ( ftp://ftp.mozilla.org/pub/firefox/releases/10.0.1/linux-i686/xpi/rm.xpi -> icecat-10.0-rm.xpi ) linguas_ro? ( ftp://ftp.mozilla.org/pub/firefox/releases/10.0.1/linux-i686/xpi/ro.xpi -> icecat-10.0-ro.xpi ) linguas_ru? ( ftp://ftp.mozilla.org/pub/firefox/releases/10.0.1/linux-i686/xpi/ru.xpi -> icecat-10.0-ru.xpi ) linguas_si? ( ftp://ftp.mozilla.org/pub/firefox/releases/10.0.1/linux-i686/xpi/si.xpi -> icecat-10.0-si.xpi ) linguas_sk? ( ftp://ftp.mozilla.org/pub/firefox/releases/10.0.1/linux-i686/xpi/sk.xpi -> icecat-10.0-sk.xpi ) linguas_sl? ( ftp://ftp.mozilla.org/pub/firefox/releases/10.0.1/linux-i686/xpi/sl.xpi -> icecat-10.0-sl.xpi ) linguas_son? ( ftp://ftp.mozilla.org/pub/firefox/releases/10.0.1/linux-i686/xpi/son.xpi -> icecat-10.0-son.xpi ) linguas_sq? ( ftp://ftp.mozilla.org/pub/firefox/releases/10.0.1/linux-i686/xpi/sq.xpi -> icecat-10.0-sq.xpi ) linguas_sr? ( ftp://ftp.mozilla.org/pub/firefox/releases/10.0.1/linux-i686/xpi/sr.xpi -> icecat-10.0-sr.xpi ) linguas_sv_SE? ( ftp://ftp.mozilla.org/pub/firefox/releases/10.0.1/linux-i686/xpi/sv-SE.xpi -> icecat-10.0-sv-SE.xpi ) linguas_ta? ( ftp://ftp.mozilla.org/pub/firefox/releases/10.0.1/linux-i686/xpi/ta.xpi -> icecat-10.0-ta.xpi ) linguas_ta_LK? ( ftp://ftp.mozilla.org/pub/firefox/releases/10.0.1/linux-i686/xpi/ta-LK.xpi -> icecat-10.0-ta-LK.xpi ) linguas_te? ( ftp://ftp.mozilla.org/pub/firefox/releases/10.0.1/linux-i686/xpi/te.xpi -> icecat-10.0-te.xpi ) linguas_th? ( ftp://ftp.mozilla.org/pub/firefox/releases/10.0.1/linux-i686/xpi/th.xpi -> icecat-10.0-th.xpi ) linguas_tr? ( ftp://ftp.mozilla.org/pub/firefox/releases/10.0.1/linux-i686/xpi/tr.xpi -> icecat-10.0-tr.xpi ) linguas_uk? ( ftp://ftp.mozilla.org/pub/firefox/releases/10.0.1/linux-i686/xpi/uk.xpi -> icecat-10.0-uk.xpi ) linguas_vi? ( ftp://ftp.mozilla.org/pub/firefox/releases/10.0.1/linux-i686/xpi/vi.xpi -> icecat-10.0-vi.xpi ) linguas_zh_CN? ( ftp://ftp.mozilla.org/pub/firefox/releases/10.0.1/linux-i686/xpi/zh-CN.xpi -> icecat-10.0-zh-CN.xpi ) linguas_zh_TW? ( ftp://ftp.mozilla.org/pub/firefox/releases/10.0.1/linux-i686/xpi/zh-TW.xpi -> icecat-10.0-zh-TW.xpi ) linguas_zu? ( ftp://ftp.mozilla.org/pub/firefox/releases/10.0.1/linux-i686/xpi/zu.xpi -> icecat-10.0-zu.xpi ) mirror://gnu/gnuzilla/10.0/icecat-10.0.tar.xz http://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-10.0-patches-0.5.tar.xz http://dev.gentoo.org/~polynomial-c/mozilla/ff1001.diff
diff --git a/metadata/cache/www-client/icecat-10.0-r2 b/metadata/cache/www-client/icecat-10.0-r2
index 94d257ea6374..8e6e24f3296a 100644
--- a/metadata/cache/www-client/icecat-10.0-r2
+++ b/metadata/cache/www-client/icecat-10.0-r2
@@ -1,4 +1,4 @@
->=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.13.1 >=dev-libs/nspr-4.8.8 >=dev-libs/glib-2.26:2 >=media-libs/mesa-7.10 media-libs/libpng[apng] virtual/libffi system-sqlite? ( >=dev-db/sqlite-3.7.7.1[fts3,secure-delete,threadsafe,unlock-notify,debug=] ) webm? ( >=media-libs/libvpx-1.0.0 media-libs/alsa-lib ) crashreporter? ( net-misc/curl ) selinux? ( sec-policy/selinux-mozilla ) dev-util/pkgconfig pgo? ( =dev-lang/python-2*[sqlite] >=sys-devel/gcc-4.5 ) webm? ( x86? ( >=dev-lang/yasm-1.1 ) amd64? ( >=dev-lang/yasm-1.1 ) ) >=sys-apps/sed-4 x11-libs/libXrender x11-libs/libXt x11-libs/libXmu >=sys-libs/zlib-1.1.4 dev-util/pkgconfig =dev-lang/python-2*[threads] app-arch/zip app-arch/unzip >=app-text/hunspell-1.2 dev-libs/expat >=dev-libs/libIDL-0.8.0 >=dev-libs/libevent-1.4.7 >=x11-libs/cairo-1.8[X] >=x11-libs/gtk+-2.8.6:2 >=x11-libs/pango-1.10.1[X] virtual/jpeg virtual/freedesktop-icon-theme alsa? ( media-libs/alsa-lib ) dbus? ( >=dev-libs/dbus-glib-0.72 ) libnotify? ( >=x11-libs/libnotify-0.4 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) wifi? ( net-wireless/wireless-tools ) || ( >=sys-devel/automake-1.11.1 ) =sys-devel/autoconf-2.1* sys-devel/libtool pgo? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) app-arch/unzip
+>=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.13.1 >=dev-libs/nspr-4.8.8 >=dev-libs/glib-2.26:2 >=media-libs/mesa-7.10 media-libs/libpng[apng] virtual/libffi system-sqlite? ( >=dev-db/sqlite-3.7.7.1[fts3,secure-delete,threadsafe,unlock-notify,debug=] ) webm? ( >=media-libs/libvpx-1.0.0 media-libs/alsa-lib ) crashreporter? ( net-misc/curl ) selinux? ( sec-policy/selinux-mozilla ) dev-util/pkgconfig pgo? ( =dev-lang/python-2*[sqlite] >=sys-devel/gcc-4.5 ) webm? ( x86? ( >=dev-lang/yasm-1.1 ) amd64? ( >=dev-lang/yasm-1.1 ) ) >=sys-apps/sed-4 x11-libs/libXrender x11-libs/libXt x11-libs/libXmu >=sys-libs/zlib-1.1.4 dev-util/pkgconfig =dev-lang/python-2*[threads] app-arch/zip app-arch/unzip >=app-text/hunspell-1.2 dev-libs/expat >=dev-libs/libIDL-0.8.0 >=dev-libs/libevent-1.4.7 >=x11-libs/cairo-1.8[X] >=x11-libs/gtk+-2.8.6:2 >=x11-libs/pango-1.10.1[X] virtual/jpeg virtual/freedesktop-icon-theme alsa? ( media-libs/alsa-lib ) dbus? ( >=dev-libs/dbus-glib-0.72 ) libnotify? ( >=x11-libs/libnotify-0.4 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) wifi? ( net-wireless/wireless-tools ) || ( >=sys-devel/automake-1.11.1:1.11 ) =sys-devel/autoconf-2.1* sys-devel/libtool pgo? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) app-arch/unzip
 >=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.13.1 >=dev-libs/nspr-4.8.8 >=dev-libs/glib-2.26:2 >=media-libs/mesa-7.10 media-libs/libpng[apng] virtual/libffi system-sqlite? ( >=dev-db/sqlite-3.7.7.1[fts3,secure-delete,threadsafe,unlock-notify,debug=] ) webm? ( >=media-libs/libvpx-1.0.0 media-libs/alsa-lib ) crashreporter? ( net-misc/curl ) selinux? ( sec-policy/selinux-mozilla ) x11-libs/libXrender x11-libs/libXt x11-libs/libXmu >=sys-libs/zlib-1.1.4 app-arch/zip app-arch/unzip >=app-text/hunspell-1.2 dev-libs/expat >=dev-libs/libIDL-0.8.0 >=dev-libs/libevent-1.4.7 >=x11-libs/cairo-1.8[X] >=x11-libs/gtk+-2.8.6:2 >=x11-libs/pango-1.10.1[X] virtual/jpeg virtual/freedesktop-icon-theme alsa? ( media-libs/alsa-lib ) dbus? ( >=dev-libs/dbus-glib-0.72 ) libnotify? ( >=x11-libs/libnotify-0.4 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) wifi? ( net-wireless/wireless-tools )
 0
 linguas_af? ( ftp://ftp.mozilla.org/pub/firefox/releases/10.0.1/linux-i686/xpi/af.xpi -> icecat-10.0-af.xpi ) linguas_ak? ( ftp://ftp.mozilla.org/pub/firefox/releases/10.0.1/linux-i686/xpi/ak.xpi -> icecat-10.0-ak.xpi ) linguas_ar? ( ftp://ftp.mozilla.org/pub/firefox/releases/10.0.1/linux-i686/xpi/ar.xpi -> icecat-10.0-ar.xpi ) linguas_as? ( ftp://ftp.mozilla.org/pub/firefox/releases/10.0.1/linux-i686/xpi/as.xpi -> icecat-10.0-as.xpi ) linguas_ast? ( ftp://ftp.mozilla.org/pub/firefox/releases/10.0.1/linux-i686/xpi/ast.xpi -> icecat-10.0-ast.xpi ) linguas_be? ( ftp://ftp.mozilla.org/pub/firefox/releases/10.0.1/linux-i686/xpi/be.xpi -> icecat-10.0-be.xpi ) linguas_bg? ( ftp://ftp.mozilla.org/pub/firefox/releases/10.0.1/linux-i686/xpi/bg.xpi -> icecat-10.0-bg.xpi ) linguas_bn_BD? ( ftp://ftp.mozilla.org/pub/firefox/releases/10.0.1/linux-i686/xpi/bn-BD.xpi -> icecat-10.0-bn-BD.xpi ) linguas_bn_IN? ( ftp://ftp.mozilla.org/pub/firefox/releases/10.0.1/linux-i686/xpi/bn-IN.xpi -> icecat-10.0-bn-IN.xpi ) linguas_br? ( ftp://ftp.mozilla.org/pub/firefox/releases/10.0.1/linux-i686/xpi/br.xpi -> icecat-10.0-br.xpi ) linguas_bs? ( ftp://ftp.mozilla.org/pub/firefox/releases/10.0.1/linux-i686/xpi/bs.xpi -> icecat-10.0-bs.xpi ) linguas_ca? ( ftp://ftp.mozilla.org/pub/firefox/releases/10.0.1/linux-i686/xpi/ca.xpi -> icecat-10.0-ca.xpi ) linguas_cs? ( ftp://ftp.mozilla.org/pub/firefox/releases/10.0.1/linux-i686/xpi/cs.xpi -> icecat-10.0-cs.xpi ) linguas_csb? ( ftp://ftp.mozilla.org/pub/firefox/releases/10.0.1/linux-i686/xpi/csb.xpi -> icecat-10.0-csb.xpi ) linguas_cy? ( ftp://ftp.mozilla.org/pub/firefox/releases/10.0.1/linux-i686/xpi/cy.xpi -> icecat-10.0-cy.xpi ) linguas_da? ( ftp://ftp.mozilla.org/pub/firefox/releases/10.0.1/linux-i686/xpi/da.xpi -> icecat-10.0-da.xpi ) linguas_de? ( ftp://ftp.mozilla.org/pub/firefox/releases/10.0.1/linux-i686/xpi/de.xpi -> icecat-10.0-de.xpi ) linguas_el? ( ftp://ftp.mozilla.org/pub/firefox/releases/10.0.1/linux-i686/xpi/el.xpi -> icecat-10.0-el.xpi ) linguas_en_GB? ( ftp://ftp.mozilla.org/pub/firefox/releases/10.0.1/linux-i686/xpi/en-GB.xpi -> icecat-10.0-en-GB.xpi ) linguas_en_ZA? ( ftp://ftp.mozilla.org/pub/firefox/releases/10.0.1/linux-i686/xpi/en-ZA.xpi -> icecat-10.0-en-ZA.xpi ) linguas_eo? ( ftp://ftp.mozilla.org/pub/firefox/releases/10.0.1/linux-i686/xpi/eo.xpi -> icecat-10.0-eo.xpi ) linguas_es_AR? ( ftp://ftp.mozilla.org/pub/firefox/releases/10.0.1/linux-i686/xpi/es-AR.xpi -> icecat-10.0-es-AR.xpi ) linguas_es_CL? ( ftp://ftp.mozilla.org/pub/firefox/releases/10.0.1/linux-i686/xpi/es-CL.xpi -> icecat-10.0-es-CL.xpi ) linguas_es_ES? ( ftp://ftp.mozilla.org/pub/firefox/releases/10.0.1/linux-i686/xpi/es-ES.xpi -> icecat-10.0-es-ES.xpi ) linguas_es_MX? ( ftp://ftp.mozilla.org/pub/firefox/releases/10.0.1/linux-i686/xpi/es-MX.xpi -> icecat-10.0-es-MX.xpi ) linguas_et? ( ftp://ftp.mozilla.org/pub/firefox/releases/10.0.1/linux-i686/xpi/et.xpi -> icecat-10.0-et.xpi ) linguas_eu? ( ftp://ftp.mozilla.org/pub/firefox/releases/10.0.1/linux-i686/xpi/eu.xpi -> icecat-10.0-eu.xpi ) linguas_fa? ( ftp://ftp.mozilla.org/pub/firefox/releases/10.0.1/linux-i686/xpi/fa.xpi -> icecat-10.0-fa.xpi ) linguas_fi? ( ftp://ftp.mozilla.org/pub/firefox/releases/10.0.1/linux-i686/xpi/fi.xpi -> icecat-10.0-fi.xpi ) linguas_fr? ( ftp://ftp.mozilla.org/pub/firefox/releases/10.0.1/linux-i686/xpi/fr.xpi -> icecat-10.0-fr.xpi ) linguas_fy_NL? ( ftp://ftp.mozilla.org/pub/firefox/releases/10.0.1/linux-i686/xpi/fy-NL.xpi -> icecat-10.0-fy-NL.xpi ) linguas_ga_IE? ( ftp://ftp.mozilla.org/pub/firefox/releases/10.0.1/linux-i686/xpi/ga-IE.xpi -> icecat-10.0-ga-IE.xpi ) linguas_gd? ( ftp://ftp.mozilla.org/pub/firefox/releases/10.0.1/linux-i686/xpi/gd.xpi -> icecat-10.0-gd.xpi ) linguas_gl? ( ftp://ftp.mozilla.org/pub/firefox/releases/10.0.1/linux-i686/xpi/gl.xpi -> icecat-10.0-gl.xpi ) linguas_gu_IN? ( ftp://ftp.mozilla.org/pub/firefox/releases/10.0.1/linux-i686/xpi/gu-IN.xpi -> icecat-10.0-gu-IN.xpi ) linguas_he? ( ftp://ftp.mozilla.org/pub/firefox/releases/10.0.1/linux-i686/xpi/he.xpi -> icecat-10.0-he.xpi ) linguas_hi_IN? ( ftp://ftp.mozilla.org/pub/firefox/releases/10.0.1/linux-i686/xpi/hi-IN.xpi -> icecat-10.0-hi-IN.xpi ) linguas_hr? ( ftp://ftp.mozilla.org/pub/firefox/releases/10.0.1/linux-i686/xpi/hr.xpi -> icecat-10.0-hr.xpi ) linguas_hu? ( ftp://ftp.mozilla.org/pub/firefox/releases/10.0.1/linux-i686/xpi/hu.xpi -> icecat-10.0-hu.xpi ) linguas_hy_AM? ( ftp://ftp.mozilla.org/pub/firefox/releases/10.0.1/linux-i686/xpi/hy-AM.xpi -> icecat-10.0-hy-AM.xpi ) linguas_id? ( ftp://ftp.mozilla.org/pub/firefox/releases/10.0.1/linux-i686/xpi/id.xpi -> icecat-10.0-id.xpi ) linguas_is? ( ftp://ftp.mozilla.org/pub/firefox/releases/10.0.1/linux-i686/xpi/is.xpi -> icecat-10.0-is.xpi ) linguas_it? ( ftp://ftp.mozilla.org/pub/firefox/releases/10.0.1/linux-i686/xpi/it.xpi -> icecat-10.0-it.xpi ) linguas_ja? ( ftp://ftp.mozilla.org/pub/firefox/releases/10.0.1/linux-i686/xpi/ja.xpi -> icecat-10.0-ja.xpi ) linguas_kk? ( ftp://ftp.mozilla.org/pub/firefox/releases/10.0.1/linux-i686/xpi/kk.xpi -> icecat-10.0-kk.xpi ) linguas_kn? ( ftp://ftp.mozilla.org/pub/firefox/releases/10.0.1/linux-i686/xpi/kn.xpi -> icecat-10.0-kn.xpi ) linguas_ko? ( ftp://ftp.mozilla.org/pub/firefox/releases/10.0.1/linux-i686/xpi/ko.xpi -> icecat-10.0-ko.xpi ) linguas_ku? ( ftp://ftp.mozilla.org/pub/firefox/releases/10.0.1/linux-i686/xpi/ku.xpi -> icecat-10.0-ku.xpi ) linguas_lg? ( ftp://ftp.mozilla.org/pub/firefox/releases/10.0.1/linux-i686/xpi/lg.xpi -> icecat-10.0-lg.xpi ) linguas_lt? ( ftp://ftp.mozilla.org/pub/firefox/releases/10.0.1/linux-i686/xpi/lt.xpi -> icecat-10.0-lt.xpi ) linguas_lv? ( ftp://ftp.mozilla.org/pub/firefox/releases/10.0.1/linux-i686/xpi/lv.xpi -> icecat-10.0-lv.xpi ) linguas_mai? ( ftp://ftp.mozilla.org/pub/firefox/releases/10.0.1/linux-i686/xpi/mai.xpi -> icecat-10.0-mai.xpi ) linguas_mk? ( ftp://ftp.mozilla.org/pub/firefox/releases/10.0.1/linux-i686/xpi/mk.xpi -> icecat-10.0-mk.xpi ) linguas_ml? ( ftp://ftp.mozilla.org/pub/firefox/releases/10.0.1/linux-i686/xpi/ml.xpi -> icecat-10.0-ml.xpi ) linguas_mr? ( ftp://ftp.mozilla.org/pub/firefox/releases/10.0.1/linux-i686/xpi/mr.xpi -> icecat-10.0-mr.xpi ) linguas_nb_NO? ( ftp://ftp.mozilla.org/pub/firefox/releases/10.0.1/linux-i686/xpi/nb-NO.xpi -> icecat-10.0-nb-NO.xpi ) linguas_nl? ( ftp://ftp.mozilla.org/pub/firefox/releases/10.0.1/linux-i686/xpi/nl.xpi -> icecat-10.0-nl.xpi ) linguas_nn_NO? ( ftp://ftp.mozilla.org/pub/firefox/releases/10.0.1/linux-i686/xpi/nn-NO.xpi -> icecat-10.0-nn-NO.xpi ) linguas_nso? ( ftp://ftp.mozilla.org/pub/firefox/releases/10.0.1/linux-i686/xpi/nso.xpi -> icecat-10.0-nso.xpi ) linguas_or? ( ftp://ftp.mozilla.org/pub/firefox/releases/10.0.1/linux-i686/xpi/or.xpi -> icecat-10.0-or.xpi ) linguas_pa_IN? ( ftp://ftp.mozilla.org/pub/firefox/releases/10.0.1/linux-i686/xpi/pa-IN.xpi -> icecat-10.0-pa-IN.xpi ) linguas_pl? ( ftp://ftp.mozilla.org/pub/firefox/releases/10.0.1/linux-i686/xpi/pl.xpi -> icecat-10.0-pl.xpi ) linguas_pt_BR? ( ftp://ftp.mozilla.org/pub/firefox/releases/10.0.1/linux-i686/xpi/pt-BR.xpi -> icecat-10.0-pt-BR.xpi ) linguas_pt_PT? ( ftp://ftp.mozilla.org/pub/firefox/releases/10.0.1/linux-i686/xpi/pt-PT.xpi -> icecat-10.0-pt-PT.xpi ) linguas_rm? ( ftp://ftp.mozilla.org/pub/firefox/releases/10.0.1/linux-i686/xpi/rm.xpi -> icecat-10.0-rm.xpi ) linguas_ro? ( ftp://ftp.mozilla.org/pub/firefox/releases/10.0.1/linux-i686/xpi/ro.xpi -> icecat-10.0-ro.xpi ) linguas_ru? ( ftp://ftp.mozilla.org/pub/firefox/releases/10.0.1/linux-i686/xpi/ru.xpi -> icecat-10.0-ru.xpi ) linguas_si? ( ftp://ftp.mozilla.org/pub/firefox/releases/10.0.1/linux-i686/xpi/si.xpi -> icecat-10.0-si.xpi ) linguas_sk? ( ftp://ftp.mozilla.org/pub/firefox/releases/10.0.1/linux-i686/xpi/sk.xpi -> icecat-10.0-sk.xpi ) linguas_sl? ( ftp://ftp.mozilla.org/pub/firefox/releases/10.0.1/linux-i686/xpi/sl.xpi -> icecat-10.0-sl.xpi ) linguas_son? ( ftp://ftp.mozilla.org/pub/firefox/releases/10.0.1/linux-i686/xpi/son.xpi -> icecat-10.0-son.xpi ) linguas_sq? ( ftp://ftp.mozilla.org/pub/firefox/releases/10.0.1/linux-i686/xpi/sq.xpi -> icecat-10.0-sq.xpi ) linguas_sr? ( ftp://ftp.mozilla.org/pub/firefox/releases/10.0.1/linux-i686/xpi/sr.xpi -> icecat-10.0-sr.xpi ) linguas_sv_SE? ( ftp://ftp.mozilla.org/pub/firefox/releases/10.0.1/linux-i686/xpi/sv-SE.xpi -> icecat-10.0-sv-SE.xpi ) linguas_ta? ( ftp://ftp.mozilla.org/pub/firefox/releases/10.0.1/linux-i686/xpi/ta.xpi -> icecat-10.0-ta.xpi ) linguas_ta_LK? ( ftp://ftp.mozilla.org/pub/firefox/releases/10.0.1/linux-i686/xpi/ta-LK.xpi -> icecat-10.0-ta-LK.xpi ) linguas_te? ( ftp://ftp.mozilla.org/pub/firefox/releases/10.0.1/linux-i686/xpi/te.xpi -> icecat-10.0-te.xpi ) linguas_th? ( ftp://ftp.mozilla.org/pub/firefox/releases/10.0.1/linux-i686/xpi/th.xpi -> icecat-10.0-th.xpi ) linguas_tr? ( ftp://ftp.mozilla.org/pub/firefox/releases/10.0.1/linux-i686/xpi/tr.xpi -> icecat-10.0-tr.xpi ) linguas_uk? ( ftp://ftp.mozilla.org/pub/firefox/releases/10.0.1/linux-i686/xpi/uk.xpi -> icecat-10.0-uk.xpi ) linguas_vi? ( ftp://ftp.mozilla.org/pub/firefox/releases/10.0.1/linux-i686/xpi/vi.xpi -> icecat-10.0-vi.xpi ) linguas_zh_CN? ( ftp://ftp.mozilla.org/pub/firefox/releases/10.0.1/linux-i686/xpi/zh-CN.xpi -> icecat-10.0-zh-CN.xpi ) linguas_zh_TW? ( ftp://ftp.mozilla.org/pub/firefox/releases/10.0.1/linux-i686/xpi/zh-TW.xpi -> icecat-10.0-zh-TW.xpi ) linguas_zu? ( ftp://ftp.mozilla.org/pub/firefox/releases/10.0.1/linux-i686/xpi/zu.xpi -> icecat-10.0-zu.xpi ) mirror://gnu/gnuzilla/10.0/icecat-10.0.tar.xz http://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-10.0-patches-0.6.tar.xz http://dev.gentoo.org/~polynomial-c/mozilla/ff1001.diff
diff --git a/metadata/cache/www-client/icecat-3.6.16-r3 b/metadata/cache/www-client/icecat-3.6.16-r3
index d781f9e07048..072db695b524 100644
--- a/metadata/cache/www-client/icecat-3.6.16-r3
+++ b/metadata/cache/www-client/icecat-3.6.16-r3
@@ -1,4 +1,4 @@
->=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.12.8 >=dev-libs/nspr-4.8.6 >=app-text/hunspell-1.2 system-sqlite? ( >=dev-db/sqlite-3.7.4[fts3,secure-delete] ) alsa? ( media-libs/alsa-lib ) >=x11-libs/cairo-1.8.8[X] gnome? ( >=gnome-base/gnome-vfs-2.16.3 >=gnome-base/libgnomeui-2.16.1 >=gnome-base/gconf-2.16.0 >=gnome-base/libgnome-2.16.0 ) wifi? ( net-wireless/wireless-tools ) libnotify? ( >=x11-libs/libnotify-0.4 ) ~net-libs/xulrunner-1.9.2.20[ipc=,java=,wifi=,libnotify=,system-sqlite=] java? ( >=virtual/jdk-1.4 ) =dev-lang/python-2*[threads] dev-util/pkgconfig x11-libs/libXrender x11-libs/libXt x11-libs/libXmu >=sys-libs/zlib-1.1.4 dev-util/pkgconfig =dev-lang/python-2*[threads] app-arch/zip app-arch/unzip >=app-text/hunspell-1.2 dev-libs/expat >=dev-libs/libIDL-0.8.0 >=dev-libs/libevent-1.4.7 >=x11-libs/cairo-1.8[X] >=x11-libs/gtk+-2.8.6:2 >=x11-libs/pango-1.10.1[X] virtual/jpeg virtual/freedesktop-icon-theme alsa? ( media-libs/alsa-lib ) dbus? ( >=dev-libs/dbus-glib-0.72 ) libnotify? ( >=x11-libs/libnotify-0.4 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) wifi? ( net-wireless/wireless-tools ) || ( >=sys-devel/automake-1.11.1 ) =sys-devel/autoconf-2.1* sys-devel/libtool app-arch/unzip java? ( >=dev-java/java-config-2.1.9-r1 )
+>=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.12.8 >=dev-libs/nspr-4.8.6 >=app-text/hunspell-1.2 system-sqlite? ( >=dev-db/sqlite-3.7.4[fts3,secure-delete] ) alsa? ( media-libs/alsa-lib ) >=x11-libs/cairo-1.8.8[X] gnome? ( >=gnome-base/gnome-vfs-2.16.3 >=gnome-base/libgnomeui-2.16.1 >=gnome-base/gconf-2.16.0 >=gnome-base/libgnome-2.16.0 ) wifi? ( net-wireless/wireless-tools ) libnotify? ( >=x11-libs/libnotify-0.4 ) ~net-libs/xulrunner-1.9.2.20[ipc=,java=,wifi=,libnotify=,system-sqlite=] java? ( >=virtual/jdk-1.4 ) =dev-lang/python-2*[threads] dev-util/pkgconfig x11-libs/libXrender x11-libs/libXt x11-libs/libXmu >=sys-libs/zlib-1.1.4 dev-util/pkgconfig =dev-lang/python-2*[threads] app-arch/zip app-arch/unzip >=app-text/hunspell-1.2 dev-libs/expat >=dev-libs/libIDL-0.8.0 >=dev-libs/libevent-1.4.7 >=x11-libs/cairo-1.8[X] >=x11-libs/gtk+-2.8.6:2 >=x11-libs/pango-1.10.1[X] virtual/jpeg virtual/freedesktop-icon-theme alsa? ( media-libs/alsa-lib ) dbus? ( >=dev-libs/dbus-glib-0.72 ) libnotify? ( >=x11-libs/libnotify-0.4 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) wifi? ( net-wireless/wireless-tools ) || ( >=sys-devel/automake-1.11.1:1.11 ) =sys-devel/autoconf-2.1* sys-devel/libtool app-arch/unzip java? ( >=dev-java/java-config-2.1.9-r1 )
 >=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.12.8 >=dev-libs/nspr-4.8.6 >=app-text/hunspell-1.2 system-sqlite? ( >=dev-db/sqlite-3.7.4[fts3,secure-delete] ) alsa? ( media-libs/alsa-lib ) >=x11-libs/cairo-1.8.8[X] gnome? ( >=gnome-base/gnome-vfs-2.16.3 >=gnome-base/libgnomeui-2.16.1 >=gnome-base/gconf-2.16.0 >=gnome-base/libgnome-2.16.0 ) wifi? ( net-wireless/wireless-tools ) libnotify? ( >=x11-libs/libnotify-0.4 ) ~net-libs/xulrunner-1.9.2.20[ipc=,java=,wifi=,libnotify=,system-sqlite=] java? ( >=virtual/jre-1.4 ) x11-libs/libXrender x11-libs/libXt x11-libs/libXmu >=sys-libs/zlib-1.1.4 app-arch/zip app-arch/unzip >=app-text/hunspell-1.2 dev-libs/expat >=dev-libs/libIDL-0.8.0 >=dev-libs/libevent-1.4.7 >=x11-libs/cairo-1.8[X] >=x11-libs/gtk+-2.8.6:2 >=x11-libs/pango-1.10.1[X] virtual/jpeg virtual/freedesktop-icon-theme alsa? ( media-libs/alsa-lib ) dbus? ( >=dev-libs/dbus-glib-0.72 ) libnotify? ( >=x11-libs/libnotify-0.4 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) wifi? ( net-wireless/wireless-tools ) java? ( >=dev-java/java-config-2.1.9-r1 )
 0
 mirror://gnu/gnuzilla/3.6.16/icecat-3.6.16.tar.bz2 http://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-3.6-patches-0.4.tar.bz2 http://dev.gentoo.org/~polynomial-c/mozilla/ff3617.diff.xz http://dev.gentoo.org/~polynomial-c/mozilla/ff3618.diff.xz http://dev.gentoo.org/~polynomial-c/mozilla/ff3620.diff.xz linguas_af? ( http://gnuzilla.gnu.org/download/langpacks/3.6.16/af.xpi -> icecat-3.6.16-af.xpi ) linguas_ar? ( http://gnuzilla.gnu.org/download/langpacks/3.6.16/ar.xpi -> icecat-3.6.16-ar.xpi ) linguas_as? ( http://gnuzilla.gnu.org/download/langpacks/3.6.16/as.xpi -> icecat-3.6.16-as.xpi ) linguas_ast? ( http://gnuzilla.gnu.org/download/langpacks/3.6.16/ast.xpi -> icecat-3.6.16-ast.xpi ) linguas_be? ( http://gnuzilla.gnu.org/download/langpacks/3.6.16/be.xpi -> icecat-3.6.16-be.xpi ) linguas_bg? ( http://gnuzilla.gnu.org/download/langpacks/3.6.16/bg.xpi -> icecat-3.6.16-bg.xpi ) linguas_bn_BD? ( http://gnuzilla.gnu.org/download/langpacks/3.6.16/bn-BD.xpi -> icecat-3.6.16-bn-BD.xpi ) linguas_bn? ( http://gnuzilla.gnu.org/download/langpacks/3.6.16/bn-BD.xpi -> icecat-3.6.16-bn-BD.xpi ) linguas_bn_IN? ( http://gnuzilla.gnu.org/download/langpacks/3.6.16/bn-IN.xpi -> icecat-3.6.16-bn-IN.xpi ) linguas_bn? ( http://gnuzilla.gnu.org/download/langpacks/3.6.16/bn-IN.xpi -> icecat-3.6.16-bn-IN.xpi ) linguas_ca? ( http://gnuzilla.gnu.org/download/langpacks/3.6.16/ca.xpi -> icecat-3.6.16-ca.xpi ) linguas_cs? ( http://gnuzilla.gnu.org/download/langpacks/3.6.16/cs.xpi -> icecat-3.6.16-cs.xpi ) linguas_cy? ( http://gnuzilla.gnu.org/download/langpacks/3.6.16/cy.xpi -> icecat-3.6.16-cy.xpi ) linguas_da? ( http://gnuzilla.gnu.org/download/langpacks/3.6.16/da.xpi -> icecat-3.6.16-da.xpi ) linguas_de? ( http://gnuzilla.gnu.org/download/langpacks/3.6.16/de.xpi -> icecat-3.6.16-de.xpi ) linguas_el? ( http://gnuzilla.gnu.org/download/langpacks/3.6.16/el.xpi -> icecat-3.6.16-el.xpi ) linguas_en_GB? ( http://gnuzilla.gnu.org/download/langpacks/3.6.16/en-GB.xpi -> icecat-3.6.16-en-GB.xpi ) linguas_eo? ( http://gnuzilla.gnu.org/download/langpacks/3.6.16/eo.xpi -> icecat-3.6.16-eo.xpi ) linguas_es_AR? ( http://gnuzilla.gnu.org/download/langpacks/3.6.16/es-AR.xpi -> icecat-3.6.16-es-AR.xpi ) linguas_es_CL? ( http://gnuzilla.gnu.org/download/langpacks/3.6.16/es-CL.xpi -> icecat-3.6.16-es-CL.xpi ) linguas_es_ES? ( http://gnuzilla.gnu.org/download/langpacks/3.6.16/es-ES.xpi -> icecat-3.6.16-es-ES.xpi ) linguas_es? ( http://gnuzilla.gnu.org/download/langpacks/3.6.16/es-ES.xpi -> icecat-3.6.16-es-ES.xpi ) linguas_es_MX? ( http://gnuzilla.gnu.org/download/langpacks/3.6.16/es-MX.xpi -> icecat-3.6.16-es-MX.xpi ) linguas_et? ( http://gnuzilla.gnu.org/download/langpacks/3.6.16/et.xpi -> icecat-3.6.16-et.xpi ) linguas_eu? ( http://gnuzilla.gnu.org/download/langpacks/3.6.16/eu.xpi -> icecat-3.6.16-eu.xpi ) linguas_fa? ( http://gnuzilla.gnu.org/download/langpacks/3.6.16/fa.xpi -> icecat-3.6.16-fa.xpi ) linguas_fi? ( http://gnuzilla.gnu.org/download/langpacks/3.6.16/fi.xpi -> icecat-3.6.16-fi.xpi ) linguas_fr? ( http://gnuzilla.gnu.org/download/langpacks/3.6.16/fr.xpi -> icecat-3.6.16-fr.xpi ) linguas_fy_NL? ( http://gnuzilla.gnu.org/download/langpacks/3.6.16/fy-NL.xpi -> icecat-3.6.16-fy-NL.xpi ) linguas_fy? ( http://gnuzilla.gnu.org/download/langpacks/3.6.16/fy-NL.xpi -> icecat-3.6.16-fy-NL.xpi ) linguas_ga_IE? ( http://gnuzilla.gnu.org/download/langpacks/3.6.16/ga-IE.xpi -> icecat-3.6.16-ga-IE.xpi ) linguas_ga? ( http://gnuzilla.gnu.org/download/langpacks/3.6.16/ga-IE.xpi -> icecat-3.6.16-ga-IE.xpi ) linguas_gl? ( http://gnuzilla.gnu.org/download/langpacks/3.6.16/gl.xpi -> icecat-3.6.16-gl.xpi ) linguas_gu_IN? ( http://gnuzilla.gnu.org/download/langpacks/3.6.16/gu-IN.xpi -> icecat-3.6.16-gu-IN.xpi ) linguas_gu? ( http://gnuzilla.gnu.org/download/langpacks/3.6.16/gu-IN.xpi -> icecat-3.6.16-gu-IN.xpi ) linguas_he? ( http://gnuzilla.gnu.org/download/langpacks/3.6.16/he.xpi -> icecat-3.6.16-he.xpi ) linguas_hi_IN? ( http://gnuzilla.gnu.org/download/langpacks/3.6.16/hi-IN.xpi -> icecat-3.6.16-hi-IN.xpi ) linguas_hi? ( http://gnuzilla.gnu.org/download/langpacks/3.6.16/hi-IN.xpi -> icecat-3.6.16-hi-IN.xpi ) linguas_hr? ( http://gnuzilla.gnu.org/download/langpacks/3.6.16/hr.xpi -> icecat-3.6.16-hr.xpi ) linguas_hu? ( http://gnuzilla.gnu.org/download/langpacks/3.6.16/hu.xpi -> icecat-3.6.16-hu.xpi ) linguas_id? ( http://gnuzilla.gnu.org/download/langpacks/3.6.16/id.xpi -> icecat-3.6.16-id.xpi ) linguas_is? ( http://gnuzilla.gnu.org/download/langpacks/3.6.16/is.xpi -> icecat-3.6.16-is.xpi ) linguas_it? ( http://gnuzilla.gnu.org/download/langpacks/3.6.16/it.xpi -> icecat-3.6.16-it.xpi ) linguas_ja? ( http://gnuzilla.gnu.org/download/langpacks/3.6.16/ja.xpi -> icecat-3.6.16-ja.xpi ) linguas_ka? ( http://gnuzilla.gnu.org/download/langpacks/3.6.16/ka.xpi -> icecat-3.6.16-ka.xpi ) linguas_kk? ( http://gnuzilla.gnu.org/download/langpacks/3.6.16/kk.xpi -> icecat-3.6.16-kk.xpi ) linguas_kn? ( http://gnuzilla.gnu.org/download/langpacks/3.6.16/kn.xpi -> icecat-3.6.16-kn.xpi ) linguas_ko? ( http://gnuzilla.gnu.org/download/langpacks/3.6.16/ko.xpi -> icecat-3.6.16-ko.xpi ) linguas_ku? ( http://gnuzilla.gnu.org/download/langpacks/3.6.16/ku.xpi -> icecat-3.6.16-ku.xpi ) linguas_lt? ( http://gnuzilla.gnu.org/download/langpacks/3.6.16/lt.xpi -> icecat-3.6.16-lt.xpi ) linguas_lv? ( http://gnuzilla.gnu.org/download/langpacks/3.6.16/lv.xpi -> icecat-3.6.16-lv.xpi ) linguas_mk? ( http://gnuzilla.gnu.org/download/langpacks/3.6.16/mk.xpi -> icecat-3.6.16-mk.xpi ) linguas_ml? ( http://gnuzilla.gnu.org/download/langpacks/3.6.16/ml.xpi -> icecat-3.6.16-ml.xpi ) linguas_mr? ( http://gnuzilla.gnu.org/download/langpacks/3.6.16/mr.xpi -> icecat-3.6.16-mr.xpi ) linguas_nb_NO? ( http://gnuzilla.gnu.org/download/langpacks/3.6.16/nb-NO.xpi -> icecat-3.6.16-nb-NO.xpi ) linguas_nb? ( http://gnuzilla.gnu.org/download/langpacks/3.6.16/nb-NO.xpi -> icecat-3.6.16-nb-NO.xpi ) linguas_nl? ( http://gnuzilla.gnu.org/download/langpacks/3.6.16/nl.xpi -> icecat-3.6.16-nl.xpi ) linguas_nn_NO? ( http://gnuzilla.gnu.org/download/langpacks/3.6.16/nn-NO.xpi -> icecat-3.6.16-nn-NO.xpi ) linguas_nn? ( http://gnuzilla.gnu.org/download/langpacks/3.6.16/nn-NO.xpi -> icecat-3.6.16-nn-NO.xpi ) linguas_oc? ( http://gnuzilla.gnu.org/download/langpacks/3.6.16/oc.xpi -> icecat-3.6.16-oc.xpi ) linguas_or? ( http://gnuzilla.gnu.org/download/langpacks/3.6.16/or.xpi -> icecat-3.6.16-or.xpi ) linguas_pa_IN? ( http://gnuzilla.gnu.org/download/langpacks/3.6.16/pa-IN.xpi -> icecat-3.6.16-pa-IN.xpi ) linguas_pa? ( http://gnuzilla.gnu.org/download/langpacks/3.6.16/pa-IN.xpi -> icecat-3.6.16-pa-IN.xpi ) linguas_pl? ( http://gnuzilla.gnu.org/download/langpacks/3.6.16/pl.xpi -> icecat-3.6.16-pl.xpi ) linguas_pt_BR? ( http://gnuzilla.gnu.org/download/langpacks/3.6.16/pt-BR.xpi -> icecat-3.6.16-pt-BR.xpi ) linguas_pt_PT? ( http://gnuzilla.gnu.org/download/langpacks/3.6.16/pt-PT.xpi -> icecat-3.6.16-pt-PT.xpi ) linguas_pt? ( http://gnuzilla.gnu.org/download/langpacks/3.6.16/pt-PT.xpi -> icecat-3.6.16-pt-PT.xpi ) linguas_rm? ( http://gnuzilla.gnu.org/download/langpacks/3.6.16/rm.xpi -> icecat-3.6.16-rm.xpi ) linguas_ro? ( http://gnuzilla.gnu.org/download/langpacks/3.6.16/ro.xpi -> icecat-3.6.16-ro.xpi ) linguas_ru? ( http://gnuzilla.gnu.org/download/langpacks/3.6.16/ru.xpi -> icecat-3.6.16-ru.xpi ) linguas_si? ( http://gnuzilla.gnu.org/download/langpacks/3.6.16/si.xpi -> icecat-3.6.16-si.xpi ) linguas_sk? ( http://gnuzilla.gnu.org/download/langpacks/3.6.16/sk.xpi -> icecat-3.6.16-sk.xpi ) linguas_sl? ( http://gnuzilla.gnu.org/download/langpacks/3.6.16/sl.xpi -> icecat-3.6.16-sl.xpi ) linguas_sq? ( http://gnuzilla.gnu.org/download/langpacks/3.6.16/sq.xpi -> icecat-3.6.16-sq.xpi ) linguas_sr? ( http://gnuzilla.gnu.org/download/langpacks/3.6.16/sr.xpi -> icecat-3.6.16-sr.xpi ) linguas_sv_SE? ( http://gnuzilla.gnu.org/download/langpacks/3.6.16/sv-SE.xpi -> icecat-3.6.16-sv-SE.xpi ) linguas_sv? ( http://gnuzilla.gnu.org/download/langpacks/3.6.16/sv-SE.xpi -> icecat-3.6.16-sv-SE.xpi ) linguas_ta? ( http://gnuzilla.gnu.org/download/langpacks/3.6.16/ta.xpi -> icecat-3.6.16-ta.xpi ) linguas_ta_LK? ( http://gnuzilla.gnu.org/download/langpacks/3.6.16/ta-LK.xpi -> icecat-3.6.16-ta-LK.xpi ) linguas_ta? ( http://gnuzilla.gnu.org/download/langpacks/3.6.16/ta-LK.xpi -> icecat-3.6.16-ta-LK.xpi ) linguas_te? ( http://gnuzilla.gnu.org/download/langpacks/3.6.16/te.xpi -> icecat-3.6.16-te.xpi ) linguas_th? ( http://gnuzilla.gnu.org/download/langpacks/3.6.16/th.xpi -> icecat-3.6.16-th.xpi ) linguas_tr? ( http://gnuzilla.gnu.org/download/langpacks/3.6.16/tr.xpi -> icecat-3.6.16-tr.xpi ) linguas_uk? ( http://gnuzilla.gnu.org/download/langpacks/3.6.16/uk.xpi -> icecat-3.6.16-uk.xpi ) linguas_vi? ( http://gnuzilla.gnu.org/download/langpacks/3.6.16/vi.xpi -> icecat-3.6.16-vi.xpi ) linguas_zh_CN? ( http://gnuzilla.gnu.org/download/langpacks/3.6.16/zh-CN.xpi -> icecat-3.6.16-zh-CN.xpi ) linguas_zh_TW? ( http://gnuzilla.gnu.org/download/langpacks/3.6.16/zh-TW.xpi -> icecat-3.6.16-zh-TW.xpi )
diff --git a/metadata/cache/www-client/icecat-3.6.16-r4 b/metadata/cache/www-client/icecat-3.6.16-r4
index cf2f2f1376c0..ece37c091f92 100644
--- a/metadata/cache/www-client/icecat-3.6.16-r4
+++ b/metadata/cache/www-client/icecat-3.6.16-r4
@@ -1,4 +1,4 @@
->=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.12.8 >=dev-libs/nspr-4.8.6 >=app-text/hunspell-1.2 system-sqlite? ( >=dev-db/sqlite-3.7.4[fts3,secure-delete] ) alsa? ( media-libs/alsa-lib ) >=x11-libs/cairo-1.8.8[X] gnome? ( >=gnome-base/gnome-vfs-2.16.3 >=gnome-base/libgnomeui-2.16.1 >=gnome-base/gconf-2.16.0 >=gnome-base/libgnome-2.16.0 ) wifi? ( net-wireless/wireless-tools ) libnotify? ( >=x11-libs/libnotify-0.4 ) ~net-libs/xulrunner-1.9.2.21[ipc=,java=,wifi=,libnotify=,system-sqlite=] java? ( >=virtual/jdk-1.4 ) =dev-lang/python-2*[threads] dev-util/pkgconfig x11-libs/libXrender x11-libs/libXt x11-libs/libXmu >=sys-libs/zlib-1.1.4 dev-util/pkgconfig =dev-lang/python-2*[threads] app-arch/zip app-arch/unzip >=app-text/hunspell-1.2 dev-libs/expat >=dev-libs/libIDL-0.8.0 >=dev-libs/libevent-1.4.7 >=x11-libs/cairo-1.8[X] >=x11-libs/gtk+-2.8.6:2 >=x11-libs/pango-1.10.1[X] virtual/jpeg virtual/freedesktop-icon-theme alsa? ( media-libs/alsa-lib ) dbus? ( >=dev-libs/dbus-glib-0.72 ) libnotify? ( >=x11-libs/libnotify-0.4 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) wifi? ( net-wireless/wireless-tools ) || ( >=sys-devel/automake-1.11.1 ) =sys-devel/autoconf-2.1* sys-devel/libtool app-arch/unzip java? ( >=dev-java/java-config-2.1.9-r1 )
+>=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.12.8 >=dev-libs/nspr-4.8.6 >=app-text/hunspell-1.2 system-sqlite? ( >=dev-db/sqlite-3.7.4[fts3,secure-delete] ) alsa? ( media-libs/alsa-lib ) >=x11-libs/cairo-1.8.8[X] gnome? ( >=gnome-base/gnome-vfs-2.16.3 >=gnome-base/libgnomeui-2.16.1 >=gnome-base/gconf-2.16.0 >=gnome-base/libgnome-2.16.0 ) wifi? ( net-wireless/wireless-tools ) libnotify? ( >=x11-libs/libnotify-0.4 ) ~net-libs/xulrunner-1.9.2.21[ipc=,java=,wifi=,libnotify=,system-sqlite=] java? ( >=virtual/jdk-1.4 ) =dev-lang/python-2*[threads] dev-util/pkgconfig x11-libs/libXrender x11-libs/libXt x11-libs/libXmu >=sys-libs/zlib-1.1.4 dev-util/pkgconfig =dev-lang/python-2*[threads] app-arch/zip app-arch/unzip >=app-text/hunspell-1.2 dev-libs/expat >=dev-libs/libIDL-0.8.0 >=dev-libs/libevent-1.4.7 >=x11-libs/cairo-1.8[X] >=x11-libs/gtk+-2.8.6:2 >=x11-libs/pango-1.10.1[X] virtual/jpeg virtual/freedesktop-icon-theme alsa? ( media-libs/alsa-lib ) dbus? ( >=dev-libs/dbus-glib-0.72 ) libnotify? ( >=x11-libs/libnotify-0.4 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) wifi? ( net-wireless/wireless-tools ) || ( >=sys-devel/automake-1.11.1:1.11 ) =sys-devel/autoconf-2.1* sys-devel/libtool app-arch/unzip java? ( >=dev-java/java-config-2.1.9-r1 )
 >=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.12.8 >=dev-libs/nspr-4.8.6 >=app-text/hunspell-1.2 system-sqlite? ( >=dev-db/sqlite-3.7.4[fts3,secure-delete] ) alsa? ( media-libs/alsa-lib ) >=x11-libs/cairo-1.8.8[X] gnome? ( >=gnome-base/gnome-vfs-2.16.3 >=gnome-base/libgnomeui-2.16.1 >=gnome-base/gconf-2.16.0 >=gnome-base/libgnome-2.16.0 ) wifi? ( net-wireless/wireless-tools ) libnotify? ( >=x11-libs/libnotify-0.4 ) ~net-libs/xulrunner-1.9.2.21[ipc=,java=,wifi=,libnotify=,system-sqlite=] java? ( >=virtual/jre-1.4 ) x11-libs/libXrender x11-libs/libXt x11-libs/libXmu >=sys-libs/zlib-1.1.4 app-arch/zip app-arch/unzip >=app-text/hunspell-1.2 dev-libs/expat >=dev-libs/libIDL-0.8.0 >=dev-libs/libevent-1.4.7 >=x11-libs/cairo-1.8[X] >=x11-libs/gtk+-2.8.6:2 >=x11-libs/pango-1.10.1[X] virtual/jpeg virtual/freedesktop-icon-theme alsa? ( media-libs/alsa-lib ) dbus? ( >=dev-libs/dbus-glib-0.72 ) libnotify? ( >=x11-libs/libnotify-0.4 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) wifi? ( net-wireless/wireless-tools ) java? ( >=dev-java/java-config-2.1.9-r1 )
 0
 mirror://gnu/gnuzilla/3.6.16/icecat-3.6.16.tar.bz2 http://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-3.6-patches-0.4.tar.bz2 http://dev.gentoo.org/~polynomial-c/mozilla/ff3617.diff.xz http://dev.gentoo.org/~polynomial-c/mozilla/ff3618.diff.xz http://dev.gentoo.org/~polynomial-c/mozilla/ff3620.diff.xz http://dev.gentoo.org/~polynomial-c/mozilla/ff3621.diff.xz linguas_af? ( http://gnuzilla.gnu.org/download/langpacks/3.6.16/af.xpi -> icecat-3.6.16-af.xpi ) linguas_ar? ( http://gnuzilla.gnu.org/download/langpacks/3.6.16/ar.xpi -> icecat-3.6.16-ar.xpi ) linguas_as? ( http://gnuzilla.gnu.org/download/langpacks/3.6.16/as.xpi -> icecat-3.6.16-as.xpi ) linguas_ast? ( http://gnuzilla.gnu.org/download/langpacks/3.6.16/ast.xpi -> icecat-3.6.16-ast.xpi ) linguas_be? ( http://gnuzilla.gnu.org/download/langpacks/3.6.16/be.xpi -> icecat-3.6.16-be.xpi ) linguas_bg? ( http://gnuzilla.gnu.org/download/langpacks/3.6.16/bg.xpi -> icecat-3.6.16-bg.xpi ) linguas_bn_BD? ( http://gnuzilla.gnu.org/download/langpacks/3.6.16/bn-BD.xpi -> icecat-3.6.16-bn-BD.xpi ) linguas_bn? ( http://gnuzilla.gnu.org/download/langpacks/3.6.16/bn-BD.xpi -> icecat-3.6.16-bn-BD.xpi ) linguas_bn_IN? ( http://gnuzilla.gnu.org/download/langpacks/3.6.16/bn-IN.xpi -> icecat-3.6.16-bn-IN.xpi ) linguas_bn? ( http://gnuzilla.gnu.org/download/langpacks/3.6.16/bn-IN.xpi -> icecat-3.6.16-bn-IN.xpi ) linguas_ca? ( http://gnuzilla.gnu.org/download/langpacks/3.6.16/ca.xpi -> icecat-3.6.16-ca.xpi ) linguas_cs? ( http://gnuzilla.gnu.org/download/langpacks/3.6.16/cs.xpi -> icecat-3.6.16-cs.xpi ) linguas_cy? ( http://gnuzilla.gnu.org/download/langpacks/3.6.16/cy.xpi -> icecat-3.6.16-cy.xpi ) linguas_da? ( http://gnuzilla.gnu.org/download/langpacks/3.6.16/da.xpi -> icecat-3.6.16-da.xpi ) linguas_de? ( http://gnuzilla.gnu.org/download/langpacks/3.6.16/de.xpi -> icecat-3.6.16-de.xpi ) linguas_el? ( http://gnuzilla.gnu.org/download/langpacks/3.6.16/el.xpi -> icecat-3.6.16-el.xpi ) linguas_en_GB? ( http://gnuzilla.gnu.org/download/langpacks/3.6.16/en-GB.xpi -> icecat-3.6.16-en-GB.xpi ) linguas_eo? ( http://gnuzilla.gnu.org/download/langpacks/3.6.16/eo.xpi -> icecat-3.6.16-eo.xpi ) linguas_es_AR? ( http://gnuzilla.gnu.org/download/langpacks/3.6.16/es-AR.xpi -> icecat-3.6.16-es-AR.xpi ) linguas_es_CL? ( http://gnuzilla.gnu.org/download/langpacks/3.6.16/es-CL.xpi -> icecat-3.6.16-es-CL.xpi ) linguas_es_ES? ( http://gnuzilla.gnu.org/download/langpacks/3.6.16/es-ES.xpi -> icecat-3.6.16-es-ES.xpi ) linguas_es? ( http://gnuzilla.gnu.org/download/langpacks/3.6.16/es-ES.xpi -> icecat-3.6.16-es-ES.xpi ) linguas_es_MX? ( http://gnuzilla.gnu.org/download/langpacks/3.6.16/es-MX.xpi -> icecat-3.6.16-es-MX.xpi ) linguas_et? ( http://gnuzilla.gnu.org/download/langpacks/3.6.16/et.xpi -> icecat-3.6.16-et.xpi ) linguas_eu? ( http://gnuzilla.gnu.org/download/langpacks/3.6.16/eu.xpi -> icecat-3.6.16-eu.xpi ) linguas_fa? ( http://gnuzilla.gnu.org/download/langpacks/3.6.16/fa.xpi -> icecat-3.6.16-fa.xpi ) linguas_fi? ( http://gnuzilla.gnu.org/download/langpacks/3.6.16/fi.xpi -> icecat-3.6.16-fi.xpi ) linguas_fr? ( http://gnuzilla.gnu.org/download/langpacks/3.6.16/fr.xpi -> icecat-3.6.16-fr.xpi ) linguas_fy_NL? ( http://gnuzilla.gnu.org/download/langpacks/3.6.16/fy-NL.xpi -> icecat-3.6.16-fy-NL.xpi ) linguas_fy? ( http://gnuzilla.gnu.org/download/langpacks/3.6.16/fy-NL.xpi -> icecat-3.6.16-fy-NL.xpi ) linguas_ga_IE? ( http://gnuzilla.gnu.org/download/langpacks/3.6.16/ga-IE.xpi -> icecat-3.6.16-ga-IE.xpi ) linguas_ga? ( http://gnuzilla.gnu.org/download/langpacks/3.6.16/ga-IE.xpi -> icecat-3.6.16-ga-IE.xpi ) linguas_gl? ( http://gnuzilla.gnu.org/download/langpacks/3.6.16/gl.xpi -> icecat-3.6.16-gl.xpi ) linguas_gu_IN? ( http://gnuzilla.gnu.org/download/langpacks/3.6.16/gu-IN.xpi -> icecat-3.6.16-gu-IN.xpi ) linguas_gu? ( http://gnuzilla.gnu.org/download/langpacks/3.6.16/gu-IN.xpi -> icecat-3.6.16-gu-IN.xpi ) linguas_he? ( http://gnuzilla.gnu.org/download/langpacks/3.6.16/he.xpi -> icecat-3.6.16-he.xpi ) linguas_hi_IN? ( http://gnuzilla.gnu.org/download/langpacks/3.6.16/hi-IN.xpi -> icecat-3.6.16-hi-IN.xpi ) linguas_hi? ( http://gnuzilla.gnu.org/download/langpacks/3.6.16/hi-IN.xpi -> icecat-3.6.16-hi-IN.xpi ) linguas_hr? ( http://gnuzilla.gnu.org/download/langpacks/3.6.16/hr.xpi -> icecat-3.6.16-hr.xpi ) linguas_hu? ( http://gnuzilla.gnu.org/download/langpacks/3.6.16/hu.xpi -> icecat-3.6.16-hu.xpi ) linguas_id? ( http://gnuzilla.gnu.org/download/langpacks/3.6.16/id.xpi -> icecat-3.6.16-id.xpi ) linguas_is? ( http://gnuzilla.gnu.org/download/langpacks/3.6.16/is.xpi -> icecat-3.6.16-is.xpi ) linguas_it? ( http://gnuzilla.gnu.org/download/langpacks/3.6.16/it.xpi -> icecat-3.6.16-it.xpi ) linguas_ja? ( http://gnuzilla.gnu.org/download/langpacks/3.6.16/ja.xpi -> icecat-3.6.16-ja.xpi ) linguas_ka? ( http://gnuzilla.gnu.org/download/langpacks/3.6.16/ka.xpi -> icecat-3.6.16-ka.xpi ) linguas_kk? ( http://gnuzilla.gnu.org/download/langpacks/3.6.16/kk.xpi -> icecat-3.6.16-kk.xpi ) linguas_kn? ( http://gnuzilla.gnu.org/download/langpacks/3.6.16/kn.xpi -> icecat-3.6.16-kn.xpi ) linguas_ko? ( http://gnuzilla.gnu.org/download/langpacks/3.6.16/ko.xpi -> icecat-3.6.16-ko.xpi ) linguas_ku? ( http://gnuzilla.gnu.org/download/langpacks/3.6.16/ku.xpi -> icecat-3.6.16-ku.xpi ) linguas_lt? ( http://gnuzilla.gnu.org/download/langpacks/3.6.16/lt.xpi -> icecat-3.6.16-lt.xpi ) linguas_lv? ( http://gnuzilla.gnu.org/download/langpacks/3.6.16/lv.xpi -> icecat-3.6.16-lv.xpi ) linguas_mk? ( http://gnuzilla.gnu.org/download/langpacks/3.6.16/mk.xpi -> icecat-3.6.16-mk.xpi ) linguas_ml? ( http://gnuzilla.gnu.org/download/langpacks/3.6.16/ml.xpi -> icecat-3.6.16-ml.xpi ) linguas_mr? ( http://gnuzilla.gnu.org/download/langpacks/3.6.16/mr.xpi -> icecat-3.6.16-mr.xpi ) linguas_nb_NO? ( http://gnuzilla.gnu.org/download/langpacks/3.6.16/nb-NO.xpi -> icecat-3.6.16-nb-NO.xpi ) linguas_nb? ( http://gnuzilla.gnu.org/download/langpacks/3.6.16/nb-NO.xpi -> icecat-3.6.16-nb-NO.xpi ) linguas_nl? ( http://gnuzilla.gnu.org/download/langpacks/3.6.16/nl.xpi -> icecat-3.6.16-nl.xpi ) linguas_nn_NO? ( http://gnuzilla.gnu.org/download/langpacks/3.6.16/nn-NO.xpi -> icecat-3.6.16-nn-NO.xpi ) linguas_nn? ( http://gnuzilla.gnu.org/download/langpacks/3.6.16/nn-NO.xpi -> icecat-3.6.16-nn-NO.xpi ) linguas_oc? ( http://gnuzilla.gnu.org/download/langpacks/3.6.16/oc.xpi -> icecat-3.6.16-oc.xpi ) linguas_or? ( http://gnuzilla.gnu.org/download/langpacks/3.6.16/or.xpi -> icecat-3.6.16-or.xpi ) linguas_pa_IN? ( http://gnuzilla.gnu.org/download/langpacks/3.6.16/pa-IN.xpi -> icecat-3.6.16-pa-IN.xpi ) linguas_pa? ( http://gnuzilla.gnu.org/download/langpacks/3.6.16/pa-IN.xpi -> icecat-3.6.16-pa-IN.xpi ) linguas_pl? ( http://gnuzilla.gnu.org/download/langpacks/3.6.16/pl.xpi -> icecat-3.6.16-pl.xpi ) linguas_pt_BR? ( http://gnuzilla.gnu.org/download/langpacks/3.6.16/pt-BR.xpi -> icecat-3.6.16-pt-BR.xpi ) linguas_pt_PT? ( http://gnuzilla.gnu.org/download/langpacks/3.6.16/pt-PT.xpi -> icecat-3.6.16-pt-PT.xpi ) linguas_pt? ( http://gnuzilla.gnu.org/download/langpacks/3.6.16/pt-PT.xpi -> icecat-3.6.16-pt-PT.xpi ) linguas_rm? ( http://gnuzilla.gnu.org/download/langpacks/3.6.16/rm.xpi -> icecat-3.6.16-rm.xpi ) linguas_ro? ( http://gnuzilla.gnu.org/download/langpacks/3.6.16/ro.xpi -> icecat-3.6.16-ro.xpi ) linguas_ru? ( http://gnuzilla.gnu.org/download/langpacks/3.6.16/ru.xpi -> icecat-3.6.16-ru.xpi ) linguas_si? ( http://gnuzilla.gnu.org/download/langpacks/3.6.16/si.xpi -> icecat-3.6.16-si.xpi ) linguas_sk? ( http://gnuzilla.gnu.org/download/langpacks/3.6.16/sk.xpi -> icecat-3.6.16-sk.xpi ) linguas_sl? ( http://gnuzilla.gnu.org/download/langpacks/3.6.16/sl.xpi -> icecat-3.6.16-sl.xpi ) linguas_sq? ( http://gnuzilla.gnu.org/download/langpacks/3.6.16/sq.xpi -> icecat-3.6.16-sq.xpi ) linguas_sr? ( http://gnuzilla.gnu.org/download/langpacks/3.6.16/sr.xpi -> icecat-3.6.16-sr.xpi ) linguas_sv_SE? ( http://gnuzilla.gnu.org/download/langpacks/3.6.16/sv-SE.xpi -> icecat-3.6.16-sv-SE.xpi ) linguas_sv? ( http://gnuzilla.gnu.org/download/langpacks/3.6.16/sv-SE.xpi -> icecat-3.6.16-sv-SE.xpi ) linguas_ta? ( http://gnuzilla.gnu.org/download/langpacks/3.6.16/ta.xpi -> icecat-3.6.16-ta.xpi ) linguas_ta_LK? ( http://gnuzilla.gnu.org/download/langpacks/3.6.16/ta-LK.xpi -> icecat-3.6.16-ta-LK.xpi ) linguas_ta? ( http://gnuzilla.gnu.org/download/langpacks/3.6.16/ta-LK.xpi -> icecat-3.6.16-ta-LK.xpi ) linguas_te? ( http://gnuzilla.gnu.org/download/langpacks/3.6.16/te.xpi -> icecat-3.6.16-te.xpi ) linguas_th? ( http://gnuzilla.gnu.org/download/langpacks/3.6.16/th.xpi -> icecat-3.6.16-th.xpi ) linguas_tr? ( http://gnuzilla.gnu.org/download/langpacks/3.6.16/tr.xpi -> icecat-3.6.16-tr.xpi ) linguas_uk? ( http://gnuzilla.gnu.org/download/langpacks/3.6.16/uk.xpi -> icecat-3.6.16-uk.xpi ) linguas_vi? ( http://gnuzilla.gnu.org/download/langpacks/3.6.16/vi.xpi -> icecat-3.6.16-vi.xpi ) linguas_zh_CN? ( http://gnuzilla.gnu.org/download/langpacks/3.6.16/zh-CN.xpi -> icecat-3.6.16-zh-CN.xpi ) linguas_zh_TW? ( http://gnuzilla.gnu.org/download/langpacks/3.6.16/zh-TW.xpi -> icecat-3.6.16-zh-TW.xpi )
diff --git a/metadata/cache/www-client/jd-2.6.5_p100425 b/metadata/cache/www-client/jd-2.6.5_p100425
index cc33c43f1ac7..626c67768842 100644
--- a/metadata/cache/www-client/jd-2.6.5_p100425
+++ b/metadata/cache/www-client/jd-2.6.5_p100425
@@ -1,4 +1,4 @@
-dev-cpp/gtkmm:2.4 dev-libs/glib:2 x11-misc/xdg-utils alsa? ( >=media-libs/alsa-lib-1 ) gnome? ( >=gnome-base/libgnomeui-2 ) !gnome? ( x11-libs/libSM x11-libs/libICE ) gnutls? ( >=net-libs/gnutls-1.2 ) !gnutls? ( >=dev-libs/openssl-0.9 ) migemo? ( app-text/cmigemo ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-cpp/gtkmm:2.4 dev-libs/glib:2 x11-misc/xdg-utils alsa? ( >=media-libs/alsa-lib-1 ) gnome? ( >=gnome-base/libgnomeui-2 ) !gnome? ( x11-libs/libSM x11-libs/libICE ) gnutls? ( >=net-libs/gnutls-1.2 ) !gnutls? ( >=dev-libs/openssl-0.9 ) migemo? ( app-text/cmigemo ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-cpp/gtkmm:2.4 dev-libs/glib:2 x11-misc/xdg-utils alsa? ( >=media-libs/alsa-lib-1 ) gnome? ( >=gnome-base/libgnomeui-2 ) !gnome? ( x11-libs/libSM x11-libs/libICE ) gnutls? ( >=net-libs/gnutls-1.2 ) !gnutls? ( >=dev-libs/openssl-0.9 ) migemo? ( app-text/cmigemo )
 0
 mirror://sourceforge.jp/jd4linux/47156/jd-2.6.5-100425.tgz
diff --git a/metadata/cache/www-client/jd-2.7.5_p101228 b/metadata/cache/www-client/jd-2.7.5_p101228
index 06a5ea7350d2..976dd26d10af 100644
--- a/metadata/cache/www-client/jd-2.7.5_p101228
+++ b/metadata/cache/www-client/jd-2.7.5_p101228
@@ -1,4 +1,4 @@
-dev-cpp/gtkmm:2.4 dev-libs/glib:2 x11-misc/xdg-utils alsa? ( >=media-libs/alsa-lib-1 ) gnome? ( >=gnome-base/libgnomeui-2 ) !gnome? ( x11-libs/libSM x11-libs/libICE ) gnutls? ( >=net-libs/gnutls-1.2 ) !gnutls? ( >=dev-libs/openssl-0.9 ) migemo? ( app-text/cmigemo ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-cpp/gtkmm:2.4 dev-libs/glib:2 x11-misc/xdg-utils alsa? ( >=media-libs/alsa-lib-1 ) gnome? ( >=gnome-base/libgnomeui-2 ) !gnome? ( x11-libs/libSM x11-libs/libICE ) gnutls? ( >=net-libs/gnutls-1.2 ) !gnutls? ( >=dev-libs/openssl-0.9 ) migemo? ( app-text/cmigemo ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-cpp/gtkmm:2.4 dev-libs/glib:2 x11-misc/xdg-utils alsa? ( >=media-libs/alsa-lib-1 ) gnome? ( >=gnome-base/libgnomeui-2 ) !gnome? ( x11-libs/libSM x11-libs/libICE ) gnutls? ( >=net-libs/gnutls-1.2 ) !gnutls? ( >=dev-libs/openssl-0.9 ) migemo? ( app-text/cmigemo )
 0
 mirror://sourceforge.jp/jd4linux/50363/jd-2.7.5-101228.tgz
diff --git a/metadata/cache/www-client/jd-2.8.0_p110203 b/metadata/cache/www-client/jd-2.8.0_p110203
index ffca315decac..0332c09fd790 100644
--- a/metadata/cache/www-client/jd-2.8.0_p110203
+++ b/metadata/cache/www-client/jd-2.8.0_p110203
@@ -1,4 +1,4 @@
-dev-cpp/gtkmm:2.4 dev-libs/glib:2 x11-misc/xdg-utils alsa? ( >=media-libs/alsa-lib-1 ) gnome? ( >=gnome-base/libgnomeui-2 ) !gnome? ( x11-libs/libSM x11-libs/libICE ) gnutls? ( >=net-libs/gnutls-1.2 ) !gnutls? ( >=dev-libs/openssl-0.9 ) migemo? ( app-text/cmigemo ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-cpp/gtkmm:2.4 dev-libs/glib:2 x11-misc/xdg-utils alsa? ( >=media-libs/alsa-lib-1 ) gnome? ( >=gnome-base/libgnomeui-2 ) !gnome? ( x11-libs/libSM x11-libs/libICE ) gnutls? ( >=net-libs/gnutls-1.2 ) !gnutls? ( >=dev-libs/openssl-0.9 ) migemo? ( app-text/cmigemo ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-cpp/gtkmm:2.4 dev-libs/glib:2 x11-misc/xdg-utils alsa? ( >=media-libs/alsa-lib-1 ) gnome? ( >=gnome-base/libgnomeui-2 ) !gnome? ( x11-libs/libSM x11-libs/libICE ) gnutls? ( >=net-libs/gnutls-1.2 ) !gnutls? ( >=dev-libs/openssl-0.9 ) migemo? ( app-text/cmigemo )
 0
 mirror://sourceforge.jp/jd4linux/50791/jd-2.8.0-110203.tgz
diff --git a/metadata/cache/www-client/links-2.4-r2 b/metadata/cache/www-client/links-2.4-r2
index 3db44bc0bf6a..862bfdd6f656 100644
--- a/metadata/cache/www-client/links-2.4-r2
+++ b/metadata/cache/www-client/links-2.4-r2
@@ -1,4 +1,4 @@
-ssl? ( dev-libs/openssl:0 ) gpm? ( sys-libs/gpm ) jpeg? ( virtual/jpeg ) fbcon? ( media-libs/libpng:0 virtual/jpeg sys-libs/gpm ) tiff? ( media-libs/tiff:0 ) svga? ( >=media-libs/svgalib-1.4.3 media-libs/libpng:0 ) X? ( x11-libs/libXext media-libs/libpng:0 ) directfb? ( dev-libs/DirectFB ) sys-libs/ncurses livecd? ( media-libs/libpng:0 virtual/jpeg sys-libs/gpm ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+ssl? ( dev-libs/openssl:0 ) gpm? ( sys-libs/gpm ) jpeg? ( virtual/jpeg ) fbcon? ( media-libs/libpng:0 virtual/jpeg sys-libs/gpm ) tiff? ( media-libs/tiff:0 ) svga? ( >=media-libs/svgalib-1.4.3 media-libs/libpng:0 ) X? ( x11-libs/libXext media-libs/libpng:0 ) directfb? ( dev-libs/DirectFB ) sys-libs/ncurses livecd? ( media-libs/libpng:0 virtual/jpeg sys-libs/gpm ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 ssl? ( dev-libs/openssl:0 ) gpm? ( sys-libs/gpm ) jpeg? ( virtual/jpeg ) fbcon? ( media-libs/libpng:0 virtual/jpeg sys-libs/gpm ) tiff? ( media-libs/tiff:0 ) svga? ( >=media-libs/svgalib-1.4.3 media-libs/libpng:0 ) X? ( x11-libs/libXext media-libs/libpng:0 ) directfb? ( dev-libs/DirectFB ) sys-libs/ncurses livecd? ( media-libs/libpng:0 virtual/jpeg sys-libs/gpm )
 2
 http://links.twibright.com/download/links-2.4.tar.bz2 mirror://debian/pool/main/l/links2/links2_2.4-1.debian.tar.gz
diff --git a/metadata/cache/www-client/links-2.5 b/metadata/cache/www-client/links-2.5
index b1b975ceb674..1c3b6d593754 100644
--- a/metadata/cache/www-client/links-2.5
+++ b/metadata/cache/www-client/links-2.5
@@ -1,4 +1,4 @@
->=sys-libs/ncurses-5.7-r7 bzip2? ( app-arch/bzip2 ) directfb? ( dev-libs/DirectFB ) fbcon? ( >=media-libs/libpng-1.2:0 ) gpm? ( sys-libs/gpm ) jpeg? ( virtual/jpeg ) livecd? ( >=media-libs/libpng-1.2:0 ) lzma? ( app-arch/xz-utils ) ssl? ( dev-libs/openssl:0 ) svga? ( >=media-libs/libpng-1.2:0 >=media-libs/svgalib-1.4.3 ) tiff? ( media-libs/tiff:0 ) X? ( >=media-libs/libpng-1.2:0 x11-libs/libXext ) zlib? ( sys-libs/zlib ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=sys-libs/ncurses-5.7-r7 bzip2? ( app-arch/bzip2 ) directfb? ( dev-libs/DirectFB ) fbcon? ( >=media-libs/libpng-1.2:0 ) gpm? ( sys-libs/gpm ) jpeg? ( virtual/jpeg ) livecd? ( >=media-libs/libpng-1.2:0 ) lzma? ( app-arch/xz-utils ) ssl? ( dev-libs/openssl:0 ) svga? ( >=media-libs/libpng-1.2:0 >=media-libs/svgalib-1.4.3 ) tiff? ( media-libs/tiff:0 ) X? ( >=media-libs/libpng-1.2:0 x11-libs/libXext ) zlib? ( sys-libs/zlib ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=sys-libs/ncurses-5.7-r7 bzip2? ( app-arch/bzip2 ) directfb? ( dev-libs/DirectFB ) fbcon? ( >=media-libs/libpng-1.2:0 ) gpm? ( sys-libs/gpm ) jpeg? ( virtual/jpeg ) livecd? ( >=media-libs/libpng-1.2:0 ) lzma? ( app-arch/xz-utils ) ssl? ( dev-libs/openssl:0 ) svga? ( >=media-libs/libpng-1.2:0 >=media-libs/svgalib-1.4.3 ) tiff? ( media-libs/tiff:0 ) X? ( >=media-libs/libpng-1.2:0 x11-libs/libXext ) zlib? ( sys-libs/zlib )
 2
 http://links.twibright.com/download/links-2.5.tar.bz2 mirror://debian/pool/main/l/links2/links2_2.5-1.debian.tar.gz
diff --git a/metadata/cache/www-client/seamonkey-2.0.14-r1 b/metadata/cache/www-client/seamonkey-2.0.14-r1
index 6eb2a6d07ac2..85e65d7ee826 100644
--- a/metadata/cache/www-client/seamonkey-2.0.14-r1
+++ b/metadata/cache/www-client/seamonkey-2.0.14-r1
@@ -1,4 +1,4 @@
-java? ( virtual/jre ) >=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.12.8 >=dev-libs/nspr-4.8.6 alsa? ( media-libs/alsa-lib ) system-sqlite? ( >=dev-db/sqlite-3.6.22-r2[fts3,secure-delete] ) >=app-text/hunspell-1.2 >=x11-libs/gtk+-2.10.0:2 >=x11-libs/pango-1.14.0[X] crypt? ( mailclient? ( >=app-crypt/gnupg-1.4 ) ) gnome? ( >=gnome-base/gnome-vfs-2.16.3 >=gnome-base/libgnomeui-2.16.1 >=gnome-base/gconf-2.16.0 >=gnome-base/libgnome-2.16.0 ) =dev-lang/python-2*[threads] dev-util/pkgconfig java? ( >=virtual/jdk-1.4 ) x11-libs/libXrender x11-libs/libXt x11-libs/libXmu >=sys-libs/zlib-1.1.4 dev-util/pkgconfig =dev-lang/python-2*[threads] app-arch/zip app-arch/unzip >=app-text/hunspell-1.2 dev-libs/expat >=dev-libs/libIDL-0.8.0 >=dev-libs/libevent-1.4.7 >=x11-libs/cairo-1.8[X] >=x11-libs/gtk+-2.8.6:2 >=x11-libs/pango-1.10.1[X] virtual/jpeg virtual/freedesktop-icon-theme alsa? ( media-libs/alsa-lib ) dbus? ( >=dev-libs/dbus-glib-0.72 ) libnotify? ( >=x11-libs/libnotify-0.4 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) wifi? ( net-wireless/wireless-tools ) || ( >=sys-devel/automake-1.11.1 ) =sys-devel/autoconf-2.1* sys-devel/libtool app-arch/unzip java? ( >=dev-java/java-config-2.1.9-r1 )
+java? ( virtual/jre ) >=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.12.8 >=dev-libs/nspr-4.8.6 alsa? ( media-libs/alsa-lib ) system-sqlite? ( >=dev-db/sqlite-3.6.22-r2[fts3,secure-delete] ) >=app-text/hunspell-1.2 >=x11-libs/gtk+-2.10.0:2 >=x11-libs/pango-1.14.0[X] crypt? ( mailclient? ( >=app-crypt/gnupg-1.4 ) ) gnome? ( >=gnome-base/gnome-vfs-2.16.3 >=gnome-base/libgnomeui-2.16.1 >=gnome-base/gconf-2.16.0 >=gnome-base/libgnome-2.16.0 ) =dev-lang/python-2*[threads] dev-util/pkgconfig java? ( >=virtual/jdk-1.4 ) x11-libs/libXrender x11-libs/libXt x11-libs/libXmu >=sys-libs/zlib-1.1.4 dev-util/pkgconfig =dev-lang/python-2*[threads] app-arch/zip app-arch/unzip >=app-text/hunspell-1.2 dev-libs/expat >=dev-libs/libIDL-0.8.0 >=dev-libs/libevent-1.4.7 >=x11-libs/cairo-1.8[X] >=x11-libs/gtk+-2.8.6:2 >=x11-libs/pango-1.10.1[X] virtual/jpeg virtual/freedesktop-icon-theme alsa? ( media-libs/alsa-lib ) dbus? ( >=dev-libs/dbus-glib-0.72 ) libnotify? ( >=x11-libs/libnotify-0.4 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) wifi? ( net-wireless/wireless-tools ) || ( >=sys-devel/automake-1.11.1:1.11 ) =sys-devel/autoconf-2.1* sys-devel/libtool app-arch/unzip java? ( >=dev-java/java-config-2.1.9-r1 )
 java? ( virtual/jre ) >=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.12.8 >=dev-libs/nspr-4.8.6 alsa? ( media-libs/alsa-lib ) system-sqlite? ( >=dev-db/sqlite-3.6.22-r2[fts3,secure-delete] ) >=app-text/hunspell-1.2 >=x11-libs/gtk+-2.10.0:2 >=x11-libs/pango-1.14.0[X] crypt? ( mailclient? ( >=app-crypt/gnupg-1.4 ) ) gnome? ( >=gnome-base/gnome-vfs-2.16.3 >=gnome-base/libgnomeui-2.16.1 >=gnome-base/gconf-2.16.0 >=gnome-base/libgnome-2.16.0 ) x11-libs/libXrender x11-libs/libXt x11-libs/libXmu >=sys-libs/zlib-1.1.4 app-arch/zip app-arch/unzip >=app-text/hunspell-1.2 dev-libs/expat >=dev-libs/libIDL-0.8.0 >=dev-libs/libevent-1.4.7 >=x11-libs/cairo-1.8[X] >=x11-libs/gtk+-2.8.6:2 >=x11-libs/pango-1.10.1[X] virtual/jpeg virtual/freedesktop-icon-theme alsa? ( media-libs/alsa-lib ) dbus? ( >=dev-libs/dbus-glib-0.72 ) libnotify? ( >=x11-libs/libnotify-0.4 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) wifi? ( net-wireless/wireless-tools ) java? ( >=dev-java/java-config-2.1.9-r1 )
 0
 http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/2.0.14/source/seamonkey-2.0.14.source.tar.bz2 http://dev.gentoo.org/~polynomial-c/mozilla/patchsets/seamonkey-2.0.11-patches-01.tar.bz2 crypt? ( mailclient? ( http://www.mozilla-enigmail.org/download/source/enigmail-1.0.1.tar.gz ) ) linguas_be? ( http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/2.0.14/langpack/seamonkey-2.0.14.be.langpack.xpi -> seamonkey-2.0.14-be.xpi ) linguas_ca? ( http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/2.0.14/langpack/seamonkey-2.0.14.ca.langpack.xpi -> seamonkey-2.0.14-ca.xpi ) linguas_cs? ( http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/2.0.14/langpack/seamonkey-2.0.14.cs.langpack.xpi -> seamonkey-2.0.14-cs.xpi ) linguas_de? ( http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/2.0.14/langpack/seamonkey-2.0.14.de.langpack.xpi -> seamonkey-2.0.14-de.xpi ) linguas_en_GB? ( http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/2.0.14/langpack/seamonkey-2.0.14.en-GB.langpack.xpi -> seamonkey-2.0.14-en-GB.xpi ) linguas_es_AR? ( http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/2.0.14/langpack/seamonkey-2.0.14.es-AR.langpack.xpi -> seamonkey-2.0.14-es-AR.xpi ) linguas_es_ES? ( http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/2.0.14/langpack/seamonkey-2.0.14.es-ES.langpack.xpi -> seamonkey-2.0.14-es-ES.xpi ) linguas_es? ( http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/2.0.14/langpack/seamonkey-2.0.14.es-ES.langpack.xpi -> seamonkey-2.0.14-es-ES.xpi ) linguas_fi? ( http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/2.0.14/langpack/seamonkey-2.0.14.fi.langpack.xpi -> seamonkey-2.0.14-fi.xpi ) linguas_fr? ( http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/2.0.14/langpack/seamonkey-2.0.14.fr.langpack.xpi -> seamonkey-2.0.14-fr.xpi ) linguas_gl? ( http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/2.0.14/langpack/seamonkey-2.0.14.gl.langpack.xpi -> seamonkey-2.0.14-gl.xpi ) linguas_hu? ( http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/2.0.14/langpack/seamonkey-2.0.14.hu.langpack.xpi -> seamonkey-2.0.14-hu.xpi ) linguas_it? ( http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/2.0.14/langpack/seamonkey-2.0.14.it.langpack.xpi -> seamonkey-2.0.14-it.xpi ) linguas_ja? ( http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/2.0.14/langpack/seamonkey-2.0.14.ja.langpack.xpi -> seamonkey-2.0.14-ja.xpi ) linguas_ka? ( http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/2.0.14/langpack/seamonkey-2.0.14.ka.langpack.xpi -> seamonkey-2.0.14-ka.xpi ) linguas_lt? ( http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/2.0.14/langpack/seamonkey-2.0.14.lt.langpack.xpi -> seamonkey-2.0.14-lt.xpi ) linguas_nb_NO? ( http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/2.0.14/langpack/seamonkey-2.0.14.nb-NO.langpack.xpi -> seamonkey-2.0.14-nb-NO.xpi ) linguas_nb? ( http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/2.0.14/langpack/seamonkey-2.0.14.nb-NO.langpack.xpi -> seamonkey-2.0.14-nb-NO.xpi ) linguas_nl? ( http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/2.0.14/langpack/seamonkey-2.0.14.nl.langpack.xpi -> seamonkey-2.0.14-nl.xpi ) linguas_pl? ( http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/2.0.14/langpack/seamonkey-2.0.14.pl.langpack.xpi -> seamonkey-2.0.14-pl.xpi ) linguas_pt_PT? ( http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/2.0.14/langpack/seamonkey-2.0.14.pt-PT.langpack.xpi -> seamonkey-2.0.14-pt-PT.xpi ) linguas_pt? ( http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/2.0.14/langpack/seamonkey-2.0.14.pt-PT.langpack.xpi -> seamonkey-2.0.14-pt-PT.xpi ) linguas_ru? ( http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/2.0.14/langpack/seamonkey-2.0.14.ru.langpack.xpi -> seamonkey-2.0.14-ru.xpi ) linguas_sk? ( http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/2.0.14/langpack/seamonkey-2.0.14.sk.langpack.xpi -> seamonkey-2.0.14-sk.xpi ) linguas_sv_SE? ( http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/2.0.14/langpack/seamonkey-2.0.14.sv-SE.langpack.xpi -> seamonkey-2.0.14-sv-SE.xpi ) linguas_sv? ( http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/2.0.14/langpack/seamonkey-2.0.14.sv-SE.langpack.xpi -> seamonkey-2.0.14-sv-SE.xpi ) linguas_tr? ( http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/2.0.14/langpack/seamonkey-2.0.14.tr.langpack.xpi -> seamonkey-2.0.14-tr.xpi ) linguas_zh_CN? ( http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/2.0.14/langpack/seamonkey-2.0.14.zh-CN.langpack.xpi -> seamonkey-2.0.14-zh-CN.xpi ) linguas_zh? ( http://releases.mozilla.org/pub/mozilla.org/seamonkey/releases/2.0.14/langpack/seamonkey-2.0.14.zh-CN.langpack.xpi -> seamonkey-2.0.14-zh-CN.xpi )
diff --git a/metadata/cache/www-client/seamonkey-2.4.1-r1 b/metadata/cache/www-client/seamonkey-2.4.1-r1
index 99adb1453a23..afab37afde64 100644
--- a/metadata/cache/www-client/seamonkey-2.4.1-r1
+++ b/metadata/cache/www-client/seamonkey-2.4.1-r1
@@ -1,4 +1,4 @@
->=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.12.10 >=dev-libs/nspr-4.8.8 >=dev-libs/glib-2.26 >=media-libs/mesa-7.10 >=media-libs/libpng-1.4.1[apng] >=x11-libs/cairo-1.10 >=x11-libs/pango-1.14.0 >=x11-libs/gtk+-2.14 virtual/libffi system-sqlite? ( >=dev-db/sqlite-3.7.5[fts3,secure-delete,unlock-notify,debug=] ) crypt? ( >=app-crypt/gnupg-1.4 ) webm? ( media-libs/libvpx media-libs/alsa-lib ) dev-util/pkgconfig webm? ( amd64? ( >=dev-lang/yasm-1.1 ) x86? ( >=dev-lang/yasm-1.1 ) ) x11-libs/libXrender x11-libs/libXt x11-libs/libXmu >=sys-libs/zlib-1.1.4 dev-util/pkgconfig =dev-lang/python-2*[threads] app-arch/zip app-arch/unzip >=app-text/hunspell-1.2 dev-libs/expat >=dev-libs/libIDL-0.8.0 >=dev-libs/libevent-1.4.7 >=x11-libs/cairo-1.8[X] >=x11-libs/gtk+-2.8.6:2 >=x11-libs/pango-1.10.1[X] virtual/jpeg virtual/freedesktop-icon-theme alsa? ( media-libs/alsa-lib ) dbus? ( >=dev-libs/dbus-glib-0.72 ) libnotify? ( >=x11-libs/libnotify-0.4 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) wifi? ( net-wireless/wireless-tools ) || ( >=sys-devel/automake-1.11.1 ) =sys-devel/autoconf-2.1* sys-devel/libtool app-arch/unzip
+>=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.12.10 >=dev-libs/nspr-4.8.8 >=dev-libs/glib-2.26 >=media-libs/mesa-7.10 >=media-libs/libpng-1.4.1[apng] >=x11-libs/cairo-1.10 >=x11-libs/pango-1.14.0 >=x11-libs/gtk+-2.14 virtual/libffi system-sqlite? ( >=dev-db/sqlite-3.7.5[fts3,secure-delete,unlock-notify,debug=] ) crypt? ( >=app-crypt/gnupg-1.4 ) webm? ( media-libs/libvpx media-libs/alsa-lib ) dev-util/pkgconfig webm? ( amd64? ( >=dev-lang/yasm-1.1 ) x86? ( >=dev-lang/yasm-1.1 ) ) x11-libs/libXrender x11-libs/libXt x11-libs/libXmu >=sys-libs/zlib-1.1.4 dev-util/pkgconfig =dev-lang/python-2*[threads] app-arch/zip app-arch/unzip >=app-text/hunspell-1.2 dev-libs/expat >=dev-libs/libIDL-0.8.0 >=dev-libs/libevent-1.4.7 >=x11-libs/cairo-1.8[X] >=x11-libs/gtk+-2.8.6:2 >=x11-libs/pango-1.10.1[X] virtual/jpeg virtual/freedesktop-icon-theme alsa? ( media-libs/alsa-lib ) dbus? ( >=dev-libs/dbus-glib-0.72 ) libnotify? ( >=x11-libs/libnotify-0.4 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) wifi? ( net-wireless/wireless-tools ) || ( >=sys-devel/automake-1.11.1:1.11 ) =sys-devel/autoconf-2.1* sys-devel/libtool app-arch/unzip
 >=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.12.10 >=dev-libs/nspr-4.8.8 >=dev-libs/glib-2.26 >=media-libs/mesa-7.10 >=media-libs/libpng-1.4.1[apng] >=x11-libs/cairo-1.10 >=x11-libs/pango-1.14.0 >=x11-libs/gtk+-2.14 virtual/libffi system-sqlite? ( >=dev-db/sqlite-3.7.5[fts3,secure-delete,unlock-notify,debug=] ) crypt? ( >=app-crypt/gnupg-1.4 ) webm? ( media-libs/libvpx media-libs/alsa-lib ) x11-libs/libXrender x11-libs/libXt x11-libs/libXmu >=sys-libs/zlib-1.1.4 app-arch/zip app-arch/unzip >=app-text/hunspell-1.2 dev-libs/expat >=dev-libs/libIDL-0.8.0 >=dev-libs/libevent-1.4.7 >=x11-libs/cairo-1.8[X] >=x11-libs/gtk+-2.8.6:2 >=x11-libs/pango-1.10.1[X] virtual/jpeg virtual/freedesktop-icon-theme alsa? ( media-libs/alsa-lib ) dbus? ( >=dev-libs/dbus-glib-0.72 ) libnotify? ( >=x11-libs/libnotify-0.4 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) wifi? ( net-wireless/wireless-tools )
 0
 ftp://ftp.mozilla.org/pub/seamonkey/releases/2.4.1/source/seamonkey-2.4.1.source.tar.bz2 -> seamonkey-2.4.1.source.tar.bz2 http://dev.gentoo.org/~polynomial-c/mozilla/patchsets/seamonkey-2.4.1-patches-01.tar.xz crypt? ( http://www.mozilla-enigmail.org/download/source/enigmail-1.3.2.tar.gz ) linguas_be? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.4.1/langpack/seamonkey-2.4.1.be.langpack.xpi -> seamonkey-2.4.1-be.xpi ) linguas_ca? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.4.1/langpack/seamonkey-2.4.1.ca.langpack.xpi -> seamonkey-2.4.1-ca.xpi ) linguas_cs? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.4.1/langpack/seamonkey-2.4.1.cs.langpack.xpi -> seamonkey-2.4.1-cs.xpi ) linguas_de? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.4.1/langpack/seamonkey-2.4.1.de.langpack.xpi -> seamonkey-2.4.1-de.xpi ) linguas_en_GB? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.4.1/langpack/seamonkey-2.4.1.en-GB.langpack.xpi -> seamonkey-2.4.1-en-GB.xpi ) linguas_en_US? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.4.1/langpack/seamonkey-2.4.1.en-US.langpack.xpi -> seamonkey-2.4.1-en-US.xpi ) linguas_es_AR? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.4.1/langpack/seamonkey-2.4.1.es-AR.langpack.xpi -> seamonkey-2.4.1-es-AR.xpi ) linguas_es_ES? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.4.1/langpack/seamonkey-2.4.1.es-ES.langpack.xpi -> seamonkey-2.4.1-es-ES.xpi ) linguas_es? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.4.1/langpack/seamonkey-2.4.1.es-ES.langpack.xpi -> seamonkey-2.4.1-es-ES.xpi ) linguas_fi? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.4.1/langpack/seamonkey-2.4.1.fi.langpack.xpi -> seamonkey-2.4.1-fi.xpi ) linguas_fr? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.4.1/langpack/seamonkey-2.4.1.fr.langpack.xpi -> seamonkey-2.4.1-fr.xpi ) linguas_gl? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.4.1/langpack/seamonkey-2.4.1.gl.langpack.xpi -> seamonkey-2.4.1-gl.xpi ) linguas_hu? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.4.1/langpack/seamonkey-2.4.1.hu.langpack.xpi -> seamonkey-2.4.1-hu.xpi ) linguas_it? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.4.1/langpack/seamonkey-2.4.1.it.langpack.xpi -> seamonkey-2.4.1-it.xpi ) linguas_ja? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.4.1/langpack/seamonkey-2.4.1.ja.langpack.xpi -> seamonkey-2.4.1-ja.xpi ) linguas_lt? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.4.1/langpack/seamonkey-2.4.1.lt.langpack.xpi -> seamonkey-2.4.1-lt.xpi ) linguas_nb_NO? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.4.1/langpack/seamonkey-2.4.1.nb-NO.langpack.xpi -> seamonkey-2.4.1-nb-NO.xpi ) linguas_nb? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.4.1/langpack/seamonkey-2.4.1.nb-NO.langpack.xpi -> seamonkey-2.4.1-nb-NO.xpi ) linguas_nl? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.4.1/langpack/seamonkey-2.4.1.nl.langpack.xpi -> seamonkey-2.4.1-nl.xpi ) linguas_pl? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.4.1/langpack/seamonkey-2.4.1.pl.langpack.xpi -> seamonkey-2.4.1-pl.xpi ) linguas_pt_PT? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.4.1/langpack/seamonkey-2.4.1.pt-PT.langpack.xpi -> seamonkey-2.4.1-pt-PT.xpi ) linguas_pt? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.4.1/langpack/seamonkey-2.4.1.pt-PT.langpack.xpi -> seamonkey-2.4.1-pt-PT.xpi ) linguas_ru? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.4.1/langpack/seamonkey-2.4.1.ru.langpack.xpi -> seamonkey-2.4.1-ru.xpi ) linguas_sk? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.4.1/langpack/seamonkey-2.4.1.sk.langpack.xpi -> seamonkey-2.4.1-sk.xpi ) linguas_sv_SE? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.4.1/langpack/seamonkey-2.4.1.sv-SE.langpack.xpi -> seamonkey-2.4.1-sv-SE.xpi ) linguas_sv? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.4.1/langpack/seamonkey-2.4.1.sv-SE.langpack.xpi -> seamonkey-2.4.1-sv-SE.xpi ) linguas_tr? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.4.1/langpack/seamonkey-2.4.1.tr.langpack.xpi -> seamonkey-2.4.1-tr.xpi ) linguas_zh_CN? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.4.1/langpack/seamonkey-2.4.1.zh-CN.langpack.xpi -> seamonkey-2.4.1-zh-CN.xpi ) linguas_zh? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.4.1/langpack/seamonkey-2.4.1.zh-CN.langpack.xpi -> seamonkey-2.4.1-zh-CN.xpi )
diff --git a/metadata/cache/www-client/seamonkey-2.7.1 b/metadata/cache/www-client/seamonkey-2.7.1
index af8e8f851cec..19d8859a8486 100644
--- a/metadata/cache/www-client/seamonkey-2.7.1
+++ b/metadata/cache/www-client/seamonkey-2.7.1
@@ -1,4 +1,4 @@
->=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.13.1 >=dev-libs/nspr-4.8.9 >=dev-libs/glib-2.26 >=media-libs/mesa-7.10 >=media-libs/libpng-1.4.1[apng] >=x11-libs/cairo-1.10 >=x11-libs/pango-1.14.0 >=x11-libs/gtk+-2.14 virtual/libffi system-sqlite? ( >=dev-db/sqlite-3.7.7.1[fts3,secure-delete,unlock-notify,debug=] ) crypt? ( >=app-crypt/gnupg-1.4 ) webm? ( >=media-libs/libvpx-0.9.7 media-libs/alsa-lib ) dev-util/pkgconfig webm? ( amd64? ( >=dev-lang/yasm-1.1 ) x86? ( >=dev-lang/yasm-1.1 ) ) x11-libs/libXrender x11-libs/libXt x11-libs/libXmu >=sys-libs/zlib-1.1.4 dev-util/pkgconfig =dev-lang/python-2*[threads] app-arch/zip app-arch/unzip >=app-text/hunspell-1.2 dev-libs/expat >=dev-libs/libIDL-0.8.0 >=dev-libs/libevent-1.4.7 >=x11-libs/cairo-1.8[X] >=x11-libs/gtk+-2.8.6:2 >=x11-libs/pango-1.10.1[X] virtual/jpeg virtual/freedesktop-icon-theme alsa? ( media-libs/alsa-lib ) dbus? ( >=dev-libs/dbus-glib-0.72 ) libnotify? ( >=x11-libs/libnotify-0.4 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) wifi? ( net-wireless/wireless-tools ) || ( >=sys-devel/automake-1.11.1 ) =sys-devel/autoconf-2.1* sys-devel/libtool app-arch/unzip app-arch/unzip
+>=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.13.1 >=dev-libs/nspr-4.8.9 >=dev-libs/glib-2.26 >=media-libs/mesa-7.10 >=media-libs/libpng-1.4.1[apng] >=x11-libs/cairo-1.10 >=x11-libs/pango-1.14.0 >=x11-libs/gtk+-2.14 virtual/libffi system-sqlite? ( >=dev-db/sqlite-3.7.7.1[fts3,secure-delete,unlock-notify,debug=] ) crypt? ( >=app-crypt/gnupg-1.4 ) webm? ( >=media-libs/libvpx-0.9.7 media-libs/alsa-lib ) dev-util/pkgconfig webm? ( amd64? ( >=dev-lang/yasm-1.1 ) x86? ( >=dev-lang/yasm-1.1 ) ) x11-libs/libXrender x11-libs/libXt x11-libs/libXmu >=sys-libs/zlib-1.1.4 dev-util/pkgconfig =dev-lang/python-2*[threads] app-arch/zip app-arch/unzip >=app-text/hunspell-1.2 dev-libs/expat >=dev-libs/libIDL-0.8.0 >=dev-libs/libevent-1.4.7 >=x11-libs/cairo-1.8[X] >=x11-libs/gtk+-2.8.6:2 >=x11-libs/pango-1.10.1[X] virtual/jpeg virtual/freedesktop-icon-theme alsa? ( media-libs/alsa-lib ) dbus? ( >=dev-libs/dbus-glib-0.72 ) libnotify? ( >=x11-libs/libnotify-0.4 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) wifi? ( net-wireless/wireless-tools ) || ( >=sys-devel/automake-1.11.1:1.11 ) =sys-devel/autoconf-2.1* sys-devel/libtool app-arch/unzip app-arch/unzip
 >=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.13.1 >=dev-libs/nspr-4.8.9 >=dev-libs/glib-2.26 >=media-libs/mesa-7.10 >=media-libs/libpng-1.4.1[apng] >=x11-libs/cairo-1.10 >=x11-libs/pango-1.14.0 >=x11-libs/gtk+-2.14 virtual/libffi system-sqlite? ( >=dev-db/sqlite-3.7.7.1[fts3,secure-delete,unlock-notify,debug=] ) crypt? ( >=app-crypt/gnupg-1.4 ) webm? ( >=media-libs/libvpx-0.9.7 media-libs/alsa-lib ) x11-libs/libXrender x11-libs/libXt x11-libs/libXmu >=sys-libs/zlib-1.1.4 app-arch/zip app-arch/unzip >=app-text/hunspell-1.2 dev-libs/expat >=dev-libs/libIDL-0.8.0 >=dev-libs/libevent-1.4.7 >=x11-libs/cairo-1.8[X] >=x11-libs/gtk+-2.8.6:2 >=x11-libs/pango-1.10.1[X] virtual/jpeg virtual/freedesktop-icon-theme alsa? ( media-libs/alsa-lib ) dbus? ( >=dev-libs/dbus-glib-0.72 ) libnotify? ( >=x11-libs/libnotify-0.4 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) wifi? ( net-wireless/wireless-tools )
 0
 linguas_be? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.7.1/langpack/seamonkey-2.7.1.be.langpack.xpi -> seamonkey-2.7.1-be.xpi ) linguas_ca? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.7.1/langpack/seamonkey-2.7.1.ca.langpack.xpi -> seamonkey-2.7.1-ca.xpi ) linguas_cs? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.7.1/langpack/seamonkey-2.7.1.cs.langpack.xpi -> seamonkey-2.7.1-cs.xpi ) linguas_de? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.7.1/langpack/seamonkey-2.7.1.de.langpack.xpi -> seamonkey-2.7.1-de.xpi ) linguas_en_GB? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.7.1/langpack/seamonkey-2.7.1.en-GB.langpack.xpi -> seamonkey-2.7.1-en-GB.xpi ) linguas_es_AR? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.7.1/langpack/seamonkey-2.7.1.es-AR.langpack.xpi -> seamonkey-2.7.1-es-AR.xpi ) linguas_es_ES? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.7.1/langpack/seamonkey-2.7.1.es-ES.langpack.xpi -> seamonkey-2.7.1-es-ES.xpi ) linguas_fi? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.7.1/langpack/seamonkey-2.7.1.fi.langpack.xpi -> seamonkey-2.7.1-fi.xpi ) linguas_fr? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.7.1/langpack/seamonkey-2.7.1.fr.langpack.xpi -> seamonkey-2.7.1-fr.xpi ) linguas_gl? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.7.1/langpack/seamonkey-2.7.1.gl.langpack.xpi -> seamonkey-2.7.1-gl.xpi ) linguas_hu? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.7.1/langpack/seamonkey-2.7.1.hu.langpack.xpi -> seamonkey-2.7.1-hu.xpi ) linguas_it? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.7.1/langpack/seamonkey-2.7.1.it.langpack.xpi -> seamonkey-2.7.1-it.xpi ) linguas_ja? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.7.1/langpack/seamonkey-2.7.1.ja.langpack.xpi -> seamonkey-2.7.1-ja.xpi ) linguas_lt? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.7.1/langpack/seamonkey-2.7.1.lt.langpack.xpi -> seamonkey-2.7.1-lt.xpi ) linguas_nb_NO? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.7.1/langpack/seamonkey-2.7.1.nb-NO.langpack.xpi -> seamonkey-2.7.1-nb-NO.xpi ) linguas_nl? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.7.1/langpack/seamonkey-2.7.1.nl.langpack.xpi -> seamonkey-2.7.1-nl.xpi ) linguas_pl? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.7.1/langpack/seamonkey-2.7.1.pl.langpack.xpi -> seamonkey-2.7.1-pl.xpi ) linguas_pt_PT? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.7.1/langpack/seamonkey-2.7.1.pt-PT.langpack.xpi -> seamonkey-2.7.1-pt-PT.xpi ) linguas_ru? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.7.1/langpack/seamonkey-2.7.1.ru.langpack.xpi -> seamonkey-2.7.1-ru.xpi ) linguas_sk? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.7.1/langpack/seamonkey-2.7.1.sk.langpack.xpi -> seamonkey-2.7.1-sk.xpi ) linguas_sv_SE? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.7.1/langpack/seamonkey-2.7.1.sv-SE.langpack.xpi -> seamonkey-2.7.1-sv-SE.xpi ) linguas_tr? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.7.1/langpack/seamonkey-2.7.1.tr.langpack.xpi -> seamonkey-2.7.1-tr.xpi ) linguas_zh_CN? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.7.1/langpack/seamonkey-2.7.1.zh-CN.langpack.xpi -> seamonkey-2.7.1-zh-CN.xpi ) linguas_be? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.7.1/langpack/seamonkey-2.7.1.be.langpack.xpi -> seamonkey-2.7.1-be.xpi ) linguas_ca? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.7.1/langpack/seamonkey-2.7.1.ca.langpack.xpi -> seamonkey-2.7.1-ca.xpi ) linguas_cs? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.7.1/langpack/seamonkey-2.7.1.cs.langpack.xpi -> seamonkey-2.7.1-cs.xpi ) linguas_de? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.7.1/langpack/seamonkey-2.7.1.de.langpack.xpi -> seamonkey-2.7.1-de.xpi ) linguas_en_GB? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.7.1/langpack/seamonkey-2.7.1.en-GB.langpack.xpi -> seamonkey-2.7.1-en-GB.xpi ) linguas_es_AR? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.7.1/langpack/seamonkey-2.7.1.es-AR.langpack.xpi -> seamonkey-2.7.1-es-AR.xpi ) linguas_es_ES? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.7.1/langpack/seamonkey-2.7.1.es-ES.langpack.xpi -> seamonkey-2.7.1-es-ES.xpi ) linguas_fi? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.7.1/langpack/seamonkey-2.7.1.fi.langpack.xpi -> seamonkey-2.7.1-fi.xpi ) linguas_fr? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.7.1/langpack/seamonkey-2.7.1.fr.langpack.xpi -> seamonkey-2.7.1-fr.xpi ) linguas_gl? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.7.1/langpack/seamonkey-2.7.1.gl.langpack.xpi -> seamonkey-2.7.1-gl.xpi ) linguas_hu? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.7.1/langpack/seamonkey-2.7.1.hu.langpack.xpi -> seamonkey-2.7.1-hu.xpi ) linguas_it? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.7.1/langpack/seamonkey-2.7.1.it.langpack.xpi -> seamonkey-2.7.1-it.xpi ) linguas_ja? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.7.1/langpack/seamonkey-2.7.1.ja.langpack.xpi -> seamonkey-2.7.1-ja.xpi ) linguas_lt? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.7.1/langpack/seamonkey-2.7.1.lt.langpack.xpi -> seamonkey-2.7.1-lt.xpi ) linguas_nb_NO? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.7.1/langpack/seamonkey-2.7.1.nb-NO.langpack.xpi -> seamonkey-2.7.1-nb-NO.xpi ) linguas_nl? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.7.1/langpack/seamonkey-2.7.1.nl.langpack.xpi -> seamonkey-2.7.1-nl.xpi ) linguas_pl? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.7.1/langpack/seamonkey-2.7.1.pl.langpack.xpi -> seamonkey-2.7.1-pl.xpi ) linguas_pt_PT? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.7.1/langpack/seamonkey-2.7.1.pt-PT.langpack.xpi -> seamonkey-2.7.1-pt-PT.xpi ) linguas_ru? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.7.1/langpack/seamonkey-2.7.1.ru.langpack.xpi -> seamonkey-2.7.1-ru.xpi ) linguas_sk? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.7.1/langpack/seamonkey-2.7.1.sk.langpack.xpi -> seamonkey-2.7.1-sk.xpi ) linguas_sv_SE? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.7.1/langpack/seamonkey-2.7.1.sv-SE.langpack.xpi -> seamonkey-2.7.1-sv-SE.xpi ) linguas_tr? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.7.1/langpack/seamonkey-2.7.1.tr.langpack.xpi -> seamonkey-2.7.1-tr.xpi ) linguas_zh_CN? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.7.1/langpack/seamonkey-2.7.1.zh-CN.langpack.xpi -> seamonkey-2.7.1-zh-CN.xpi ) ftp://ftp.mozilla.org/pub/seamonkey/releases/2.7.1/source/seamonkey-2.7.1.source.tar.bz2 -> seamonkey-2.7.1.source.tar.bz2 http://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-10.0-patches-0.5.tar.xz http://dev.gentoo.org/~anarchy/mozilla/patchsets/seamonkey-2.7-patches-03.tar.xz crypt? ( http://www.mozilla-enigmail.org/download/source/enigmail-1.3.5.tar.gz )
diff --git a/metadata/cache/www-client/seamonkey-2.7.1-r1 b/metadata/cache/www-client/seamonkey-2.7.1-r1
index 6ba5bb9b3473..d0baa09c20c1 100644
--- a/metadata/cache/www-client/seamonkey-2.7.1-r1
+++ b/metadata/cache/www-client/seamonkey-2.7.1-r1
@@ -1,4 +1,4 @@
->=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.13.1 >=dev-libs/nspr-4.8.9 >=dev-libs/glib-2.26 >=media-libs/mesa-7.10 >=media-libs/libpng-1.4.1[apng] >=x11-libs/cairo-1.10 >=x11-libs/pango-1.14.0 >=x11-libs/gtk+-2.14 virtual/libffi system-sqlite? ( >=dev-db/sqlite-3.7.7.1[fts3,secure-delete,unlock-notify,debug=] ) crypt? ( >=app-crypt/gnupg-1.4 ) webm? ( >=media-libs/libvpx-1.0.0 media-libs/alsa-lib ) dev-util/pkgconfig webm? ( amd64? ( >=dev-lang/yasm-1.1 ) x86? ( >=dev-lang/yasm-1.1 ) ) x11-libs/libXrender x11-libs/libXt x11-libs/libXmu >=sys-libs/zlib-1.1.4 dev-util/pkgconfig =dev-lang/python-2*[threads] app-arch/zip app-arch/unzip >=app-text/hunspell-1.2 dev-libs/expat >=dev-libs/libIDL-0.8.0 >=dev-libs/libevent-1.4.7 >=x11-libs/cairo-1.8[X] >=x11-libs/gtk+-2.8.6:2 >=x11-libs/pango-1.10.1[X] virtual/jpeg virtual/freedesktop-icon-theme alsa? ( media-libs/alsa-lib ) dbus? ( >=dev-libs/dbus-glib-0.72 ) libnotify? ( >=x11-libs/libnotify-0.4 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) wifi? ( net-wireless/wireless-tools ) || ( >=sys-devel/automake-1.11.1 ) =sys-devel/autoconf-2.1* sys-devel/libtool app-arch/unzip app-arch/unzip
+>=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.13.1 >=dev-libs/nspr-4.8.9 >=dev-libs/glib-2.26 >=media-libs/mesa-7.10 >=media-libs/libpng-1.4.1[apng] >=x11-libs/cairo-1.10 >=x11-libs/pango-1.14.0 >=x11-libs/gtk+-2.14 virtual/libffi system-sqlite? ( >=dev-db/sqlite-3.7.7.1[fts3,secure-delete,unlock-notify,debug=] ) crypt? ( >=app-crypt/gnupg-1.4 ) webm? ( >=media-libs/libvpx-1.0.0 media-libs/alsa-lib ) dev-util/pkgconfig webm? ( amd64? ( >=dev-lang/yasm-1.1 ) x86? ( >=dev-lang/yasm-1.1 ) ) x11-libs/libXrender x11-libs/libXt x11-libs/libXmu >=sys-libs/zlib-1.1.4 dev-util/pkgconfig =dev-lang/python-2*[threads] app-arch/zip app-arch/unzip >=app-text/hunspell-1.2 dev-libs/expat >=dev-libs/libIDL-0.8.0 >=dev-libs/libevent-1.4.7 >=x11-libs/cairo-1.8[X] >=x11-libs/gtk+-2.8.6:2 >=x11-libs/pango-1.10.1[X] virtual/jpeg virtual/freedesktop-icon-theme alsa? ( media-libs/alsa-lib ) dbus? ( >=dev-libs/dbus-glib-0.72 ) libnotify? ( >=x11-libs/libnotify-0.4 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) wifi? ( net-wireless/wireless-tools ) || ( >=sys-devel/automake-1.11.1:1.11 ) =sys-devel/autoconf-2.1* sys-devel/libtool app-arch/unzip app-arch/unzip
 >=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.13.1 >=dev-libs/nspr-4.8.9 >=dev-libs/glib-2.26 >=media-libs/mesa-7.10 >=media-libs/libpng-1.4.1[apng] >=x11-libs/cairo-1.10 >=x11-libs/pango-1.14.0 >=x11-libs/gtk+-2.14 virtual/libffi system-sqlite? ( >=dev-db/sqlite-3.7.7.1[fts3,secure-delete,unlock-notify,debug=] ) crypt? ( >=app-crypt/gnupg-1.4 ) webm? ( >=media-libs/libvpx-1.0.0 media-libs/alsa-lib ) x11-libs/libXrender x11-libs/libXt x11-libs/libXmu >=sys-libs/zlib-1.1.4 app-arch/zip app-arch/unzip >=app-text/hunspell-1.2 dev-libs/expat >=dev-libs/libIDL-0.8.0 >=dev-libs/libevent-1.4.7 >=x11-libs/cairo-1.8[X] >=x11-libs/gtk+-2.8.6:2 >=x11-libs/pango-1.10.1[X] virtual/jpeg virtual/freedesktop-icon-theme alsa? ( media-libs/alsa-lib ) dbus? ( >=dev-libs/dbus-glib-0.72 ) libnotify? ( >=x11-libs/libnotify-0.4 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) wifi? ( net-wireless/wireless-tools )
 0
 linguas_be? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.7.1/langpack/seamonkey-2.7.1.be.langpack.xpi -> seamonkey-2.7.1-be.xpi ) linguas_ca? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.7.1/langpack/seamonkey-2.7.1.ca.langpack.xpi -> seamonkey-2.7.1-ca.xpi ) linguas_cs? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.7.1/langpack/seamonkey-2.7.1.cs.langpack.xpi -> seamonkey-2.7.1-cs.xpi ) linguas_de? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.7.1/langpack/seamonkey-2.7.1.de.langpack.xpi -> seamonkey-2.7.1-de.xpi ) linguas_en_GB? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.7.1/langpack/seamonkey-2.7.1.en-GB.langpack.xpi -> seamonkey-2.7.1-en-GB.xpi ) linguas_es_AR? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.7.1/langpack/seamonkey-2.7.1.es-AR.langpack.xpi -> seamonkey-2.7.1-es-AR.xpi ) linguas_es_ES? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.7.1/langpack/seamonkey-2.7.1.es-ES.langpack.xpi -> seamonkey-2.7.1-es-ES.xpi ) linguas_fi? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.7.1/langpack/seamonkey-2.7.1.fi.langpack.xpi -> seamonkey-2.7.1-fi.xpi ) linguas_fr? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.7.1/langpack/seamonkey-2.7.1.fr.langpack.xpi -> seamonkey-2.7.1-fr.xpi ) linguas_gl? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.7.1/langpack/seamonkey-2.7.1.gl.langpack.xpi -> seamonkey-2.7.1-gl.xpi ) linguas_hu? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.7.1/langpack/seamonkey-2.7.1.hu.langpack.xpi -> seamonkey-2.7.1-hu.xpi ) linguas_it? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.7.1/langpack/seamonkey-2.7.1.it.langpack.xpi -> seamonkey-2.7.1-it.xpi ) linguas_ja? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.7.1/langpack/seamonkey-2.7.1.ja.langpack.xpi -> seamonkey-2.7.1-ja.xpi ) linguas_lt? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.7.1/langpack/seamonkey-2.7.1.lt.langpack.xpi -> seamonkey-2.7.1-lt.xpi ) linguas_nb_NO? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.7.1/langpack/seamonkey-2.7.1.nb-NO.langpack.xpi -> seamonkey-2.7.1-nb-NO.xpi ) linguas_nl? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.7.1/langpack/seamonkey-2.7.1.nl.langpack.xpi -> seamonkey-2.7.1-nl.xpi ) linguas_pl? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.7.1/langpack/seamonkey-2.7.1.pl.langpack.xpi -> seamonkey-2.7.1-pl.xpi ) linguas_pt_PT? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.7.1/langpack/seamonkey-2.7.1.pt-PT.langpack.xpi -> seamonkey-2.7.1-pt-PT.xpi ) linguas_ru? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.7.1/langpack/seamonkey-2.7.1.ru.langpack.xpi -> seamonkey-2.7.1-ru.xpi ) linguas_sk? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.7.1/langpack/seamonkey-2.7.1.sk.langpack.xpi -> seamonkey-2.7.1-sk.xpi ) linguas_sv_SE? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.7.1/langpack/seamonkey-2.7.1.sv-SE.langpack.xpi -> seamonkey-2.7.1-sv-SE.xpi ) linguas_tr? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.7.1/langpack/seamonkey-2.7.1.tr.langpack.xpi -> seamonkey-2.7.1-tr.xpi ) linguas_zh_CN? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.7.1/langpack/seamonkey-2.7.1.zh-CN.langpack.xpi -> seamonkey-2.7.1-zh-CN.xpi ) linguas_be? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.7.1/langpack/seamonkey-2.7.1.be.langpack.xpi -> seamonkey-2.7.1-be.xpi ) linguas_ca? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.7.1/langpack/seamonkey-2.7.1.ca.langpack.xpi -> seamonkey-2.7.1-ca.xpi ) linguas_cs? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.7.1/langpack/seamonkey-2.7.1.cs.langpack.xpi -> seamonkey-2.7.1-cs.xpi ) linguas_de? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.7.1/langpack/seamonkey-2.7.1.de.langpack.xpi -> seamonkey-2.7.1-de.xpi ) linguas_en_GB? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.7.1/langpack/seamonkey-2.7.1.en-GB.langpack.xpi -> seamonkey-2.7.1-en-GB.xpi ) linguas_es_AR? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.7.1/langpack/seamonkey-2.7.1.es-AR.langpack.xpi -> seamonkey-2.7.1-es-AR.xpi ) linguas_es_ES? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.7.1/langpack/seamonkey-2.7.1.es-ES.langpack.xpi -> seamonkey-2.7.1-es-ES.xpi ) linguas_fi? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.7.1/langpack/seamonkey-2.7.1.fi.langpack.xpi -> seamonkey-2.7.1-fi.xpi ) linguas_fr? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.7.1/langpack/seamonkey-2.7.1.fr.langpack.xpi -> seamonkey-2.7.1-fr.xpi ) linguas_gl? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.7.1/langpack/seamonkey-2.7.1.gl.langpack.xpi -> seamonkey-2.7.1-gl.xpi ) linguas_hu? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.7.1/langpack/seamonkey-2.7.1.hu.langpack.xpi -> seamonkey-2.7.1-hu.xpi ) linguas_it? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.7.1/langpack/seamonkey-2.7.1.it.langpack.xpi -> seamonkey-2.7.1-it.xpi ) linguas_ja? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.7.1/langpack/seamonkey-2.7.1.ja.langpack.xpi -> seamonkey-2.7.1-ja.xpi ) linguas_lt? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.7.1/langpack/seamonkey-2.7.1.lt.langpack.xpi -> seamonkey-2.7.1-lt.xpi ) linguas_nb_NO? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.7.1/langpack/seamonkey-2.7.1.nb-NO.langpack.xpi -> seamonkey-2.7.1-nb-NO.xpi ) linguas_nl? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.7.1/langpack/seamonkey-2.7.1.nl.langpack.xpi -> seamonkey-2.7.1-nl.xpi ) linguas_pl? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.7.1/langpack/seamonkey-2.7.1.pl.langpack.xpi -> seamonkey-2.7.1-pl.xpi ) linguas_pt_PT? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.7.1/langpack/seamonkey-2.7.1.pt-PT.langpack.xpi -> seamonkey-2.7.1-pt-PT.xpi ) linguas_ru? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.7.1/langpack/seamonkey-2.7.1.ru.langpack.xpi -> seamonkey-2.7.1-ru.xpi ) linguas_sk? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.7.1/langpack/seamonkey-2.7.1.sk.langpack.xpi -> seamonkey-2.7.1-sk.xpi ) linguas_sv_SE? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.7.1/langpack/seamonkey-2.7.1.sv-SE.langpack.xpi -> seamonkey-2.7.1-sv-SE.xpi ) linguas_tr? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.7.1/langpack/seamonkey-2.7.1.tr.langpack.xpi -> seamonkey-2.7.1-tr.xpi ) linguas_zh_CN? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.7.1/langpack/seamonkey-2.7.1.zh-CN.langpack.xpi -> seamonkey-2.7.1-zh-CN.xpi ) ftp://ftp.mozilla.org/pub/seamonkey/releases/2.7.1/source/seamonkey-2.7.1.source.tar.bz2 -> seamonkey-2.7.1.source.tar.bz2 http://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-10.0-patches-0.6.tar.xz http://dev.gentoo.org/~anarchy/mozilla/patchsets/seamonkey-2.7-patches-03.tar.xz crypt? ( http://www.mozilla-enigmail.org/download/source/enigmail-1.3.5.tar.gz )
diff --git a/metadata/cache/www-client/seamonkey-2.8 b/metadata/cache/www-client/seamonkey-2.8
index 5420870f3ac2..d4cc53767d9d 100644
--- a/metadata/cache/www-client/seamonkey-2.8
+++ b/metadata/cache/www-client/seamonkey-2.8
@@ -1,4 +1,4 @@
->=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.13.2 >=dev-libs/nspr-4.9 >=dev-libs/glib-2.26 >=media-libs/mesa-7.10 >=media-libs/libpng-1.4.1[apng] >=x11-libs/cairo-1.10 >=x11-libs/pango-1.14.0 >=x11-libs/gtk+-2.14 virtual/libffi system-sqlite? ( >=dev-db/sqlite-3.7.7.1[fts3,secure-delete,unlock-notify,debug=] ) crypt? ( >=app-crypt/gnupg-1.4 ) webm? ( >=media-libs/libvpx-1.0.0 media-libs/alsa-lib ) dev-util/pkgconfig webm? ( amd64? ( >=dev-lang/yasm-1.1 ) x86? ( >=dev-lang/yasm-1.1 ) ) x11-libs/libXrender x11-libs/libXt x11-libs/libXmu >=sys-libs/zlib-1.1.4 dev-util/pkgconfig =dev-lang/python-2*[threads] app-arch/zip app-arch/unzip >=app-text/hunspell-1.2 dev-libs/expat >=dev-libs/libIDL-0.8.0 >=dev-libs/libevent-1.4.7 >=x11-libs/cairo-1.8[X] >=x11-libs/gtk+-2.8.6:2 >=x11-libs/pango-1.10.1[X] virtual/jpeg virtual/freedesktop-icon-theme alsa? ( media-libs/alsa-lib ) dbus? ( >=dev-libs/dbus-glib-0.72 ) libnotify? ( >=x11-libs/libnotify-0.4 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) wifi? ( net-wireless/wireless-tools ) || ( >=sys-devel/automake-1.11.1 ) =sys-devel/autoconf-2.1* sys-devel/libtool app-arch/unzip app-arch/unzip
+>=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.13.2 >=dev-libs/nspr-4.9 >=dev-libs/glib-2.26 >=media-libs/mesa-7.10 >=media-libs/libpng-1.4.1[apng] >=x11-libs/cairo-1.10 >=x11-libs/pango-1.14.0 >=x11-libs/gtk+-2.14 virtual/libffi system-sqlite? ( >=dev-db/sqlite-3.7.7.1[fts3,secure-delete,unlock-notify,debug=] ) crypt? ( >=app-crypt/gnupg-1.4 ) webm? ( >=media-libs/libvpx-1.0.0 media-libs/alsa-lib ) dev-util/pkgconfig webm? ( amd64? ( >=dev-lang/yasm-1.1 ) x86? ( >=dev-lang/yasm-1.1 ) ) x11-libs/libXrender x11-libs/libXt x11-libs/libXmu >=sys-libs/zlib-1.1.4 dev-util/pkgconfig =dev-lang/python-2*[threads] app-arch/zip app-arch/unzip >=app-text/hunspell-1.2 dev-libs/expat >=dev-libs/libIDL-0.8.0 >=dev-libs/libevent-1.4.7 >=x11-libs/cairo-1.8[X] >=x11-libs/gtk+-2.8.6:2 >=x11-libs/pango-1.10.1[X] virtual/jpeg virtual/freedesktop-icon-theme alsa? ( media-libs/alsa-lib ) dbus? ( >=dev-libs/dbus-glib-0.72 ) libnotify? ( >=x11-libs/libnotify-0.4 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) wifi? ( net-wireless/wireless-tools ) || ( >=sys-devel/automake-1.11.1:1.11 ) =sys-devel/autoconf-2.1* sys-devel/libtool app-arch/unzip app-arch/unzip
 >=sys-devel/binutils-2.16.1 >=dev-libs/nss-3.13.2 >=dev-libs/nspr-4.9 >=dev-libs/glib-2.26 >=media-libs/mesa-7.10 >=media-libs/libpng-1.4.1[apng] >=x11-libs/cairo-1.10 >=x11-libs/pango-1.14.0 >=x11-libs/gtk+-2.14 virtual/libffi system-sqlite? ( >=dev-db/sqlite-3.7.7.1[fts3,secure-delete,unlock-notify,debug=] ) crypt? ( >=app-crypt/gnupg-1.4 ) webm? ( >=media-libs/libvpx-1.0.0 media-libs/alsa-lib ) x11-libs/libXrender x11-libs/libXt x11-libs/libXmu >=sys-libs/zlib-1.1.4 app-arch/zip app-arch/unzip >=app-text/hunspell-1.2 dev-libs/expat >=dev-libs/libIDL-0.8.0 >=dev-libs/libevent-1.4.7 >=x11-libs/cairo-1.8[X] >=x11-libs/gtk+-2.8.6:2 >=x11-libs/pango-1.10.1[X] virtual/jpeg virtual/freedesktop-icon-theme alsa? ( media-libs/alsa-lib ) dbus? ( >=dev-libs/dbus-glib-0.72 ) libnotify? ( >=x11-libs/libnotify-0.4 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) wifi? ( net-wireless/wireless-tools )
 0
 linguas_be? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.8/langpack/seamonkey-2.8.be.langpack.xpi -> seamonkey-2.8-be.xpi ) linguas_ca? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.8/langpack/seamonkey-2.8.ca.langpack.xpi -> seamonkey-2.8-ca.xpi ) linguas_cs? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.8/langpack/seamonkey-2.8.cs.langpack.xpi -> seamonkey-2.8-cs.xpi ) linguas_de? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.8/langpack/seamonkey-2.8.de.langpack.xpi -> seamonkey-2.8-de.xpi ) linguas_en_GB? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.8/langpack/seamonkey-2.8.en-GB.langpack.xpi -> seamonkey-2.8-en-GB.xpi ) linguas_es_AR? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.8/langpack/seamonkey-2.8.es-AR.langpack.xpi -> seamonkey-2.8-es-AR.xpi ) linguas_es_ES? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.8/langpack/seamonkey-2.8.es-ES.langpack.xpi -> seamonkey-2.8-es-ES.xpi ) linguas_fi? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.8/langpack/seamonkey-2.8.fi.langpack.xpi -> seamonkey-2.8-fi.xpi ) linguas_fr? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.8/langpack/seamonkey-2.8.fr.langpack.xpi -> seamonkey-2.8-fr.xpi ) linguas_gl? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.8/langpack/seamonkey-2.8.gl.langpack.xpi -> seamonkey-2.8-gl.xpi ) linguas_hu? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.8/langpack/seamonkey-2.8.hu.langpack.xpi -> seamonkey-2.8-hu.xpi ) linguas_it? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.8/langpack/seamonkey-2.8.it.langpack.xpi -> seamonkey-2.8-it.xpi ) linguas_ja? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.8/langpack/seamonkey-2.8.ja.langpack.xpi -> seamonkey-2.8-ja.xpi ) linguas_lt? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.8/langpack/seamonkey-2.8.lt.langpack.xpi -> seamonkey-2.8-lt.xpi ) linguas_nb_NO? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.8/langpack/seamonkey-2.8.nb-NO.langpack.xpi -> seamonkey-2.8-nb-NO.xpi ) linguas_nl? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.8/langpack/seamonkey-2.8.nl.langpack.xpi -> seamonkey-2.8-nl.xpi ) linguas_pl? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.8/langpack/seamonkey-2.8.pl.langpack.xpi -> seamonkey-2.8-pl.xpi ) linguas_pt_PT? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.8/langpack/seamonkey-2.8.pt-PT.langpack.xpi -> seamonkey-2.8-pt-PT.xpi ) linguas_ru? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.8/langpack/seamonkey-2.8.ru.langpack.xpi -> seamonkey-2.8-ru.xpi ) linguas_sk? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.8/langpack/seamonkey-2.8.sk.langpack.xpi -> seamonkey-2.8-sk.xpi ) linguas_sv_SE? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.8/langpack/seamonkey-2.8.sv-SE.langpack.xpi -> seamonkey-2.8-sv-SE.xpi ) linguas_tr? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.8/langpack/seamonkey-2.8.tr.langpack.xpi -> seamonkey-2.8-tr.xpi ) linguas_zh_CN? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.8/langpack/seamonkey-2.8.zh-CN.langpack.xpi -> seamonkey-2.8-zh-CN.xpi ) linguas_be? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.8/langpack/seamonkey-2.8.be.langpack.xpi -> seamonkey-2.8-be.xpi ) linguas_ca? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.8/langpack/seamonkey-2.8.ca.langpack.xpi -> seamonkey-2.8-ca.xpi ) linguas_cs? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.8/langpack/seamonkey-2.8.cs.langpack.xpi -> seamonkey-2.8-cs.xpi ) linguas_de? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.8/langpack/seamonkey-2.8.de.langpack.xpi -> seamonkey-2.8-de.xpi ) linguas_en_GB? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.8/langpack/seamonkey-2.8.en-GB.langpack.xpi -> seamonkey-2.8-en-GB.xpi ) linguas_es_AR? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.8/langpack/seamonkey-2.8.es-AR.langpack.xpi -> seamonkey-2.8-es-AR.xpi ) linguas_es_ES? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.8/langpack/seamonkey-2.8.es-ES.langpack.xpi -> seamonkey-2.8-es-ES.xpi ) linguas_fi? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.8/langpack/seamonkey-2.8.fi.langpack.xpi -> seamonkey-2.8-fi.xpi ) linguas_fr? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.8/langpack/seamonkey-2.8.fr.langpack.xpi -> seamonkey-2.8-fr.xpi ) linguas_gl? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.8/langpack/seamonkey-2.8.gl.langpack.xpi -> seamonkey-2.8-gl.xpi ) linguas_hu? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.8/langpack/seamonkey-2.8.hu.langpack.xpi -> seamonkey-2.8-hu.xpi ) linguas_it? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.8/langpack/seamonkey-2.8.it.langpack.xpi -> seamonkey-2.8-it.xpi ) linguas_ja? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.8/langpack/seamonkey-2.8.ja.langpack.xpi -> seamonkey-2.8-ja.xpi ) linguas_lt? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.8/langpack/seamonkey-2.8.lt.langpack.xpi -> seamonkey-2.8-lt.xpi ) linguas_nb_NO? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.8/langpack/seamonkey-2.8.nb-NO.langpack.xpi -> seamonkey-2.8-nb-NO.xpi ) linguas_nl? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.8/langpack/seamonkey-2.8.nl.langpack.xpi -> seamonkey-2.8-nl.xpi ) linguas_pl? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.8/langpack/seamonkey-2.8.pl.langpack.xpi -> seamonkey-2.8-pl.xpi ) linguas_pt_PT? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.8/langpack/seamonkey-2.8.pt-PT.langpack.xpi -> seamonkey-2.8-pt-PT.xpi ) linguas_ru? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.8/langpack/seamonkey-2.8.ru.langpack.xpi -> seamonkey-2.8-ru.xpi ) linguas_sk? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.8/langpack/seamonkey-2.8.sk.langpack.xpi -> seamonkey-2.8-sk.xpi ) linguas_sv_SE? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.8/langpack/seamonkey-2.8.sv-SE.langpack.xpi -> seamonkey-2.8-sv-SE.xpi ) linguas_tr? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.8/langpack/seamonkey-2.8.tr.langpack.xpi -> seamonkey-2.8-tr.xpi ) linguas_zh_CN? ( ftp://ftp.mozilla.org/pub/seamonkey/releases/2.8/langpack/seamonkey-2.8.zh-CN.langpack.xpi -> seamonkey-2.8-zh-CN.xpi ) ftp://ftp.mozilla.org/pub/seamonkey/releases/2.8/source/seamonkey-2.8.source.tar.bz2 -> seamonkey-2.8.source.tar.bz2 http://dev.gentoo.org/~anarchy/mozilla/patchsets/firefox-11.0-patches-0.1.tar.xz http://dev.gentoo.org/~anarchy/mozilla/patchsets/seamonkey-2.7-patches-03.tar.xz crypt? ( http://www.mozilla-enigmail.org/download/source/enigmail-1.4.tar.gz )
diff --git a/metadata/cache/www-client/uget-1.7.0 b/metadata/cache/www-client/uget-1.7.0
index c1b64ae8055f..87cfaa01442c 100644
--- a/metadata/cache/www-client/uget-1.7.0
+++ b/metadata/cache/www-client/uget-1.7.0
@@ -1,4 +1,4 @@
-dev-libs/libpcre >=dev-libs/glib-2:2 >=net-misc/curl-7.10 >=x11-libs/gtk+-2.18:2 gstreamer? ( media-libs/gstreamer ) libnotify? ( x11-libs/libnotify ) dev-util/intltool dev-util/pkgconfig sys-devel/gettext || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-libs/libpcre >=dev-libs/glib-2:2 >=net-misc/curl-7.10 >=x11-libs/gtk+-2.18:2 gstreamer? ( media-libs/gstreamer ) libnotify? ( x11-libs/libnotify ) dev-util/intltool dev-util/pkgconfig sys-devel/gettext || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-libs/libpcre >=dev-libs/glib-2:2 >=net-misc/curl-7.10 >=x11-libs/gtk+-2.18:2 gstreamer? ( media-libs/gstreamer ) libnotify? ( x11-libs/libnotify )
 0
 mirror://sourceforge/urlget/uget-1.7.0.tar.gz
diff --git a/metadata/cache/www-client/uget-9999 b/metadata/cache/www-client/uget-9999
index 3b01b120821e..4a89893539a7 100644
--- a/metadata/cache/www-client/uget-9999
+++ b/metadata/cache/www-client/uget-9999
@@ -1,4 +1,4 @@
-dev-libs/libpcre >=dev-libs/glib-2:2 !gtk3? ( >=x11-libs/gtk+-2.18:2 ) gtk3? ( x11-libs/gtk+:3 ) curl? ( >=net-misc/curl-7.10 ) gstreamer? ( media-libs/gstreamer ) libnotify? ( x11-libs/libnotify ) dev-util/intltool dev-util/pkgconfig sys-devel/gettext || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
+dev-libs/libpcre >=dev-libs/glib-2:2 !gtk3? ( >=x11-libs/gtk+-2.18:2 ) gtk3? ( x11-libs/gtk+:3 ) curl? ( >=net-misc/curl-7.10 ) gstreamer? ( media-libs/gstreamer ) libnotify? ( x11-libs/libnotify ) dev-util/intltool dev-util/pkgconfig sys-devel/gettext || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
 dev-libs/libpcre >=dev-libs/glib-2:2 !gtk3? ( >=x11-libs/gtk+-2.18:2 ) gtk3? ( x11-libs/gtk+:3 ) curl? ( >=net-misc/curl-7.10 ) gstreamer? ( media-libs/gstreamer ) libnotify? ( x11-libs/libnotify )
 0
 
diff --git a/metadata/cache/www-misc/fcgiwrap-1.0.3 b/metadata/cache/www-misc/fcgiwrap-1.0.3
index ace674c08634..6e435109f5b2 100644
--- a/metadata/cache/www-misc/fcgiwrap-1.0.3
+++ b/metadata/cache/www-misc/fcgiwrap-1.0.3
@@ -1,4 +1,4 @@
-dev-libs/fcgi || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-libs/fcgi || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-libs/fcgi
 0
 mirror://gentoo/gnosek-fcgiwrap-1.0.3-4-g58ec209.tar.gz -> fcgiwrap-1.0.3.tar.gz
diff --git a/metadata/cache/www-misc/fcgiwrap-1.0.3-r1 b/metadata/cache/www-misc/fcgiwrap-1.0.3-r1
index 5e0ecb13a229..c03e96cb403b 100644
--- a/metadata/cache/www-misc/fcgiwrap-1.0.3-r1
+++ b/metadata/cache/www-misc/fcgiwrap-1.0.3-r1
@@ -1,4 +1,4 @@
-dev-libs/fcgi || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-libs/fcgi || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-libs/fcgi
 0
 mirror://gentoo/gnosek-fcgiwrap-1.0.3-4-g58ec209.tar.gz -> fcgiwrap-1.0.3.tar.gz
diff --git a/metadata/cache/www-misc/fcgiwrap-9999 b/metadata/cache/www-misc/fcgiwrap-9999
index 9ae272ef32b9..0b528ad67d64 100644
--- a/metadata/cache/www-misc/fcgiwrap-9999
+++ b/metadata/cache/www-misc/fcgiwrap-9999
@@ -1,4 +1,4 @@
-dev-libs/fcgi || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
+dev-libs/fcgi || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
 dev-libs/fcgi
 0
 
diff --git a/metadata/cache/www-misc/gurlchecker-0.10.5 b/metadata/cache/www-misc/gurlchecker-0.10.5
index 54535d972de3..995fea871de5 100644
--- a/metadata/cache/www-misc/gurlchecker-0.10.5
+++ b/metadata/cache/www-misc/gurlchecker-0.10.5
@@ -1,4 +1,4 @@
->=x11-libs/gtk+-2.6:2 >=gnome-base/libgnomeui-2 >=gnome-base/libglade-2:2.0 >=dev-libs/libxml2-2.6:2 >=net-libs/gnet-2 >=dev-libs/libcroco-0.6 tidy? ( app-text/htmltidy ) clamav? ( app-antivirus/clamav ) gnutls? ( >=net-libs/gnutls-1 ) >=dev-util/pkgconfig-0.9 >=dev-util/intltool-0.30 app-text/docbook-sgml-utils dev-util/gtk-doc-am doc? ( >dev-util/gtk-doc-1.1 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+>=x11-libs/gtk+-2.6:2 >=gnome-base/libgnomeui-2 >=gnome-base/libglade-2:2.0 >=dev-libs/libxml2-2.6:2 >=net-libs/gnet-2 >=dev-libs/libcroco-0.6 tidy? ( app-text/htmltidy ) clamav? ( app-antivirus/clamav ) gnutls? ( >=net-libs/gnutls-1 ) >=dev-util/pkgconfig-0.9 >=dev-util/intltool-0.30 app-text/docbook-sgml-utils dev-util/gtk-doc-am doc? ( >dev-util/gtk-doc-1.1 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 >=x11-libs/gtk+-2.6:2 >=gnome-base/libgnomeui-2 >=gnome-base/libglade-2:2.0 >=dev-libs/libxml2-2.6:2 >=net-libs/gnet-2 >=dev-libs/libcroco-0.6 tidy? ( app-text/htmltidy ) clamav? ( app-antivirus/clamav ) gnutls? ( >=net-libs/gnutls-1 )
 0
 http://labs.libre-entreprise.org/frs/download.php/737/gurlchecker-0.10.5.tar.gz
diff --git a/metadata/cache/www-plugins/gnash-0.8.10-r1 b/metadata/cache/www-plugins/gnash-0.8.10-r1
index a536a6fdc3e6..945e99d10f56 100644
--- a/metadata/cache/www-plugins/gnash-0.8.10-r1
+++ b/metadata/cache/www-plugins/gnash-0.8.10-r1
@@ -1,4 +1,4 @@
->=dev-libs/boost-1.41.0 !!dev-libs/boost:0 dev-libs/expat dev-libs/libxml2 virtual/jpeg media-libs/libpng net-misc/curl x11-libs/libX11 x11-libs/libXi x11-libs/libXmu x11-libs/libXt media-libs/giflib x11-proto/xproto agg? ( x11-libs/agg ) cairo? ( x11-libs/cairo ) directfb? ( dev-libs/DirectFB ) doc? ( >=app-text/docbook2X-0.8.8 app-text/docbook-sgml-utils ) egl? ( media-libs/mesa[egl] ) fbcon? ( x11-libs/tslib ) ffmpeg? ( virtual/ffmpeg[vaapi?] ) gconf? ( gnome-base/gconf ) gstreamer? ( media-plugins/gst-plugins-ffmpeg media-plugins/gst-plugins-mad media-plugins/gst-plugins-meta ) gtk? ( x11-libs/gtk+:2 net-libs/xulrunner:1.9 python? ( dev-python/pygtk:2 ) ) kde? ( >=kde-base/kdebase-startkde-4.4:4[aqua=] ) opengl? ( virtual/opengl gtk? ( x11-libs/gtkglext ) ) openvg? ( media-libs/mesa[openvg] ) nsplugin? ( || ( net-misc/npapi-sdk >=net-libs/xulrunner-1.9.2:1.9 ) ) sdl? ( media-libs/libsdl[X] ) sdl-sound? ( media-libs/libsdl ) media-libs/speex[ogg] sys-libs/zlib >=sys-devel/libtool-2.2 mysql? ( virtual/mysql ) lirc? ( app-misc/lirc ) dbus? ( sys-apps/dbus ) ssh? ( >=net-libs/libssh-0.4[server] ) ssl? ( dev-libs/openssl ) vaapi? ( x11-libs/libva[opengl?] ) dev-util/pkgconfig nls? ( sys-devel/gettext ) gnome? ( app-text/rarian ) test? ( dev-util/dejagnu ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 kde? ( dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) ) kde? ( dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=] ) python? ( =dev-lang/python-2* )
+>=dev-libs/boost-1.41.0 !!dev-libs/boost:0 dev-libs/expat dev-libs/libxml2 virtual/jpeg media-libs/libpng net-misc/curl x11-libs/libX11 x11-libs/libXi x11-libs/libXmu x11-libs/libXt media-libs/giflib x11-proto/xproto agg? ( x11-libs/agg ) cairo? ( x11-libs/cairo ) directfb? ( dev-libs/DirectFB ) doc? ( >=app-text/docbook2X-0.8.8 app-text/docbook-sgml-utils ) egl? ( media-libs/mesa[egl] ) fbcon? ( x11-libs/tslib ) ffmpeg? ( virtual/ffmpeg[vaapi?] ) gconf? ( gnome-base/gconf ) gstreamer? ( media-plugins/gst-plugins-ffmpeg media-plugins/gst-plugins-mad media-plugins/gst-plugins-meta ) gtk? ( x11-libs/gtk+:2 net-libs/xulrunner:1.9 python? ( dev-python/pygtk:2 ) ) kde? ( >=kde-base/kdebase-startkde-4.4:4[aqua=] ) opengl? ( virtual/opengl gtk? ( x11-libs/gtkglext ) ) openvg? ( media-libs/mesa[openvg] ) nsplugin? ( || ( net-misc/npapi-sdk >=net-libs/xulrunner-1.9.2:1.9 ) ) sdl? ( media-libs/libsdl[X] ) sdl-sound? ( media-libs/libsdl ) media-libs/speex[ogg] sys-libs/zlib >=sys-devel/libtool-2.2 mysql? ( virtual/mysql ) lirc? ( app-misc/lirc ) dbus? ( sys-apps/dbus ) ssh? ( >=net-libs/libssh-0.4[server] ) ssl? ( dev-libs/openssl ) vaapi? ( x11-libs/libva[opengl?] ) dev-util/pkgconfig nls? ( sys-devel/gettext ) gnome? ( app-text/rarian ) test? ( dev-util/dejagnu ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 kde? ( dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) ) kde? ( dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=] ) python? ( =dev-lang/python-2* )
 >=dev-libs/boost-1.41.0 !!dev-libs/boost:0 dev-libs/expat dev-libs/libxml2 virtual/jpeg media-libs/libpng net-misc/curl x11-libs/libX11 x11-libs/libXi x11-libs/libXmu x11-libs/libXt media-libs/giflib x11-proto/xproto agg? ( x11-libs/agg ) cairo? ( x11-libs/cairo ) directfb? ( dev-libs/DirectFB ) doc? ( >=app-text/docbook2X-0.8.8 app-text/docbook-sgml-utils ) egl? ( media-libs/mesa[egl] ) fbcon? ( x11-libs/tslib ) ffmpeg? ( virtual/ffmpeg[vaapi?] ) gconf? ( gnome-base/gconf ) gstreamer? ( media-plugins/gst-plugins-ffmpeg media-plugins/gst-plugins-mad media-plugins/gst-plugins-meta ) gtk? ( x11-libs/gtk+:2 net-libs/xulrunner:1.9 python? ( dev-python/pygtk:2 ) ) kde? ( >=kde-base/kdebase-startkde-4.4:4[aqua=] ) opengl? ( virtual/opengl gtk? ( x11-libs/gtkglext ) ) openvg? ( media-libs/mesa[openvg] ) nsplugin? ( || ( net-misc/npapi-sdk >=net-libs/xulrunner-1.9.2:1.9 ) ) sdl? ( media-libs/libsdl[X] ) sdl-sound? ( media-libs/libsdl ) media-libs/speex[ogg] sys-libs/zlib >=sys-devel/libtool-2.2 mysql? ( virtual/mysql ) lirc? ( app-misc/lirc ) dbus? ( sys-apps/dbus ) ssh? ( >=net-libs/libssh-0.4[server] ) ssl? ( dev-libs/openssl ) vaapi? ( x11-libs/libva[opengl?] ) kde? ( >=kde-base/oxygen-icons-4.4:4[aqua=] ) kde? ( dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=] ) python? ( =dev-lang/python-2* )
 0
 mirror://gentoo/gnash-0.8.10.tar.gz
diff --git a/metadata/cache/www-plugins/gnash-0.8.10-r2 b/metadata/cache/www-plugins/gnash-0.8.10-r2
index f8858f593d15..d38d1fda0057 100644
--- a/metadata/cache/www-plugins/gnash-0.8.10-r2
+++ b/metadata/cache/www-plugins/gnash-0.8.10-r2
@@ -1,4 +1,4 @@
->=dev-libs/boost-1.41.0 !!dev-libs/boost:0 dev-libs/expat dev-libs/libxml2 virtual/jpeg media-libs/libpng net-misc/curl x11-libs/libX11 x11-libs/libXi x11-libs/libXmu x11-libs/libXt media-libs/giflib x11-proto/xproto agg? ( x11-libs/agg ) cairo? ( x11-libs/cairo ) directfb? ( dev-libs/DirectFB ) doc? ( >=app-text/docbook2X-0.8.8 app-text/docbook-sgml-utils ) egl? ( media-libs/mesa[egl] ) fbcon? ( x11-libs/tslib ) ffmpeg? ( virtual/ffmpeg[vaapi?] ) gconf? ( gnome-base/gconf ) gstreamer? ( media-plugins/gst-plugins-ffmpeg media-plugins/gst-plugins-mad media-plugins/gst-plugins-meta ) gtk? ( x11-libs/gtk+:2 python? ( dev-python/pygtk:2 ) ) kde? ( >=kde-base/kdebase-startkde-4.4:4[aqua=] ) opengl? ( virtual/opengl gtk? ( x11-libs/gtkglext ) ) openvg? ( media-libs/mesa[openvg] ) sdl? ( media-libs/libsdl[X] ) sdl-sound? ( media-libs/libsdl ) media-libs/speex[ogg] sys-libs/zlib >=sys-devel/libtool-2.2 mysql? ( virtual/mysql ) lirc? ( app-misc/lirc ) dbus? ( sys-apps/dbus ) ssh? ( >=net-libs/libssh-0.4[server] ) ssl? ( dev-libs/openssl ) vaapi? ( x11-libs/libva[opengl?] ) dev-util/pkgconfig nls? ( sys-devel/gettext ) gnome? ( app-text/rarian ) nsplugin? ( || ( net-misc/npapi-sdk >=net-libs/xulrunner-1.9.2:1.9 ) ) test? ( dev-util/dejagnu ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 kde? ( dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) ) kde? ( dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=] ) python? ( =dev-lang/python-2* )
+>=dev-libs/boost-1.41.0 !!dev-libs/boost:0 dev-libs/expat dev-libs/libxml2 virtual/jpeg media-libs/libpng net-misc/curl x11-libs/libX11 x11-libs/libXi x11-libs/libXmu x11-libs/libXt media-libs/giflib x11-proto/xproto agg? ( x11-libs/agg ) cairo? ( x11-libs/cairo ) directfb? ( dev-libs/DirectFB ) doc? ( >=app-text/docbook2X-0.8.8 app-text/docbook-sgml-utils ) egl? ( media-libs/mesa[egl] ) fbcon? ( x11-libs/tslib ) ffmpeg? ( virtual/ffmpeg[vaapi?] ) gconf? ( gnome-base/gconf ) gstreamer? ( media-plugins/gst-plugins-ffmpeg media-plugins/gst-plugins-mad media-plugins/gst-plugins-meta ) gtk? ( x11-libs/gtk+:2 python? ( dev-python/pygtk:2 ) ) kde? ( >=kde-base/kdebase-startkde-4.4:4[aqua=] ) opengl? ( virtual/opengl gtk? ( x11-libs/gtkglext ) ) openvg? ( media-libs/mesa[openvg] ) sdl? ( media-libs/libsdl[X] ) sdl-sound? ( media-libs/libsdl ) media-libs/speex[ogg] sys-libs/zlib >=sys-devel/libtool-2.2 mysql? ( virtual/mysql ) lirc? ( app-misc/lirc ) dbus? ( sys-apps/dbus ) ssh? ( >=net-libs/libssh-0.4[server] ) ssl? ( dev-libs/openssl ) vaapi? ( x11-libs/libva[opengl?] ) dev-util/pkgconfig nls? ( sys-devel/gettext ) gnome? ( app-text/rarian ) nsplugin? ( || ( net-misc/npapi-sdk >=net-libs/xulrunner-1.9.2:1.9 ) ) test? ( dev-util/dejagnu ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 kde? ( dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) ) kde? ( dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=] ) python? ( =dev-lang/python-2* )
 >=dev-libs/boost-1.41.0 !!dev-libs/boost:0 dev-libs/expat dev-libs/libxml2 virtual/jpeg media-libs/libpng net-misc/curl x11-libs/libX11 x11-libs/libXi x11-libs/libXmu x11-libs/libXt media-libs/giflib x11-proto/xproto agg? ( x11-libs/agg ) cairo? ( x11-libs/cairo ) directfb? ( dev-libs/DirectFB ) doc? ( >=app-text/docbook2X-0.8.8 app-text/docbook-sgml-utils ) egl? ( media-libs/mesa[egl] ) fbcon? ( x11-libs/tslib ) ffmpeg? ( virtual/ffmpeg[vaapi?] ) gconf? ( gnome-base/gconf ) gstreamer? ( media-plugins/gst-plugins-ffmpeg media-plugins/gst-plugins-mad media-plugins/gst-plugins-meta ) gtk? ( x11-libs/gtk+:2 python? ( dev-python/pygtk:2 ) ) kde? ( >=kde-base/kdebase-startkde-4.4:4[aqua=] ) opengl? ( virtual/opengl gtk? ( x11-libs/gtkglext ) ) openvg? ( media-libs/mesa[openvg] ) sdl? ( media-libs/libsdl[X] ) sdl-sound? ( media-libs/libsdl ) media-libs/speex[ogg] sys-libs/zlib >=sys-devel/libtool-2.2 mysql? ( virtual/mysql ) lirc? ( app-misc/lirc ) dbus? ( sys-apps/dbus ) ssh? ( >=net-libs/libssh-0.4[server] ) ssl? ( dev-libs/openssl ) vaapi? ( x11-libs/libva[opengl?] ) kde? ( >=kde-base/oxygen-icons-4.4:4[aqua=] ) kde? ( dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=] ) python? ( =dev-lang/python-2* )
 0
 mirror://gentoo/gnash-0.8.10.tar.gz
@@ -6,7 +6,7 @@ test
 http://www.gnu.org/software/gnash/
 GPL-3
 GNU Flash movie player that supports many SWF v7,8,9 features
-amd64 ~ppc ~ppc64 ~sparc ~x86
+amd64 ~ppc ~ppc64 ~sparc x86
 autotools base eutils fdo-mime flag-o-matic gnome2-utils kde4-base kde4-functions libtool multilib nsplugins python toolchain-funcs user versionator virtualx
 X +agg cairo cygnal dbus directfb doc dump egl fbcon +ffmpeg gconf gnome gstreamer gtk kde lirc mysql +nls nsplugin opengl openvg python sdl +sdl-sound ssh ssl test vaapi aqua kde
 dump? ( agg ffmpeg ) fbcon? ( agg ) nsplugin? ( gtk ) openvg? ( egl ) python? ( gtk ) vaapi? ( agg ffmpeg ) || ( agg cairo opengl openvg ) || ( dump fbcon gtk kde sdl )
diff --git a/metadata/cache/www-plugins/gnash-0.8.8 b/metadata/cache/www-plugins/gnash-0.8.8
index d7d821237fc0..46f30cf7c211 100644
--- a/metadata/cache/www-plugins/gnash-0.8.8
+++ b/metadata/cache/www-plugins/gnash-0.8.8
@@ -1,4 +1,4 @@
->=dev-libs/boost-1.41.0 !!dev-libs/boost:0 dev-libs/expat dev-libs/libxml2 virtual/jpeg media-libs/libpng net-misc/curl x11-libs/libX11 x11-libs/libXi x11-libs/libXmu x11-libs/libXt x11-libs/libXv media-libs/giflib x11-proto/xproto agg? ( x11-libs/agg ) cairo? ( x11-libs/cairo ) doc? ( >=app-text/docbook2X-0.8.8 app-text/docbook-sgml-utils ) ffmpeg? ( virtual/ffmpeg[vaapi?] ) gstreamer? ( media-plugins/gst-plugins-ffmpeg media-plugins/gst-plugins-mad media-plugins/gst-plugins-meta ) gtk? ( x11-libs/gtk+:2 net-libs/xulrunner:1.9 python? ( dev-python/pygtk:2 ) ) kde? ( >=kde-base/kdebase-startkde-4.4:4[aqua=] ) opengl? ( virtual/opengl gtk? ( x11-libs/gtkglext ) ) nsplugin? ( >=net-libs/xulrunner-1.9.2:1.9 ) sdl? ( media-libs/libsdl[X] ) sdl-sound? ( media-libs/libsdl ) media-libs/speex[ogg] sys-libs/zlib >=sys-devel/libtool-2.2 mysql? ( virtual/mysql ) lirc? ( app-misc/lirc ) dbus? ( sys-apps/dbus ) ssh? ( >=net-libs/libssh-0.4[server] ) ssl? ( dev-libs/openssl ) vaapi? ( x11-libs/libva[opengl?] ) xv? ( x11-libs/libXv ) dev-util/pkgconfig nls? ( sys-devel/gettext ) gnome? ( app-text/rarian ) test? ( dev-util/dejagnu ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 kde? ( dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) ) kde? ( dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=] )
+>=dev-libs/boost-1.41.0 !!dev-libs/boost:0 dev-libs/expat dev-libs/libxml2 virtual/jpeg media-libs/libpng net-misc/curl x11-libs/libX11 x11-libs/libXi x11-libs/libXmu x11-libs/libXt x11-libs/libXv media-libs/giflib x11-proto/xproto agg? ( x11-libs/agg ) cairo? ( x11-libs/cairo ) doc? ( >=app-text/docbook2X-0.8.8 app-text/docbook-sgml-utils ) ffmpeg? ( virtual/ffmpeg[vaapi?] ) gstreamer? ( media-plugins/gst-plugins-ffmpeg media-plugins/gst-plugins-mad media-plugins/gst-plugins-meta ) gtk? ( x11-libs/gtk+:2 net-libs/xulrunner:1.9 python? ( dev-python/pygtk:2 ) ) kde? ( >=kde-base/kdebase-startkde-4.4:4[aqua=] ) opengl? ( virtual/opengl gtk? ( x11-libs/gtkglext ) ) nsplugin? ( >=net-libs/xulrunner-1.9.2:1.9 ) sdl? ( media-libs/libsdl[X] ) sdl-sound? ( media-libs/libsdl ) media-libs/speex[ogg] sys-libs/zlib >=sys-devel/libtool-2.2 mysql? ( virtual/mysql ) lirc? ( app-misc/lirc ) dbus? ( sys-apps/dbus ) ssh? ( >=net-libs/libssh-0.4[server] ) ssl? ( dev-libs/openssl ) vaapi? ( x11-libs/libva[opengl?] ) xv? ( x11-libs/libXv ) dev-util/pkgconfig nls? ( sys-devel/gettext ) gnome? ( app-text/rarian ) test? ( dev-util/dejagnu ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 kde? ( dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) ) kde? ( dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=] )
 >=dev-libs/boost-1.41.0 !!dev-libs/boost:0 dev-libs/expat dev-libs/libxml2 virtual/jpeg media-libs/libpng net-misc/curl x11-libs/libX11 x11-libs/libXi x11-libs/libXmu x11-libs/libXt x11-libs/libXv media-libs/giflib x11-proto/xproto agg? ( x11-libs/agg ) cairo? ( x11-libs/cairo ) doc? ( >=app-text/docbook2X-0.8.8 app-text/docbook-sgml-utils ) ffmpeg? ( virtual/ffmpeg[vaapi?] ) gstreamer? ( media-plugins/gst-plugins-ffmpeg media-plugins/gst-plugins-mad media-plugins/gst-plugins-meta ) gtk? ( x11-libs/gtk+:2 net-libs/xulrunner:1.9 python? ( dev-python/pygtk:2 ) ) kde? ( >=kde-base/kdebase-startkde-4.4:4[aqua=] ) opengl? ( virtual/opengl gtk? ( x11-libs/gtkglext ) ) nsplugin? ( >=net-libs/xulrunner-1.9.2:1.9 ) sdl? ( media-libs/libsdl[X] ) sdl-sound? ( media-libs/libsdl ) media-libs/speex[ogg] sys-libs/zlib >=sys-devel/libtool-2.2 mysql? ( virtual/mysql ) lirc? ( app-misc/lirc ) dbus? ( sys-apps/dbus ) ssh? ( >=net-libs/libssh-0.4[server] ) ssl? ( dev-libs/openssl ) vaapi? ( x11-libs/libva[opengl?] ) xv? ( x11-libs/libXv ) kde? ( >=kde-base/oxygen-icons-4.4:4[aqua=] ) kde? ( dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=] )
 0
 mirror://gnu/gnash/0.8.8/gnash-0.8.8.tar.bz2
diff --git a/metadata/cache/www-plugins/gnash-0.8.9 b/metadata/cache/www-plugins/gnash-0.8.9
index 4b447b986154..e9a9da5e44e8 100644
--- a/metadata/cache/www-plugins/gnash-0.8.9
+++ b/metadata/cache/www-plugins/gnash-0.8.9
@@ -1,4 +1,4 @@
->=dev-libs/boost-1.41.0 !!dev-libs/boost:0 dev-libs/expat dev-libs/libxml2 virtual/jpeg media-libs/libpng net-misc/curl x11-libs/libX11 x11-libs/libXi x11-libs/libXmu x11-libs/libXt media-libs/giflib x11-proto/xproto agg? ( x11-libs/agg ) cairo? ( x11-libs/cairo ) doc? ( >=app-text/docbook2X-0.8.8 app-text/docbook-sgml-utils ) fbcon? ( x11-libs/tslib ) ffmpeg? ( virtual/ffmpeg[vaapi?] ) gstreamer? ( media-plugins/gst-plugins-ffmpeg media-plugins/gst-plugins-mad media-plugins/gst-plugins-meta ) gtk? ( x11-libs/gtk+:2 net-libs/xulrunner:1.9 python? ( dev-python/pygtk:2 ) ) kde? ( >=kde-base/kdebase-startkde-4.4:4[aqua=] ) opengl? ( virtual/opengl gtk? ( x11-libs/gtkglext ) ) openvg? ( virtual/opengl ) nsplugin? ( >=net-libs/xulrunner-1.9.2:1.9 ) sdl? ( media-libs/libsdl[X] ) sdl-sound? ( media-libs/libsdl ) media-libs/speex[ogg] sys-libs/zlib >=sys-devel/libtool-2.2 mysql? ( virtual/mysql ) lirc? ( app-misc/lirc ) dbus? ( sys-apps/dbus ) ssh? ( >=net-libs/libssh-0.4[server] ) ssl? ( dev-libs/openssl ) vaapi? ( x11-libs/libva[opengl?] ) dev-util/pkgconfig nls? ( sys-devel/gettext ) gnome? ( app-text/rarian ) test? ( dev-util/dejagnu ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 kde? ( dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) ) kde? ( dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=] )
+>=dev-libs/boost-1.41.0 !!dev-libs/boost:0 dev-libs/expat dev-libs/libxml2 virtual/jpeg media-libs/libpng net-misc/curl x11-libs/libX11 x11-libs/libXi x11-libs/libXmu x11-libs/libXt media-libs/giflib x11-proto/xproto agg? ( x11-libs/agg ) cairo? ( x11-libs/cairo ) doc? ( >=app-text/docbook2X-0.8.8 app-text/docbook-sgml-utils ) fbcon? ( x11-libs/tslib ) ffmpeg? ( virtual/ffmpeg[vaapi?] ) gstreamer? ( media-plugins/gst-plugins-ffmpeg media-plugins/gst-plugins-mad media-plugins/gst-plugins-meta ) gtk? ( x11-libs/gtk+:2 net-libs/xulrunner:1.9 python? ( dev-python/pygtk:2 ) ) kde? ( >=kde-base/kdebase-startkde-4.4:4[aqua=] ) opengl? ( virtual/opengl gtk? ( x11-libs/gtkglext ) ) openvg? ( virtual/opengl ) nsplugin? ( >=net-libs/xulrunner-1.9.2:1.9 ) sdl? ( media-libs/libsdl[X] ) sdl-sound? ( media-libs/libsdl ) media-libs/speex[ogg] sys-libs/zlib >=sys-devel/libtool-2.2 mysql? ( virtual/mysql ) lirc? ( app-misc/lirc ) dbus? ( sys-apps/dbus ) ssh? ( >=net-libs/libssh-0.4[server] ) ssl? ( dev-libs/openssl ) vaapi? ( x11-libs/libva[opengl?] ) dev-util/pkgconfig nls? ( sys-devel/gettext ) gnome? ( app-text/rarian ) test? ( dev-util/dejagnu ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 kde? ( dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) ) kde? ( dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=] )
 >=dev-libs/boost-1.41.0 !!dev-libs/boost:0 dev-libs/expat dev-libs/libxml2 virtual/jpeg media-libs/libpng net-misc/curl x11-libs/libX11 x11-libs/libXi x11-libs/libXmu x11-libs/libXt media-libs/giflib x11-proto/xproto agg? ( x11-libs/agg ) cairo? ( x11-libs/cairo ) doc? ( >=app-text/docbook2X-0.8.8 app-text/docbook-sgml-utils ) fbcon? ( x11-libs/tslib ) ffmpeg? ( virtual/ffmpeg[vaapi?] ) gstreamer? ( media-plugins/gst-plugins-ffmpeg media-plugins/gst-plugins-mad media-plugins/gst-plugins-meta ) gtk? ( x11-libs/gtk+:2 net-libs/xulrunner:1.9 python? ( dev-python/pygtk:2 ) ) kde? ( >=kde-base/kdebase-startkde-4.4:4[aqua=] ) opengl? ( virtual/opengl gtk? ( x11-libs/gtkglext ) ) openvg? ( virtual/opengl ) nsplugin? ( >=net-libs/xulrunner-1.9.2:1.9 ) sdl? ( media-libs/libsdl[X] ) sdl-sound? ( media-libs/libsdl ) media-libs/speex[ogg] sys-libs/zlib >=sys-devel/libtool-2.2 mysql? ( virtual/mysql ) lirc? ( app-misc/lirc ) dbus? ( sys-apps/dbus ) ssh? ( >=net-libs/libssh-0.4[server] ) ssl? ( dev-libs/openssl ) vaapi? ( x11-libs/libva[opengl?] ) kde? ( >=kde-base/oxygen-icons-4.4:4[aqua=] ) kde? ( dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=] )
 0
 mirror://gnu/gnash/0.8.9/gnash-0.8.9.tar.bz2
diff --git a/metadata/cache/www-plugins/gnash-0.8.9-r2 b/metadata/cache/www-plugins/gnash-0.8.9-r2
index 895998054bb8..c36dc43bac4c 100644
--- a/metadata/cache/www-plugins/gnash-0.8.9-r2
+++ b/metadata/cache/www-plugins/gnash-0.8.9-r2
@@ -1,4 +1,4 @@
->=dev-libs/boost-1.41.0 !!dev-libs/boost:0 dev-libs/expat dev-libs/libxml2 virtual/jpeg media-libs/libpng net-misc/curl x11-libs/libX11 x11-libs/libXi x11-libs/libXmu x11-libs/libXt media-libs/giflib x11-proto/xproto agg? ( x11-libs/agg ) cairo? ( x11-libs/cairo ) doc? ( >=app-text/docbook2X-0.8.8 app-text/docbook-sgml-utils ) fbcon? ( x11-libs/tslib ) ffmpeg? ( virtual/ffmpeg[vaapi?] ) gstreamer? ( media-plugins/gst-plugins-ffmpeg media-plugins/gst-plugins-mad media-plugins/gst-plugins-meta ) gtk? ( x11-libs/gtk+:2 net-libs/xulrunner:1.9 python? ( dev-python/pygtk:2 ) ) kde? ( >=kde-base/kdebase-startkde-4.4:4[aqua=] ) opengl? ( virtual/opengl gtk? ( x11-libs/gtkglext ) ) openvg? ( virtual/opengl ) nsplugin? ( >=net-libs/xulrunner-1.9.2:1.9 ) sdl? ( media-libs/libsdl[X] ) sdl-sound? ( media-libs/libsdl ) media-libs/speex[ogg] sys-libs/zlib >=sys-devel/libtool-2.2 mysql? ( virtual/mysql ) lirc? ( app-misc/lirc ) dbus? ( sys-apps/dbus ) ssh? ( >=net-libs/libssh-0.4[server] ) ssl? ( dev-libs/openssl ) vaapi? ( x11-libs/libva[opengl?] ) dev-util/pkgconfig nls? ( sys-devel/gettext ) gnome? ( app-text/rarian ) test? ( dev-util/dejagnu ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 kde? ( dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) ) kde? ( dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=] )
+>=dev-libs/boost-1.41.0 !!dev-libs/boost:0 dev-libs/expat dev-libs/libxml2 virtual/jpeg media-libs/libpng net-misc/curl x11-libs/libX11 x11-libs/libXi x11-libs/libXmu x11-libs/libXt media-libs/giflib x11-proto/xproto agg? ( x11-libs/agg ) cairo? ( x11-libs/cairo ) doc? ( >=app-text/docbook2X-0.8.8 app-text/docbook-sgml-utils ) fbcon? ( x11-libs/tslib ) ffmpeg? ( virtual/ffmpeg[vaapi?] ) gstreamer? ( media-plugins/gst-plugins-ffmpeg media-plugins/gst-plugins-mad media-plugins/gst-plugins-meta ) gtk? ( x11-libs/gtk+:2 net-libs/xulrunner:1.9 python? ( dev-python/pygtk:2 ) ) kde? ( >=kde-base/kdebase-startkde-4.4:4[aqua=] ) opengl? ( virtual/opengl gtk? ( x11-libs/gtkglext ) ) openvg? ( virtual/opengl ) nsplugin? ( >=net-libs/xulrunner-1.9.2:1.9 ) sdl? ( media-libs/libsdl[X] ) sdl-sound? ( media-libs/libsdl ) media-libs/speex[ogg] sys-libs/zlib >=sys-devel/libtool-2.2 mysql? ( virtual/mysql ) lirc? ( app-misc/lirc ) dbus? ( sys-apps/dbus ) ssh? ( >=net-libs/libssh-0.4[server] ) ssl? ( dev-libs/openssl ) vaapi? ( x11-libs/libva[opengl?] ) dev-util/pkgconfig nls? ( sys-devel/gettext ) gnome? ( app-text/rarian ) test? ( dev-util/dejagnu ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 kde? ( dev-util/automoc dev-util/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) ) kde? ( dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=] )
 >=dev-libs/boost-1.41.0 !!dev-libs/boost:0 dev-libs/expat dev-libs/libxml2 virtual/jpeg media-libs/libpng net-misc/curl x11-libs/libX11 x11-libs/libXi x11-libs/libXmu x11-libs/libXt media-libs/giflib x11-proto/xproto agg? ( x11-libs/agg ) cairo? ( x11-libs/cairo ) doc? ( >=app-text/docbook2X-0.8.8 app-text/docbook-sgml-utils ) fbcon? ( x11-libs/tslib ) ffmpeg? ( virtual/ffmpeg[vaapi?] ) gstreamer? ( media-plugins/gst-plugins-ffmpeg media-plugins/gst-plugins-mad media-plugins/gst-plugins-meta ) gtk? ( x11-libs/gtk+:2 net-libs/xulrunner:1.9 python? ( dev-python/pygtk:2 ) ) kde? ( >=kde-base/kdebase-startkde-4.4:4[aqua=] ) opengl? ( virtual/opengl gtk? ( x11-libs/gtkglext ) ) openvg? ( virtual/opengl ) nsplugin? ( >=net-libs/xulrunner-1.9.2:1.9 ) sdl? ( media-libs/libsdl[X] ) sdl-sound? ( media-libs/libsdl ) media-libs/speex[ogg] sys-libs/zlib >=sys-devel/libtool-2.2 mysql? ( virtual/mysql ) lirc? ( app-misc/lirc ) dbus? ( sys-apps/dbus ) ssh? ( >=net-libs/libssh-0.4[server] ) ssl? ( dev-libs/openssl ) vaapi? ( x11-libs/libva[opengl?] ) kde? ( >=kde-base/oxygen-icons-4.4:4[aqua=] ) kde? ( dev-lang/perl >=x11-libs/qt-core-4.7.0:4[qt3support,ssl] >=x11-libs/qt-gui-4.7.0:4[accessibility,dbus] >=x11-libs/qt-qt3support-4.7.0:4[accessibility] >=x11-libs/qt-script-4.7.0:4 >=x11-libs/qt-sql-4.7.0:4[qt3support] >=x11-libs/qt-svg-4.7.0:4 >=x11-libs/qt-test-4.7.0:4 >=x11-libs/qt-webkit-4.7.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=] )
 0
 mirror://gnu/gnash/0.8.9/gnash-0.8.9.tar.bz2
diff --git a/metadata/cache/www-servers/apache-2.2.21-r1 b/metadata/cache/www-servers/apache-2.2.21-r1
index ed360493fbe0..650c25105a0c 100644
--- a/metadata/cache/www-servers/apache-2.2.21-r1
+++ b/metadata/cache/www-servers/apache-2.2.21-r1
@@ -1,4 +1,4 @@
->=dev-libs/openssl-0.9.8m apache2_modules_deflate? ( sys-libs/zlib ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool ssl? ( dev-libs/openssl ) dev-lang/perl =dev-libs/apr-1* =dev-libs/apr-util-1*[ldap?] dev-libs/libpcre ldap? ( =net-nds/openldap-2* ) selinux? ( sec-policy/selinux-apache ) ssl? ( >=dev-libs/openssl-0.9.8f ) !=www-servers/apache-1*
+>=dev-libs/openssl-0.9.8m apache2_modules_deflate? ( sys-libs/zlib ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool ssl? ( dev-libs/openssl ) dev-lang/perl =dev-libs/apr-1* =dev-libs/apr-util-1*[ldap?] dev-libs/libpcre ldap? ( =net-nds/openldap-2* ) selinux? ( sec-policy/selinux-apache ) ssl? ( >=dev-libs/openssl-0.9.8f ) !=www-servers/apache-1*
 >=dev-libs/apr-1.4.5 >=dev-libs/openssl-0.9.8m apache2_modules_mime? ( app-misc/mime-types ) dev-lang/perl =dev-libs/apr-1* =dev-libs/apr-util-1*[ldap?] dev-libs/libpcre ldap? ( =net-nds/openldap-2* ) selinux? ( sec-policy/selinux-apache ) ssl? ( >=dev-libs/openssl-0.9.8f ) !=www-servers/apache-1*
 2
 mirror://apache/httpd/httpd-2.2.21.tar.bz2 http://dev.gentoo.org/~pva/dist/apache/gentoo-apache-2.2.21-r1-20111018.tar.bz2
diff --git a/metadata/cache/www-servers/apache-2.2.21-r2 b/metadata/cache/www-servers/apache-2.2.21-r2
index a11e2ea3fb29..edc807037ac5 100644
--- a/metadata/cache/www-servers/apache-2.2.21-r2
+++ b/metadata/cache/www-servers/apache-2.2.21-r2
@@ -1,4 +1,4 @@
->=dev-libs/openssl-0.9.8m apache2_modules_deflate? ( sys-libs/zlib ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool ssl? ( dev-libs/openssl ) dev-lang/perl =dev-libs/apr-1* =dev-libs/apr-util-1*[ldap?] dev-libs/libpcre ldap? ( =net-nds/openldap-2* ) selinux? ( sec-policy/selinux-apache ) ssl? ( >=dev-libs/openssl-0.9.8f ) !=www-servers/apache-1*
+>=dev-libs/openssl-0.9.8m apache2_modules_deflate? ( sys-libs/zlib ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool ssl? ( dev-libs/openssl ) dev-lang/perl =dev-libs/apr-1* =dev-libs/apr-util-1*[ldap?] dev-libs/libpcre ldap? ( =net-nds/openldap-2* ) selinux? ( sec-policy/selinux-apache ) ssl? ( >=dev-libs/openssl-0.9.8f ) !=www-servers/apache-1*
 >=dev-libs/apr-1.4.5 >=dev-libs/openssl-0.9.8m apache2_modules_mime? ( app-misc/mime-types ) dev-lang/perl =dev-libs/apr-1* =dev-libs/apr-util-1*[ldap?] dev-libs/libpcre ldap? ( =net-nds/openldap-2* ) selinux? ( sec-policy/selinux-apache ) ssl? ( >=dev-libs/openssl-0.9.8f ) !=www-servers/apache-1*
 2
 mirror://apache/httpd/httpd-2.2.21.tar.bz2 http://dev.gentoo.org/~jmbsvicetto/dist/apache/gentoo-apache-2.2.21-r2-20120213.tar.bz2
diff --git a/metadata/cache/www-servers/gatling-0.12-r2 b/metadata/cache/www-servers/gatling-0.12-r2
new file mode 100644
index 000000000000..b2daf18c41a2
--- /dev/null
+++ b/metadata/cache/www-servers/gatling-0.12-r2
@@ -0,0 +1,22 @@
+>=dev-libs/libowfat-0.25 diet? ( dev-libs/dietlibc ) ssl? ( dev-libs/openssl )
+>=dev-libs/libowfat-0.25 diet? ( dev-libs/dietlibc ) ssl? ( dev-libs/openssl )
+0
+http://dl.fefe.de/gatling-0.12.tar.bz2
+
+http://www.fefe.de/gatling/
+GPL-2
+High performance web server
+~amd64 ~x86
+eutils multilib toolchain-funcs user
+ssl diet
+
+
+
+4
+
+compile install prepare setup
+
+
+
+
+
diff --git a/metadata/cache/www-servers/lighttpd-1.4.23-r1 b/metadata/cache/www-servers/lighttpd-1.4.23-r1
index 344b968fa85e..516c70f49778 100644
--- a/metadata/cache/www-servers/lighttpd-1.4.23-r1
+++ b/metadata/cache/www-servers/lighttpd-1.4.23-r1
@@ -1,4 +1,4 @@
->=sys-libs/zlib-1.1 bzip2? ( app-arch/bzip2 ) fam? ( virtual/fam ) gdbm? ( sys-libs/gdbm ) ldap? ( >=net-nds/openldap-2.1.26 ) lua? ( >=dev-lang/lua-5.1 ) memcache? ( dev-libs/libmemcache ) mysql? ( >=virtual/mysql-4.0 ) pcre? ( >=dev-libs/libpcre-3.1 ) php? ( virtual/httpd-php ) rrdtool? ( net-analyzer/rrdtool ) ssl? ( >=dev-libs/openssl-0.9.7 ) webdav? ( dev-libs/libxml2 >=dev-db/sqlite-3 sys-fs/e2fsprogs ) xattr? ( kernel_linux? ( sys-apps/attr ) ) dev-util/pkgconfig doc? ( dev-python/docutils ) test? ( virtual/perl-Test-Harness dev-libs/fcgi ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=sys-libs/zlib-1.1 bzip2? ( app-arch/bzip2 ) fam? ( virtual/fam ) gdbm? ( sys-libs/gdbm ) ldap? ( >=net-nds/openldap-2.1.26 ) lua? ( >=dev-lang/lua-5.1 ) memcache? ( dev-libs/libmemcache ) mysql? ( >=virtual/mysql-4.0 ) pcre? ( >=dev-libs/libpcre-3.1 ) php? ( virtual/httpd-php ) rrdtool? ( net-analyzer/rrdtool ) ssl? ( >=dev-libs/openssl-0.9.7 ) webdav? ( dev-libs/libxml2 >=dev-db/sqlite-3 sys-fs/e2fsprogs ) xattr? ( kernel_linux? ( sys-apps/attr ) ) dev-util/pkgconfig doc? ( dev-python/docutils ) test? ( virtual/perl-Test-Harness dev-libs/fcgi ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=sys-libs/zlib-1.1 bzip2? ( app-arch/bzip2 ) fam? ( virtual/fam ) gdbm? ( sys-libs/gdbm ) ldap? ( >=net-nds/openldap-2.1.26 ) lua? ( >=dev-lang/lua-5.1 ) memcache? ( dev-libs/libmemcache ) mysql? ( >=virtual/mysql-4.0 ) pcre? ( >=dev-libs/libpcre-3.1 ) php? ( virtual/httpd-php ) rrdtool? ( net-analyzer/rrdtool ) ssl? ( >=dev-libs/openssl-0.9.7 ) webdav? ( dev-libs/libxml2 >=dev-db/sqlite-3 sys-fs/e2fsprogs ) xattr? ( kernel_linux? ( sys-apps/attr ) )
 0
 http://www.lighttpd.net/download/lighttpd-1.4.23.tar.bz2
diff --git a/metadata/cache/www-servers/lighttpd-1.4.25-r2 b/metadata/cache/www-servers/lighttpd-1.4.25-r2
index 38c3b38716bd..46dab73feda5 100644
--- a/metadata/cache/www-servers/lighttpd-1.4.25-r2
+++ b/metadata/cache/www-servers/lighttpd-1.4.25-r2
@@ -1,4 +1,4 @@
->=sys-libs/zlib-1.1 bzip2? ( app-arch/bzip2 ) fam? ( virtual/fam ) gdbm? ( sys-libs/gdbm ) ldap? ( >=net-nds/openldap-2.1.26 ) lua? ( >=dev-lang/lua-5.1 ) memcache? ( dev-libs/libmemcache ) mysql? ( >=virtual/mysql-4.0 ) pcre? ( >=dev-libs/libpcre-3.1 ) php? ( virtual/httpd-php ) rrdtool? ( net-analyzer/rrdtool ) ssl? ( >=dev-libs/openssl-0.9.7 ) webdav? ( dev-libs/libxml2 >=dev-db/sqlite-3 sys-fs/e2fsprogs ) xattr? ( kernel_linux? ( sys-apps/attr ) ) dev-util/pkgconfig doc? ( dev-python/docutils ) test? ( virtual/perl-Test-Harness dev-libs/fcgi ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=sys-libs/zlib-1.1 bzip2? ( app-arch/bzip2 ) fam? ( virtual/fam ) gdbm? ( sys-libs/gdbm ) ldap? ( >=net-nds/openldap-2.1.26 ) lua? ( >=dev-lang/lua-5.1 ) memcache? ( dev-libs/libmemcache ) mysql? ( >=virtual/mysql-4.0 ) pcre? ( >=dev-libs/libpcre-3.1 ) php? ( virtual/httpd-php ) rrdtool? ( net-analyzer/rrdtool ) ssl? ( >=dev-libs/openssl-0.9.7 ) webdav? ( dev-libs/libxml2 >=dev-db/sqlite-3 sys-fs/e2fsprogs ) xattr? ( kernel_linux? ( sys-apps/attr ) ) dev-util/pkgconfig doc? ( dev-python/docutils ) test? ( virtual/perl-Test-Harness dev-libs/fcgi ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=sys-libs/zlib-1.1 bzip2? ( app-arch/bzip2 ) fam? ( virtual/fam ) gdbm? ( sys-libs/gdbm ) ldap? ( >=net-nds/openldap-2.1.26 ) lua? ( >=dev-lang/lua-5.1 ) memcache? ( dev-libs/libmemcache ) mysql? ( >=virtual/mysql-4.0 ) pcre? ( >=dev-libs/libpcre-3.1 ) php? ( virtual/httpd-php ) rrdtool? ( net-analyzer/rrdtool ) ssl? ( >=dev-libs/openssl-0.9.7 ) webdav? ( dev-libs/libxml2 >=dev-db/sqlite-3 sys-fs/e2fsprogs ) xattr? ( kernel_linux? ( sys-apps/attr ) )
 0
 http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-1.4.25.tar.bz2
diff --git a/metadata/cache/www-servers/lighttpd-1.4.25-r3 b/metadata/cache/www-servers/lighttpd-1.4.25-r3
index dec6383062ae..25e9f73c1d6b 100644
--- a/metadata/cache/www-servers/lighttpd-1.4.25-r3
+++ b/metadata/cache/www-servers/lighttpd-1.4.25-r3
@@ -1,4 +1,4 @@
->=sys-libs/zlib-1.1 bzip2? ( app-arch/bzip2 ) fam? ( virtual/fam ) gdbm? ( sys-libs/gdbm ) ldap? ( >=net-nds/openldap-2.1.26 ) lua? ( >=dev-lang/lua-5.1 ) memcache? ( dev-libs/libmemcache ) mysql? ( >=virtual/mysql-4.0 ) pcre? ( >=dev-libs/libpcre-3.1 ) php? ( virtual/httpd-php ) rrdtool? ( net-analyzer/rrdtool ) ssl? ( >=dev-libs/openssl-0.9.7 ) webdav? ( dev-libs/libxml2 >=dev-db/sqlite-3 sys-fs/e2fsprogs ) xattr? ( kernel_linux? ( sys-apps/attr ) ) dev-util/pkgconfig doc? ( dev-python/docutils ) test? ( virtual/perl-Test-Harness dev-libs/fcgi ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=sys-libs/zlib-1.1 bzip2? ( app-arch/bzip2 ) fam? ( virtual/fam ) gdbm? ( sys-libs/gdbm ) ldap? ( >=net-nds/openldap-2.1.26 ) lua? ( >=dev-lang/lua-5.1 ) memcache? ( dev-libs/libmemcache ) mysql? ( >=virtual/mysql-4.0 ) pcre? ( >=dev-libs/libpcre-3.1 ) php? ( virtual/httpd-php ) rrdtool? ( net-analyzer/rrdtool ) ssl? ( >=dev-libs/openssl-0.9.7 ) webdav? ( dev-libs/libxml2 >=dev-db/sqlite-3 sys-fs/e2fsprogs ) xattr? ( kernel_linux? ( sys-apps/attr ) ) dev-util/pkgconfig doc? ( dev-python/docutils ) test? ( virtual/perl-Test-Harness dev-libs/fcgi ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=sys-libs/zlib-1.1 bzip2? ( app-arch/bzip2 ) fam? ( virtual/fam ) gdbm? ( sys-libs/gdbm ) ldap? ( >=net-nds/openldap-2.1.26 ) lua? ( >=dev-lang/lua-5.1 ) memcache? ( dev-libs/libmemcache ) mysql? ( >=virtual/mysql-4.0 ) pcre? ( >=dev-libs/libpcre-3.1 ) php? ( virtual/httpd-php ) rrdtool? ( net-analyzer/rrdtool ) ssl? ( >=dev-libs/openssl-0.9.7 ) webdav? ( dev-libs/libxml2 >=dev-db/sqlite-3 sys-fs/e2fsprogs ) xattr? ( kernel_linux? ( sys-apps/attr ) )
 0
 http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-1.4.25.tar.bz2
diff --git a/metadata/cache/www-servers/lighttpd-1.4.26-r2 b/metadata/cache/www-servers/lighttpd-1.4.26-r2
index 90c95b059436..786997d3d8f5 100644
--- a/metadata/cache/www-servers/lighttpd-1.4.26-r2
+++ b/metadata/cache/www-servers/lighttpd-1.4.26-r2
@@ -1,4 +1,4 @@
->=sys-libs/zlib-1.1 bzip2? ( app-arch/bzip2 ) fam? ( virtual/fam ) gdbm? ( sys-libs/gdbm ) ldap? ( >=net-nds/openldap-2.1.26 ) lua? ( >=dev-lang/lua-5.1 ) memcache? ( dev-libs/libmemcache ) mysql? ( >=virtual/mysql-4.0 ) pcre? ( >=dev-libs/libpcre-3.1 ) php? ( virtual/httpd-php ) rrdtool? ( net-analyzer/rrdtool ) ssl? ( >=dev-libs/openssl-0.9.7 ) webdav? ( dev-libs/libxml2 >=dev-db/sqlite-3 sys-fs/e2fsprogs ) xattr? ( kernel_linux? ( sys-apps/attr ) ) dev-util/pkgconfig doc? ( dev-python/docutils ) test? ( virtual/perl-Test-Harness dev-libs/fcgi ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=sys-libs/zlib-1.1 bzip2? ( app-arch/bzip2 ) fam? ( virtual/fam ) gdbm? ( sys-libs/gdbm ) ldap? ( >=net-nds/openldap-2.1.26 ) lua? ( >=dev-lang/lua-5.1 ) memcache? ( dev-libs/libmemcache ) mysql? ( >=virtual/mysql-4.0 ) pcre? ( >=dev-libs/libpcre-3.1 ) php? ( virtual/httpd-php ) rrdtool? ( net-analyzer/rrdtool ) ssl? ( >=dev-libs/openssl-0.9.7 ) webdav? ( dev-libs/libxml2 >=dev-db/sqlite-3 sys-fs/e2fsprogs ) xattr? ( kernel_linux? ( sys-apps/attr ) ) dev-util/pkgconfig doc? ( dev-python/docutils ) test? ( virtual/perl-Test-Harness dev-libs/fcgi ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=sys-libs/zlib-1.1 bzip2? ( app-arch/bzip2 ) fam? ( virtual/fam ) gdbm? ( sys-libs/gdbm ) ldap? ( >=net-nds/openldap-2.1.26 ) lua? ( >=dev-lang/lua-5.1 ) memcache? ( dev-libs/libmemcache ) mysql? ( >=virtual/mysql-4.0 ) pcre? ( >=dev-libs/libpcre-3.1 ) php? ( virtual/httpd-php ) rrdtool? ( net-analyzer/rrdtool ) ssl? ( >=dev-libs/openssl-0.9.7 ) webdav? ( dev-libs/libxml2 >=dev-db/sqlite-3 sys-fs/e2fsprogs ) xattr? ( kernel_linux? ( sys-apps/attr ) )
 0
 http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-1.4.26.tar.bz2
diff --git a/metadata/cache/www-servers/lighttpd-1.4.28-r3 b/metadata/cache/www-servers/lighttpd-1.4.28-r3
index 990d8aaa52a6..9bb1fc1fdbd1 100644
--- a/metadata/cache/www-servers/lighttpd-1.4.28-r3
+++ b/metadata/cache/www-servers/lighttpd-1.4.28-r3
@@ -1,4 +1,4 @@
->=sys-libs/zlib-1.1 bzip2? ( app-arch/bzip2 ) fam? ( virtual/fam ) gdbm? ( sys-libs/gdbm ) ldap? ( >=net-nds/openldap-2.1.26 ) libev? ( dev-libs/libev ) lua? ( >=dev-lang/lua-5.1 ) memcache? ( dev-libs/libmemcache ) mysql? ( >=virtual/mysql-4.0 ) pcre? ( >=dev-libs/libpcre-3.1 ) php? ( dev-lang/php[cgi] ) rrdtool? ( net-analyzer/rrdtool ) ssl? ( >=dev-libs/openssl-0.9.7 ) webdav? ( dev-libs/libxml2 >=dev-db/sqlite-3 sys-fs/e2fsprogs ) xattr? ( kernel_linux? ( sys-apps/attr ) ) dev-util/pkgconfig doc? ( dev-python/docutils ) test? ( virtual/perl-Test-Harness dev-libs/fcgi ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=sys-libs/zlib-1.1 bzip2? ( app-arch/bzip2 ) fam? ( virtual/fam ) gdbm? ( sys-libs/gdbm ) ldap? ( >=net-nds/openldap-2.1.26 ) libev? ( dev-libs/libev ) lua? ( >=dev-lang/lua-5.1 ) memcache? ( dev-libs/libmemcache ) mysql? ( >=virtual/mysql-4.0 ) pcre? ( >=dev-libs/libpcre-3.1 ) php? ( dev-lang/php[cgi] ) rrdtool? ( net-analyzer/rrdtool ) ssl? ( >=dev-libs/openssl-0.9.7 ) webdav? ( dev-libs/libxml2 >=dev-db/sqlite-3 sys-fs/e2fsprogs ) xattr? ( kernel_linux? ( sys-apps/attr ) ) dev-util/pkgconfig doc? ( dev-python/docutils ) test? ( virtual/perl-Test-Harness dev-libs/fcgi ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=sys-libs/zlib-1.1 bzip2? ( app-arch/bzip2 ) fam? ( virtual/fam ) gdbm? ( sys-libs/gdbm ) ldap? ( >=net-nds/openldap-2.1.26 ) libev? ( dev-libs/libev ) lua? ( >=dev-lang/lua-5.1 ) memcache? ( dev-libs/libmemcache ) mysql? ( >=virtual/mysql-4.0 ) pcre? ( >=dev-libs/libpcre-3.1 ) php? ( dev-lang/php[cgi] ) rrdtool? ( net-analyzer/rrdtool ) ssl? ( >=dev-libs/openssl-0.9.7 ) webdav? ( dev-libs/libxml2 >=dev-db/sqlite-3 sys-fs/e2fsprogs ) xattr? ( kernel_linux? ( sys-apps/attr ) )
 0
 http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-1.4.28.tar.bz2
diff --git a/metadata/cache/www-servers/lighttpd-1.4.28-r4 b/metadata/cache/www-servers/lighttpd-1.4.28-r4
index 9e1cdf8379df..14f6552df384 100644
--- a/metadata/cache/www-servers/lighttpd-1.4.28-r4
+++ b/metadata/cache/www-servers/lighttpd-1.4.28-r4
@@ -1,4 +1,4 @@
->=sys-libs/zlib-1.1 bzip2? ( app-arch/bzip2 ) fam? ( virtual/fam ) gdbm? ( sys-libs/gdbm ) ldap? ( >=net-nds/openldap-2.1.26 ) libev? ( >=dev-libs/libev-4.01 ) lua? ( >=dev-lang/lua-5.1 ) memcache? ( dev-libs/libmemcache ) mysql? ( >=virtual/mysql-4.0 ) pcre? ( >=dev-libs/libpcre-3.1 ) php? ( dev-lang/php[cgi] ) rrdtool? ( net-analyzer/rrdtool ) ssl? ( >=dev-libs/openssl-0.9.7 ) webdav? ( dev-libs/libxml2 >=dev-db/sqlite-3 sys-fs/e2fsprogs ) xattr? ( kernel_linux? ( sys-apps/attr ) ) dev-util/pkgconfig doc? ( dev-python/docutils ) test? ( virtual/perl-Test-Harness dev-libs/fcgi ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=sys-libs/zlib-1.1 bzip2? ( app-arch/bzip2 ) fam? ( virtual/fam ) gdbm? ( sys-libs/gdbm ) ldap? ( >=net-nds/openldap-2.1.26 ) libev? ( >=dev-libs/libev-4.01 ) lua? ( >=dev-lang/lua-5.1 ) memcache? ( dev-libs/libmemcache ) mysql? ( >=virtual/mysql-4.0 ) pcre? ( >=dev-libs/libpcre-3.1 ) php? ( dev-lang/php[cgi] ) rrdtool? ( net-analyzer/rrdtool ) ssl? ( >=dev-libs/openssl-0.9.7 ) webdav? ( dev-libs/libxml2 >=dev-db/sqlite-3 sys-fs/e2fsprogs ) xattr? ( kernel_linux? ( sys-apps/attr ) ) dev-util/pkgconfig doc? ( dev-python/docutils ) test? ( virtual/perl-Test-Harness dev-libs/fcgi ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=sys-libs/zlib-1.1 bzip2? ( app-arch/bzip2 ) fam? ( virtual/fam ) gdbm? ( sys-libs/gdbm ) ldap? ( >=net-nds/openldap-2.1.26 ) libev? ( >=dev-libs/libev-4.01 ) lua? ( >=dev-lang/lua-5.1 ) memcache? ( dev-libs/libmemcache ) mysql? ( >=virtual/mysql-4.0 ) pcre? ( >=dev-libs/libpcre-3.1 ) php? ( dev-lang/php[cgi] ) rrdtool? ( net-analyzer/rrdtool ) ssl? ( >=dev-libs/openssl-0.9.7 ) webdav? ( dev-libs/libxml2 >=dev-db/sqlite-3 sys-fs/e2fsprogs ) xattr? ( kernel_linux? ( sys-apps/attr ) )
 0
 http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-1.4.28.tar.bz2
diff --git a/metadata/cache/www-servers/lighttpd-1.4.28-r5 b/metadata/cache/www-servers/lighttpd-1.4.28-r5
index ab6fa15ace79..7713888123df 100644
--- a/metadata/cache/www-servers/lighttpd-1.4.28-r5
+++ b/metadata/cache/www-servers/lighttpd-1.4.28-r5
@@ -1,4 +1,4 @@
->=sys-libs/zlib-1.1 bzip2? ( app-arch/bzip2 ) fam? ( virtual/fam ) gdbm? ( sys-libs/gdbm ) ldap? ( >=net-nds/openldap-2.1.26 ) libev? ( >=dev-libs/libev-4.01 ) lua? ( >=dev-lang/lua-5.1 ) memcache? ( dev-libs/libmemcache ) mysql? ( >=virtual/mysql-4.0 ) pcre? ( >=dev-libs/libpcre-3.1 ) php? ( dev-lang/php[cgi] ) rrdtool? ( net-analyzer/rrdtool ) ssl? ( >=dev-libs/openssl-0.9.7 ) webdav? ( dev-libs/libxml2 >=dev-db/sqlite-3 sys-fs/e2fsprogs ) xattr? ( kernel_linux? ( sys-apps/attr ) ) dev-util/pkgconfig doc? ( dev-python/docutils ) test? ( virtual/perl-Test-Harness dev-libs/fcgi ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=sys-libs/zlib-1.1 bzip2? ( app-arch/bzip2 ) fam? ( virtual/fam ) gdbm? ( sys-libs/gdbm ) ldap? ( >=net-nds/openldap-2.1.26 ) libev? ( >=dev-libs/libev-4.01 ) lua? ( >=dev-lang/lua-5.1 ) memcache? ( dev-libs/libmemcache ) mysql? ( >=virtual/mysql-4.0 ) pcre? ( >=dev-libs/libpcre-3.1 ) php? ( dev-lang/php[cgi] ) rrdtool? ( net-analyzer/rrdtool ) ssl? ( >=dev-libs/openssl-0.9.7 ) webdav? ( dev-libs/libxml2 >=dev-db/sqlite-3 sys-fs/e2fsprogs ) xattr? ( kernel_linux? ( sys-apps/attr ) ) dev-util/pkgconfig doc? ( dev-python/docutils ) test? ( virtual/perl-Test-Harness dev-libs/fcgi ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=sys-libs/zlib-1.1 bzip2? ( app-arch/bzip2 ) fam? ( virtual/fam ) gdbm? ( sys-libs/gdbm ) ldap? ( >=net-nds/openldap-2.1.26 ) libev? ( >=dev-libs/libev-4.01 ) lua? ( >=dev-lang/lua-5.1 ) memcache? ( dev-libs/libmemcache ) mysql? ( >=virtual/mysql-4.0 ) pcre? ( >=dev-libs/libpcre-3.1 ) php? ( dev-lang/php[cgi] ) rrdtool? ( net-analyzer/rrdtool ) ssl? ( >=dev-libs/openssl-0.9.7 ) webdav? ( dev-libs/libxml2 >=dev-db/sqlite-3 sys-fs/e2fsprogs ) xattr? ( kernel_linux? ( sys-apps/attr ) )
 0
 http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-1.4.28.tar.bz2
diff --git a/metadata/cache/www-servers/lighttpd-1.4.29-r4 b/metadata/cache/www-servers/lighttpd-1.4.29-r4
index 7432164c91fc..af8e34991316 100644
--- a/metadata/cache/www-servers/lighttpd-1.4.29-r4
+++ b/metadata/cache/www-servers/lighttpd-1.4.29-r4
@@ -1,4 +1,4 @@
-bzip2? ( app-arch/bzip2 ) fam? ( virtual/fam ) gdbm? ( sys-libs/gdbm ) ldap? ( >=net-nds/openldap-2.1.26 ) libev? ( >=dev-libs/libev-4.01 ) lua? ( >=dev-lang/lua-5.1 ) memcache? ( dev-libs/libmemcache ) mysql? ( >=virtual/mysql-4.0 ) pcre? ( >=dev-libs/libpcre-3.1 ) php? ( dev-lang/php[cgi] ) rrdtool? ( net-analyzer/rrdtool ) ssl? ( >=dev-libs/openssl-0.9.7[kerberos?] ) webdav? ( dev-libs/libxml2 >=dev-db/sqlite-3 sys-fs/e2fsprogs ) xattr? ( kernel_linux? ( sys-apps/attr ) ) zlib? ( >=sys-libs/zlib-1.1 ) dev-util/pkgconfig doc? ( dev-python/docutils ) test? ( virtual/perl-Test-Harness dev-libs/fcgi ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+bzip2? ( app-arch/bzip2 ) fam? ( virtual/fam ) gdbm? ( sys-libs/gdbm ) ldap? ( >=net-nds/openldap-2.1.26 ) libev? ( >=dev-libs/libev-4.01 ) lua? ( >=dev-lang/lua-5.1 ) memcache? ( dev-libs/libmemcache ) mysql? ( >=virtual/mysql-4.0 ) pcre? ( >=dev-libs/libpcre-3.1 ) php? ( dev-lang/php[cgi] ) rrdtool? ( net-analyzer/rrdtool ) ssl? ( >=dev-libs/openssl-0.9.7[kerberos?] ) webdav? ( dev-libs/libxml2 >=dev-db/sqlite-3 sys-fs/e2fsprogs ) xattr? ( kernel_linux? ( sys-apps/attr ) ) zlib? ( >=sys-libs/zlib-1.1 ) dev-util/pkgconfig doc? ( dev-python/docutils ) test? ( virtual/perl-Test-Harness dev-libs/fcgi ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 bzip2? ( app-arch/bzip2 ) fam? ( virtual/fam ) gdbm? ( sys-libs/gdbm ) ldap? ( >=net-nds/openldap-2.1.26 ) libev? ( >=dev-libs/libev-4.01 ) lua? ( >=dev-lang/lua-5.1 ) memcache? ( dev-libs/libmemcache ) mysql? ( >=virtual/mysql-4.0 ) pcre? ( >=dev-libs/libpcre-3.1 ) php? ( dev-lang/php[cgi] ) rrdtool? ( net-analyzer/rrdtool ) ssl? ( >=dev-libs/openssl-0.9.7[kerberos?] ) webdav? ( dev-libs/libxml2 >=dev-db/sqlite-3 sys-fs/e2fsprogs ) xattr? ( kernel_linux? ( sys-apps/attr ) ) zlib? ( >=sys-libs/zlib-1.1 )
 0
 http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-1.4.29.tar.bz2
diff --git a/metadata/cache/www-servers/lighttpd-1.4.30-r1 b/metadata/cache/www-servers/lighttpd-1.4.30-r1
index 5e73d62243b0..a71127909c63 100644
--- a/metadata/cache/www-servers/lighttpd-1.4.30-r1
+++ b/metadata/cache/www-servers/lighttpd-1.4.30-r1
@@ -1,4 +1,4 @@
-bzip2? ( app-arch/bzip2 ) fam? ( virtual/fam ) gdbm? ( sys-libs/gdbm ) ldap? ( >=net-nds/openldap-2.1.26 ) libev? ( >=dev-libs/libev-4.01 ) lua? ( >=dev-lang/lua-5.1 ) memcache? ( dev-libs/libmemcache ) mysql? ( >=virtual/mysql-4.0 ) pcre? ( >=dev-libs/libpcre-3.1 ) php? ( dev-lang/php[cgi] ) rrdtool? ( net-analyzer/rrdtool ) selinux? ( sec-policy/selinux-apache ) ssl? ( >=dev-libs/openssl-0.9.7[kerberos?] ) webdav? ( dev-libs/libxml2 >=dev-db/sqlite-3 sys-fs/e2fsprogs ) xattr? ( kernel_linux? ( sys-apps/attr ) ) zlib? ( >=sys-libs/zlib-1.1 ) dev-util/pkgconfig doc? ( dev-python/docutils ) test? ( virtual/perl-Test-Harness dev-libs/fcgi ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+bzip2? ( app-arch/bzip2 ) fam? ( virtual/fam ) gdbm? ( sys-libs/gdbm ) ldap? ( >=net-nds/openldap-2.1.26 ) libev? ( >=dev-libs/libev-4.01 ) lua? ( >=dev-lang/lua-5.1 ) memcache? ( dev-libs/libmemcache ) mysql? ( >=virtual/mysql-4.0 ) pcre? ( >=dev-libs/libpcre-3.1 ) php? ( dev-lang/php[cgi] ) rrdtool? ( net-analyzer/rrdtool ) selinux? ( sec-policy/selinux-apache ) ssl? ( >=dev-libs/openssl-0.9.7[kerberos?] ) webdav? ( dev-libs/libxml2 >=dev-db/sqlite-3 sys-fs/e2fsprogs ) xattr? ( kernel_linux? ( sys-apps/attr ) ) zlib? ( >=sys-libs/zlib-1.1 ) dev-util/pkgconfig doc? ( dev-python/docutils ) test? ( virtual/perl-Test-Harness dev-libs/fcgi ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 bzip2? ( app-arch/bzip2 ) fam? ( virtual/fam ) gdbm? ( sys-libs/gdbm ) ldap? ( >=net-nds/openldap-2.1.26 ) libev? ( >=dev-libs/libev-4.01 ) lua? ( >=dev-lang/lua-5.1 ) memcache? ( dev-libs/libmemcache ) mysql? ( >=virtual/mysql-4.0 ) pcre? ( >=dev-libs/libpcre-3.1 ) php? ( dev-lang/php[cgi] ) rrdtool? ( net-analyzer/rrdtool ) selinux? ( sec-policy/selinux-apache ) ssl? ( >=dev-libs/openssl-0.9.7[kerberos?] ) webdav? ( dev-libs/libxml2 >=dev-db/sqlite-3 sys-fs/e2fsprogs ) xattr? ( kernel_linux? ( sys-apps/attr ) ) zlib? ( >=sys-libs/zlib-1.1 )
 0
 http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-1.4.30.tar.bz2
diff --git a/metadata/cache/www-servers/monkeyd-0.32.0 b/metadata/cache/www-servers/monkeyd-0.32.0
deleted file mode 100644
index 2090ea32e7d7..000000000000
--- a/metadata/cache/www-servers/monkeyd-0.32.0
+++ /dev/null
@@ -1,22 +0,0 @@
-
-php? ( virtual/httpd-php )
-0
-http://monkey-project.com/releases/0.32/monkey-0.32.0.tar.gz
-
-http://www.monkey-project.com/
-GPL-2
-A small, fast, and scalable web server
-~amd64 ~mips ~ppc ~x86
-depend.php eutils multilib phpconfutils toolchain-funcs user
-php
-
-
-
-4
-
-compile configure install prepare setup
-
-
-
-
-
diff --git a/metadata/cache/www-servers/monkeyd-0.9.1 b/metadata/cache/www-servers/monkeyd-0.9.1
deleted file mode 100644
index e5d967ade693..000000000000
--- a/metadata/cache/www-servers/monkeyd-0.9.1
+++ /dev/null
@@ -1,22 +0,0 @@
-
-php? ( virtual/httpd-php )
-0
-http://monkeyd.sourceforge.net/versions/monkey-0.9.1.tar.gz
-
-http://monkeyd.sourceforge.net/
-GPL-2
-fast, efficient, (REALLY) small, and easy to configure web server
-~amd64 ~mips ppc x86
-depend.php eutils multilib phpconfutils toolchain-funcs user
-php
-
-
-
-
-
-compile install setup unpack
-
-
-
-
-
diff --git a/metadata/cache/www-servers/resin-4.0.13-r1 b/metadata/cache/www-servers/resin-4.0.13-r1
index e6ac1d043530..111919822372 100644
--- a/metadata/cache/www-servers/resin-4.0.13-r1
+++ b/metadata/cache/www-servers/resin-4.0.13-r1
@@ -1,4 +1,4 @@
->=virtual/jdk-1.5 app-arch/unzip dev-java/ant-core dev-libs/openssl ~dev-java/resin-servlet-api-4.0.13 dev-java/glassfish-deployment-api:1.2 java-virtuals/javamail dev-java/jsr101 dev-java/mojarra:1.2 dev-java/validation-api:1.0 >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip ) >=dev-java/ant-core-1.7.0 >=dev-java/javatoolkit-0.3.0-r2 >=dev-lang/python-2.4 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=virtual/jdk-1.5 app-arch/unzip dev-java/ant-core dev-libs/openssl ~dev-java/resin-servlet-api-4.0.13 dev-java/glassfish-deployment-api:1.2 java-virtuals/javamail dev-java/jsr101 dev-java/mojarra:1.2 dev-java/validation-api:1.0 >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip ) >=dev-java/ant-core-1.7.0 >=dev-java/javatoolkit-0.3.0-r2 >=dev-lang/python-2.4 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=virtual/jdk-1.5 ~dev-java/resin-servlet-api-4.0.13 dev-java/glassfish-deployment-api:1.2 java-virtuals/javamail dev-java/jsr101 dev-java/mojarra:1.2 dev-java/validation-api:1.0 >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip )
 0
 http://www.caucho.com/download/resin-4.0.13-src.zip mirror://gentoo/resin-gentoo-patches-4.0.13.tar.bz2
diff --git a/metadata/cache/www-servers/resin-4.0.14 b/metadata/cache/www-servers/resin-4.0.14
index 3231404811b2..5c9428aa27c1 100644
--- a/metadata/cache/www-servers/resin-4.0.14
+++ b/metadata/cache/www-servers/resin-4.0.14
@@ -1,4 +1,4 @@
->=virtual/jdk-1.5 app-arch/unzip dev-java/ant-core dev-libs/openssl ~dev-java/resin-servlet-api-4.0.14 dev-java/glassfish-deployment-api:1.2 java-virtuals/javamail dev-java/jsr101 dev-java/mojarra:1.2 dev-java/validation-api:1.0 >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip ) >=dev-java/ant-core-1.7.0 >=dev-java/javatoolkit-0.3.0-r2 >=dev-lang/python-2.4 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=virtual/jdk-1.5 app-arch/unzip dev-java/ant-core dev-libs/openssl ~dev-java/resin-servlet-api-4.0.14 dev-java/glassfish-deployment-api:1.2 java-virtuals/javamail dev-java/jsr101 dev-java/mojarra:1.2 dev-java/validation-api:1.0 >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip ) >=dev-java/ant-core-1.7.0 >=dev-java/javatoolkit-0.3.0-r2 >=dev-lang/python-2.4 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=virtual/jdk-1.5 ~dev-java/resin-servlet-api-4.0.14 dev-java/glassfish-deployment-api:1.2 java-virtuals/javamail dev-java/jsr101 dev-java/mojarra:1.2 dev-java/validation-api:1.0 >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip )
 0
 http://www.caucho.com/download/resin-4.0.14-src.zip mirror://gentoo/resin-gentoo-patches-4.0.14.tar.bz2
diff --git a/metadata/cache/www-servers/resin-4.0.15 b/metadata/cache/www-servers/resin-4.0.15
index 71f496fc8611..75da956c77fe 100644
--- a/metadata/cache/www-servers/resin-4.0.15
+++ b/metadata/cache/www-servers/resin-4.0.15
@@ -1,4 +1,4 @@
->=virtual/jdk-1.5 app-arch/unzip dev-java/ant-core dev-libs/openssl ~dev-java/resin-servlet-api-4.0.15 dev-java/glassfish-deployment-api:1.2 java-virtuals/javamail dev-java/jsr101 dev-java/mojarra:1.2 dev-java/validation-api:1.0 >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip ) >=dev-java/ant-core-1.7.0 >=dev-java/javatoolkit-0.3.0-r2 >=dev-lang/python-2.4 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=virtual/jdk-1.5 app-arch/unzip dev-java/ant-core dev-libs/openssl ~dev-java/resin-servlet-api-4.0.15 dev-java/glassfish-deployment-api:1.2 java-virtuals/javamail dev-java/jsr101 dev-java/mojarra:1.2 dev-java/validation-api:1.0 >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip ) >=dev-java/ant-core-1.7.0 >=dev-java/javatoolkit-0.3.0-r2 >=dev-lang/python-2.4 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=virtual/jdk-1.5 ~dev-java/resin-servlet-api-4.0.15 dev-java/glassfish-deployment-api:1.2 java-virtuals/javamail dev-java/jsr101 dev-java/mojarra:1.2 dev-java/validation-api:1.0 >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip )
 0
 http://www.caucho.com/download/resin-4.0.15-src.zip mirror://gentoo/resin-gentoo-patches-4.0.15.tar.bz2
diff --git a/metadata/cache/www-servers/resin-4.0.22 b/metadata/cache/www-servers/resin-4.0.22
index 90dad4ffa8e7..42bfe1f1ff3f 100644
--- a/metadata/cache/www-servers/resin-4.0.22
+++ b/metadata/cache/www-servers/resin-4.0.22
@@ -1,4 +1,4 @@
->=virtual/jdk-1.5 app-arch/unzip dev-java/ant-core dev-libs/openssl ~dev-java/resin-servlet-api-4.0.22 dev-java/glassfish-deployment-api:1.2 java-virtuals/javamail dev-java/jsr101 dev-java/mojarra:1.2 dev-java/validation-api:1.0 >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip ) >=dev-java/ant-core-1.7.0 >=dev-java/javatoolkit-0.3.0-r2 >=dev-lang/python-2.4 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=virtual/jdk-1.5 app-arch/unzip dev-java/ant-core dev-libs/openssl ~dev-java/resin-servlet-api-4.0.22 dev-java/glassfish-deployment-api:1.2 java-virtuals/javamail dev-java/jsr101 dev-java/mojarra:1.2 dev-java/validation-api:1.0 >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip ) >=dev-java/ant-core-1.7.0 >=dev-java/javatoolkit-0.3.0-r2 >=dev-lang/python-2.4 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=virtual/jdk-1.5 ~dev-java/resin-servlet-api-4.0.22 dev-java/glassfish-deployment-api:1.2 java-virtuals/javamail dev-java/jsr101 dev-java/mojarra:1.2 dev-java/validation-api:1.0 >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip )
 0
 http://www.caucho.com/download/resin-4.0.22-src.zip mirror://gentoo/resin-gentoo-patches-4.0.22-r1.tar.bz2
diff --git a/metadata/cache/www-servers/resin-4.0.25 b/metadata/cache/www-servers/resin-4.0.25
index 8a2155160b33..b9751f698d24 100644
--- a/metadata/cache/www-servers/resin-4.0.25
+++ b/metadata/cache/www-servers/resin-4.0.25
@@ -1,4 +1,4 @@
->=virtual/jdk-1.5 app-arch/unzip dev-java/ant-core dev-libs/openssl ~dev-java/resin-servlet-api-4.0.25 dev-java/glassfish-deployment-api:1.2 java-virtuals/javamail dev-java/jsr101 dev-java/mojarra:1.2 dev-java/validation-api:1.0 >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip ) >=dev-java/ant-core-1.7.0 >=dev-java/javatoolkit-0.3.0-r2 >=dev-lang/python-2.4 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=virtual/jdk-1.5 app-arch/unzip dev-java/ant-core dev-libs/openssl ~dev-java/resin-servlet-api-4.0.25 dev-java/glassfish-deployment-api:1.2 java-virtuals/javamail dev-java/jsr101 dev-java/mojarra:1.2 dev-java/validation-api:1.0 >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip ) >=dev-java/ant-core-1.7.0 >=dev-java/javatoolkit-0.3.0-r2 >=dev-lang/python-2.4 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=virtual/jdk-1.5 ~dev-java/resin-servlet-api-4.0.25 dev-java/glassfish-deployment-api:1.2 java-virtuals/javamail dev-java/jsr101 dev-java/mojarra:1.2 dev-java/validation-api:1.0 >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip )
 0
 http://www.caucho.com/download/resin-4.0.25-src.zip mirror://gentoo/resin-gentoo-patches-4.0.25-r1.tar.bz2
diff --git a/metadata/cache/www-servers/resin-4.0.26 b/metadata/cache/www-servers/resin-4.0.26
index 2d26f7dfbdda..f0fea401e3c0 100644
--- a/metadata/cache/www-servers/resin-4.0.26
+++ b/metadata/cache/www-servers/resin-4.0.26
@@ -1,4 +1,4 @@
->=virtual/jdk-1.5 app-arch/unzip dev-java/ant-core dev-libs/openssl ~dev-java/resin-servlet-api-4.0.26 dev-java/glassfish-deployment-api:1.2 java-virtuals/javamail dev-java/jsr101 dev-java/mojarra:1.2 dev-java/validation-api:1.0 >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip ) >=dev-java/ant-core-1.7.0 >=dev-java/javatoolkit-0.3.0-r2 >=dev-lang/python-2.4 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=virtual/jdk-1.5 app-arch/unzip dev-java/ant-core dev-libs/openssl ~dev-java/resin-servlet-api-4.0.26 dev-java/glassfish-deployment-api:1.2 java-virtuals/javamail dev-java/jsr101 dev-java/mojarra:1.2 dev-java/validation-api:1.0 >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip ) >=dev-java/ant-core-1.7.0 >=dev-java/javatoolkit-0.3.0-r2 >=dev-lang/python-2.4 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=virtual/jdk-1.5 ~dev-java/resin-servlet-api-4.0.26 dev-java/glassfish-deployment-api:1.2 java-virtuals/javamail dev-java/jsr101 dev-java/mojarra:1.2 dev-java/validation-api:1.0 >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip )
 0
 http://www.caucho.com/download/resin-4.0.26-src.zip mirror://gentoo/resin-gentoo-patches-4.0.26.tar.bz2
diff --git a/metadata/cache/www-servers/thttpd-2.25b-r8 b/metadata/cache/www-servers/thttpd-2.25b-r8
index f3024256fef0..95a887dd7825 100644
--- a/metadata/cache/www-servers/thttpd-2.25b-r8
+++ b/metadata/cache/www-servers/thttpd-2.25b-r8
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/automake-1.11.1 ) =sys-devel/autoconf-2.1* sys-devel/libtool
+|| ( >=sys-devel/automake-1.11.1:1.11 ) =sys-devel/autoconf-2.1* sys-devel/libtool
 
 0
 http://www.acme.com/software/thttpd/thttpd-2.25b.tar.gz
diff --git a/metadata/cache/www-servers/varnish-2.0.4-r1 b/metadata/cache/www-servers/varnish-2.0.4-r1
index 8d8928977b01..58f3d97b3915 100644
--- a/metadata/cache/www-servers/varnish-2.0.4-r1
+++ b/metadata/cache/www-servers/varnish-2.0.4-r1
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 sys-devel/gcc
 0
 mirror://sourceforge/varnish/varnish-2.0.4.tar.gz
diff --git a/metadata/cache/www-servers/varnish-2.1.5 b/metadata/cache/www-servers/varnish-2.1.5
deleted file mode 100644
index 27e71de51841..000000000000
--- a/metadata/cache/www-servers/varnish-2.1.5
+++ /dev/null
@@ -1,22 +0,0 @@
-dev-libs/libpcre dev-python/docutils dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
-dev-libs/libpcre sys-devel/gcc
-0
-http://repo.varnish-cache.org/source/varnish-2.1.5.tar.gz
-test
-http://www.varnish-cache.org/
-BSD-2
-Varnish is a state-of-the-art, high-performance HTTP accelerator.
-~amd64 ~x86
-autotools eutils libtool multilib toolchain-funcs user
-doc
-
-
-
-3
-
-install postinst prepare
-
-
-
-
-
diff --git a/metadata/cache/www-servers/varnish-3.0.1 b/metadata/cache/www-servers/varnish-3.0.1
deleted file mode 100644
index c1af16945d2d..000000000000
--- a/metadata/cache/www-servers/varnish-3.0.1
+++ /dev/null
@@ -1,22 +0,0 @@
-dev-libs/libpcre dev-python/docutils dev-util/pkgconfig
-dev-libs/libpcre sys-devel/gcc
-0
-http://repo.varnish-cache.org/source/varnish-3.0.1.tar.gz
-test
-http://www.varnish-cache.org/
-BSD-2
-Varnish is a state-of-the-art, high-performance HTTP accelerator.
-~amd64 ~x86
-
-doc static-libs
-
-
-
-4
-
-configure install postinst
-
-
-
-
-
diff --git a/metadata/cache/www-servers/varnish-3.0.2 b/metadata/cache/www-servers/varnish-3.0.2
deleted file mode 100644
index 7e0cce4618c2..000000000000
--- a/metadata/cache/www-servers/varnish-3.0.2
+++ /dev/null
@@ -1,22 +0,0 @@
-dev-libs/libpcre dev-python/docutils dev-util/pkgconfig
-dev-libs/libpcre sys-devel/gcc
-0
-http://repo.varnish-cache.org/source/varnish-3.0.2.tar.gz
-test
-http://www.varnish-cache.org/
-BSD-2
-Varnish is a state-of-the-art, high-performance HTTP accelerator
-~amd64 ~x86
-autotools autotools-utils eutils libtool multilib toolchain-funcs user
-doc static-libs
-
-
-
-4
-
-compile configure install postinst prepare test
-
-
-
-
-
diff --git a/metadata/cache/x11-apps/ardesia-0.7 b/metadata/cache/x11-apps/ardesia-0.7
index dcd295c3a7fb..9c9b0d9065a2 100644
--- a/metadata/cache/x11-apps/ardesia-0.7
+++ b/metadata/cache/x11-apps/ardesia-0.7
@@ -1,4 +1,4 @@
-dev-libs/atk dev-libs/libsigsegv media-libs/fontconfig media-libs/libpng sci-libs/gsl sys-devel/gettext x11-libs/cairo x11-libs/gtk+:2 cwiid? ( app-misc/cwiid ) x11-misc/xdg-utils || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-libs/atk dev-libs/libsigsegv media-libs/fontconfig media-libs/libpng sci-libs/gsl sys-devel/gettext x11-libs/cairo x11-libs/gtk+:2 cwiid? ( app-misc/cwiid ) x11-misc/xdg-utils || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-libs/atk dev-libs/libsigsegv media-libs/fontconfig media-libs/libpng sci-libs/gsl sys-devel/gettext x11-libs/cairo x11-libs/gtk+:2 cwiid? ( app-misc/cwiid )
 0
 http://ardesia.googlecode.com/files/ardesia-0.7.tar.bz2
diff --git a/metadata/cache/x11-drivers/ati-drivers-12.2 b/metadata/cache/x11-drivers/ati-drivers-12.2
index ef3e8c53b074..a5da2063fc7e 100644
--- a/metadata/cache/x11-drivers/ati-drivers-12.2
+++ b/metadata/cache/x11-drivers/ati-drivers-12.2
@@ -6,7 +6,7 @@ http://www2.ati.com/drivers/linux//amd-driver-installer-12-2-x86.x86_64.run
 http://www.amd.com
 AMD GPL-2 QPL-1.0 as-is
 Ati precompiled drivers for radeon r600 (HD Series) and newer chipsets
-~amd64 ~x86
+amd64 ~x86
 eutils linux-info linux-mod multilib toolchain-funcs user versionator
 debug +modules multilib pax_kernel qt4 kernel_linux
 
diff --git a/metadata/cache/x11-drivers/xf86-video-psb-0.31.0_p11 b/metadata/cache/x11-drivers/xf86-video-psb-0.31.0_p11
index b72208fed497..deb17bba1c5e 100644
--- a/metadata/cache/x11-drivers/xf86-video-psb-0.31.0_p11
+++ b/metadata/cache/x11-drivers/xf86-video-psb-0.31.0_p11
@@ -1,4 +1,4 @@
-x11-base/xorg-server x11-proto/xf86dgaproto x11-proto/randrproto x11-proto/xf86driproto x11-proto/xineramaproto x11-libs/libdrm-poulsbo >=app-arch/rpm2targz-9.0.0.3g || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+x11-base/xorg-server x11-proto/xf86dgaproto x11-proto/randrproto x11-proto/xf86driproto x11-proto/xineramaproto x11-libs/libdrm-poulsbo >=app-arch/rpm2targz-9.0.0.3g || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 x11-base/xorg-server x11-proto/xf86dgaproto x11-proto/randrproto x11-proto/xf86driproto x11-proto/xineramaproto x11-libs/libdrm-poulsbo x11-drivers/psb-kmod x11-libs/xpsb-glx
 0
 http://adamwill.fedorapeople.org/poulsbo/src/xorg-x11-drv-psb-0.31.0-11.fc11.src.rpm
diff --git a/metadata/cache/x11-drivers/xf86-video-psb-0.31.0_p14 b/metadata/cache/x11-drivers/xf86-video-psb-0.31.0_p14
index 10f972b7200d..ffcabe715873 100644
--- a/metadata/cache/x11-drivers/xf86-video-psb-0.31.0_p14
+++ b/metadata/cache/x11-drivers/xf86-video-psb-0.31.0_p14
@@ -1,4 +1,4 @@
-x11-base/xorg-server x11-proto/xf86dgaproto x11-proto/randrproto x11-proto/xf86driproto x11-proto/xineramaproto x11-libs/libdrm-poulsbo >=app-arch/rpm2targz-9.0.0.3g || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+x11-base/xorg-server x11-proto/xf86dgaproto x11-proto/randrproto x11-proto/xf86driproto x11-proto/xineramaproto x11-libs/libdrm-poulsbo >=app-arch/rpm2targz-9.0.0.3g || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 x11-base/xorg-server x11-proto/xf86dgaproto x11-proto/randrproto x11-proto/xf86driproto x11-proto/xineramaproto x11-libs/libdrm-poulsbo x11-drivers/psb-kmod x11-libs/xpsb-glx
 0
 http://download1.rpmfusion.org/nonfree/fedora/updates/testing/11/SRPMS/xorg-x11-drv-psb-0.31.0-14.fc11.src.rpm
diff --git a/metadata/cache/x11-drivers/xf86-video-psb-0.32.0_p1 b/metadata/cache/x11-drivers/xf86-video-psb-0.32.0_p1
index 27e8b5b02cd0..4a6cfb8d704d 100644
--- a/metadata/cache/x11-drivers/xf86-video-psb-0.32.0_p1
+++ b/metadata/cache/x11-drivers/xf86-video-psb-0.32.0_p1
@@ -1,4 +1,4 @@
-x11-base/xorg-server x11-proto/xf86dgaproto x11-proto/randrproto x11-proto/xf86driproto x11-proto/xineramaproto x11-libs/libdrm-poulsbo >=app-arch/rpm2targz-9.0.0.3g || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+x11-base/xorg-server x11-proto/xf86dgaproto x11-proto/randrproto x11-proto/xf86driproto x11-proto/xineramaproto x11-libs/libdrm-poulsbo >=app-arch/rpm2targz-9.0.0.3g || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 x11-base/xorg-server x11-proto/xf86dgaproto x11-proto/randrproto x11-proto/xf86driproto x11-proto/xineramaproto x11-libs/libdrm-poulsbo x11-drivers/psb-kmod x11-libs/xpsb-glx
 0
 http://download1.rpmfusion.org/nonfree/fedora/updates/testing/11/SRPMS/xorg-x11-drv-psb-0.32.0-1.fc11.src.rpm
diff --git a/metadata/cache/x11-libs/agg-2.5-r2 b/metadata/cache/x11-libs/agg-2.5-r2
index 4d4b9e497498..c33bcc3bed1a 100644
--- a/metadata/cache/x11-libs/agg-2.5-r2
+++ b/metadata/cache/x11-libs/agg-2.5-r2
@@ -1,4 +1,4 @@
-media-libs/libsdl[X?] X? ( || ( <x11-libs/libX11-1.3.99.901[xcb] >=x11-libs/libX11-1.3.99.901 ) ) truetype? ( media-libs/freetype:2 ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+media-libs/libsdl[X?] X? ( || ( <x11-libs/libX11-1.3.99.901[xcb] >=x11-libs/libX11-1.3.99.901 ) ) truetype? ( media-libs/freetype:2 ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 media-libs/libsdl[X?] X? ( || ( <x11-libs/libX11-1.3.99.901[xcb] >=x11-libs/libX11-1.3.99.901 ) ) truetype? ( media-libs/freetype:2 )
 0
 http://antigrain.com/agg-2.5.tar.gz
diff --git a/metadata/cache/x11-libs/cairo-1.10.2-r1 b/metadata/cache/x11-libs/cairo-1.10.2-r1
index 427922eaca7d..15881cc02c63 100644
--- a/metadata/cache/x11-libs/cairo-1.10.2-r1
+++ b/metadata/cache/x11-libs/cairo-1.10.2-r1
@@ -1,4 +1,4 @@
-media-libs/fontconfig media-libs/freetype:2 media-libs/libpng:0 sys-libs/zlib >=x11-libs/pixman-0.18.4 directfb? ( dev-libs/DirectFB ) glib? ( dev-libs/glib:2 ) opengl? ( virtual/opengl ) openvg? ( media-libs/mesa[gallium] ) qt4? ( >=x11-libs/qt-gui-4.4:4 ) svg? ( dev-libs/libxml2 ) X? ( >=x11-libs/libXrender-0.6 x11-libs/libXext x11-libs/libX11 x11-libs/libXft drm? ( >=sys-fs/udev-136 gallium? ( media-libs/mesa[gallium] ) ) ) xcb? ( x11-libs/libxcb x11-libs/xcb-util ) dev-util/pkgconfig >=sys-devel/libtool-2 doc? ( >=dev-util/gtk-doc-1.6 ~app-text/docbook-xml-dtd-4.2 ) X? ( x11-proto/renderproto drm? ( x11-proto/xproto >=x11-proto/xextproto-7.1 ) ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+media-libs/fontconfig media-libs/freetype:2 media-libs/libpng:0 sys-libs/zlib >=x11-libs/pixman-0.18.4 directfb? ( dev-libs/DirectFB ) glib? ( dev-libs/glib:2 ) opengl? ( virtual/opengl ) openvg? ( media-libs/mesa[gallium] ) qt4? ( >=x11-libs/qt-gui-4.4:4 ) svg? ( dev-libs/libxml2 ) X? ( >=x11-libs/libXrender-0.6 x11-libs/libXext x11-libs/libX11 x11-libs/libXft drm? ( >=sys-fs/udev-136 gallium? ( media-libs/mesa[gallium] ) ) ) xcb? ( x11-libs/libxcb x11-libs/xcb-util ) dev-util/pkgconfig >=sys-devel/libtool-2 doc? ( >=dev-util/gtk-doc-1.6 ~app-text/docbook-xml-dtd-4.2 ) X? ( x11-proto/renderproto drm? ( x11-proto/xproto >=x11-proto/xextproto-7.1 ) ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 media-libs/fontconfig media-libs/freetype:2 media-libs/libpng:0 sys-libs/zlib >=x11-libs/pixman-0.18.4 directfb? ( dev-libs/DirectFB ) glib? ( dev-libs/glib:2 ) opengl? ( virtual/opengl ) openvg? ( media-libs/mesa[gallium] ) qt4? ( >=x11-libs/qt-gui-4.4:4 ) svg? ( dev-libs/libxml2 ) X? ( >=x11-libs/libXrender-0.6 x11-libs/libXext x11-libs/libX11 x11-libs/libXft drm? ( >=sys-fs/udev-136 gallium? ( media-libs/mesa[gallium] ) ) ) xcb? ( x11-libs/libxcb x11-libs/xcb-util )
 0
 http://cairographics.org/releases/cairo-1.10.2.tar.gz
diff --git a/metadata/cache/x11-libs/cairo-1.10.2-r2 b/metadata/cache/x11-libs/cairo-1.10.2-r2
index f22bb3f1a76f..94c50207b828 100644
--- a/metadata/cache/x11-libs/cairo-1.10.2-r2
+++ b/metadata/cache/x11-libs/cairo-1.10.2-r2
@@ -1,4 +1,4 @@
-media-libs/fontconfig media-libs/freetype:2 media-libs/libpng:0 sys-libs/zlib >=x11-libs/pixman-0.18.4 directfb? ( dev-libs/DirectFB ) glib? ( dev-libs/glib:2 ) opengl? ( virtual/opengl ) openvg? ( media-libs/mesa[gallium] ) qt4? ( >=x11-libs/qt-gui-4.4:4 ) svg? ( dev-libs/libxml2 ) X? ( >=x11-libs/libXrender-0.6 x11-libs/libXext x11-libs/libX11 x11-libs/libXft drm? ( >=sys-fs/udev-136 gallium? ( media-libs/mesa[gallium] ) ) ) xcb? ( x11-libs/libxcb x11-libs/xcb-util ) dev-util/pkgconfig >=sys-devel/libtool-2 doc? ( >=dev-util/gtk-doc-1.6 ~app-text/docbook-xml-dtd-4.2 ) X? ( x11-proto/renderproto drm? ( x11-proto/xproto >=x11-proto/xextproto-7.1 ) ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+media-libs/fontconfig media-libs/freetype:2 media-libs/libpng:0 sys-libs/zlib >=x11-libs/pixman-0.18.4 directfb? ( dev-libs/DirectFB ) glib? ( dev-libs/glib:2 ) opengl? ( virtual/opengl ) openvg? ( media-libs/mesa[gallium] ) qt4? ( >=x11-libs/qt-gui-4.4:4 ) svg? ( dev-libs/libxml2 ) X? ( >=x11-libs/libXrender-0.6 x11-libs/libXext x11-libs/libX11 x11-libs/libXft drm? ( >=sys-fs/udev-136 gallium? ( media-libs/mesa[gallium] ) ) ) xcb? ( x11-libs/libxcb x11-libs/xcb-util ) dev-util/pkgconfig >=sys-devel/libtool-2 doc? ( >=dev-util/gtk-doc-1.6 ~app-text/docbook-xml-dtd-4.2 ) X? ( x11-proto/renderproto drm? ( x11-proto/xproto >=x11-proto/xextproto-7.1 ) ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 media-libs/fontconfig media-libs/freetype:2 media-libs/libpng:0 sys-libs/zlib >=x11-libs/pixman-0.18.4 directfb? ( dev-libs/DirectFB ) glib? ( dev-libs/glib:2 ) opengl? ( virtual/opengl ) openvg? ( media-libs/mesa[gallium] ) qt4? ( >=x11-libs/qt-gui-4.4:4 ) svg? ( dev-libs/libxml2 ) X? ( >=x11-libs/libXrender-0.6 x11-libs/libXext x11-libs/libX11 x11-libs/libXft drm? ( >=sys-fs/udev-136 gallium? ( media-libs/mesa[gallium] ) ) ) xcb? ( x11-libs/libxcb x11-libs/xcb-util )
 0
 http://cairographics.org/releases/cairo-1.10.2.tar.gz
diff --git a/metadata/cache/x11-libs/cairo-1.8.10 b/metadata/cache/x11-libs/cairo-1.8.10
index 49cbaafca7e9..dbb4fd2bb197 100644
--- a/metadata/cache/x11-libs/cairo-1.8.10
+++ b/metadata/cache/x11-libs/cairo-1.8.10
@@ -1,4 +1,4 @@
-media-libs/fontconfig >=media-libs/freetype-2.1.9 sys-libs/zlib >=media-libs/libpng-1.2.43-r2:0 >=x11-libs/pixman-0.12.0 directfb? ( >=dev-libs/DirectFB-0.9.24 ) svg? ( dev-libs/libxml2 ) X? ( >=x11-libs/libXrender-0.6 x11-libs/libXext x11-libs/libX11 x11-libs/libXft ) xcb? ( >=x11-libs/libxcb-0.92 x11-libs/xcb-util ) >=dev-util/pkgconfig-0.19 >=sys-devel/libtool-2 doc? ( >=dev-util/gtk-doc-1.6 ~app-text/docbook-xml-dtd-4.2 ) X? ( x11-proto/renderproto ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+media-libs/fontconfig >=media-libs/freetype-2.1.9 sys-libs/zlib >=media-libs/libpng-1.2.43-r2:0 >=x11-libs/pixman-0.12.0 directfb? ( >=dev-libs/DirectFB-0.9.24 ) svg? ( dev-libs/libxml2 ) X? ( >=x11-libs/libXrender-0.6 x11-libs/libXext x11-libs/libX11 x11-libs/libXft ) xcb? ( >=x11-libs/libxcb-0.92 x11-libs/xcb-util ) >=dev-util/pkgconfig-0.19 >=sys-devel/libtool-2 doc? ( >=dev-util/gtk-doc-1.6 ~app-text/docbook-xml-dtd-4.2 ) X? ( x11-proto/renderproto ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 media-libs/fontconfig >=media-libs/freetype-2.1.9 sys-libs/zlib >=media-libs/libpng-1.2.43-r2:0 >=x11-libs/pixman-0.12.0 directfb? ( >=dev-libs/DirectFB-0.9.24 ) svg? ( dev-libs/libxml2 ) X? ( >=x11-libs/libXrender-0.6 x11-libs/libXext x11-libs/libX11 x11-libs/libXft ) xcb? ( >=x11-libs/libxcb-0.92 x11-libs/xcb-util )
 0
 http://cairographics.org/releases/cairo-1.8.10.tar.gz mirror://gentoo/cairo-1.8-lcd_filter.patch.bz2
diff --git a/metadata/cache/x11-libs/cairo-9999 b/metadata/cache/x11-libs/cairo-9999
index 12ce4ed08197..99b6442cd61d 100644
--- a/metadata/cache/x11-libs/cairo-9999
+++ b/metadata/cache/x11-libs/cairo-9999
@@ -1,4 +1,4 @@
-media-libs/fontconfig media-libs/freetype:2 media-libs/libpng:0 sys-libs/zlib >=x11-libs/pixman-0.18.4 directfb? ( dev-libs/DirectFB ) glib? ( >=dev-libs/glib-2.28.6:2 ) opengl? ( virtual/opengl ) openvg? ( media-libs/mesa[gallium] ) qt4? ( >=x11-libs/qt-gui-4.4:4 ) svg? ( dev-libs/libxml2 ) X? ( >=x11-libs/libXrender-0.6 x11-libs/libXext x11-libs/libX11 x11-libs/libXft drm? ( >=sys-fs/udev-136 gallium? ( media-libs/mesa[gallium] ) ) ) xcb? ( x11-libs/libxcb x11-libs/xcb-util ) dev-util/pkgconfig >=sys-devel/libtool-2 doc? ( >=dev-util/gtk-doc-1.6 ~app-text/docbook-xml-dtd-4.2 ) X? ( x11-proto/renderproto drm? ( x11-proto/xproto >=x11-proto/xextproto-7.1 ) ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
+media-libs/fontconfig media-libs/freetype:2 media-libs/libpng:0 sys-libs/zlib >=x11-libs/pixman-0.18.4 directfb? ( dev-libs/DirectFB ) glib? ( >=dev-libs/glib-2.28.6:2 ) opengl? ( virtual/opengl ) openvg? ( media-libs/mesa[gallium] ) qt4? ( >=x11-libs/qt-gui-4.4:4 ) svg? ( dev-libs/libxml2 ) X? ( >=x11-libs/libXrender-0.6 x11-libs/libXext x11-libs/libX11 x11-libs/libXft drm? ( >=sys-fs/udev-136 gallium? ( media-libs/mesa[gallium] ) ) ) xcb? ( x11-libs/libxcb x11-libs/xcb-util ) dev-util/pkgconfig >=sys-devel/libtool-2 doc? ( >=dev-util/gtk-doc-1.6 ~app-text/docbook-xml-dtd-4.2 ) X? ( x11-proto/renderproto drm? ( x11-proto/xproto >=x11-proto/xextproto-7.1 ) ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
 media-libs/fontconfig media-libs/freetype:2 media-libs/libpng:0 sys-libs/zlib >=x11-libs/pixman-0.18.4 directfb? ( dev-libs/DirectFB ) glib? ( >=dev-libs/glib-2.28.6:2 ) opengl? ( virtual/opengl ) openvg? ( media-libs/mesa[gallium] ) qt4? ( >=x11-libs/qt-gui-4.4:4 ) svg? ( dev-libs/libxml2 ) X? ( >=x11-libs/libXrender-0.6 x11-libs/libXext x11-libs/libX11 x11-libs/libXft drm? ( >=sys-fs/udev-136 gallium? ( media-libs/mesa[gallium] ) ) ) xcb? ( x11-libs/libxcb x11-libs/xcb-util )
 0
 
diff --git a/metadata/cache/x11-libs/fltk-1.3.0 b/metadata/cache/x11-libs/fltk-1.3.0
index fedbae918ef7..e7f07f3370de 100644
--- a/metadata/cache/x11-libs/fltk-1.3.0
+++ b/metadata/cache/x11-libs/fltk-1.3.0
@@ -1,4 +1,4 @@
->=media-libs/libpng-1.2:0 virtual/jpeg sys-libs/zlib x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt cairo? ( x11-libs/cairo ) opengl? ( virtual/opengl ) xinerama? ( x11-libs/libXinerama ) xft? ( x11-libs/libXft ) x11-proto/xextproto doc? ( app-doc/doxygen pdf? ( dev-texlive/texlive-latex ) ) xinerama? ( x11-proto/xineramaproto ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=media-libs/libpng-1.2:0 virtual/jpeg sys-libs/zlib x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt cairo? ( x11-libs/cairo ) opengl? ( virtual/opengl ) xinerama? ( x11-libs/libXinerama ) xft? ( x11-libs/libXft ) x11-proto/xextproto doc? ( app-doc/doxygen pdf? ( dev-texlive/texlive-latex ) ) xinerama? ( x11-proto/xineramaproto ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=media-libs/libpng-1.2:0 virtual/jpeg sys-libs/zlib x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt cairo? ( x11-libs/cairo ) opengl? ( virtual/opengl ) xinerama? ( x11-libs/libXinerama ) xft? ( x11-libs/libXft )
 1
 mirror://easysw/fltk/1.3.0/fltk-1.3.0-source.tar.gz
diff --git a/metadata/cache/x11-libs/fltk-1.3.0-r1 b/metadata/cache/x11-libs/fltk-1.3.0-r1
index 2daf360b1dce..37749c7d0e6c 100644
--- a/metadata/cache/x11-libs/fltk-1.3.0-r1
+++ b/metadata/cache/x11-libs/fltk-1.3.0-r1
@@ -1,4 +1,4 @@
->=media-libs/libpng-1.2:0 virtual/jpeg sys-libs/zlib x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt cairo? ( x11-libs/cairo ) opengl? ( virtual/opengl ) xinerama? ( x11-libs/libXinerama ) xft? ( x11-libs/libXft ) x11-proto/xextproto doc? ( app-doc/doxygen pdf? ( dev-texlive/texlive-latex ) ) xinerama? ( x11-proto/xineramaproto ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=media-libs/libpng-1.2:0 virtual/jpeg sys-libs/zlib x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt cairo? ( x11-libs/cairo ) opengl? ( virtual/opengl ) xinerama? ( x11-libs/libXinerama ) xft? ( x11-libs/libXft ) x11-proto/xextproto doc? ( app-doc/doxygen pdf? ( dev-texlive/texlive-latex ) ) xinerama? ( x11-proto/xineramaproto ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=media-libs/libpng-1.2:0 virtual/jpeg sys-libs/zlib x11-libs/libICE x11-libs/libSM x11-libs/libXext x11-libs/libXt cairo? ( x11-libs/cairo ) opengl? ( virtual/opengl ) xinerama? ( x11-libs/libXinerama ) xft? ( x11-libs/libXft )
 1
 mirror://easysw/fltk/1.3.0/fltk-1.3.0-source.tar.gz
diff --git a/metadata/cache/x11-libs/fltk-2.0_pre6970-r1 b/metadata/cache/x11-libs/fltk-2.0_pre6970-r1
index 26ca74370770..940362b88457 100644
--- a/metadata/cache/x11-libs/fltk-2.0_pre6970-r1
+++ b/metadata/cache/x11-libs/fltk-2.0_pre6970-r1
@@ -1,4 +1,4 @@
-x11-libs/libXext x11-libs/libICE x11-libs/libSM x11-libs/libXt xft? ( x11-libs/libXft ) png? ( media-libs/libpng:0 ) jpeg? ( virtual/jpeg ) opengl? ( virtual/opengl ) cairo? ( x11-libs/cairo ) xinerama? ( x11-libs/libXinerama ) zlib? ( sys-libs/zlib ) >=sys-libs/glibc-2.10 x11-misc/makedepend x11-proto/xextproto x11-libs/libXi xinerama? ( x11-proto/xineramaproto ) cairo? ( dev-util/pkgconfig ) doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+x11-libs/libXext x11-libs/libICE x11-libs/libSM x11-libs/libXt xft? ( x11-libs/libXft ) png? ( media-libs/libpng:0 ) jpeg? ( virtual/jpeg ) opengl? ( virtual/opengl ) cairo? ( x11-libs/cairo ) xinerama? ( x11-libs/libXinerama ) zlib? ( sys-libs/zlib ) >=sys-libs/glibc-2.10 x11-misc/makedepend x11-proto/xextproto x11-libs/libXi xinerama? ( x11-proto/xineramaproto ) cairo? ( dev-util/pkgconfig ) doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 x11-libs/libXext x11-libs/libICE x11-libs/libSM x11-libs/libXt xft? ( x11-libs/libXft ) png? ( media-libs/libpng:0 ) jpeg? ( virtual/jpeg ) opengl? ( virtual/opengl ) cairo? ( x11-libs/cairo ) xinerama? ( x11-libs/libXinerama ) zlib? ( sys-libs/zlib ) >=sys-libs/glibc-2.10
 2
 mirror://easysw/fltk/snapshots/fltk-2.0.x-r6970.tar.bz2
diff --git a/metadata/cache/x11-libs/fox-1.6.40 b/metadata/cache/x11-libs/fox-1.6.40
index 177519482d94..22ddb8af5cbc 100644
--- a/metadata/cache/x11-libs/fox-1.6.40
+++ b/metadata/cache/x11-libs/fox-1.6.40
@@ -1,4 +1,4 @@
-x11-libs/libXrandr x11-libs/libXcursor x11-libs/fox-wrapper bzip2? ( >=app-arch/bzip2-1.0.2 ) jpeg? ( virtual/jpeg ) opengl? ( virtual/opengl ) png? ( >=media-libs/libpng-1.2.5 ) tiff? ( >=media-libs/tiff-3.5.7 ) truetype? ( =media-libs/freetype-2* x11-libs/libXft ) zlib? ( >=sys-libs/zlib-1.1.4 ) x11-proto/xextproto x11-libs/libXt || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool doc? ( app-doc/doxygen ) dev-util/reswrap >=sys-apps/sed-4
+x11-libs/libXrandr x11-libs/libXcursor x11-libs/fox-wrapper bzip2? ( >=app-arch/bzip2-1.0.2 ) jpeg? ( virtual/jpeg ) opengl? ( virtual/opengl ) png? ( >=media-libs/libpng-1.2.5 ) tiff? ( >=media-libs/tiff-3.5.7 ) truetype? ( =media-libs/freetype-2* x11-libs/libXft ) zlib? ( >=sys-libs/zlib-1.1.4 ) x11-proto/xextproto x11-libs/libXt || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool doc? ( app-doc/doxygen ) dev-util/reswrap >=sys-apps/sed-4
 x11-libs/libXrandr x11-libs/libXcursor x11-libs/fox-wrapper bzip2? ( >=app-arch/bzip2-1.0.2 ) jpeg? ( virtual/jpeg ) opengl? ( virtual/opengl ) png? ( >=media-libs/libpng-1.2.5 ) tiff? ( >=media-libs/tiff-3.5.7 ) truetype? ( =media-libs/freetype-2* x11-libs/libXft ) zlib? ( >=sys-libs/zlib-1.1.4 )
 1.6
 ftp://ftp.fox-toolkit.org/pub/fox-1.6.40.tar.gz
diff --git a/metadata/cache/x11-libs/fox-1.6.43 b/metadata/cache/x11-libs/fox-1.6.43
index 5645f3912afd..b5e4c2902d3a 100644
--- a/metadata/cache/x11-libs/fox-1.6.43
+++ b/metadata/cache/x11-libs/fox-1.6.43
@@ -1,4 +1,4 @@
-x11-libs/libXrandr x11-libs/libXcursor x11-libs/fox-wrapper media-libs/mesa bzip2? ( >=app-arch/bzip2-1.0.2 ) jpeg? ( virtual/jpeg ) opengl? ( virtual/opengl ) png? ( >=media-libs/libpng-1.2.5 ) tiff? ( >=media-libs/tiff-3.5.7 ) truetype? ( =media-libs/freetype-2* x11-libs/libXft ) zlib? ( >=sys-libs/zlib-1.1.4 ) x11-proto/xextproto x11-libs/libXt || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool doc? ( app-doc/doxygen ) dev-util/reswrap >=sys-apps/sed-4
+x11-libs/libXrandr x11-libs/libXcursor x11-libs/fox-wrapper media-libs/mesa bzip2? ( >=app-arch/bzip2-1.0.2 ) jpeg? ( virtual/jpeg ) opengl? ( virtual/opengl ) png? ( >=media-libs/libpng-1.2.5 ) tiff? ( >=media-libs/tiff-3.5.7 ) truetype? ( =media-libs/freetype-2* x11-libs/libXft ) zlib? ( >=sys-libs/zlib-1.1.4 ) x11-proto/xextproto x11-libs/libXt || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool doc? ( app-doc/doxygen ) dev-util/reswrap >=sys-apps/sed-4
 x11-libs/libXrandr x11-libs/libXcursor x11-libs/fox-wrapper media-libs/mesa bzip2? ( >=app-arch/bzip2-1.0.2 ) jpeg? ( virtual/jpeg ) opengl? ( virtual/opengl ) png? ( >=media-libs/libpng-1.2.5 ) tiff? ( >=media-libs/tiff-3.5.7 ) truetype? ( =media-libs/freetype-2* x11-libs/libXft ) zlib? ( >=sys-libs/zlib-1.1.4 )
 1.6
 ftp://ftp.fox-toolkit.org/pub/fox-1.6.43.tar.gz
diff --git a/metadata/cache/x11-libs/fox-1.7.32 b/metadata/cache/x11-libs/fox-1.7.32
index 31a5ea55f1ce..5725caa798cb 100644
--- a/metadata/cache/x11-libs/fox-1.7.32
+++ b/metadata/cache/x11-libs/fox-1.7.32
@@ -1,4 +1,4 @@
-x11-libs/libXrandr x11-libs/libXcursor x11-libs/fox-wrapper >=sys-devel/autoconf-2.67 media-libs/mesa bzip2? ( app-arch/bzip2 ) jpeg? ( virtual/jpeg ) opengl? ( virtual/opengl ) png? ( media-libs/libpng ) tiff? ( media-libs/tiff ) truetype? ( media-libs/freetype:2 x11-libs/libXft ) zlib? ( sys-libs/zlib ) x11-proto/xextproto x11-libs/libXt || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool doc? ( app-doc/doxygen ) dev-util/reswrap >=sys-apps/sed-4
+x11-libs/libXrandr x11-libs/libXcursor x11-libs/fox-wrapper >=sys-devel/autoconf-2.67 media-libs/mesa bzip2? ( app-arch/bzip2 ) jpeg? ( virtual/jpeg ) opengl? ( virtual/opengl ) png? ( media-libs/libpng ) tiff? ( media-libs/tiff ) truetype? ( media-libs/freetype:2 x11-libs/libXft ) zlib? ( sys-libs/zlib ) x11-proto/xextproto x11-libs/libXt || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool doc? ( app-doc/doxygen ) dev-util/reswrap >=sys-apps/sed-4
 x11-libs/libXrandr x11-libs/libXcursor x11-libs/fox-wrapper >=sys-devel/autoconf-2.67 media-libs/mesa bzip2? ( app-arch/bzip2 ) jpeg? ( virtual/jpeg ) opengl? ( virtual/opengl ) png? ( media-libs/libpng ) tiff? ( media-libs/tiff ) truetype? ( media-libs/freetype:2 x11-libs/libXft ) zlib? ( sys-libs/zlib )
 1.7
 ftp://ftp.fox-toolkit.org/pub/fox-1.7.32.tar.gz
diff --git a/metadata/cache/x11-libs/fxscintilla-2.28.0 b/metadata/cache/x11-libs/fxscintilla-2.28.0
index db7ff74f3adc..b665edf29111 100644
--- a/metadata/cache/x11-libs/fxscintilla-2.28.0
+++ b/metadata/cache/x11-libs/fxscintilla-2.28.0
@@ -1,4 +1,4 @@
-|| ( x11-libs/fox:1.6 x11-libs/fox:1.7 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+|| ( x11-libs/fox:1.6 x11-libs/fox:1.7 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 || ( x11-libs/fox:1.6 x11-libs/fox:1.7 )
 0
 http://savannah.nongnu.org/download/fxscintilla/fxscintilla-2.28.0.tar.gz
diff --git a/metadata/cache/x11-libs/gdk-pixbuf-2.24.0-r1 b/metadata/cache/x11-libs/gdk-pixbuf-2.24.0-r1
index 4abf4d80db9f..48a0bfad05aa 100644
--- a/metadata/cache/x11-libs/gdk-pixbuf-2.24.0-r1
+++ b/metadata/cache/x11-libs/gdk-pixbuf-2.24.0-r1
@@ -1,4 +1,4 @@
->=dev-libs/glib-2.27.2:2 >=media-libs/libpng-1.4:0 introspection? ( >=dev-libs/gobject-introspection-0.9.3 ) jpeg? ( virtual/jpeg ) jpeg2k? ( media-libs/jasper ) tiff? ( >=media-libs/tiff-3.9.2:0 ) X? ( x11-libs/libX11 ) >=dev-util/pkgconfig-0.9 >=sys-devel/gettext-0.17 >=dev-util/gtk-doc-am-1.11 doc? ( >=dev-util/gtk-doc-1.11 ~app-text/docbook-xml-dtd-4.1.2 ) app-arch/xz-utils || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-libs/glib-2.27.2:2 >=media-libs/libpng-1.4:0 introspection? ( >=dev-libs/gobject-introspection-0.9.3 ) jpeg? ( virtual/jpeg ) jpeg2k? ( media-libs/jasper ) tiff? ( >=media-libs/tiff-3.9.2:0 ) X? ( x11-libs/libX11 ) >=dev-util/pkgconfig-0.9 >=sys-devel/gettext-0.17 >=dev-util/gtk-doc-am-1.11 doc? ( >=dev-util/gtk-doc-1.11 ~app-text/docbook-xml-dtd-4.1.2 ) app-arch/xz-utils || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=dev-libs/glib-2.27.2:2 >=media-libs/libpng-1.4:0 introspection? ( >=dev-libs/gobject-introspection-0.9.3 ) jpeg? ( virtual/jpeg ) jpeg2k? ( media-libs/jasper ) tiff? ( >=media-libs/tiff-3.9.2:0 ) X? ( x11-libs/libX11 ) !<gnome-base/gail-1000 !<gnome-base/librsvg-2.31.0 !<x11-libs/gtk+-2.21.3:2 !<x11-libs/gtk+-2.90.4:3
 2
 mirror://gnome/sources/gdk-pixbuf/2.24/gdk-pixbuf-2.24.0.tar.xz
diff --git a/metadata/cache/x11-libs/gdk-pixbuf-2.24.1 b/metadata/cache/x11-libs/gdk-pixbuf-2.24.1
index b6af4de1f578..440610a212ab 100644
--- a/metadata/cache/x11-libs/gdk-pixbuf-2.24.1
+++ b/metadata/cache/x11-libs/gdk-pixbuf-2.24.1
@@ -1,4 +1,4 @@
->=dev-libs/glib-2.27.2:2 >=media-libs/libpng-1.4:0 introspection? ( >=dev-libs/gobject-introspection-0.9.3 ) jpeg? ( virtual/jpeg ) jpeg2k? ( media-libs/jasper ) tiff? ( >=media-libs/tiff-3.9.2:0 ) X? ( x11-libs/libX11 ) >=dev-util/pkgconfig-0.9 >=sys-apps/coreutils-8.5 >=sys-devel/gettext-0.17 >=dev-util/gtk-doc-am-1.11 doc? ( >=dev-util/gtk-doc-1.11 ~app-text/docbook-xml-dtd-4.1.2 ) app-arch/xz-utils || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-libs/glib-2.27.2:2 >=media-libs/libpng-1.4:0 introspection? ( >=dev-libs/gobject-introspection-0.9.3 ) jpeg? ( virtual/jpeg ) jpeg2k? ( media-libs/jasper ) tiff? ( >=media-libs/tiff-3.9.2:0 ) X? ( x11-libs/libX11 ) >=dev-util/pkgconfig-0.9 >=sys-apps/coreutils-8.5 >=sys-devel/gettext-0.17 >=dev-util/gtk-doc-am-1.11 doc? ( >=dev-util/gtk-doc-1.11 ~app-text/docbook-xml-dtd-4.1.2 ) app-arch/xz-utils || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=dev-libs/glib-2.27.2:2 >=media-libs/libpng-1.4:0 introspection? ( >=dev-libs/gobject-introspection-0.9.3 ) jpeg? ( virtual/jpeg ) jpeg2k? ( media-libs/jasper ) tiff? ( >=media-libs/tiff-3.9.2:0 ) X? ( x11-libs/libX11 ) !<gnome-base/gail-1000 !<gnome-base/librsvg-2.31.0 !<x11-libs/gtk+-2.21.3:2 !<x11-libs/gtk+-2.90.4:3
 2
 mirror://gnome/sources/gdk-pixbuf/2.24/gdk-pixbuf-2.24.1.tar.xz
diff --git a/metadata/cache/x11-libs/gtk+-2.24.10-r1 b/metadata/cache/x11-libs/gtk+-2.24.10-r1
index 8462feca271a..fb947ae4464a 100644
--- a/metadata/cache/x11-libs/gtk+-2.24.10-r1
+++ b/metadata/cache/x11-libs/gtk+-2.24.10-r1
@@ -1,4 +1,4 @@
-!aqua? ( x11-libs/libXrender x11-libs/libX11 x11-libs/libXi x11-libs/libXt x11-libs/libXext >=x11-libs/libXrandr-1.3 x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXcomposite x11-libs/libXdamage >=x11-libs/cairo-1.6[X,svg] x11-libs/gdk-pixbuf:2[X,introspection?] ) aqua? ( >=x11-libs/cairo-1.6[aqua,svg] x11-libs/gdk-pixbuf:2[introspection?] ) xinerama? ( x11-libs/libXinerama ) >=dev-libs/glib-2.27.3:2 >=x11-libs/pango-1.20[introspection?] >=dev-libs/atk-1.29.2[introspection?] media-libs/fontconfig x11-misc/shared-mime-info cups? ( net-print/cups ) introspection? ( >=dev-libs/gobject-introspection-0.9.3 ) !<gnome-base/gail-1000 >=dev-util/pkgconfig-0.9 !aqua? ( x11-proto/xextproto x11-proto/xproto x11-proto/inputproto x11-proto/damageproto ) xinerama? ( x11-proto/xineramaproto ) >=dev-util/gtk-doc-am-1.11 doc? ( >=dev-util/gtk-doc-1.11 ~app-text/docbook-xml-dtd-4.1.2 ) test? ( media-fonts/font-misc-misc media-fonts/font-cursor-misc ) app-arch/xz-utils test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+!aqua? ( x11-libs/libXrender x11-libs/libX11 x11-libs/libXi x11-libs/libXt x11-libs/libXext >=x11-libs/libXrandr-1.3 x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXcomposite x11-libs/libXdamage >=x11-libs/cairo-1.6[X,svg] x11-libs/gdk-pixbuf:2[X,introspection?] ) aqua? ( >=x11-libs/cairo-1.6[aqua,svg] x11-libs/gdk-pixbuf:2[introspection?] ) xinerama? ( x11-libs/libXinerama ) >=dev-libs/glib-2.27.3:2 >=x11-libs/pango-1.20[introspection?] >=dev-libs/atk-1.29.2[introspection?] media-libs/fontconfig x11-misc/shared-mime-info cups? ( net-print/cups ) introspection? ( >=dev-libs/gobject-introspection-0.9.3 ) !<gnome-base/gail-1000 >=dev-util/pkgconfig-0.9 !aqua? ( x11-proto/xextproto x11-proto/xproto x11-proto/inputproto x11-proto/damageproto ) xinerama? ( x11-proto/xineramaproto ) >=dev-util/gtk-doc-am-1.11 doc? ( >=dev-util/gtk-doc-1.11 ~app-text/docbook-xml-dtd-4.1.2 ) test? ( media-fonts/font-misc-misc media-fonts/font-cursor-misc ) app-arch/xz-utils test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 !aqua? ( x11-libs/libXrender x11-libs/libX11 x11-libs/libXi x11-libs/libXt x11-libs/libXext >=x11-libs/libXrandr-1.3 x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXcomposite x11-libs/libXdamage >=x11-libs/cairo-1.6[X,svg] x11-libs/gdk-pixbuf:2[X,introspection?] ) aqua? ( >=x11-libs/cairo-1.6[aqua,svg] x11-libs/gdk-pixbuf:2[introspection?] ) xinerama? ( x11-libs/libXinerama ) >=dev-libs/glib-2.27.3:2 >=x11-libs/pango-1.20[introspection?] >=dev-libs/atk-1.29.2[introspection?] media-libs/fontconfig x11-misc/shared-mime-info cups? ( net-print/cups ) introspection? ( >=dev-libs/gobject-introspection-0.9.3 ) !<gnome-base/gail-1000 !<x11-libs/vte-0.28.2-r201:0
 2
 mirror://gnome/sources/gtk+/2.24/gtk+-2.24.10.tar.xz mirror://gentoo/introspection.m4.bz2
diff --git a/metadata/cache/x11-libs/gtk+-2.24.5-r1 b/metadata/cache/x11-libs/gtk+-2.24.5-r1
index 0b1407eb9c39..6a0c0c9f2f3e 100644
--- a/metadata/cache/x11-libs/gtk+-2.24.5-r1
+++ b/metadata/cache/x11-libs/gtk+-2.24.5-r1
@@ -1,4 +1,4 @@
-!aqua? ( x11-libs/libXrender x11-libs/libX11 x11-libs/libXi x11-libs/libXt x11-libs/libXext >=x11-libs/libXrandr-1.3 x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXcomposite x11-libs/libXdamage >=x11-libs/cairo-1.6[X,svg] x11-libs/gdk-pixbuf:2[X,introspection?] ) aqua? ( >=x11-libs/cairo-1.6[aqua,svg] x11-libs/gdk-pixbuf:2[introspection?] ) xinerama? ( x11-libs/libXinerama ) >=dev-libs/glib-2.27.3:2 >=x11-libs/pango-1.20[introspection?] >=dev-libs/atk-1.29.2[introspection?] media-libs/fontconfig x11-misc/shared-mime-info cups? ( net-print/cups ) introspection? ( >=dev-libs/gobject-introspection-0.9.3 ) !dev-util/gtk-builder-convert !<gnome-base/gail-1000 >=dev-util/pkgconfig-0.9 !aqua? ( x11-proto/xextproto x11-proto/xproto x11-proto/inputproto x11-proto/damageproto ) xinerama? ( x11-proto/xineramaproto ) >=dev-util/gtk-doc-am-1.11 doc? ( >=dev-util/gtk-doc-1.11 ~app-text/docbook-xml-dtd-4.1.2 ) test? ( media-fonts/font-misc-misc media-fonts/font-cursor-misc ) app-arch/xz-utils || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+!aqua? ( x11-libs/libXrender x11-libs/libX11 x11-libs/libXi x11-libs/libXt x11-libs/libXext >=x11-libs/libXrandr-1.3 x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXcomposite x11-libs/libXdamage >=x11-libs/cairo-1.6[X,svg] x11-libs/gdk-pixbuf:2[X,introspection?] ) aqua? ( >=x11-libs/cairo-1.6[aqua,svg] x11-libs/gdk-pixbuf:2[introspection?] ) xinerama? ( x11-libs/libXinerama ) >=dev-libs/glib-2.27.3:2 >=x11-libs/pango-1.20[introspection?] >=dev-libs/atk-1.29.2[introspection?] media-libs/fontconfig x11-misc/shared-mime-info cups? ( net-print/cups ) introspection? ( >=dev-libs/gobject-introspection-0.9.3 ) !dev-util/gtk-builder-convert !<gnome-base/gail-1000 >=dev-util/pkgconfig-0.9 !aqua? ( x11-proto/xextproto x11-proto/xproto x11-proto/inputproto x11-proto/damageproto ) xinerama? ( x11-proto/xineramaproto ) >=dev-util/gtk-doc-am-1.11 doc? ( >=dev-util/gtk-doc-1.11 ~app-text/docbook-xml-dtd-4.1.2 ) test? ( media-fonts/font-misc-misc media-fonts/font-cursor-misc ) app-arch/xz-utils || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 !aqua? ( x11-libs/libXrender x11-libs/libX11 x11-libs/libXi x11-libs/libXt x11-libs/libXext >=x11-libs/libXrandr-1.3 x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXcomposite x11-libs/libXdamage >=x11-libs/cairo-1.6[X,svg] x11-libs/gdk-pixbuf:2[X,introspection?] ) aqua? ( >=x11-libs/cairo-1.6[aqua,svg] x11-libs/gdk-pixbuf:2[introspection?] ) xinerama? ( x11-libs/libXinerama ) >=dev-libs/glib-2.27.3:2 >=x11-libs/pango-1.20[introspection?] >=dev-libs/atk-1.29.2[introspection?] media-libs/fontconfig x11-misc/shared-mime-info cups? ( net-print/cups ) introspection? ( >=dev-libs/gobject-introspection-0.9.3 ) !dev-util/gtk-builder-convert !<gnome-base/gail-1000 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
 2
 mirror://gnome/sources/gtk+/2.24/gtk+-2.24.5.tar.xz mirror://gentoo/introspection.m4.bz2
diff --git a/metadata/cache/x11-libs/gtk+-2.24.8-r1 b/metadata/cache/x11-libs/gtk+-2.24.8-r1
index 56799710cc2c..71b145e36c40 100644
--- a/metadata/cache/x11-libs/gtk+-2.24.8-r1
+++ b/metadata/cache/x11-libs/gtk+-2.24.8-r1
@@ -1,4 +1,4 @@
-!aqua? ( x11-libs/libXrender x11-libs/libX11 x11-libs/libXi x11-libs/libXt x11-libs/libXext >=x11-libs/libXrandr-1.3 x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXcomposite x11-libs/libXdamage >=x11-libs/cairo-1.6[X,svg] x11-libs/gdk-pixbuf:2[X,introspection?] ) aqua? ( >=x11-libs/cairo-1.6[aqua,svg] x11-libs/gdk-pixbuf:2[introspection?] ) xinerama? ( x11-libs/libXinerama ) >=dev-libs/glib-2.27.3:2 >=x11-libs/pango-1.20[introspection?] >=dev-libs/atk-1.29.2[introspection?] media-libs/fontconfig x11-misc/shared-mime-info cups? ( net-print/cups ) introspection? ( >=dev-libs/gobject-introspection-0.9.3 ) !dev-util/gtk-builder-convert !<gnome-base/gail-1000 >=dev-util/pkgconfig-0.9 !aqua? ( x11-proto/xextproto x11-proto/xproto x11-proto/inputproto x11-proto/damageproto ) xinerama? ( x11-proto/xineramaproto ) >=dev-util/gtk-doc-am-1.11 doc? ( >=dev-util/gtk-doc-1.11 ~app-text/docbook-xml-dtd-4.1.2 ) test? ( media-fonts/font-misc-misc media-fonts/font-cursor-misc ) app-arch/xz-utils || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+!aqua? ( x11-libs/libXrender x11-libs/libX11 x11-libs/libXi x11-libs/libXt x11-libs/libXext >=x11-libs/libXrandr-1.3 x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXcomposite x11-libs/libXdamage >=x11-libs/cairo-1.6[X,svg] x11-libs/gdk-pixbuf:2[X,introspection?] ) aqua? ( >=x11-libs/cairo-1.6[aqua,svg] x11-libs/gdk-pixbuf:2[introspection?] ) xinerama? ( x11-libs/libXinerama ) >=dev-libs/glib-2.27.3:2 >=x11-libs/pango-1.20[introspection?] >=dev-libs/atk-1.29.2[introspection?] media-libs/fontconfig x11-misc/shared-mime-info cups? ( net-print/cups ) introspection? ( >=dev-libs/gobject-introspection-0.9.3 ) !dev-util/gtk-builder-convert !<gnome-base/gail-1000 >=dev-util/pkgconfig-0.9 !aqua? ( x11-proto/xextproto x11-proto/xproto x11-proto/inputproto x11-proto/damageproto ) xinerama? ( x11-proto/xineramaproto ) >=dev-util/gtk-doc-am-1.11 doc? ( >=dev-util/gtk-doc-1.11 ~app-text/docbook-xml-dtd-4.1.2 ) test? ( media-fonts/font-misc-misc media-fonts/font-cursor-misc ) app-arch/xz-utils || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 !aqua? ( x11-libs/libXrender x11-libs/libX11 x11-libs/libXi x11-libs/libXt x11-libs/libXext >=x11-libs/libXrandr-1.3 x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXcomposite x11-libs/libXdamage >=x11-libs/cairo-1.6[X,svg] x11-libs/gdk-pixbuf:2[X,introspection?] ) aqua? ( >=x11-libs/cairo-1.6[aqua,svg] x11-libs/gdk-pixbuf:2[introspection?] ) xinerama? ( x11-libs/libXinerama ) >=dev-libs/glib-2.27.3:2 >=x11-libs/pango-1.20[introspection?] >=dev-libs/atk-1.29.2[introspection?] media-libs/fontconfig x11-misc/shared-mime-info cups? ( net-print/cups ) introspection? ( >=dev-libs/gobject-introspection-0.9.3 ) !dev-util/gtk-builder-convert !<gnome-base/gail-1000 !<x11-libs/vte-0.28.2-r201:0 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
 2
 mirror://gnome/sources/gtk+/2.24/gtk+-2.24.8.tar.xz mirror://gentoo/introspection.m4.bz2
diff --git a/metadata/cache/x11-libs/gtk+-2.24.9-r1 b/metadata/cache/x11-libs/gtk+-2.24.9-r1
index 587252895e33..2b272ce233d5 100644
--- a/metadata/cache/x11-libs/gtk+-2.24.9-r1
+++ b/metadata/cache/x11-libs/gtk+-2.24.9-r1
@@ -1,4 +1,4 @@
-!aqua? ( x11-libs/libXrender x11-libs/libX11 x11-libs/libXi x11-libs/libXt x11-libs/libXext >=x11-libs/libXrandr-1.3 x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXcomposite x11-libs/libXdamage >=x11-libs/cairo-1.6[X,svg] x11-libs/gdk-pixbuf:2[X,introspection?] ) aqua? ( >=x11-libs/cairo-1.6[aqua,svg] x11-libs/gdk-pixbuf:2[introspection?] ) xinerama? ( x11-libs/libXinerama ) >=dev-libs/glib-2.27.3:2 >=x11-libs/pango-1.20[introspection?] >=dev-libs/atk-1.29.2[introspection?] media-libs/fontconfig x11-misc/shared-mime-info cups? ( net-print/cups ) introspection? ( >=dev-libs/gobject-introspection-0.9.3 ) !dev-util/gtk-builder-convert !<gnome-base/gail-1000 >=dev-util/pkgconfig-0.9 !aqua? ( x11-proto/xextproto x11-proto/xproto x11-proto/inputproto x11-proto/damageproto ) xinerama? ( x11-proto/xineramaproto ) >=dev-util/gtk-doc-am-1.11 doc? ( >=dev-util/gtk-doc-1.11 ~app-text/docbook-xml-dtd-4.1.2 ) test? ( media-fonts/font-misc-misc media-fonts/font-cursor-misc ) app-arch/xz-utils || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+!aqua? ( x11-libs/libXrender x11-libs/libX11 x11-libs/libXi x11-libs/libXt x11-libs/libXext >=x11-libs/libXrandr-1.3 x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXcomposite x11-libs/libXdamage >=x11-libs/cairo-1.6[X,svg] x11-libs/gdk-pixbuf:2[X,introspection?] ) aqua? ( >=x11-libs/cairo-1.6[aqua,svg] x11-libs/gdk-pixbuf:2[introspection?] ) xinerama? ( x11-libs/libXinerama ) >=dev-libs/glib-2.27.3:2 >=x11-libs/pango-1.20[introspection?] >=dev-libs/atk-1.29.2[introspection?] media-libs/fontconfig x11-misc/shared-mime-info cups? ( net-print/cups ) introspection? ( >=dev-libs/gobject-introspection-0.9.3 ) !dev-util/gtk-builder-convert !<gnome-base/gail-1000 >=dev-util/pkgconfig-0.9 !aqua? ( x11-proto/xextproto x11-proto/xproto x11-proto/inputproto x11-proto/damageproto ) xinerama? ( x11-proto/xineramaproto ) >=dev-util/gtk-doc-am-1.11 doc? ( >=dev-util/gtk-doc-1.11 ~app-text/docbook-xml-dtd-4.1.2 ) test? ( media-fonts/font-misc-misc media-fonts/font-cursor-misc ) app-arch/xz-utils || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 !aqua? ( x11-libs/libXrender x11-libs/libX11 x11-libs/libXi x11-libs/libXt x11-libs/libXext >=x11-libs/libXrandr-1.3 x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXcomposite x11-libs/libXdamage >=x11-libs/cairo-1.6[X,svg] x11-libs/gdk-pixbuf:2[X,introspection?] ) aqua? ( >=x11-libs/cairo-1.6[aqua,svg] x11-libs/gdk-pixbuf:2[introspection?] ) xinerama? ( x11-libs/libXinerama ) >=dev-libs/glib-2.27.3:2 >=x11-libs/pango-1.20[introspection?] >=dev-libs/atk-1.29.2[introspection?] media-libs/fontconfig x11-misc/shared-mime-info cups? ( net-print/cups ) introspection? ( >=dev-libs/gobject-introspection-0.9.3 ) !dev-util/gtk-builder-convert !<gnome-base/gail-1000 !<x11-libs/vte-0.28.2-r201:0 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* =dev-lang/python-2.5* )
 2
 mirror://gnome/sources/gtk+/2.24/gtk+-2.24.9.tar.xz mirror://gentoo/introspection.m4.bz2
diff --git a/metadata/cache/x11-libs/gtk+extra-2.1.2-r1 b/metadata/cache/x11-libs/gtk+extra-2.1.2-r1
index 0844ec12cb9c..87cea17abc43 100644
--- a/metadata/cache/x11-libs/gtk+extra-2.1.2-r1
+++ b/metadata/cache/x11-libs/gtk+extra-2.1.2-r1
@@ -1,4 +1,4 @@
-x11-libs/gtk+:2 dev-libs/glib:2 dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+x11-libs/gtk+:2 dev-libs/glib:2 dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 x11-libs/gtk+:2 dev-libs/glib:2
 0
 mirror://sourceforge/gtkextra/gtk+extra-2.1.2.tar.gz
diff --git a/metadata/cache/x11-libs/gtk+extra-3.0.1 b/metadata/cache/x11-libs/gtk+extra-3.0.1
index 5a4c7f59def4..23091f4746f6 100644
--- a/metadata/cache/x11-libs/gtk+extra-3.0.1
+++ b/metadata/cache/x11-libs/gtk+extra-3.0.1
@@ -1,4 +1,4 @@
->=x11-libs/gtk+-2.12.0:2 dev-libs/glib:2 introspection? ( >=dev-libs/gobject-introspection-0.6.14 ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=x11-libs/gtk+-2.12.0:2 dev-libs/glib:2 introspection? ( >=dev-libs/gobject-introspection-0.6.14 ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=x11-libs/gtk+-2.12.0:2 dev-libs/glib:2 introspection? ( >=dev-libs/gobject-introspection-0.6.14 )
 0
 mirror://sourceforge/gtkextra/gtk+extra-3.0.1.tar.gz mirror://gentoo/introspection.m4.bz2
diff --git a/metadata/cache/x11-libs/gtkmathview-0.8.0-r1 b/metadata/cache/x11-libs/gtkmathview-0.8.0-r1
index 43f4fc03b000..c25f3bf74fde 100644
--- a/metadata/cache/x11-libs/gtkmathview-0.8.0-r1
+++ b/metadata/cache/x11-libs/gtkmathview-0.8.0-r1
@@ -1,4 +1,4 @@
->=dev-libs/glib-2.2.1:2 >=dev-libs/popt-1.7 >=dev-libs/libxml2-2.6.7:2 gtk? ( >=x11-libs/gtk+-2.2.1:2 >=media-libs/t1lib-5:5 >=dev-libs/gmetadom-0.1.8 x11-libs/pango ) mathml? ( media-fonts/texcm-ttf ) t1lib? ( >=media-libs/t1lib-5:5 ) dev-libs/libxslt dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-libs/glib-2.2.1:2 >=dev-libs/popt-1.7 >=dev-libs/libxml2-2.6.7:2 gtk? ( >=x11-libs/gtk+-2.2.1:2 >=media-libs/t1lib-5:5 >=dev-libs/gmetadom-0.1.8 x11-libs/pango ) mathml? ( media-fonts/texcm-ttf ) t1lib? ( >=media-libs/t1lib-5:5 ) dev-libs/libxslt dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=dev-libs/glib-2.2.1:2 >=dev-libs/popt-1.7 >=dev-libs/libxml2-2.6.7:2 gtk? ( >=x11-libs/gtk+-2.2.1:2 >=media-libs/t1lib-5:5 >=dev-libs/gmetadom-0.1.8 x11-libs/pango ) mathml? ( media-fonts/texcm-ttf ) t1lib? ( >=media-libs/t1lib-5:5 )
 0
 http://helm.cs.unibo.it/mml-widget/sources/gtkmathview-0.8.0.tar.gz
diff --git a/metadata/cache/x11-libs/guile-gtk-2.1 b/metadata/cache/x11-libs/guile-gtk-2.1
index 7a2a54dbc4ef..a9f4807755d5 100644
--- a/metadata/cache/x11-libs/guile-gtk-2.1
+++ b/metadata/cache/x11-libs/guile-gtk-2.1
@@ -1,4 +1,4 @@
-dev-scheme/guile x11-libs/gtk+:2 gnome-base/libglade:2.0 >=x11-libs/gtkglarea-1.90:2 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+dev-scheme/guile x11-libs/gtk+:2 gnome-base/libglade:2.0 >=x11-libs/gtkglarea-1.90:2 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 dev-scheme/guile x11-libs/gtk+:2 gnome-base/libglade:2.0 >=x11-libs/gtkglarea-1.90:2
 0
 ftp://ftp.gnu.org/gnu/guile-gtk/guile-gtk-2.1.tar.gz
diff --git a/metadata/cache/x11-libs/guile-gtk-2.1-r1 b/metadata/cache/x11-libs/guile-gtk-2.1-r1
index eab8541de15a..ad7151a0b35e 100644
--- a/metadata/cache/x11-libs/guile-gtk-2.1-r1
+++ b/metadata/cache/x11-libs/guile-gtk-2.1-r1
@@ -1,4 +1,4 @@
-dev-scheme/guile[deprecated(+)] x11-libs/gtk+:2 gnome-base/libglade:2.0 >=x11-libs/gtkglarea-1.90:2 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+dev-scheme/guile[deprecated(+)] x11-libs/gtk+:2 gnome-base/libglade:2.0 >=x11-libs/gtkglarea-1.90:2 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 dev-scheme/guile[deprecated(+)] x11-libs/gtk+:2 gnome-base/libglade:2.0 >=x11-libs/gtkglarea-1.90:2
 0
 ftp://ftp.gnu.org/gnu/guile-gtk/guile-gtk-2.1.tar.gz
diff --git a/metadata/cache/x11-libs/ige-mac-integration-9999 b/metadata/cache/x11-libs/ige-mac-integration-9999
index ad37d2b05086..b9ca86b7ae9a 100644
--- a/metadata/cache/x11-libs/ige-mac-integration-9999
+++ b/metadata/cache/x11-libs/ige-mac-integration-9999
@@ -1,4 +1,4 @@
-x11-libs/gtk+:2 dev-python/pygtk:2 dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
+x11-libs/gtk+:2 dev-python/pygtk:2 dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
 x11-libs/gtk+:2 dev-python/pygtk:2
 0
 
diff --git a/metadata/cache/x11-libs/libGLw-1.0.0_pre120304 b/metadata/cache/x11-libs/libGLw-1.0.0_pre120304
index b6c5c0522aeb..095c3f7f484a 100644
--- a/metadata/cache/x11-libs/libGLw-1.0.0_pre120304
+++ b/metadata/cache/x11-libs/libGLw-1.0.0_pre120304
@@ -1,4 +1,4 @@
-!media-libs/mesa[motif] x11-libs/libX11 x11-libs/libXt x11-libs/openmotif virtual/opengl dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+!media-libs/mesa[motif] x11-libs/libX11 x11-libs/libXt x11-libs/openmotif virtual/opengl dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 !media-libs/mesa[motif] x11-libs/libX11 x11-libs/libXt x11-libs/openmotif virtual/opengl
 0
 http://dev.gentoo.org/~jlec/distfiles/libGLw-1.0.0_pre120304.tar.xz
diff --git a/metadata/cache/x11-libs/libPropList-0.10.1-r4 b/metadata/cache/x11-libs/libPropList-0.10.1-r4
index 92cfe248f93a..8067f6fc7d87 100644
--- a/metadata/cache/x11-libs/libPropList-0.10.1-r4
+++ b/metadata/cache/x11-libs/libPropList-0.10.1-r4
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 ftp://ftp.windowmaker.org/pub/libs/libPropList-0.10.1.tar.gz
diff --git a/metadata/cache/x11-libs/libfakekey-0.1-r1 b/metadata/cache/x11-libs/libfakekey-0.1-r1
index 9d96e38a6b77..19500ff45c18 100644
--- a/metadata/cache/x11-libs/libfakekey-0.1-r1
+++ b/metadata/cache/x11-libs/libfakekey-0.1-r1
@@ -1,4 +1,4 @@
-x11-libs/libXtst doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+x11-libs/libXtst doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 x11-libs/libXtst
 0
 http://matchbox-project.org/sources/libfakekey/0.1/libfakekey-0.1.tar.bz2
diff --git a/metadata/cache/x11-libs/libfm-0.1.15_pre20110422 b/metadata/cache/x11-libs/libfm-0.1.15_pre20110422
index bfd0a988a6c0..9474b6564fa2 100644
--- a/metadata/cache/x11-libs/libfm-0.1.15_pre20110422
+++ b/metadata/cache/x11-libs/libfm-0.1.15_pre20110422
@@ -1,4 +1,4 @@
->=dev-libs/glib-2.18:2 >=x11-libs/gtk+-2.16:2 udev? ( dev-libs/dbus-glib ) >=lxde-base/menu-cache-0.3.2 dev-util/gtk-doc-am doc? ( dev-util/gtk-doc ) >=dev-util/intltool-0.40 dev-util/pkgconfig sys-devel/gettext || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-libs/glib-2.18:2 >=x11-libs/gtk+-2.16:2 udev? ( dev-libs/dbus-glib ) >=lxde-base/menu-cache-0.3.2 dev-util/gtk-doc-am doc? ( dev-util/gtk-doc ) >=dev-util/intltool-0.40 dev-util/pkgconfig sys-devel/gettext || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=dev-libs/glib-2.18:2 >=x11-libs/gtk+-2.16:2 udev? ( dev-libs/dbus-glib ) >=lxde-base/menu-cache-0.3.2 x11-misc/shared-mime-info udev? ( sys-fs/udisks )
 0
 http://dev.gentoo.org/~hwoarang/distfiles/libfm-0.1.15_pre20110422.tar.gz
diff --git a/metadata/cache/x11-libs/libfm-0.1.15_pre20110614 b/metadata/cache/x11-libs/libfm-0.1.15_pre20110614
index fabbf3a9ecb8..d8540c258205 100644
--- a/metadata/cache/x11-libs/libfm-0.1.15_pre20110614
+++ b/metadata/cache/x11-libs/libfm-0.1.15_pre20110614
@@ -1,4 +1,4 @@
->=dev-libs/glib-2.18:2 >=x11-libs/gtk+-2.16:2 udev? ( dev-libs/dbus-glib ) >=lxde-base/menu-cache-0.3.2 dev-util/gtk-doc-am doc? ( dev-util/gtk-doc ) >=dev-util/intltool-0.40 dev-util/pkgconfig sys-devel/gettext || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-libs/glib-2.18:2 >=x11-libs/gtk+-2.16:2 udev? ( dev-libs/dbus-glib ) >=lxde-base/menu-cache-0.3.2 dev-util/gtk-doc-am doc? ( dev-util/gtk-doc ) >=dev-util/intltool-0.40 dev-util/pkgconfig sys-devel/gettext || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=dev-libs/glib-2.18:2 >=x11-libs/gtk+-2.16:2 udev? ( dev-libs/dbus-glib ) >=lxde-base/menu-cache-0.3.2 x11-misc/shared-mime-info udev? ( sys-fs/udisks )
 0
 http://dev.gentoo.org/~hwoarang/distfiles/libfm-0.1.15_pre20110614.tar.gz
diff --git a/metadata/cache/x11-libs/libfm-0.1.16 b/metadata/cache/x11-libs/libfm-0.1.16
index 1bad9c734dec..8816b76483da 100644
--- a/metadata/cache/x11-libs/libfm-0.1.16
+++ b/metadata/cache/x11-libs/libfm-0.1.16
@@ -1,4 +1,4 @@
->=dev-libs/glib-2.18:2 >=x11-libs/gtk+-2.16:2 udev? ( dev-libs/dbus-glib ) >=lxde-base/menu-cache-0.3.2 dev-util/gtk-doc-am >=dev-util/intltool-0.40 dev-util/pkgconfig sys-devel/gettext || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-libs/glib-2.18:2 >=x11-libs/gtk+-2.16:2 udev? ( dev-libs/dbus-glib ) >=lxde-base/menu-cache-0.3.2 dev-util/gtk-doc-am >=dev-util/intltool-0.40 dev-util/pkgconfig sys-devel/gettext || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=dev-libs/glib-2.18:2 >=x11-libs/gtk+-2.16:2 udev? ( dev-libs/dbus-glib ) >=lxde-base/menu-cache-0.3.2 x11-misc/shared-mime-info udev? ( sys-fs/udisks )
 0
 http://dev.gentoo.org/~hwoarang/distfiles/libfm-0.1.16.tar.gz
diff --git a/metadata/cache/x11-libs/libfm-0.1.17 b/metadata/cache/x11-libs/libfm-0.1.17
index 199ea936aebb..a45d20cb423c 100644
--- a/metadata/cache/x11-libs/libfm-0.1.17
+++ b/metadata/cache/x11-libs/libfm-0.1.17
@@ -1,4 +1,4 @@
->=dev-libs/glib-2.18:2 >=x11-libs/gtk+-2.16:2 udev? ( dev-libs/dbus-glib ) >=lxde-base/menu-cache-0.3.2 dev-util/gtk-doc-am >=dev-util/intltool-0.40 dev-util/pkgconfig sys-devel/gettext || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-libs/glib-2.18:2 >=x11-libs/gtk+-2.16:2 udev? ( dev-libs/dbus-glib ) >=lxde-base/menu-cache-0.3.2 dev-util/gtk-doc-am >=dev-util/intltool-0.40 dev-util/pkgconfig sys-devel/gettext || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=dev-libs/glib-2.18:2 >=x11-libs/gtk+-2.16:2 udev? ( dev-libs/dbus-glib ) >=lxde-base/menu-cache-0.3.2 x11-misc/shared-mime-info udev? ( sys-fs/udisks )
 0
 http://dev.gentoo.org/~hwoarang/distfiles/libfm-0.1.17.tar.gz
diff --git a/metadata/cache/x11-libs/libfm-9999 b/metadata/cache/x11-libs/libfm-9999
index 04cf39a62f31..706b01eefc66 100644
--- a/metadata/cache/x11-libs/libfm-9999
+++ b/metadata/cache/x11-libs/libfm-9999
@@ -1,4 +1,4 @@
->=dev-libs/glib-2.18:2 >=x11-libs/gtk+-2.16:2 udev? ( dev-libs/dbus-glib ) >=lxde-base/menu-cache-0.3.2 >=dev-lang/vala-0.14.0 dev-util/gtk-doc-am doc? ( dev-util/gtk-doc ) >=dev-util/intltool-0.40 dev-util/pkgconfig sys-devel/gettext || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
+>=dev-libs/glib-2.18:2 >=x11-libs/gtk+-2.16:2 udev? ( dev-libs/dbus-glib ) >=lxde-base/menu-cache-0.3.2 >=dev-lang/vala-0.14.0 dev-util/gtk-doc-am doc? ( dev-util/gtk-doc ) >=dev-util/intltool-0.40 dev-util/pkgconfig sys-devel/gettext || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
 >=dev-libs/glib-2.18:2 >=x11-libs/gtk+-2.16:2 udev? ( dev-libs/dbus-glib ) >=lxde-base/menu-cache-0.3.2 x11-misc/shared-mime-info udev? ( sys-fs/udisks )
 0
 
diff --git a/metadata/cache/x11-libs/libgksu-2.0.12-r1 b/metadata/cache/x11-libs/libgksu-2.0.12-r1
index 3f5e5e77bf71..183a8f8eea7f 100644
--- a/metadata/cache/x11-libs/libgksu-2.0.12-r1
+++ b/metadata/cache/x11-libs/libgksu-2.0.12-r1
@@ -1,4 +1,4 @@
->=x11-libs/gtk+-2.12:2 >=gnome-base/gconf-2 gnome-base/libgnome-keyring x11-libs/startup-notification >=gnome-base/libgtop-2 nls? ( >=sys-devel/gettext-0.14.1 ) doc? ( >=dev-util/gtk-doc-1.2-r1 ) dev-util/gtk-doc-am >=dev-util/intltool-0.35.5 >=dev-util/pkgconfig-0.19 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+>=x11-libs/gtk+-2.12:2 >=gnome-base/gconf-2 gnome-base/libgnome-keyring x11-libs/startup-notification >=gnome-base/libgtop-2 nls? ( >=sys-devel/gettext-0.14.1 ) doc? ( >=dev-util/gtk-doc-1.2-r1 ) dev-util/gtk-doc-am >=dev-util/intltool-0.35.5 >=dev-util/pkgconfig-0.19 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 >=x11-libs/gtk+-2.12:2 >=gnome-base/gconf-2 gnome-base/libgnome-keyring x11-libs/startup-notification >=gnome-base/libgtop-2 nls? ( >=sys-devel/gettext-0.14.1 ) app-admin/sudo
 2
 http://people.debian.org/~kov/gksu/libgksu-2.0.12.tar.gz
diff --git a/metadata/cache/x11-libs/libnotify-0.7.4 b/metadata/cache/x11-libs/libnotify-0.7.4
index f1dfa7b74c3e..cbce75652a25 100644
--- a/metadata/cache/x11-libs/libnotify-0.7.4
+++ b/metadata/cache/x11-libs/libnotify-0.7.4
@@ -1,4 +1,4 @@
->=dev-libs/glib-2.26:2 x11-libs/gdk-pixbuf:2 introspection? ( >=dev-libs/gobject-introspection-0.9.12 ) dev-util/pkgconfig dev-util/gtk-doc-am doc? ( >=dev-util/gtk-doc-1.14 ) test? ( x11-libs/gtk+:3 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils
+>=dev-libs/glib-2.26:2 x11-libs/gdk-pixbuf:2 introspection? ( >=dev-libs/gobject-introspection-0.9.12 ) dev-util/pkgconfig dev-util/gtk-doc-am doc? ( >=dev-util/gtk-doc-1.14 ) test? ( x11-libs/gtk+:3 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils
 >=dev-libs/glib-2.26:2 x11-libs/gdk-pixbuf:2 introspection? ( >=dev-libs/gobject-introspection-0.9.12 )
 0
 mirror://gnome/sources/libnotify/0.7/libnotify-0.7.4.tar.xz mirror://gentoo/introspection-20110205.m4.tar.bz2
diff --git a/metadata/cache/x11-libs/libnotify-0.7.4-r1 b/metadata/cache/x11-libs/libnotify-0.7.4-r1
index 84e386e65f38..314728bb13e6 100644
--- a/metadata/cache/x11-libs/libnotify-0.7.4-r1
+++ b/metadata/cache/x11-libs/libnotify-0.7.4-r1
@@ -1,4 +1,4 @@
->=dev-libs/glib-2.26 x11-libs/gdk-pixbuf:2 introspection? ( >=dev-libs/gobject-introspection-0.9.12 ) dev-util/gtk-doc-am dev-util/pkgconfig doc? ( >=dev-util/gtk-doc-1.14 ) symlink? ( !x11-misc/tinynotify-send[symlink] ) test? ( x11-libs/gtk+:3 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils
+>=dev-libs/glib-2.26 x11-libs/gdk-pixbuf:2 introspection? ( >=dev-libs/gobject-introspection-0.9.12 ) dev-util/gtk-doc-am dev-util/pkgconfig doc? ( >=dev-util/gtk-doc-1.14 ) symlink? ( !x11-misc/tinynotify-send[symlink] ) test? ( x11-libs/gtk+:3 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils
 >=dev-libs/glib-2.26 x11-libs/gdk-pixbuf:2 introspection? ( >=dev-libs/gobject-introspection-0.9.12 )
 0
 mirror://gnome/sources/libnotify/0.7/libnotify-0.7.4.tar.xz mirror://gentoo/introspection-20110205.m4.tar.bz2
diff --git a/metadata/cache/x11-libs/libsexy-0.1.11-r3 b/metadata/cache/x11-libs/libsexy-0.1.11-r3
index e7e6de1db8b3..900635822ea4 100644
--- a/metadata/cache/x11-libs/libsexy-0.1.11-r3
+++ b/metadata/cache/x11-libs/libsexy-0.1.11-r3
@@ -1,4 +1,4 @@
->=dev-libs/glib-2.6:2 >=x11-libs/gtk+-2.6:2 dev-libs/libxml2 >=x11-libs/pango-1.4.0 >=app-text/iso-codes-0.49 >=dev-lang/perl-5 >=dev-util/pkgconfig-0.19 dev-util/gtk-doc-am doc? ( >=dev-util/gtk-doc-1.4 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-libs/glib-2.6:2 >=x11-libs/gtk+-2.6:2 dev-libs/libxml2 >=x11-libs/pango-1.4.0 >=app-text/iso-codes-0.49 >=dev-lang/perl-5 >=dev-util/pkgconfig-0.19 dev-util/gtk-doc-am doc? ( >=dev-util/gtk-doc-1.4 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=dev-libs/glib-2.6:2 >=x11-libs/gtk+-2.6:2 dev-libs/libxml2 >=x11-libs/pango-1.4.0 >=app-text/iso-codes-0.49
 0
 http://releases.chipx86.com/libsexy/libsexy/libsexy-0.1.11.tar.bz2
diff --git a/metadata/cache/x11-libs/libva-1.0.15 b/metadata/cache/x11-libs/libva-1.0.15
index 7049e6e266b2..90084112beec 100644
--- a/metadata/cache/x11-libs/libva-1.0.15
+++ b/metadata/cache/x11-libs/libva-1.0.15
@@ -1,4 +1,4 @@
->=x11-libs/libdrm-2.4 video_cards_dummy? ( sys-fs/udev ) x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes opengl? ( virtual/opengl ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=x11-libs/libdrm-2.4 video_cards_dummy? ( sys-fs/udev ) x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes opengl? ( virtual/opengl ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=x11-libs/libdrm-2.4 video_cards_dummy? ( sys-fs/udev ) x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes opengl? ( virtual/opengl )
 0
 http://cgit.freedesktop.org/vaapi/libva/snapshot/libva-1.0.15.tar.bz2
diff --git a/metadata/cache/x11-libs/libva-9999 b/metadata/cache/x11-libs/libva-9999
index e8de82e19f7d..e15e8c3469bf 100644
--- a/metadata/cache/x11-libs/libva-9999
+++ b/metadata/cache/x11-libs/libva-9999
@@ -1,4 +1,4 @@
->=x11-libs/libdrm-2.4 video_cards_dummy? ( sys-fs/udev ) x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes opengl? ( virtual/opengl ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
+>=x11-libs/libdrm-2.4 video_cards_dummy? ( sys-fs/udev ) x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes opengl? ( virtual/opengl ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
 >=x11-libs/libdrm-2.4 video_cards_dummy? ( sys-fs/udev ) x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes opengl? ( virtual/opengl )
 0
 
diff --git a/metadata/cache/x11-libs/libva-intel-driver-1.0.15 b/metadata/cache/x11-libs/libva-intel-driver-1.0.15
index 7d8e73b4fde8..0f23b5ed9f04 100644
--- a/metadata/cache/x11-libs/libva-intel-driver-1.0.15
+++ b/metadata/cache/x11-libs/libva-intel-driver-1.0.15
@@ -1,4 +1,4 @@
->=x11-libs/libva-1.0.14 !<x11-libs/libva-1.0.15[video_cards_intel] >=x11-libs/libdrm-2.4.23[video_cards_intel] dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=x11-libs/libva-1.0.14 !<x11-libs/libva-1.0.15[video_cards_intel] >=x11-libs/libdrm-2.4.23[video_cards_intel] dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=x11-libs/libva-1.0.14 !<x11-libs/libva-1.0.15[video_cards_intel] >=x11-libs/libdrm-2.4.23[video_cards_intel]
 0
 http://cgit.freedesktop.org/vaapi/intel-driver/snapshot/intel-driver-1.0.15.tar.bz2
diff --git a/metadata/cache/x11-libs/libva-intel-driver-9999 b/metadata/cache/x11-libs/libva-intel-driver-9999
index 1a2fc7451db4..6e1bee882a06 100644
--- a/metadata/cache/x11-libs/libva-intel-driver-9999
+++ b/metadata/cache/x11-libs/libva-intel-driver-9999
@@ -1,4 +1,4 @@
->=x11-libs/libva-1.0.14 !<x11-libs/libva-1.0.15[video_cards_intel] >=x11-libs/libdrm-2.4.23[video_cards_intel] dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
+>=x11-libs/libva-1.0.14 !<x11-libs/libva-1.0.15[video_cards_intel] >=x11-libs/libdrm-2.4.23[video_cards_intel] dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
 >=x11-libs/libva-1.0.14 !<x11-libs/libva-1.0.15[video_cards_intel] >=x11-libs/libdrm-2.4.23[video_cards_intel]
 0
 
diff --git a/metadata/cache/x11-libs/libview-0.6.6-r2 b/metadata/cache/x11-libs/libview-0.6.6-r2
index c33adccd1c05..6ec4e713d3e7 100644
--- a/metadata/cache/x11-libs/libview-0.6.6-r2
+++ b/metadata/cache/x11-libs/libview-0.6.6-r2
@@ -1,4 +1,4 @@
->=x11-libs/gtk+-2.4.0:2 dev-cpp/gtkmm:2.4 dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+>=x11-libs/gtk+-2.4.0:2 dev-cpp/gtkmm:2.4 dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 >=x11-libs/gtk+-2.4.0:2 dev-cpp/gtkmm:2.4
 0
 mirror://sourceforge/view/libview-0.6.6.tar.bz2
diff --git a/metadata/cache/x11-libs/libxdl_view-4.2-r1 b/metadata/cache/x11-libs/libxdl_view-4.2-r1
index f0710d19593b..28ff3051a216 100644
--- a/metadata/cache/x11-libs/libxdl_view-4.2-r1
+++ b/metadata/cache/x11-libs/libxdl_view-4.2-r1
@@ -1,4 +1,4 @@
-x11-libs/libXt || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+x11-libs/libXt || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 x11-libs/libXt
 0
 ftp://ftp.ccp4.ac.uk/jwc/libxdl_view-4.2.tar.gz
diff --git a/metadata/cache/x11-libs/libxklavier-5.2 b/metadata/cache/x11-libs/libxklavier-5.2
index 7d814b22acb8..d3083f6f8be3 100644
--- a/metadata/cache/x11-libs/libxklavier-5.2
+++ b/metadata/cache/x11-libs/libxklavier-5.2
@@ -1,4 +1,4 @@
-app-text/iso-codes >=dev-libs/glib-2.16 dev-libs/libxml2 x11-apps/xkbcomp x11-libs/libX11 >=x11-libs/libXi-1.1.3 x11-libs/libxkbfile x11-misc/xkeyboard-config introspection? ( >=dev-libs/gobject-introspection-1.30 ) dev-util/pkgconfig sys-devel/gettext doc? ( >=dev-util/gtk-doc-1.4 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils
+app-text/iso-codes >=dev-libs/glib-2.16 dev-libs/libxml2 x11-apps/xkbcomp x11-libs/libX11 >=x11-libs/libXi-1.1.3 x11-libs/libxkbfile x11-misc/xkeyboard-config introspection? ( >=dev-libs/gobject-introspection-1.30 ) dev-util/pkgconfig sys-devel/gettext doc? ( >=dev-util/gtk-doc-1.4 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils
 app-text/iso-codes >=dev-libs/glib-2.16 dev-libs/libxml2 x11-apps/xkbcomp x11-libs/libX11 >=x11-libs/libXi-1.1.3 x11-libs/libxkbfile x11-misc/xkeyboard-config introspection? ( >=dev-libs/gobject-introspection-1.30 )
 0
 mirror://gnome/sources/libxklavier/5.2/libxklavier-5.2.tar.xz
diff --git a/metadata/cache/x11-libs/libyui-2.21.1 b/metadata/cache/x11-libs/libyui-2.21.1
index f2b31d1bdcf0..2a93b9cc19b8 100644
--- a/metadata/cache/x11-libs/libyui-2.21.1
+++ b/metadata/cache/x11-libs/libyui-2.21.1
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 mirror://sourceforge/libyui/libyui-2.21.1.tar.gz
diff --git a/metadata/cache/x11-libs/libyui-gtk-2.21.96 b/metadata/cache/x11-libs/libyui-gtk-2.21.96
index 3d8d69263d50..0d84f6621204 100644
--- a/metadata/cache/x11-libs/libyui-gtk-2.21.96
+++ b/metadata/cache/x11-libs/libyui-gtk-2.21.96
@@ -1,4 +1,4 @@
-x11-libs/gtk+:2 dev-python/pygtk x11-libs/libyui || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+x11-libs/gtk+:2 dev-python/pygtk x11-libs/libyui || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 x11-libs/gtk+:2 dev-python/pygtk x11-libs/libyui
 0
 mirror://sourceforge/libyui/libyui-gtk-2.21.96.tar.gz
diff --git a/metadata/cache/x11-libs/libyui-ncurses-2.21.1 b/metadata/cache/x11-libs/libyui-ncurses-2.21.1
index 20d0b853b90b..337c11c9f771 100644
--- a/metadata/cache/x11-libs/libyui-ncurses-2.21.1
+++ b/metadata/cache/x11-libs/libyui-ncurses-2.21.1
@@ -1,4 +1,4 @@
-sys-libs/ncurses x11-libs/libyui || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+sys-libs/ncurses x11-libs/libyui || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 sys-libs/ncurses x11-libs/libyui
 0
 mirror://sourceforge/libyui/libyui-ncurses-2.21.1.tar.gz
diff --git a/metadata/cache/x11-libs/openmotif-2.2.3-r11 b/metadata/cache/x11-libs/openmotif-2.2.3-r11
index f62dcd76bb29..4cae11d64637 100644
--- a/metadata/cache/x11-libs/openmotif-2.2.3-r11
+++ b/metadata/cache/x11-libs/openmotif-2.2.3-r11
@@ -1,4 +1,4 @@
-x11-libs/libXmu x11-libs/libXp x11-libs/libXaw x11-misc/xbitmaps || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+x11-libs/libXmu x11-libs/libXp x11-libs/libXaw x11-misc/xbitmaps || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 x11-libs/libXmu x11-libs/libXp
 2.2
 ftp://ftp.ics.com/openmotif/2.2/2.2.3/src/openMotif-2.2.3.tar.gz mirror://gentoo/openmotif-2.2.3-patches-4.tar.bz2
diff --git a/metadata/cache/x11-libs/openmotif-2.3.2-r2 b/metadata/cache/x11-libs/openmotif-2.3.2-r2
index 23ddb3e3af97..b1d86cd510ef 100644
--- a/metadata/cache/x11-libs/openmotif-2.3.2-r2
+++ b/metadata/cache/x11-libs/openmotif-2.3.2-r2
@@ -1,4 +1,4 @@
-x11-libs/libXmu x11-libs/libXp unicode? ( virtual/libiconv ) xft? ( x11-libs/libXft ) jpeg? ( virtual/jpeg ) png? ( >=media-libs/libpng-1.4 ) sys-devel/flex x11-misc/xbitmaps || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+x11-libs/libXmu x11-libs/libXp unicode? ( virtual/libiconv ) xft? ( x11-libs/libXft ) jpeg? ( virtual/jpeg ) png? ( >=media-libs/libpng-1.4 ) sys-devel/flex x11-misc/xbitmaps || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 x11-libs/libXmu x11-libs/libXp unicode? ( virtual/libiconv ) xft? ( x11-libs/libXft ) jpeg? ( virtual/jpeg ) png? ( >=media-libs/libpng-1.4 ) doc? ( app-doc/openmotif-manual )
 0
 ftp://ftp.ics.com/openmotif/2.3/2.3.2/openmotif-2.3.2.tar.gz
diff --git a/metadata/cache/x11-libs/openmotif-2.3.3 b/metadata/cache/x11-libs/openmotif-2.3.3
index 992410322ac5..271edb879663 100644
--- a/metadata/cache/x11-libs/openmotif-2.3.3
+++ b/metadata/cache/x11-libs/openmotif-2.3.3
@@ -1,4 +1,4 @@
-x11-libs/libXmu x11-libs/libXp unicode? ( virtual/libiconv ) xft? ( x11-libs/libXft ) jpeg? ( virtual/jpeg ) png? ( >=media-libs/libpng-1.4 ) sys-devel/flex x11-misc/xbitmaps || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+x11-libs/libXmu x11-libs/libXp unicode? ( virtual/libiconv ) xft? ( x11-libs/libXft ) jpeg? ( virtual/jpeg ) png? ( >=media-libs/libpng-1.4 ) sys-devel/flex x11-misc/xbitmaps || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 x11-libs/libXmu x11-libs/libXp unicode? ( virtual/libiconv ) xft? ( x11-libs/libXft ) jpeg? ( virtual/jpeg ) png? ( >=media-libs/libpng-1.4 ) doc? ( app-doc/openmotif-manual )
 0
 ftp://ftp.ics.com/openmotif/2.3/2.3.3/openmotif-2.3.3.tar.gz
diff --git a/metadata/cache/x11-libs/openmotif-2.3.3-r1 b/metadata/cache/x11-libs/openmotif-2.3.3-r1
index 5ca83e2d59a2..7551311355a0 100644
--- a/metadata/cache/x11-libs/openmotif-2.3.3-r1
+++ b/metadata/cache/x11-libs/openmotif-2.3.3-r1
@@ -1,4 +1,4 @@
-x11-libs/libXmu x11-libs/libXp unicode? ( virtual/libiconv ) xft? ( x11-libs/libXft ) jpeg? ( virtual/jpeg ) png? ( >=media-libs/libpng-1.4 ) sys-devel/flex dev-util/byacc x11-misc/xbitmaps || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+x11-libs/libXmu x11-libs/libXp unicode? ( virtual/libiconv ) xft? ( x11-libs/libXft ) jpeg? ( virtual/jpeg ) png? ( >=media-libs/libpng-1.4 ) sys-devel/flex dev-util/byacc x11-misc/xbitmaps || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 x11-libs/libXmu x11-libs/libXp unicode? ( virtual/libiconv ) xft? ( x11-libs/libXft ) jpeg? ( virtual/jpeg ) png? ( >=media-libs/libpng-1.4 ) doc? ( app-doc/openmotif-manual )
 0
 ftp://ftp.ics.com/openmotif/2.3/2.3.3/openmotif-2.3.3.tar.gz
diff --git a/metadata/cache/x11-libs/pango-1.28.3-r1 b/metadata/cache/x11-libs/pango-1.28.3-r1
index 7df98d8188fe..75384bb66f74 100644
--- a/metadata/cache/x11-libs/pango-1.28.3-r1
+++ b/metadata/cache/x11-libs/pango-1.28.3-r1
@@ -1,4 +1,4 @@
->=dev-libs/glib-2.24:2 >=media-libs/fontconfig-2.5.0:1.0 media-libs/freetype:2 >=x11-libs/cairo-1.7.6[X?] X? ( x11-libs/libXrender x11-libs/libX11 x11-libs/libXft ) >=dev-util/pkgconfig-0.9 >=dev-util/gtk-doc-am-1.13 doc? ( >=dev-util/gtk-doc-1.13 ~app-text/docbook-xml-dtd-4.1.2 x11-libs/libXft ) introspection? ( >=dev-libs/gobject-introspection-0.9.5 ) test? ( >=dev-util/gtk-doc-1.13 ~app-text/docbook-xml-dtd-4.1.2 x11-libs/libXft ) X? ( x11-proto/xproto ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+>=dev-libs/glib-2.24:2 >=media-libs/fontconfig-2.5.0:1.0 media-libs/freetype:2 >=x11-libs/cairo-1.7.6[X?] X? ( x11-libs/libXrender x11-libs/libX11 x11-libs/libXft ) >=dev-util/pkgconfig-0.9 >=dev-util/gtk-doc-am-1.13 doc? ( >=dev-util/gtk-doc-1.13 ~app-text/docbook-xml-dtd-4.1.2 x11-libs/libXft ) introspection? ( >=dev-libs/gobject-introspection-0.9.5 ) test? ( >=dev-util/gtk-doc-1.13 ~app-text/docbook-xml-dtd-4.1.2 x11-libs/libXft ) X? ( x11-proto/xproto ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 >=dev-libs/glib-2.24:2 >=media-libs/fontconfig-2.5.0:1.0 media-libs/freetype:2 >=x11-libs/cairo-1.7.6[X?] X? ( x11-libs/libXrender x11-libs/libX11 x11-libs/libXft )
 0
 mirror://gnome/sources/pango/1.28/pango-1.28.3.tar.bz2
diff --git a/metadata/cache/x11-libs/pango-1.28.4 b/metadata/cache/x11-libs/pango-1.28.4
index 96ed78a3b580..fbf5246e39ae 100644
--- a/metadata/cache/x11-libs/pango-1.28.4
+++ b/metadata/cache/x11-libs/pango-1.28.4
@@ -1,4 +1,4 @@
->=dev-libs/glib-2.24:2 >=media-libs/fontconfig-2.5.0:1.0 media-libs/freetype:2 >=x11-libs/cairo-1.7.6[X?] X? ( x11-libs/libXrender x11-libs/libX11 x11-libs/libXft ) >=dev-util/pkgconfig-0.9 >=dev-util/gtk-doc-am-1.13 doc? ( >=dev-util/gtk-doc-1.13 ~app-text/docbook-xml-dtd-4.1.2 x11-libs/libXft ) introspection? ( >=dev-libs/gobject-introspection-0.9.5 ) test? ( >=dev-util/gtk-doc-1.13 ~app-text/docbook-xml-dtd-4.1.2 x11-libs/libXft ) X? ( x11-proto/xproto ) !<=sys-devel/autoconf-2.63:2.5 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+>=dev-libs/glib-2.24:2 >=media-libs/fontconfig-2.5.0:1.0 media-libs/freetype:2 >=x11-libs/cairo-1.7.6[X?] X? ( x11-libs/libXrender x11-libs/libX11 x11-libs/libXft ) >=dev-util/pkgconfig-0.9 >=dev-util/gtk-doc-am-1.13 doc? ( >=dev-util/gtk-doc-1.13 ~app-text/docbook-xml-dtd-4.1.2 x11-libs/libXft ) introspection? ( >=dev-libs/gobject-introspection-0.9.5 ) test? ( >=dev-util/gtk-doc-1.13 ~app-text/docbook-xml-dtd-4.1.2 x11-libs/libXft ) X? ( x11-proto/xproto ) !<=sys-devel/autoconf-2.63:2.5 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 >=dev-libs/glib-2.24:2 >=media-libs/fontconfig-2.5.0:1.0 media-libs/freetype:2 >=x11-libs/cairo-1.7.6[X?] X? ( x11-libs/libXrender x11-libs/libX11 x11-libs/libXft )
 0
 mirror://gnome/sources/pango/1.28/pango-1.28.4.tar.bz2
diff --git a/metadata/cache/x11-libs/pango-1.29.4 b/metadata/cache/x11-libs/pango-1.29.4
index 6295ba11a72f..5e3c1e5423b9 100644
--- a/metadata/cache/x11-libs/pango-1.29.4
+++ b/metadata/cache/x11-libs/pango-1.29.4
@@ -1,4 +1,4 @@
->=dev-libs/glib-2.29.5:2 >=media-libs/fontconfig-2.5.0:1.0 media-libs/freetype:2 >=x11-libs/cairo-1.7.6[X?] X? ( x11-libs/libXrender x11-libs/libX11 >=x11-libs/libXft-2.0.0 ) >=dev-util/pkgconfig-0.9 >=dev-util/gtk-doc-am-1.13 doc? ( >=dev-util/gtk-doc-1.13 ~app-text/docbook-xml-dtd-4.1.2 x11-libs/libXft ) introspection? ( >=dev-libs/gobject-introspection-0.9.5 ) test? ( >=dev-util/gtk-doc-1.13 ~app-text/docbook-xml-dtd-4.1.2 x11-libs/libXft ) X? ( x11-proto/xproto ) !<=sys-devel/autoconf-2.63:2.5 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
+>=dev-libs/glib-2.29.5:2 >=media-libs/fontconfig-2.5.0:1.0 media-libs/freetype:2 >=x11-libs/cairo-1.7.6[X?] X? ( x11-libs/libXrender x11-libs/libX11 >=x11-libs/libXft-2.0.0 ) >=dev-util/pkgconfig-0.9 >=dev-util/gtk-doc-am-1.13 doc? ( >=dev-util/gtk-doc-1.13 ~app-text/docbook-xml-dtd-4.1.2 x11-libs/libXft ) introspection? ( >=dev-libs/gobject-introspection-0.9.5 ) test? ( >=dev-util/gtk-doc-1.13 ~app-text/docbook-xml-dtd-4.1.2 x11-libs/libXft ) X? ( x11-proto/xproto ) !<=sys-devel/autoconf-2.63:2.5 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
 >=dev-libs/glib-2.29.5:2 >=media-libs/fontconfig-2.5.0:1.0 media-libs/freetype:2 >=x11-libs/cairo-1.7.6[X?] X? ( x11-libs/libXrender x11-libs/libX11 >=x11-libs/libXft-2.0.0 )
 0
 mirror://gnome/sources/pango/1.29/pango-1.29.4.tar.xz
diff --git a/metadata/cache/x11-libs/startup-notification-0.10 b/metadata/cache/x11-libs/startup-notification-0.10
index 825bd280ba82..4ba5dcbcb40b 100644
--- a/metadata/cache/x11-libs/startup-notification-0.10
+++ b/metadata/cache/x11-libs/startup-notification-0.10
@@ -1,4 +1,4 @@
-x11-libs/libX11 x11-libs/libSM x11-libs/libICE x11-libs/libxcb <x11-libs/xcb-util-0.3.8 >=x11-libs/xcb-util-0.3 dev-util/pkgconfig x11-proto/xproto x11-libs/libXt || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+x11-libs/libX11 x11-libs/libSM x11-libs/libICE x11-libs/libxcb <x11-libs/xcb-util-0.3.8 >=x11-libs/xcb-util-0.3 dev-util/pkgconfig x11-proto/xproto x11-libs/libXt || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 x11-libs/libX11 x11-libs/libSM x11-libs/libICE x11-libs/libxcb <x11-libs/xcb-util-0.3.8 >=x11-libs/xcb-util-0.3
 0
 http://freedesktop.org/software/startup-notification/releases/startup-notification-0.10.tar.gz
diff --git a/metadata/cache/x11-libs/tslib-1.0-r2 b/metadata/cache/x11-libs/tslib-1.0-r2
index 99038e3713df..a6a3fa98313e 100644
--- a/metadata/cache/x11-libs/tslib-1.0-r2
+++ b/metadata/cache/x11-libs/tslib-1.0-r2
@@ -1,4 +1,4 @@
-|| ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+|| ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 mirror://berlios/tslib/tslib-1.0.tar.bz2 mirror://gentoo/tslib-1.0-patches-5.tar.bz2
diff --git a/metadata/cache/x11-libs/vdpau-video-0.7.3 b/metadata/cache/x11-libs/vdpau-video-0.7.3
index 1284e0a1e799..3eebc91f559b 100644
--- a/metadata/cache/x11-libs/vdpau-video-0.7.3
+++ b/metadata/cache/x11-libs/vdpau-video-0.7.3
@@ -1,4 +1,4 @@
-dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 x11-libs/libva[opengl?] opengl? ( virtual/opengl ) x11-libs/libvdpau
 0
 http://www.splitted-desktop.com/~gbeauchesne/vdpau-video/vdpau-video-0.7.3.tar.gz
diff --git a/metadata/cache/x11-libs/vte-0.28.1-r300 b/metadata/cache/x11-libs/vte-0.28.1-r300
index 5f9830c69ea4..cb2a664e9959 100644
--- a/metadata/cache/x11-libs/vte-0.28.1-r300
+++ b/metadata/cache/x11-libs/vte-0.28.1-r300
@@ -1,4 +1,4 @@
->=dev-libs/glib-2.26:2 >=x11-libs/gtk+-3.0:3[introspection?] >=x11-libs/pango-1.22.0 sys-libs/ncurses x11-libs/libX11 x11-libs/libXft glade? ( >=dev-util/glade-3.9:3.10 ) introspection? ( >=dev-libs/gobject-introspection-0.9.0 ) >=dev-util/intltool-0.35 >=dev-util/pkgconfig-0.9 sys-devel/gettext doc? ( >=dev-util/gtk-doc-1.13 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
+>=dev-libs/glib-2.26:2 >=x11-libs/gtk+-3.0:3[introspection?] >=x11-libs/pango-1.22.0 sys-libs/ncurses x11-libs/libX11 x11-libs/libXft glade? ( >=dev-util/glade-3.9:3.10 ) introspection? ( >=dev-libs/gobject-introspection-0.9.0 ) >=dev-util/intltool-0.35 >=dev-util/pkgconfig-0.9 sys-devel/gettext doc? ( >=dev-util/gtk-doc-1.13 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
 >=dev-libs/glib-2.26:2 >=x11-libs/gtk+-3.0:3[introspection?] >=x11-libs/pango-1.22.0 sys-libs/ncurses x11-libs/libX11 x11-libs/libXft glade? ( >=dev-util/glade-3.9:3.10 ) introspection? ( >=dev-libs/gobject-introspection-0.9.0 )
 2.90
 mirror://gnome/sources/vte/0.28/vte-0.28.1.tar.xz
diff --git a/metadata/cache/x11-libs/vte-0.28.2-r300 b/metadata/cache/x11-libs/vte-0.28.2-r300
index 321b2ef60a2c..7ea62fd95988 100644
--- a/metadata/cache/x11-libs/vte-0.28.2-r300
+++ b/metadata/cache/x11-libs/vte-0.28.2-r300
@@ -1,4 +1,4 @@
->=dev-libs/glib-2.26:2 >=x11-libs/gtk+-3.0:3[introspection?] >=x11-libs/pango-1.22.0 sys-libs/ncurses x11-libs/libX11 x11-libs/libXft glade? ( >=dev-util/glade-3.9:3.10 ) introspection? ( >=dev-libs/gobject-introspection-0.9.0 ) >=dev-util/intltool-0.35 >=dev-util/pkgconfig-0.9 sys-devel/gettext doc? ( >=dev-util/gtk-doc-1.13 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
+>=dev-libs/glib-2.26:2 >=x11-libs/gtk+-3.0:3[introspection?] >=x11-libs/pango-1.22.0 sys-libs/ncurses x11-libs/libX11 x11-libs/libXft glade? ( >=dev-util/glade-3.9:3.10 ) introspection? ( >=dev-libs/gobject-introspection-0.9.0 ) >=dev-util/intltool-0.35 >=dev-util/pkgconfig-0.9 sys-devel/gettext doc? ( >=dev-util/gtk-doc-1.13 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
 >=dev-libs/glib-2.26:2 >=x11-libs/gtk+-3.0:3[introspection?] >=x11-libs/pango-1.22.0 sys-libs/ncurses x11-libs/libX11 x11-libs/libXft glade? ( >=dev-util/glade-3.9:3.10 ) introspection? ( >=dev-libs/gobject-introspection-0.9.0 )
 2.90
 mirror://gnome/sources/vte/0.28/vte-0.28.2.tar.xz mirror://gentoo/introspection.m4.bz2
diff --git a/metadata/cache/x11-libs/vte-0.28.2-r301 b/metadata/cache/x11-libs/vte-0.28.2-r301
index 4891d07901f5..63f315f8233f 100644
--- a/metadata/cache/x11-libs/vte-0.28.2-r301
+++ b/metadata/cache/x11-libs/vte-0.28.2-r301
@@ -1,4 +1,4 @@
->=dev-libs/glib-2.26:2 >=x11-libs/gtk+-3.0:3[introspection?] >=x11-libs/pango-1.22.0 sys-libs/ncurses x11-libs/libX11 x11-libs/libXft glade? ( >=dev-util/glade-3.9:3.10 ) introspection? ( >=dev-libs/gobject-introspection-0.9.0 ) >=dev-util/intltool-0.35 >=dev-util/pkgconfig-0.9 sys-devel/gettext doc? ( >=dev-util/gtk-doc-1.13 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
+>=dev-libs/glib-2.26:2 >=x11-libs/gtk+-3.0:3[introspection?] >=x11-libs/pango-1.22.0 sys-libs/ncurses x11-libs/libX11 x11-libs/libXft glade? ( >=dev-util/glade-3.9:3.10 ) introspection? ( >=dev-libs/gobject-introspection-0.9.0 ) >=dev-util/intltool-0.35 >=dev-util/pkgconfig-0.9 sys-devel/gettext doc? ( >=dev-util/gtk-doc-1.13 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool app-arch/xz-utils >=sys-apps/sed-4
 >=dev-libs/glib-2.26:2 >=x11-libs/gtk+-3.0:3[introspection?] >=x11-libs/pango-1.22.0 sys-libs/ncurses x11-libs/libX11 x11-libs/libXft glade? ( >=dev-util/glade-3.9:3.10 ) introspection? ( >=dev-libs/gobject-introspection-0.9.0 )
 2.90
 mirror://gnome/sources/vte/0.28/vte-0.28.2.tar.xz mirror://gentoo/introspection.m4.bz2
diff --git a/metadata/cache/x11-libs/xforms-1.0.92 b/metadata/cache/x11-libs/xforms-1.0.92
index 80a931bbec16..e620b6407b38 100644
--- a/metadata/cache/x11-libs/xforms-1.0.92
+++ b/metadata/cache/x11-libs/xforms-1.0.92
@@ -1,4 +1,4 @@
-virtual/jpeg x11-libs/libX11 x11-libs/libXpm x11-libs/libSM x11-proto/xproto opengl? ( virtual/opengl ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+virtual/jpeg x11-libs/libX11 x11-libs/libXpm x11-libs/libSM x11-proto/xproto opengl? ( virtual/opengl ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 virtual/jpeg x11-libs/libX11 x11-libs/libXpm x11-libs/libSM x11-proto/xproto opengl? ( virtual/opengl )
 0
 http://savannah.nongnu.org/download/xforms/xforms-1.0.92.tar.gz
diff --git a/metadata/cache/x11-libs/xforms-1.0.92_p2 b/metadata/cache/x11-libs/xforms-1.0.92_p2
index f82c574dd7df..23b83bb2ee0f 100644
--- a/metadata/cache/x11-libs/xforms-1.0.92_p2
+++ b/metadata/cache/x11-libs/xforms-1.0.92_p2
@@ -1,4 +1,4 @@
-virtual/jpeg x11-libs/libX11 x11-libs/libXpm x11-libs/libSM x11-proto/xproto opengl? ( virtual/opengl ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+virtual/jpeg x11-libs/libX11 x11-libs/libXpm x11-libs/libSM x11-proto/xproto opengl? ( virtual/opengl ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 virtual/jpeg x11-libs/libX11 x11-libs/libXpm x11-libs/libSM x11-proto/xproto opengl? ( virtual/opengl )
 0
 http://savannah.nongnu.org/download/xforms/xforms-1.0.92sp2.tar.gz
diff --git a/metadata/cache/x11-libs/xforms-1.0.93_p1 b/metadata/cache/x11-libs/xforms-1.0.93_p1
index 2faa19086273..8f648763b5d4 100644
--- a/metadata/cache/x11-libs/xforms-1.0.93_p1
+++ b/metadata/cache/x11-libs/xforms-1.0.93_p1
@@ -1,4 +1,4 @@
-virtual/jpeg x11-libs/libSM x11-libs/libX11 x11-libs/libXpm opengl? ( virtual/opengl ) x11-proto/xproto || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+virtual/jpeg x11-libs/libSM x11-libs/libX11 x11-libs/libXpm opengl? ( virtual/opengl ) x11-proto/xproto || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 virtual/jpeg x11-libs/libSM x11-libs/libX11 x11-libs/libXpm opengl? ( virtual/opengl )
 0
 http://savannah.nongnu.org/download/xforms/xforms-1.0.93sp1.tar.gz
diff --git a/metadata/cache/x11-libs/xpa-2.1.12 b/metadata/cache/x11-libs/xpa-2.1.12
index 003324d3ab4e..3cfa432b72b7 100644
--- a/metadata/cache/x11-libs/xpa-2.1.12
+++ b/metadata/cache/x11-libs/xpa-2.1.12
@@ -1,4 +1,4 @@
-dev-lang/tcl x11-libs/libXt !<sci-astronomy/ds9-5.3 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-lang/tcl x11-libs/libXt !<sci-astronomy/ds9-5.3 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-lang/tcl x11-libs/libXt !<sci-astronomy/ds9-5.3
 0
 http://hea-www.harvard.edu/saord/download/xpa/xpa-2.1.12.tar.gz
diff --git a/metadata/cache/x11-libs/xpa-2.1.13 b/metadata/cache/x11-libs/xpa-2.1.13
index dd517065f4cb..ac5b03e252d2 100644
--- a/metadata/cache/x11-libs/xpa-2.1.13
+++ b/metadata/cache/x11-libs/xpa-2.1.13
@@ -1,4 +1,4 @@
-dev-lang/tcl x11-libs/libXt !<sci-astronomy/ds9-5.3 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-lang/tcl x11-libs/libXt !<sci-astronomy/ds9-5.3 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-lang/tcl x11-libs/libXt !<sci-astronomy/ds9-5.3
 0
 http://hea-www.harvard.edu/saord/download/xpa/xpa-2.1.13.tar.gz
diff --git a/metadata/cache/x11-misc/3ddesktop-0.2.9-r1 b/metadata/cache/x11-misc/3ddesktop-0.2.9-r1
index 7c8572563851..ef2d476b3028 100644
--- a/metadata/cache/x11-misc/3ddesktop-0.2.9-r1
+++ b/metadata/cache/x11-misc/3ddesktop-0.2.9-r1
@@ -1,4 +1,4 @@
-x11-libs/libX11 x11-libs/libXmu x11-libs/libXt x11-libs/libXext x11-libs/libXi x11-libs/libXxf86vm media-libs/imlib2 media-libs/freeglut media-libs/freetype x11-proto/xf86vidmodeproto x11-proto/xproto || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+x11-libs/libX11 x11-libs/libXmu x11-libs/libXt x11-libs/libXext x11-libs/libXi x11-libs/libXxf86vm media-libs/imlib2 media-libs/freeglut media-libs/freetype x11-proto/xf86vidmodeproto x11-proto/xproto || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 x11-libs/libX11 x11-libs/libXmu x11-libs/libXt x11-libs/libXext x11-libs/libXi x11-libs/libXxf86vm media-libs/imlib2 media-libs/freeglut media-libs/freetype
 0
 mirror://sourceforge/desk3d/3ddesktop-0.2.9.tar.gz
diff --git a/metadata/cache/x11-misc/alltray-0.7.5.1 b/metadata/cache/x11-misc/alltray-0.7.5.1
index 76014f3c373e..e398e68647d8 100644
--- a/metadata/cache/x11-misc/alltray-0.7.5.1
+++ b/metadata/cache/x11-misc/alltray-0.7.5.1
@@ -1,4 +1,4 @@
-dev-libs/glib:2 gnome-base/libgtop:2 x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXext x11-libs/libXpm x11-libs/libwnck:1 dev-lang/vala:0.14 dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-libs/glib:2 gnome-base/libgtop:2 x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXext x11-libs/libXpm x11-libs/libwnck:1 dev-lang/vala:0.14 dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-libs/glib:2 gnome-base/libgtop:2 x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXext x11-libs/libXpm x11-libs/libwnck:1
 0
 http://code.launchpad.net/alltray/trunk/0.7.5.1dev/+download/alltray-0.7.5.1dev.tar.gz
diff --git a/metadata/cache/x11-misc/bbmail-0.9.3 b/metadata/cache/x11-misc/bbmail-0.9.3
index 233f92d78547..da7a85be5c2a 100644
--- a/metadata/cache/x11-misc/bbmail-0.9.3
+++ b/metadata/cache/x11-misc/bbmail-0.9.3
@@ -1,4 +1,4 @@
-x11-wm/blackbox x11-libs/libX11 x11-libs/libXext x11-proto/xproto || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+x11-wm/blackbox x11-libs/libX11 x11-libs/libXext x11-proto/xproto || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 x11-wm/blackbox x11-libs/libX11 x11-libs/libXext
 0
 mirror://sourceforge/bbtools/bbmail-0.9.3.tar.gz
diff --git a/metadata/cache/x11-misc/bbppp-0.2.5 b/metadata/cache/x11-misc/bbppp-0.2.5
index bb3eda60c7c8..a5d983ff3c48 100644
--- a/metadata/cache/x11-misc/bbppp-0.2.5
+++ b/metadata/cache/x11-misc/bbppp-0.2.5
@@ -1,4 +1,4 @@
-x11-libs/libX11 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+x11-libs/libX11 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 x11-libs/libX11
 0
 mirror://sourceforge/bbtools/bbppp/bbppp-0.2.5/bbppp-0.2.5.tar.gz
diff --git a/metadata/cache/x11-misc/bbtime-0.1.5 b/metadata/cache/x11-misc/bbtime-0.1.5
index 8bb1833782ed..f8612be1548d 100644
--- a/metadata/cache/x11-misc/bbtime-0.1.5
+++ b/metadata/cache/x11-misc/bbtime-0.1.5
@@ -1,4 +1,4 @@
-x11-libs/libX11 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+x11-libs/libX11 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 x11-libs/libX11
 0
 http://bbtools.windsofstorm.net/sources/bbtime-0.1.5.tar.gz
diff --git a/metadata/cache/x11-misc/bbweather-0.6.3 b/metadata/cache/x11-misc/bbweather-0.6.3
index f82fb7943b34..3e83d07cf251 100644
--- a/metadata/cache/x11-misc/bbweather-0.6.3
+++ b/metadata/cache/x11-misc/bbweather-0.6.3
@@ -1,4 +1,4 @@
-dev-lang/perl x11-libs/libX11 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-lang/perl x11-libs/libX11 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-lang/perl x11-libs/libX11 net-misc/wget x11-apps/xmessage !<=x11-plugins/gkrellweather-2.0.7-r1
 0
 http://www.netmeister.org/apps/bbweather-0.6.3.tar.bz2
diff --git a/metadata/cache/x11-misc/cairo-clock-0.3.3 b/metadata/cache/x11-misc/cairo-clock-0.3.3
index f07aa47081e5..6b24f635b0a1 100644
--- a/metadata/cache/x11-misc/cairo-clock-0.3.3
+++ b/metadata/cache/x11-misc/cairo-clock-0.3.3
@@ -1,4 +1,4 @@
-dev-util/pkgconfig dev-util/intltool sys-devel/gettext || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-util/pkgconfig dev-util/intltool sys-devel/gettext || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-libs/glib:2 gnome-base/libglade gnome-base/librsvg >=x11-libs/cairo-1.2 x11-libs/gtk+:2 >=x11-libs/pango-1.10
 0
 http://macslow.thepimp.net/projects/cairo-clock/cairo-clock_0.3.3-1.tar.gz
diff --git a/metadata/cache/x11-misc/colord-0.1.15 b/metadata/cache/x11-misc/colord-0.1.15
index f3ea8609cd02..a68c2f843a92 100644
--- a/metadata/cache/x11-misc/colord-0.1.15
+++ b/metadata/cache/x11-misc/colord-0.1.15
@@ -1,4 +1,4 @@
-dev-db/sqlite:3 >=dev-libs/glib-2.28.0:2 >=media-libs/lcms-2.2:2 elibc_FreeBSD? ( >=sys-freebsd/freebsd-lib-8.0[usb] ) !elibc_FreeBSD? ( >=dev-libs/libusb-1.0.8:1 ) gusb? ( >=dev-libs/libgusb-0.1.1 ) introspection? ( >=dev-libs/gobject-introspection-0.9.8 ) scanner? ( media-gfx/sane-backends ) udev? ( || ( sys-fs/udev[gudev] sys-fs/udev[extras] ) ) dev-libs/libxslt >=dev-util/intltool-0.35 dev-util/pkgconfig >=sys-devel/gettext-0.17 doc? ( app-text/docbook-xml-dtd:4.1.2 >=dev-util/gtk-doc-1.9 ) vala? ( dev-lang/vala:0.14[vapigen] ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-db/sqlite:3 >=dev-libs/glib-2.28.0:2 >=media-libs/lcms-2.2:2 elibc_FreeBSD? ( >=sys-freebsd/freebsd-lib-8.0[usb] ) !elibc_FreeBSD? ( >=dev-libs/libusb-1.0.8:1 ) gusb? ( >=dev-libs/libgusb-0.1.1 ) introspection? ( >=dev-libs/gobject-introspection-0.9.8 ) scanner? ( media-gfx/sane-backends ) udev? ( || ( sys-fs/udev[gudev] sys-fs/udev[extras] ) ) dev-libs/libxslt >=dev-util/intltool-0.35 dev-util/pkgconfig >=sys-devel/gettext-0.17 doc? ( app-text/docbook-xml-dtd:4.1.2 >=dev-util/gtk-doc-1.9 ) vala? ( dev-lang/vala:0.14[vapigen] ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-db/sqlite:3 >=dev-libs/glib-2.28.0:2 >=media-libs/lcms-2.2:2 elibc_FreeBSD? ( >=sys-freebsd/freebsd-lib-8.0[usb] ) !elibc_FreeBSD? ( >=dev-libs/libusb-1.0.8:1 ) gusb? ( >=dev-libs/libgusb-0.1.1 ) introspection? ( >=dev-libs/gobject-introspection-0.9.8 ) scanner? ( media-gfx/sane-backends ) udev? ( || ( sys-fs/udev[gudev] sys-fs/udev[extras] ) ) media-gfx/shared-color-profiles
 0
 http://www.freedesktop.org/software/colord/releases/colord-0.1.15.tar.xz
diff --git a/metadata/cache/x11-misc/colord-0.1.16 b/metadata/cache/x11-misc/colord-0.1.16
index 7625d5b9741a..cef66a9d6eec 100644
--- a/metadata/cache/x11-misc/colord-0.1.16
+++ b/metadata/cache/x11-misc/colord-0.1.16
@@ -1,4 +1,4 @@
-dev-db/sqlite:3 >=dev-libs/glib-2.28.0:2 >=media-libs/lcms-2.2:2 gusb? ( >=dev-libs/libgusb-0.1.1 ) introspection? ( >=dev-libs/gobject-introspection-0.9.8 ) scanner? ( media-gfx/sane-backends ) udev? ( || ( sys-fs/udev[gudev] sys-fs/udev[extras] ) ) dev-libs/libxslt >=dev-util/intltool-0.35 dev-util/pkgconfig >=sys-devel/gettext-0.17 doc? ( app-text/docbook-xml-dtd:4.1.2 >=dev-util/gtk-doc-1.9 ) vala? ( dev-lang/vala:0.14[vapigen] ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool !<sys-apps/systemd-29-r4 !=sys-apps/systemd-37-r1
+dev-db/sqlite:3 >=dev-libs/glib-2.28.0:2 >=media-libs/lcms-2.2:2 gusb? ( >=dev-libs/libgusb-0.1.1 ) introspection? ( >=dev-libs/gobject-introspection-0.9.8 ) scanner? ( media-gfx/sane-backends ) udev? ( || ( sys-fs/udev[gudev] sys-fs/udev[extras] ) ) dev-libs/libxslt >=dev-util/intltool-0.35 dev-util/pkgconfig >=sys-devel/gettext-0.17 doc? ( app-text/docbook-xml-dtd:4.1.2 >=dev-util/gtk-doc-1.9 ) vala? ( dev-lang/vala:0.14[vapigen] ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool !<sys-apps/systemd-29-r4 !=sys-apps/systemd-37-r1
 dev-db/sqlite:3 >=dev-libs/glib-2.28.0:2 >=media-libs/lcms-2.2:2 gusb? ( >=dev-libs/libgusb-0.1.1 ) introspection? ( >=dev-libs/gobject-introspection-0.9.8 ) scanner? ( media-gfx/sane-backends ) udev? ( || ( sys-fs/udev[gudev] sys-fs/udev[extras] ) ) media-gfx/shared-color-profiles
 0
 http://www.freedesktop.org/software/colord/releases/colord-0.1.16.tar.xz
diff --git a/metadata/cache/x11-misc/colord-0.1.17 b/metadata/cache/x11-misc/colord-0.1.17
index 65e934d8960d..51f48a31b606 100644
--- a/metadata/cache/x11-misc/colord-0.1.17
+++ b/metadata/cache/x11-misc/colord-0.1.17
@@ -1,4 +1,4 @@
-dev-db/sqlite:3 >=dev-libs/glib-2.28.0:2 >=media-libs/lcms-2.2:2 >=sys-auth/polkit-0.103 gusb? ( >=dev-libs/libgusb-0.1.1 ) introspection? ( >=dev-libs/gobject-introspection-0.9.8 ) scanner? ( media-gfx/sane-backends ) udev? ( || ( sys-fs/udev[gudev] sys-fs/udev[extras] ) ) dev-libs/libxslt >=dev-util/intltool-0.35 dev-util/pkgconfig >=sys-devel/gettext-0.17 doc? ( app-text/docbook-xml-dtd:4.1.2 >=dev-util/gtk-doc-1.9 ) vala? ( dev-lang/vala:0.14[vapigen] ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool !<sys-apps/systemd-29-r4 !=sys-apps/systemd-37-r1
+dev-db/sqlite:3 >=dev-libs/glib-2.28.0:2 >=media-libs/lcms-2.2:2 >=sys-auth/polkit-0.103 gusb? ( >=dev-libs/libgusb-0.1.1 ) introspection? ( >=dev-libs/gobject-introspection-0.9.8 ) scanner? ( media-gfx/sane-backends ) udev? ( || ( sys-fs/udev[gudev] sys-fs/udev[extras] ) ) dev-libs/libxslt >=dev-util/intltool-0.35 dev-util/pkgconfig >=sys-devel/gettext-0.17 doc? ( app-text/docbook-xml-dtd:4.1.2 >=dev-util/gtk-doc-1.9 ) vala? ( dev-lang/vala:0.14[vapigen] ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool !<sys-apps/systemd-29-r4 !=sys-apps/systemd-37-r1
 dev-db/sqlite:3 >=dev-libs/glib-2.28.0:2 >=media-libs/lcms-2.2:2 >=sys-auth/polkit-0.103 gusb? ( >=dev-libs/libgusb-0.1.1 ) introspection? ( >=dev-libs/gobject-introspection-0.9.8 ) scanner? ( media-gfx/sane-backends ) udev? ( || ( sys-fs/udev[gudev] sys-fs/udev[extras] ) ) media-gfx/shared-color-profiles
 0
 http://www.freedesktop.org/software/colord/releases/colord-0.1.17.tar.xz
diff --git a/metadata/cache/x11-misc/colord-0.1.18 b/metadata/cache/x11-misc/colord-0.1.18
index 98ad001f1ff9..330a192d3da2 100644
--- a/metadata/cache/x11-misc/colord-0.1.18
+++ b/metadata/cache/x11-misc/colord-0.1.18
@@ -1,4 +1,4 @@
-dev-db/sqlite:3 >=dev-libs/glib-2.28.0:2 >=media-libs/lcms-2.2:2 >=sys-auth/polkit-0.103 gusb? ( >=dev-libs/libgusb-0.1.1 ) introspection? ( >=dev-libs/gobject-introspection-0.9.8 ) scanner? ( media-gfx/sane-backends ) udev? ( || ( sys-fs/udev[gudev] sys-fs/udev[extras] ) ) dev-libs/libxslt >=dev-util/intltool-0.35 dev-util/pkgconfig >=sys-devel/gettext-0.17 doc? ( app-text/docbook-xml-dtd:4.1.2 >=dev-util/gtk-doc-1.9 ) vala? ( dev-lang/vala:0.14[vapigen] ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool !<sys-apps/systemd-29-r4 !=sys-apps/systemd-37-r1
+dev-db/sqlite:3 >=dev-libs/glib-2.28.0:2 >=media-libs/lcms-2.2:2 >=sys-auth/polkit-0.103 gusb? ( >=dev-libs/libgusb-0.1.1 ) introspection? ( >=dev-libs/gobject-introspection-0.9.8 ) scanner? ( media-gfx/sane-backends ) udev? ( || ( sys-fs/udev[gudev] sys-fs/udev[extras] ) ) dev-libs/libxslt >=dev-util/intltool-0.35 dev-util/pkgconfig >=sys-devel/gettext-0.17 doc? ( app-text/docbook-xml-dtd:4.1.2 >=dev-util/gtk-doc-1.9 ) vala? ( dev-lang/vala:0.14[vapigen] ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool !<sys-apps/systemd-29-r4 !=sys-apps/systemd-37-r1
 dev-db/sqlite:3 >=dev-libs/glib-2.28.0:2 >=media-libs/lcms-2.2:2 >=sys-auth/polkit-0.103 gusb? ( >=dev-libs/libgusb-0.1.1 ) introspection? ( >=dev-libs/gobject-introspection-0.9.8 ) scanner? ( media-gfx/sane-backends ) udev? ( || ( sys-fs/udev[gudev] sys-fs/udev[extras] ) ) media-gfx/shared-color-profiles
 0
 http://www.freedesktop.org/software/colord/releases/colord-0.1.18.tar.xz
diff --git a/metadata/cache/x11-misc/devilspie-0.22 b/metadata/cache/x11-misc/devilspie-0.22
index c341c41ac91b..4cfee18b7842 100644
--- a/metadata/cache/x11-misc/devilspie-0.22
+++ b/metadata/cache/x11-misc/devilspie-0.22
@@ -1,4 +1,4 @@
->=dev-libs/glib-2.10 x11-libs/gtk+:2 >=x11-libs/libwnck-2.10:1 x11-libs/libX11 dev-util/pkgconfig dev-util/intltool sys-devel/gettext gnome-base/gnome-common || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-libs/glib-2.10 x11-libs/gtk+:2 >=x11-libs/libwnck-2.10:1 x11-libs/libX11 dev-util/pkgconfig dev-util/intltool sys-devel/gettext gnome-base/gnome-common || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=dev-libs/glib-2.10 x11-libs/gtk+:2 >=x11-libs/libwnck-2.10:1 x11-libs/libX11
 0
 http://www.burtonini.com/computing/devilspie-0.22.tar.gz
diff --git a/metadata/cache/x11-misc/electricsheep-2.7_beta11 b/metadata/cache/x11-misc/electricsheep-2.7_beta11
index f1dbf4cbb034..475f46411a06 100644
--- a/metadata/cache/x11-misc/electricsheep-2.7_beta11
+++ b/metadata/cache/x11-misc/electricsheep-2.7_beta11
@@ -1,4 +1,4 @@
-dev-libs/expat >=gnome-base/libglade-2.5.0:2.0 virtual/ffmpeg sys-libs/zlib >=x11-libs/gtk+-2.7.0:2 x11-libs/libX11 >=dev-util/pkgconfig-0.9.0 x11-proto/xproto || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-libs/expat >=gnome-base/libglade-2.5.0:2.0 virtual/ffmpeg sys-libs/zlib >=x11-libs/gtk+-2.7.0:2 x11-libs/libX11 >=dev-util/pkgconfig-0.9.0 x11-proto/xproto || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-libs/expat >=gnome-base/libglade-2.5.0:2.0 virtual/ffmpeg sys-libs/zlib >=x11-libs/gtk+-2.7.0:2 x11-libs/libX11 app-arch/gzip media-gfx/flam3 media-video/mplayer net-misc/curl x11-misc/xdg-utils
 0
 http://dev.gentooexperimental.org/~dreeevil/electricsheep-2.7_beta11.tar.bz2
diff --git a/metadata/cache/x11-misc/fireflies-2.07-r1 b/metadata/cache/x11-misc/fireflies-2.07-r1
index c40c191e8be7..2a653991672b 100644
--- a/metadata/cache/x11-misc/fireflies-2.07-r1
+++ b/metadata/cache/x11-misc/fireflies-2.07-r1
@@ -1,4 +1,4 @@
-media-libs/libsdl x11-libs/libX11 virtual/opengl || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+media-libs/libsdl x11-libs/libX11 virtual/opengl || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 media-libs/libsdl x11-libs/libX11 virtual/opengl
 0
 http://somewhere.fscked.org/proj/fireflies/files/fireflies-2.07.tar.gz
diff --git a/metadata/cache/x11-misc/fluxter-0.1.0 b/metadata/cache/x11-misc/fluxter-0.1.0
index feca29942f21..ab03c615c8c6 100644
--- a/metadata/cache/x11-misc/fluxter-0.1.0
+++ b/metadata/cache/x11-misc/fluxter-0.1.0
@@ -1,4 +1,4 @@
-x11-libs/libX11 x11-libs/libSM x11-libs/libICE || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+x11-libs/libX11 x11-libs/libSM x11-libs/libICE || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 x11-libs/libX11 x11-libs/libSM x11-libs/libICE
 0
 http://www.isomedia.com/homes/stevencooper/files/fluxter-0.1.0.tar.gz
diff --git a/metadata/cache/x11-misc/gcolor2-0.4-r3 b/metadata/cache/x11-misc/gcolor2-0.4-r3
index 7cb82e250895..b80b6db7ee8d 100644
--- a/metadata/cache/x11-misc/gcolor2-0.4-r3
+++ b/metadata/cache/x11-misc/gcolor2-0.4-r3
@@ -1,4 +1,4 @@
->=x11-libs/gtk+-2.4:2 >=dev-util/intltool-0.27 dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=x11-libs/gtk+-2.4:2 >=dev-util/intltool-0.27 dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=x11-libs/gtk+-2.4:2
 0
 mirror://sourceforge/gcolor2/gcolor2-0.4.tar.gz
diff --git a/metadata/cache/x11-misc/gigolo-0.4.1 b/metadata/cache/x11-misc/gigolo-0.4.1
index ca7c8ec3b280..5b4f1e11fcf8 100644
--- a/metadata/cache/x11-misc/gigolo-0.4.1
+++ b/metadata/cache/x11-misc/gigolo-0.4.1
@@ -1,4 +1,4 @@
->=x11-libs/gtk+-2.12:2 >=dev-libs/glib-2.16:2 dev-util/intltool dev-util/pkgconfig >=sys-apps/sed-4 dev-util/intltool >=dev-util/xfce4-dev-tools-4.9.1 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=x11-libs/gtk+-2.12:2 >=dev-libs/glib-2.16:2 dev-util/intltool dev-util/pkgconfig >=sys-apps/sed-4 dev-util/intltool >=dev-util/xfce4-dev-tools-4.9.1 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=x11-libs/gtk+-2.12:2 >=dev-libs/glib-2.16:2
 0
 mirror://xfce/src/apps/gigolo/0.4/gigolo-0.4.1.tar.bz2
diff --git a/metadata/cache/x11-misc/gmrun-0.9.2 b/metadata/cache/x11-misc/gmrun-0.9.2
index 403467cd9091..1d786c337038 100644
--- a/metadata/cache/x11-misc/gmrun-0.9.2
+++ b/metadata/cache/x11-misc/gmrun-0.9.2
@@ -1,4 +1,4 @@
-x11-libs/gtk+:2 dev-libs/popt dev-util/pkgconfig sys-apps/sed || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+x11-libs/gtk+:2 dev-libs/popt dev-util/pkgconfig sys-apps/sed || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 x11-libs/gtk+:2 dev-libs/popt
 0
 mirror://sourceforge/gmrun/gmrun-0.9.2.tar.gz
diff --git a/metadata/cache/x11-misc/gmrun-0.9.2-r1 b/metadata/cache/x11-misc/gmrun-0.9.2-r1
index 9bd12ec2d38c..ad0d66465a9c 100644
--- a/metadata/cache/x11-misc/gmrun-0.9.2-r1
+++ b/metadata/cache/x11-misc/gmrun-0.9.2-r1
@@ -1,4 +1,4 @@
-x11-libs/gtk+:2 dev-libs/popt dev-util/pkgconfig sys-apps/sed elibc_glibc? ( >=sys-libs/glibc-2.10 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+x11-libs/gtk+:2 dev-libs/popt dev-util/pkgconfig sys-apps/sed elibc_glibc? ( >=sys-libs/glibc-2.10 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 x11-libs/gtk+:2 dev-libs/popt
 0
 mirror://sourceforge/gmrun/gmrun-0.9.2.tar.gz
diff --git a/metadata/cache/x11-misc/google-gadgets-0.11.2 b/metadata/cache/x11-misc/google-gadgets-0.11.2
index abbf29eff0da..f2d1a424a0eb 100644
--- a/metadata/cache/x11-misc/google-gadgets-0.11.2
+++ b/metadata/cache/x11-misc/google-gadgets-0.11.2
@@ -1,4 +1,4 @@
->=dev-libs/libxml2-2.6.32:2 sys-libs/zlib x11-libs/libX11 x11-libs/libXext dbus? ( sys-apps/dbus ) gstreamer? ( >=media-libs/gstreamer-0.10.19:0.10 >=media-libs/gst-plugins-base-0.10.19:0.10 ) gtk? ( >=dev-libs/atk-1.22.0 gnome-base/librsvg:2 >=net-misc/curl-7.18.2 >=x11-libs/cairo-1.6.4 >=x11-libs/gtk+-2.12.10:2 >=x11-libs/pango-1.20.3 dbus? ( >=dev-libs/dbus-glib-0.74 ) ) networkmanager? ( net-misc/networkmanager ) qt4? ( >=x11-libs/qt-core-4.4.0 >=x11-libs/qt-opengl-4.4.0 >=x11-libs/qt-script-4.4.0 >=x11-libs/qt-webkit-4.4.0 >=x11-libs/qt-xmlpatterns-4.4.0 dbus? ( >=x11-libs/qt-dbus-4.4.0 ) ) soup? ( >=net-libs/libsoup-2.26:2.4 ) startup-notification? ( x11-libs/startup-notification ) webkit? ( >=net-libs/webkit-gtk-1.0.3:2 ) >=dev-util/pkgconfig-0.20 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-libs/libxml2-2.6.32:2 sys-libs/zlib x11-libs/libX11 x11-libs/libXext dbus? ( sys-apps/dbus ) gstreamer? ( >=media-libs/gstreamer-0.10.19:0.10 >=media-libs/gst-plugins-base-0.10.19:0.10 ) gtk? ( >=dev-libs/atk-1.22.0 gnome-base/librsvg:2 >=net-misc/curl-7.18.2 >=x11-libs/cairo-1.6.4 >=x11-libs/gtk+-2.12.10:2 >=x11-libs/pango-1.20.3 dbus? ( >=dev-libs/dbus-glib-0.74 ) ) networkmanager? ( net-misc/networkmanager ) qt4? ( >=x11-libs/qt-core-4.4.0 >=x11-libs/qt-opengl-4.4.0 >=x11-libs/qt-script-4.4.0 >=x11-libs/qt-webkit-4.4.0 >=x11-libs/qt-xmlpatterns-4.4.0 dbus? ( >=x11-libs/qt-dbus-4.4.0 ) ) soup? ( >=net-libs/libsoup-2.26:2.4 ) startup-notification? ( x11-libs/startup-notification ) webkit? ( >=net-libs/webkit-gtk-1.0.3:2 ) >=dev-util/pkgconfig-0.20 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=dev-libs/libxml2-2.6.32:2 sys-libs/zlib x11-libs/libX11 x11-libs/libXext dbus? ( sys-apps/dbus ) gstreamer? ( >=media-libs/gstreamer-0.10.19:0.10 >=media-libs/gst-plugins-base-0.10.19:0.10 ) gtk? ( >=dev-libs/atk-1.22.0 gnome-base/librsvg:2 >=net-misc/curl-7.18.2 >=x11-libs/cairo-1.6.4 >=x11-libs/gtk+-2.12.10:2 >=x11-libs/pango-1.20.3 dbus? ( >=dev-libs/dbus-glib-0.74 ) ) networkmanager? ( net-misc/networkmanager ) qt4? ( >=x11-libs/qt-core-4.4.0 >=x11-libs/qt-opengl-4.4.0 >=x11-libs/qt-script-4.4.0 >=x11-libs/qt-webkit-4.4.0 >=x11-libs/qt-xmlpatterns-4.4.0 dbus? ( >=x11-libs/qt-dbus-4.4.0 ) ) soup? ( >=net-libs/libsoup-2.26:2.4 ) startup-notification? ( x11-libs/startup-notification ) webkit? ( >=net-libs/webkit-gtk-1.0.3:2 )
 0
 http://google-gadgets-for-linux.googlecode.com/files/google-gadgets-for-linux-0.11.2.tar.bz2
diff --git a/metadata/cache/x11-misc/hsetroot-1.0.2 b/metadata/cache/x11-misc/hsetroot-1.0.2
index 612aeb0265c3..5231ce0405fa 100644
--- a/metadata/cache/x11-misc/hsetroot-1.0.2
+++ b/metadata/cache/x11-misc/hsetroot-1.0.2
@@ -1,4 +1,4 @@
-x11-libs/libX11 >=media-libs/imlib2-1.0.6.2003[X] x11-proto/xproto || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+x11-libs/libX11 >=media-libs/imlib2-1.0.6.2003[X] x11-proto/xproto || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 x11-libs/libX11 >=media-libs/imlib2-1.0.6.2003[X]
 0
 http://thegraveyard.org/files/hsetroot-1.0.2.tar.gz
diff --git a/metadata/cache/x11-misc/imwheel-1.0.0_pre13_p20100827 b/metadata/cache/x11-misc/imwheel-1.0.0_pre13_p20100827
index c564cbb002b8..722833e18121 100644
--- a/metadata/cache/x11-misc/imwheel-1.0.0_pre13_p20100827
+++ b/metadata/cache/x11-misc/imwheel-1.0.0_pre13_p20100827
@@ -1,4 +1,4 @@
-x11-libs/libXtst x11-libs/libX11 x11-libs/libXmu x11-libs/libXt x11-libs/libXext x11-proto/inputproto x11-proto/xextproto x11-proto/xproto >=sys-apps/sed-4 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+x11-libs/libXtst x11-libs/libX11 x11-libs/libXmu x11-libs/libXt x11-libs/libXext x11-proto/inputproto x11-proto/xextproto x11-proto/xproto >=sys-apps/sed-4 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 x11-libs/libXtst x11-libs/libX11 x11-libs/libXmu x11-libs/libXt x11-libs/libXext
 0
 mirror://gentoo/imwheel-1.0.0_pre13_p20100827.tar.bz2
diff --git a/metadata/cache/x11-misc/lightdm-1.0.6-r4 b/metadata/cache/x11-misc/lightdm-1.0.6-r4
index 836b9bd229ab..5171eacf9def 100644
--- a/metadata/cache/x11-misc/lightdm-1.0.6-r4
+++ b/metadata/cache/x11-misc/lightdm-1.0.6-r4
@@ -1,4 +1,4 @@
-dev-libs/glib:2 virtual/pam x11-libs/libxklavier x11-libs/libX11 dev-libs/libxml2 gtk? ( x11-libs/gtk+:3 x11-themes/gnome-themes-standard x11-themes/gnome-icon-theme ) introspection? ( dev-libs/gobject-introspection ) qt4? ( x11-libs/qt-core:4 x11-libs/qt-dbus:4 ) sys-apps/accountsservice dev-lang/vala:0.12 dev-util/intltool dev-util/pkgconfig gnome-base/gnome-common sys-devel/gettext || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-libs/glib:2 virtual/pam x11-libs/libxklavier x11-libs/libX11 dev-libs/libxml2 gtk? ( x11-libs/gtk+:3 x11-themes/gnome-themes-standard x11-themes/gnome-icon-theme ) introspection? ( dev-libs/gobject-introspection ) qt4? ( x11-libs/qt-core:4 x11-libs/qt-dbus:4 ) sys-apps/accountsservice dev-lang/vala:0.12 dev-util/intltool dev-util/pkgconfig gnome-base/gnome-common sys-devel/gettext || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-libs/glib:2 virtual/pam x11-libs/libxklavier x11-libs/libX11 dev-libs/libxml2 gtk? ( x11-libs/gtk+:3 x11-themes/gnome-themes-standard x11-themes/gnome-icon-theme ) introspection? ( dev-libs/gobject-introspection ) qt4? ( x11-libs/qt-core:4 x11-libs/qt-dbus:4 ) sys-apps/accountsservice
 0
 http://launchpad.net/lightdm/trunk/1.0.6/+download/lightdm-1.0.6.tar.gz mirror://gentoo/introspection-20110205.m4.tar.bz2 gtk? ( http://dev.gentoo.org/~hwoarang/distfiles/lightdm-gentoo-patch.tar.gz )
diff --git a/metadata/cache/x11-misc/lightdm-1.1.3 b/metadata/cache/x11-misc/lightdm-1.1.3
index 4f745adc9246..25794ae9b7d1 100644
--- a/metadata/cache/x11-misc/lightdm-1.1.3
+++ b/metadata/cache/x11-misc/lightdm-1.1.3
@@ -1,4 +1,4 @@
-dev-libs/glib:2 virtual/pam x11-libs/libxklavier x11-libs/libX11 dev-libs/libxml2 introspection? ( dev-libs/gobject-introspection ) sys-apps/accountsservice dev-lang/vala:0.12 dev-util/intltool dev-util/pkgconfig gnome-base/gnome-common sys-devel/gettext || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-libs/glib:2 virtual/pam x11-libs/libxklavier x11-libs/libX11 dev-libs/libxml2 introspection? ( dev-libs/gobject-introspection ) sys-apps/accountsservice dev-lang/vala:0.12 dev-util/intltool dev-util/pkgconfig gnome-base/gnome-common sys-devel/gettext || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-libs/glib:2 virtual/pam x11-libs/libxklavier x11-libs/libX11 dev-libs/libxml2 introspection? ( dev-libs/gobject-introspection ) sys-apps/accountsservice
 0
 http://launchpad.net/lightdm/trunk/1.1.3/+download/lightdm-1.1.3.tar.gz mirror://gentoo/introspection-20110205.m4.tar.bz2
diff --git a/metadata/cache/x11-misc/lightdm-1.1.4 b/metadata/cache/x11-misc/lightdm-1.1.4
index afe87b9b8805..79ab056cba94 100644
--- a/metadata/cache/x11-misc/lightdm-1.1.4
+++ b/metadata/cache/x11-misc/lightdm-1.1.4
@@ -1,4 +1,4 @@
-dev-libs/glib:2 virtual/pam x11-libs/libxklavier x11-libs/libX11 dev-libs/libxml2 introspection? ( dev-libs/gobject-introspection ) sys-apps/accountsservice dev-lang/vala:0.12 dev-util/intltool dev-util/pkgconfig gnome-base/gnome-common sys-devel/gettext || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-libs/glib:2 virtual/pam x11-libs/libxklavier x11-libs/libX11 dev-libs/libxml2 introspection? ( dev-libs/gobject-introspection ) sys-apps/accountsservice dev-lang/vala:0.12 dev-util/intltool dev-util/pkgconfig gnome-base/gnome-common sys-devel/gettext || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-libs/glib:2 virtual/pam x11-libs/libxklavier x11-libs/libX11 dev-libs/libxml2 introspection? ( dev-libs/gobject-introspection ) sys-apps/accountsservice
 0
 http://launchpad.net/lightdm/trunk/1.1.4/+download/lightdm-1.1.4.tar.gz mirror://gentoo/introspection-20110205.m4.tar.bz2
diff --git a/metadata/cache/x11-misc/lightdm-1.1.7 b/metadata/cache/x11-misc/lightdm-1.1.7
index 76ffef866530..bf7178780b4f 100644
--- a/metadata/cache/x11-misc/lightdm-1.1.7
+++ b/metadata/cache/x11-misc/lightdm-1.1.7
@@ -1,4 +1,4 @@
-dev-libs/glib:2 virtual/pam x11-libs/libxklavier x11-libs/libX11 dev-libs/libxml2 introspection? ( dev-libs/gobject-introspection ) sys-apps/accountsservice dev-util/intltool dev-util/pkgconfig gnome-base/gnome-common sys-devel/gettext || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-libs/glib:2 virtual/pam x11-libs/libxklavier x11-libs/libX11 dev-libs/libxml2 introspection? ( dev-libs/gobject-introspection ) sys-apps/accountsservice dev-util/intltool dev-util/pkgconfig gnome-base/gnome-common sys-devel/gettext || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-libs/glib:2 virtual/pam x11-libs/libxklavier x11-libs/libX11 dev-libs/libxml2 introspection? ( dev-libs/gobject-introspection ) sys-apps/accountsservice
 0
 http://launchpad.net/lightdm/trunk/1.1.7/+download/lightdm-1.1.7.tar.gz mirror://gentoo/introspection-20110205.m4.tar.bz2
diff --git a/metadata/cache/x11-misc/lightdm-1.1.8 b/metadata/cache/x11-misc/lightdm-1.1.8
index 7ba43ed91c98..59f977a20427 100644
--- a/metadata/cache/x11-misc/lightdm-1.1.8
+++ b/metadata/cache/x11-misc/lightdm-1.1.8
@@ -1,4 +1,4 @@
-dev-libs/glib:2 virtual/pam x11-libs/libxklavier x11-libs/libX11 dev-libs/libxml2 introspection? ( dev-libs/gobject-introspection ) sys-apps/accountsservice dev-util/intltool dev-util/pkgconfig gnome-base/gnome-common sys-devel/gettext || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-libs/glib:2 virtual/pam x11-libs/libxklavier x11-libs/libX11 dev-libs/libxml2 introspection? ( dev-libs/gobject-introspection ) sys-apps/accountsservice dev-util/intltool dev-util/pkgconfig gnome-base/gnome-common sys-devel/gettext || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-libs/glib:2 virtual/pam x11-libs/libxklavier x11-libs/libX11 dev-libs/libxml2 introspection? ( dev-libs/gobject-introspection ) sys-apps/accountsservice
 0
 http://launchpad.net/lightdm/trunk/1.1.8/+download/lightdm-1.1.8.tar.gz mirror://gentoo/introspection-20110205.m4.tar.bz2
diff --git a/metadata/cache/x11-misc/nitrogen-1.4-r1 b/metadata/cache/x11-misc/nitrogen-1.4-r1
index 3fab6b69acd8..d6e1bd6cb6d6 100644
--- a/metadata/cache/x11-misc/nitrogen-1.4-r1
+++ b/metadata/cache/x11-misc/nitrogen-1.4-r1
@@ -1,4 +1,4 @@
-dev-cpp/gtkmm:2.4 >=gnome-base/librsvg-2.20:2 x11-libs/gtk+:2 xinerama? ( x11-libs/libXinerama ) dev-util/pkgconfig xinerama? ( x11-proto/xineramaproto ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-cpp/gtkmm:2.4 >=gnome-base/librsvg-2.20:2 x11-libs/gtk+:2 xinerama? ( x11-libs/libXinerama ) dev-util/pkgconfig xinerama? ( x11-proto/xineramaproto ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-cpp/gtkmm:2.4 >=gnome-base/librsvg-2.20:2 x11-libs/gtk+:2 xinerama? ( x11-libs/libXinerama )
 0
 http://projects.l3ib.org/nitrogen/files/nitrogen-1.4.tar.gz
diff --git a/metadata/cache/x11-misc/notify-osd-0.9.32 b/metadata/cache/x11-misc/notify-osd-0.9.32
index 5d49cb303d68..d29ce4d31787 100644
--- a/metadata/cache/x11-misc/notify-osd-0.9.32
+++ b/metadata/cache/x11-misc/notify-osd-0.9.32
@@ -1,4 +1,4 @@
->=dev-libs/dbus-glib-0.76 >=dev-libs/glib-2.16:2 >=x11-libs/gtk+-3.2:3 >=x11-libs/libnotify-0.7 x11-libs/libwnck:3 x11-libs/libX11 x11-libs/pixman !x11-misc/notification-daemon !x11-misc/qtnotifydaemon dev-util/pkgconfig gnome-base/gnome-common x11-proto/xproto || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+>=dev-libs/dbus-glib-0.76 >=dev-libs/glib-2.16:2 >=x11-libs/gtk+-3.2:3 >=x11-libs/libnotify-0.7 x11-libs/libwnck:3 x11-libs/libX11 x11-libs/pixman !x11-misc/notification-daemon !x11-misc/qtnotifydaemon dev-util/pkgconfig gnome-base/gnome-common x11-proto/xproto || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 >=dev-libs/dbus-glib-0.76 >=dev-libs/glib-2.16:2 >=x11-libs/gtk+-3.2:3 >=x11-libs/libnotify-0.7 x11-libs/libwnck:3 x11-libs/libX11 x11-libs/pixman !x11-misc/notification-daemon !x11-misc/qtnotifydaemon !minimal? ( x11-themes/notify-osd-icons )
 0
 http://launchpad.net/notify-osd/oneiric/0.9.32/+download/notify-osd-0.9.32.tar.gz
diff --git a/metadata/cache/x11-misc/notify-osd-0.9.33 b/metadata/cache/x11-misc/notify-osd-0.9.33
index efc28c7d2db7..df7db56745cb 100644
--- a/metadata/cache/x11-misc/notify-osd-0.9.33
+++ b/metadata/cache/x11-misc/notify-osd-0.9.33
@@ -1,4 +1,4 @@
->=dev-libs/dbus-glib-0.98 >=dev-libs/glib-2.16 >=x11-libs/gtk+-3.2:3 >=x11-libs/libnotify-0.7 >=x11-libs/libwnck-3 x11-libs/libX11 x11-libs/pixman !x11-misc/notification-daemon !x11-misc/qtnotifydaemon dev-util/pkgconfig gnome-base/gnome-common x11-proto/xproto || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+>=dev-libs/dbus-glib-0.98 >=dev-libs/glib-2.16 >=x11-libs/gtk+-3.2:3 >=x11-libs/libnotify-0.7 >=x11-libs/libwnck-3 x11-libs/libX11 x11-libs/pixman !x11-misc/notification-daemon !x11-misc/qtnotifydaemon dev-util/pkgconfig gnome-base/gnome-common x11-proto/xproto || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 >=dev-libs/dbus-glib-0.98 >=dev-libs/glib-2.16 >=x11-libs/gtk+-3.2:3 >=x11-libs/libnotify-0.7 >=x11-libs/libwnck-3 x11-libs/libX11 x11-libs/pixman !x11-misc/notification-daemon !x11-misc/qtnotifydaemon !minimal? ( x11-themes/notify-osd-icons )
 0
 http://launchpad.net/notify-osd/precise/0.9.33/+download/notify-osd-0.9.33.tar.gz
diff --git a/metadata/cache/x11-misc/obconf-2.0.3_p20110314 b/metadata/cache/x11-misc/obconf-2.0.3_p20110314
index 2c5f311b2c9a..247ff5b1db29 100644
--- a/metadata/cache/x11-misc/obconf-2.0.3_p20110314
+++ b/metadata/cache/x11-misc/obconf-2.0.3_p20110314
@@ -1,4 +1,4 @@
-gnome-base/libglade:2.0 x11-libs/gtk+:2 x11-libs/startup-notification >=x11-wm/openbox-3.5.0_pre20110313 dev-util/pkgconfig nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+gnome-base/libglade:2.0 x11-libs/gtk+:2 x11-libs/startup-notification >=x11-wm/openbox-3.5.0_pre20110313 dev-util/pkgconfig nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 gnome-base/libglade:2.0 x11-libs/gtk+:2 x11-libs/startup-notification >=x11-wm/openbox-3.5.0_pre20110313
 0
 http://dev.gentoo.org/~hwoarang/distfiles/obconf-2.0.3_p20110314.tar.gz
diff --git a/metadata/cache/x11-misc/obconf-2.0.3_p20110314-r1 b/metadata/cache/x11-misc/obconf-2.0.3_p20110314-r1
index c69b63965e5f..0416990aa641 100644
--- a/metadata/cache/x11-misc/obconf-2.0.3_p20110314-r1
+++ b/metadata/cache/x11-misc/obconf-2.0.3_p20110314-r1
@@ -1,4 +1,4 @@
-gnome-base/libglade:2.0 x11-libs/gtk+:2 x11-libs/startup-notification >=x11-wm/openbox-3.5.0_pre20110313 dev-util/pkgconfig nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+gnome-base/libglade:2.0 x11-libs/gtk+:2 x11-libs/startup-notification >=x11-wm/openbox-3.5.0_pre20110313 dev-util/pkgconfig nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 gnome-base/libglade:2.0 x11-libs/gtk+:2 x11-libs/startup-notification >=x11-wm/openbox-3.5.0_pre20110313
 0
 http://dev.gentoo.org/~hwoarang/distfiles/obconf-2.0.3_p20110314.tar.gz
diff --git a/metadata/cache/x11-misc/obconf-2.0.3_p20111019 b/metadata/cache/x11-misc/obconf-2.0.3_p20111019
index 19c62027be5a..050446c5170a 100644
--- a/metadata/cache/x11-misc/obconf-2.0.3_p20111019
+++ b/metadata/cache/x11-misc/obconf-2.0.3_p20111019
@@ -1,4 +1,4 @@
-gnome-base/libglade:2.0 x11-libs/gtk+:2 x11-libs/startup-notification >=x11-wm/openbox-3.5.0_p20111019 dev-util/pkgconfig nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+gnome-base/libglade:2.0 x11-libs/gtk+:2 x11-libs/startup-notification >=x11-wm/openbox-3.5.0_p20111019 dev-util/pkgconfig nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 gnome-base/libglade:2.0 x11-libs/gtk+:2 x11-libs/startup-notification >=x11-wm/openbox-3.5.0_p20111019
 0
 http://dev.gentoo.org/~hwoarang/distfiles/obconf-2.0.3_p20111019.tar.gz
diff --git a/metadata/cache/x11-misc/parcellite-1.0.1 b/metadata/cache/x11-misc/parcellite-1.0.1
index f8fa1db8f1c9..39e4acc98fb1 100644
--- a/metadata/cache/x11-misc/parcellite-1.0.1
+++ b/metadata/cache/x11-misc/parcellite-1.0.1
@@ -1,4 +1,4 @@
->=x11-libs/gtk+-2.10:2 >=dev-libs/glib-2.14:2 dev-util/pkgconfig nls? ( sys-devel/gettext dev-util/intltool ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=x11-libs/gtk+-2.10:2 >=dev-libs/glib-2.14:2 dev-util/pkgconfig nls? ( sys-devel/gettext dev-util/intltool ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=x11-libs/gtk+-2.10:2 >=dev-libs/glib-2.14:2
 0
 mirror://sourceforge/parcellite/parcellite-1.0.1.tar.gz
diff --git a/metadata/cache/x11-misc/parcellite-1.0.2_rc5 b/metadata/cache/x11-misc/parcellite-1.0.2_rc5
index 99f4db797a14..be9a58e2417e 100644
--- a/metadata/cache/x11-misc/parcellite-1.0.2_rc5
+++ b/metadata/cache/x11-misc/parcellite-1.0.2_rc5
@@ -1,4 +1,4 @@
->=x11-libs/gtk+-2.10:2 >=dev-libs/glib-2.14:2 dev-util/pkgconfig nls? ( sys-devel/gettext dev-util/intltool ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=x11-libs/gtk+-2.10:2 >=dev-libs/glib-2.14:2 dev-util/pkgconfig nls? ( sys-devel/gettext dev-util/intltool ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=x11-libs/gtk+-2.10:2 >=dev-libs/glib-2.14:2
 0
 mirror://sourceforge/parcellite/parcellite-1.0.2rc5.tar.gz
diff --git a/metadata/cache/x11-misc/pathfinder-1.6.36 b/metadata/cache/x11-misc/pathfinder-1.6.36
index f8c8c107d28f..d20a7414c97f 100644
--- a/metadata/cache/x11-misc/pathfinder-1.6.36
+++ b/metadata/cache/x11-misc/pathfinder-1.6.36
@@ -1,4 +1,4 @@
-x11-libs/fox:1.6 jpeg? ( virtual/jpeg ) png? ( media-libs/libpng:0 ) tiff? ( media-libs/tiff:0 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-util/reswrap >=sys-apps/sed-4
+x11-libs/fox:1.6 jpeg? ( virtual/jpeg ) png? ( media-libs/libpng:0 ) tiff? ( media-libs/tiff:0 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-util/reswrap >=sys-apps/sed-4
 x11-libs/fox:1.6 jpeg? ( virtual/jpeg ) png? ( media-libs/libpng:0 ) tiff? ( media-libs/tiff:0 )
 0
 ftp://ftp.fox-toolkit.org/pub/fox-1.6.36.tar.gz
diff --git a/metadata/cache/x11-misc/pathfinder-1.7.32 b/metadata/cache/x11-misc/pathfinder-1.7.32
index 8b3aa61834ee..36f0a1c2e317 100644
--- a/metadata/cache/x11-misc/pathfinder-1.7.32
+++ b/metadata/cache/x11-misc/pathfinder-1.7.32
@@ -1,4 +1,4 @@
-x11-libs/fox:1.7 jpeg? ( virtual/jpeg ) png? ( media-libs/libpng:0 ) tiff? ( media-libs/tiff:0 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-util/reswrap >=sys-apps/sed-4
+x11-libs/fox:1.7 jpeg? ( virtual/jpeg ) png? ( media-libs/libpng:0 ) tiff? ( media-libs/tiff:0 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-util/reswrap >=sys-apps/sed-4
 x11-libs/fox:1.7 jpeg? ( virtual/jpeg ) png? ( media-libs/libpng:0 ) tiff? ( media-libs/tiff:0 )
 0
 ftp://ftp.fox-toolkit.org/pub/fox-1.7.32.tar.gz
diff --git a/metadata/cache/x11-misc/pcmanfm-0.9.10 b/metadata/cache/x11-misc/pcmanfm-0.9.10
index d225443857d0..cbda111c9b40 100644
--- a/metadata/cache/x11-misc/pcmanfm-0.9.10
+++ b/metadata/cache/x11-misc/pcmanfm-0.9.10
@@ -1,4 +1,4 @@
->=dev-libs/glib-2.18:2 >=x11-libs/gtk+-2.22.1:2 >=lxde-base/menu-cache-0.3.2 >=x11-libs/libfm-0.1.16 >=dev-util/intltool-0.40 dev-util/pkgconfig sys-devel/gettext || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-libs/glib-2.18:2 >=x11-libs/gtk+-2.22.1:2 >=lxde-base/menu-cache-0.3.2 >=x11-libs/libfm-0.1.16 >=dev-util/intltool-0.40 dev-util/pkgconfig sys-devel/gettext || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=dev-libs/glib-2.18:2 >=x11-libs/gtk+-2.22.1:2 >=lxde-base/menu-cache-0.3.2 >=x11-libs/libfm-0.1.16 virtual/eject virtual/freedesktop-icon-theme
 0
 http://dev.gentoo.org/~hwoarang/distfiles/pcmanfm-0.9.10.tar.gz
diff --git a/metadata/cache/x11-misc/pcmanfm-0.9.9 b/metadata/cache/x11-misc/pcmanfm-0.9.9
index 05ed0c3ae37c..38a9510195b6 100644
--- a/metadata/cache/x11-misc/pcmanfm-0.9.9
+++ b/metadata/cache/x11-misc/pcmanfm-0.9.9
@@ -1,4 +1,4 @@
->=dev-libs/glib-2.18:2 >=x11-libs/gtk+-2.22.1:2 >=lxde-base/menu-cache-0.3.2 >=x11-libs/libfm-0.1.16 >=dev-util/intltool-0.40 dev-util/pkgconfig sys-devel/gettext || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-libs/glib-2.18:2 >=x11-libs/gtk+-2.22.1:2 >=lxde-base/menu-cache-0.3.2 >=x11-libs/libfm-0.1.16 >=dev-util/intltool-0.40 dev-util/pkgconfig sys-devel/gettext || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=dev-libs/glib-2.18:2 >=x11-libs/gtk+-2.22.1:2 >=lxde-base/menu-cache-0.3.2 >=x11-libs/libfm-0.1.16 virtual/eject virtual/freedesktop-icon-theme
 0
 http://dev.gentoo.org/~hwoarang/distfiles/pcmanfm-0.9.9.tar.gz
diff --git a/metadata/cache/x11-misc/pcmanfm-0.9.9_pre20110422 b/metadata/cache/x11-misc/pcmanfm-0.9.9_pre20110422
index 778d71c30c34..98459dbf184b 100644
--- a/metadata/cache/x11-misc/pcmanfm-0.9.9_pre20110422
+++ b/metadata/cache/x11-misc/pcmanfm-0.9.9_pre20110422
@@ -1,4 +1,4 @@
->=dev-libs/glib-2.18:2 >=x11-libs/gtk+-2.22.1:2 >=lxde-base/menu-cache-0.3.2 >=x11-libs/libfm-0.1.15_pre20110202 >=dev-util/intltool-0.40 dev-util/pkgconfig sys-devel/gettext || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-libs/glib-2.18:2 >=x11-libs/gtk+-2.22.1:2 >=lxde-base/menu-cache-0.3.2 >=x11-libs/libfm-0.1.15_pre20110202 >=dev-util/intltool-0.40 dev-util/pkgconfig sys-devel/gettext || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=dev-libs/glib-2.18:2 >=x11-libs/gtk+-2.22.1:2 >=lxde-base/menu-cache-0.3.2 >=x11-libs/libfm-0.1.15_pre20110202 virtual/eject
 0
 http://dev.gentoo.org/~hwoarang/distfiles/pcmanfm-0.9.9_pre20110422.tar.gz
diff --git a/metadata/cache/x11-misc/pcmanfm-0.9.9_pre20110614 b/metadata/cache/x11-misc/pcmanfm-0.9.9_pre20110614
index c862bb93a680..a8ea967263d4 100644
--- a/metadata/cache/x11-misc/pcmanfm-0.9.9_pre20110614
+++ b/metadata/cache/x11-misc/pcmanfm-0.9.9_pre20110614
@@ -1,4 +1,4 @@
->=dev-libs/glib-2.18:2 >=x11-libs/gtk+-2.22.1:2 >=lxde-base/menu-cache-0.3.2 >=x11-libs/libfm-0.1.15_pre20110614 >=dev-util/intltool-0.40 dev-util/pkgconfig sys-devel/gettext || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-libs/glib-2.18:2 >=x11-libs/gtk+-2.22.1:2 >=lxde-base/menu-cache-0.3.2 >=x11-libs/libfm-0.1.15_pre20110614 >=dev-util/intltool-0.40 dev-util/pkgconfig sys-devel/gettext || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=dev-libs/glib-2.18:2 >=x11-libs/gtk+-2.22.1:2 >=lxde-base/menu-cache-0.3.2 >=x11-libs/libfm-0.1.15_pre20110614 virtual/eject virtual/freedesktop-icon-theme
 0
 http://dev.gentoo.org/~hwoarang/distfiles/pcmanfm-0.9.9_pre20110614.tar.gz
diff --git a/metadata/cache/x11-misc/pcmanfm-9999 b/metadata/cache/x11-misc/pcmanfm-9999
index 1041e78fced1..6a4bfce2c5c9 100644
--- a/metadata/cache/x11-misc/pcmanfm-9999
+++ b/metadata/cache/x11-misc/pcmanfm-9999
@@ -1,4 +1,4 @@
->=dev-libs/glib-2.18:2 >=x11-libs/gtk+-2.22.1:2 >=lxde-base/menu-cache-0.3.2 >=x11-libs/libfm-0.1.15 >=dev-util/intltool-0.40 dev-util/pkgconfig sys-devel/gettext || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
+>=dev-libs/glib-2.18:2 >=x11-libs/gtk+-2.22.1:2 >=lxde-base/menu-cache-0.3.2 >=x11-libs/libfm-0.1.15 >=dev-util/intltool-0.40 dev-util/pkgconfig sys-devel/gettext || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/git
 >=dev-libs/glib-2.18:2 >=x11-libs/gtk+-2.22.1:2 >=lxde-base/menu-cache-0.3.2 >=x11-libs/libfm-0.1.15 virtual/eject virtual/freedesktop-icon-theme
 0
 
diff --git a/metadata/cache/x11-misc/peksystray-0.4.0 b/metadata/cache/x11-misc/peksystray-0.4.0
index 84a5b3a88cc7..ceed858d836c 100644
--- a/metadata/cache/x11-misc/peksystray-0.4.0
+++ b/metadata/cache/x11-misc/peksystray-0.4.0
@@ -1,4 +1,4 @@
-x11-libs/libX11 x11-libs/libXt || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+x11-libs/libX11 x11-libs/libXt || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 x11-libs/libX11 x11-libs/libXt
 0
 mirror://sourceforge/peksystray/peksystray-0.4.0.tar.bz2
diff --git a/metadata/cache/x11-misc/rss-glx-0.9.0 b/metadata/cache/x11-misc/rss-glx-0.9.0
index 7517844e7ea7..02688ff9a5b2 100644
--- a/metadata/cache/x11-misc/rss-glx-0.9.0
+++ b/metadata/cache/x11-misc/rss-glx-0.9.0
@@ -1,4 +1,4 @@
-x11-libs/libX11 x11-libs/libXext >=media-libs/glew-1.5.1 media-libs/mesa >=media-gfx/imagemagick-6.2 >=x11-misc/xscreensaver-5.08-r2 bzip2? ( app-arch/bzip2 ) openal? ( >=media-libs/freealut-1.1.0-r1 ) x11-proto/xextproto dev-util/pkgconfig sys-apps/sed || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+x11-libs/libX11 x11-libs/libXext >=media-libs/glew-1.5.1 media-libs/mesa >=media-gfx/imagemagick-6.2 >=x11-misc/xscreensaver-5.08-r2 bzip2? ( app-arch/bzip2 ) openal? ( >=media-libs/freealut-1.1.0-r1 ) x11-proto/xextproto dev-util/pkgconfig sys-apps/sed || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 x11-libs/libX11 x11-libs/libXext >=media-libs/glew-1.5.1 media-libs/mesa >=media-gfx/imagemagick-6.2 >=x11-misc/xscreensaver-5.08-r2 bzip2? ( app-arch/bzip2 ) openal? ( >=media-libs/freealut-1.1.0-r1 )
 0
 mirror://sourceforge/rss-glx/rss-glx_0.9.0.tar.bz2
diff --git a/metadata/cache/x11-misc/rss-glx-0.9.1 b/metadata/cache/x11-misc/rss-glx-0.9.1
index c9c35fc60348..8c4ebc2c77cd 100644
--- a/metadata/cache/x11-misc/rss-glx-0.9.1
+++ b/metadata/cache/x11-misc/rss-glx-0.9.1
@@ -1,4 +1,4 @@
-x11-libs/libX11 x11-libs/libXext >=media-libs/glew-1.5.1 media-libs/mesa >=media-gfx/imagemagick-6.4 >=x11-misc/xscreensaver-5.08-r2 bzip2? ( app-arch/bzip2 ) openal? ( >=media-libs/freealut-1.1.0-r1 ) quesoglc? ( media-libs/quesoglc ) x11-proto/xextproto dev-util/pkgconfig sys-apps/sed || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+x11-libs/libX11 x11-libs/libXext >=media-libs/glew-1.5.1 media-libs/mesa >=media-gfx/imagemagick-6.4 >=x11-misc/xscreensaver-5.08-r2 bzip2? ( app-arch/bzip2 ) openal? ( >=media-libs/freealut-1.1.0-r1 ) quesoglc? ( media-libs/quesoglc ) x11-proto/xextproto dev-util/pkgconfig sys-apps/sed || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 x11-libs/libX11 x11-libs/libXext >=media-libs/glew-1.5.1 media-libs/mesa >=media-gfx/imagemagick-6.4 >=x11-misc/xscreensaver-5.08-r2 bzip2? ( app-arch/bzip2 ) openal? ( >=media-libs/freealut-1.1.0-r1 ) quesoglc? ( media-libs/quesoglc )
 0
 mirror://sourceforge/rss-glx/rss-glx_0.9.1.tar.bz2
diff --git a/metadata/cache/x11-misc/see-0.6 b/metadata/cache/x11-misc/see-0.6
index bbdff4b9e0a8..343eae676621 100644
--- a/metadata/cache/x11-misc/see-0.6
+++ b/metadata/cache/x11-misc/see-0.6
@@ -1,4 +1,4 @@
-x11-libs/gtk+:2 dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+x11-libs/gtk+:2 dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 x11-libs/gtk+:2
 0
 http://seetxt.googlecode.com/files/see-0.6.tar.bz2
diff --git a/metadata/cache/x11-misc/shutterbug-1.6.36 b/metadata/cache/x11-misc/shutterbug-1.6.36
index bf1caf790eba..c2529f0e228f 100644
--- a/metadata/cache/x11-misc/shutterbug-1.6.36
+++ b/metadata/cache/x11-misc/shutterbug-1.6.36
@@ -1,4 +1,4 @@
-x11-libs/fox:1.6 jpeg? ( virtual/jpeg ) png? ( media-libs/libpng:0 ) tiff? ( media-libs/tiff:0 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-util/reswrap >=sys-apps/sed-4
+x11-libs/fox:1.6 jpeg? ( virtual/jpeg ) png? ( media-libs/libpng:0 ) tiff? ( media-libs/tiff:0 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-util/reswrap >=sys-apps/sed-4
 x11-libs/fox:1.6 jpeg? ( virtual/jpeg ) png? ( media-libs/libpng:0 ) tiff? ( media-libs/tiff:0 )
 0
 ftp://ftp.fox-toolkit.org/pub/fox-1.6.36.tar.gz
diff --git a/metadata/cache/x11-misc/shutterbug-1.7.32 b/metadata/cache/x11-misc/shutterbug-1.7.32
index 54fd9018411f..2f04c2df6f92 100644
--- a/metadata/cache/x11-misc/shutterbug-1.7.32
+++ b/metadata/cache/x11-misc/shutterbug-1.7.32
@@ -1,4 +1,4 @@
-x11-libs/fox:1.7 jpeg? ( virtual/jpeg ) png? ( media-libs/libpng:0 ) tiff? ( media-libs/tiff:0 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-util/reswrap >=sys-apps/sed-4
+x11-libs/fox:1.7 jpeg? ( virtual/jpeg ) png? ( media-libs/libpng:0 ) tiff? ( media-libs/tiff:0 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-util/reswrap >=sys-apps/sed-4
 x11-libs/fox:1.7 jpeg? ( virtual/jpeg ) png? ( media-libs/libpng:0 ) tiff? ( media-libs/tiff:0 )
 0
 ftp://ftp.fox-toolkit.org/pub/fox-1.7.32.tar.gz
diff --git a/metadata/cache/x11-misc/superswitcher-0.6 b/metadata/cache/x11-misc/superswitcher-0.6
index c0265aeebdd5..701f2cc7dd12 100644
--- a/metadata/cache/x11-misc/superswitcher-0.6
+++ b/metadata/cache/x11-misc/superswitcher-0.6
@@ -1,4 +1,4 @@
-dev-libs/dbus-glib dev-libs/glib:2 >=gnome-base/gconf-2:2 x11-libs/gtk+:2 >=x11-libs/libwnck-2.10:1 x11-libs/libXcomposite x11-libs/libXinerama x11-libs/libXrender dev-util/pkgconfig gnome-base/gnome-common || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-libs/dbus-glib dev-libs/glib:2 >=gnome-base/gconf-2:2 x11-libs/gtk+:2 >=x11-libs/libwnck-2.10:1 x11-libs/libXcomposite x11-libs/libXinerama x11-libs/libXrender dev-util/pkgconfig gnome-base/gnome-common || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-libs/dbus-glib dev-libs/glib:2 >=gnome-base/gconf-2:2 x11-libs/gtk+:2 >=x11-libs/libwnck-2.10:1 x11-libs/libXcomposite x11-libs/libXinerama x11-libs/libXrender
 0
 http://superswitcher.googlecode.com/files/superswitcher-0.6.tar.gz
diff --git a/metadata/cache/x11-misc/wbar-2.2.2 b/metadata/cache/x11-misc/wbar-2.2.2
index f5a634b6fd04..b8c8c97a5b79 100644
--- a/metadata/cache/x11-misc/wbar-2.2.2
+++ b/metadata/cache/x11-misc/wbar-2.2.2
@@ -1,4 +1,4 @@
-media-libs/imlib2[X] x11-libs/libX11 gtk? ( dev-libs/atk dev-libs/glib:2 dev-libs/libxml2 gnome-base/libglade media-libs/fontconfig media-libs/freetype media-libs/libpng x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:2 ) dev-util/intltool dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+media-libs/imlib2[X] x11-libs/libX11 gtk? ( dev-libs/atk dev-libs/glib:2 dev-libs/libxml2 gnome-base/libglade media-libs/fontconfig media-libs/freetype media-libs/libpng x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:2 ) dev-util/intltool dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 media-libs/imlib2[X] x11-libs/libX11 gtk? ( dev-libs/atk dev-libs/glib:2 dev-libs/libxml2 gnome-base/libglade media-libs/fontconfig media-libs/freetype media-libs/libpng x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:2 )
 0
 http://wbar.googlecode.com/files/wbar-2.2.2.tar.gz
diff --git a/metadata/cache/x11-misc/xaos-3.5-r1 b/metadata/cache/x11-misc/xaos-3.5-r1
index da26c4b5e069..04c9f6978c1b 100644
--- a/metadata/cache/x11-misc/xaos-3.5-r1
+++ b/metadata/cache/x11-misc/xaos-3.5-r1
@@ -1,4 +1,4 @@
-sci-libs/gsl sys-libs/zlib aalib? ( media-libs/aalib ) gtk? ( x11-libs/gtk+:2 ) png? ( media-libs/libpng ) X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86vm ) dev-util/pkgconfig doc? ( virtual/latex-base dev-texlive/texlive-texinfo ) X? ( x11-proto/xf86vidmodeproto x11-proto/xextproto x11-proto/xproto ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+sci-libs/gsl sys-libs/zlib aalib? ( media-libs/aalib ) gtk? ( x11-libs/gtk+:2 ) png? ( media-libs/libpng ) X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86vm ) dev-util/pkgconfig doc? ( virtual/latex-base dev-texlive/texlive-texinfo ) X? ( x11-proto/xf86vidmodeproto x11-proto/xextproto x11-proto/xproto ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 sci-libs/gsl sys-libs/zlib aalib? ( media-libs/aalib ) gtk? ( x11-libs/gtk+:2 ) png? ( media-libs/libpng ) X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXxf86vm )
 0
 http://dev.gentoo.org/~jlec/distfiles/xaos.png.tar mirror://sourceforge/xaos/xaos-3.5.tar.gz
diff --git a/metadata/cache/x11-misc/xcave-2.3.2 b/metadata/cache/x11-misc/xcave-2.3.2
index 50d2a60fc20e..1378f7408c69 100644
--- a/metadata/cache/x11-misc/xcave-2.3.2
+++ b/metadata/cache/x11-misc/xcave-2.3.2
@@ -1,4 +1,4 @@
->=x11-libs/gtk+-2.8:2 >=gnome-base/libglade-2.6 dev-libs/libxml2 dev-util/pkgconfig sys-devel/gettext dev-util/intltool || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=x11-libs/gtk+-2.8:2 >=gnome-base/libglade-2.6 dev-libs/libxml2 dev-util/pkgconfig sys-devel/gettext dev-util/intltool || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=x11-libs/gtk+-2.8:2 >=gnome-base/libglade-2.6 dev-libs/libxml2
 0
 http://xcave.free.fr/backbone.php?what=download/xcave-2.3.2.tar.gz
diff --git a/metadata/cache/x11-misc/xdg-user-dirs-0.14 b/metadata/cache/x11-misc/xdg-user-dirs-0.14
index e2c6fdc4de52..0749023263e4 100644
--- a/metadata/cache/x11-misc/xdg-user-dirs-0.14
+++ b/metadata/cache/x11-misc/xdg-user-dirs-0.14
@@ -1,4 +1,4 @@
-nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 http://user-dirs.freedesktop.org/releases/xdg-user-dirs-0.14.tar.gz
diff --git a/metadata/cache/x11-misc/xdialog-2.3.1 b/metadata/cache/x11-misc/xdialog-2.3.1
index 506385e680b5..5c3c324a4ac2 100644
--- a/metadata/cache/x11-misc/xdialog-2.3.1
+++ b/metadata/cache/x11-misc/xdialog-2.3.1
@@ -1,4 +1,4 @@
->=x11-libs/gtk+-2.2:2 dev-util/pkgconfig nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=x11-libs/gtk+-2.2:2 dev-util/pkgconfig nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=x11-libs/gtk+-2.2:2
 0
 http://thgodef.nerim.net/xdialog/Xdialog-2.3.1.tar.bz2
diff --git a/metadata/cache/x11-misc/xdiskusage-1.48_p20111016 b/metadata/cache/x11-misc/xdiskusage-1.48_p20111016
index 317593e3a2a9..ebeee1ca8dd0 100644
--- a/metadata/cache/x11-misc/xdiskusage-1.48_p20111016
+++ b/metadata/cache/x11-misc/xdiskusage-1.48_p20111016
@@ -1,4 +1,4 @@
->=x11-libs/fltk-1.3:1 app-arch/xz-utils || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=x11-libs/fltk-1.3:1 app-arch/xz-utils || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=x11-libs/fltk-1.3:1
 0
 mirror://gentoo/xdiskusage-1.48_p20111016.tar.xz
diff --git a/metadata/cache/x11-misc/xdock-0.2.0 b/metadata/cache/x11-misc/xdock-0.2.0
index 395440efaff9..1a2187464169 100644
--- a/metadata/cache/x11-misc/xdock-0.2.0
+++ b/metadata/cache/x11-misc/xdock-0.2.0
@@ -1,4 +1,4 @@
-x11-libs/libX11 media-libs/imlib || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+x11-libs/libX11 media-libs/imlib || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 x11-libs/libX11 media-libs/imlib
 0
 mirror://sourceforge/xdock/xdock-0.2.0.tar.gz
diff --git a/metadata/cache/x11-misc/xdock-0.3.0 b/metadata/cache/x11-misc/xdock-0.3.0
index 0062acb70522..27f5e59e5d87 100644
--- a/metadata/cache/x11-misc/xdock-0.3.0
+++ b/metadata/cache/x11-misc/xdock-0.3.0
@@ -1,4 +1,4 @@
-x11-libs/libX11 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+x11-libs/libX11 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 x11-libs/libX11
 0
 mirror://sourceforge/xdock/xdock-0.3.0.tar.gz
diff --git a/metadata/cache/x11-misc/xlockmore-5.31 b/metadata/cache/x11-misc/xlockmore-5.31
index 30f8fdea695a..4dab36253d1b 100644
--- a/metadata/cache/x11-misc/xlockmore-5.31
+++ b/metadata/cache/x11-misc/xlockmore-5.31
@@ -1,4 +1,4 @@
-x11-libs/libX11 x11-libs/libXext x11-libs/libXpm x11-libs/libXt x11-libs/libXmu opengl? ( media-libs/mesa truetype? ( >=media-libs/ftgl-2.1.3_rc5 ) ) truetype? ( media-libs/freetype:2 ) pam? ( virtual/pam ) nas? ( media-libs/nas ) motif? ( >=x11-libs/openmotif-2.3:0 ) gtk? ( x11-libs/gtk+:2 ) xinerama? ( x11-libs/libXinerama ) dev-util/pkgconfig x11-proto/xineramaproto || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+x11-libs/libX11 x11-libs/libXext x11-libs/libXpm x11-libs/libXt x11-libs/libXmu opengl? ( media-libs/mesa truetype? ( >=media-libs/ftgl-2.1.3_rc5 ) ) truetype? ( media-libs/freetype:2 ) pam? ( virtual/pam ) nas? ( media-libs/nas ) motif? ( >=x11-libs/openmotif-2.3:0 ) gtk? ( x11-libs/gtk+:2 ) xinerama? ( x11-libs/libXinerama ) dev-util/pkgconfig x11-proto/xineramaproto || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 x11-libs/libX11 x11-libs/libXext x11-libs/libXpm x11-libs/libXt x11-libs/libXmu opengl? ( media-libs/mesa truetype? ( >=media-libs/ftgl-2.1.3_rc5 ) ) truetype? ( media-libs/freetype:2 ) pam? ( virtual/pam ) nas? ( media-libs/nas ) motif? ( >=x11-libs/openmotif-2.3:0 ) gtk? ( x11-libs/gtk+:2 ) xinerama? ( x11-libs/libXinerama )
 0
 http://ftp.tux.org/pub/tux/bagleyd/xlockmore/xlockmore-5.31/xlockmore-5.31.tar.bz2
diff --git a/metadata/cache/x11-misc/xlockmore-5.37 b/metadata/cache/x11-misc/xlockmore-5.37
index 6c3b2d03c7c0..bbebe41a08ea 100644
--- a/metadata/cache/x11-misc/xlockmore-5.37
+++ b/metadata/cache/x11-misc/xlockmore-5.37
@@ -1,4 +1,4 @@
-x11-libs/libX11 x11-libs/libXext x11-libs/libXmu x11-libs/libXpm x11-libs/libXt gtk? ( x11-libs/gtk+:2 ) imagemagick? ( media-gfx/imagemagick ) motif? ( >=x11-libs/openmotif-2.3:0 ) nas? ( media-libs/nas ) opengl? ( media-libs/mesa truetype? ( >=media-libs/ftgl-2.1.3_rc5 ) ) pam? ( virtual/pam ) truetype? ( media-libs/freetype:2 ) xinerama? ( x11-libs/libXinerama ) dev-util/pkgconfig x11-proto/xineramaproto || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+x11-libs/libX11 x11-libs/libXext x11-libs/libXmu x11-libs/libXpm x11-libs/libXt gtk? ( x11-libs/gtk+:2 ) imagemagick? ( media-gfx/imagemagick ) motif? ( >=x11-libs/openmotif-2.3:0 ) nas? ( media-libs/nas ) opengl? ( media-libs/mesa truetype? ( >=media-libs/ftgl-2.1.3_rc5 ) ) pam? ( virtual/pam ) truetype? ( media-libs/freetype:2 ) xinerama? ( x11-libs/libXinerama ) dev-util/pkgconfig x11-proto/xineramaproto || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 x11-libs/libX11 x11-libs/libXext x11-libs/libXmu x11-libs/libXpm x11-libs/libXt gtk? ( x11-libs/gtk+:2 ) imagemagick? ( media-gfx/imagemagick ) motif? ( >=x11-libs/openmotif-2.3:0 ) nas? ( media-libs/nas ) opengl? ( media-libs/mesa truetype? ( >=media-libs/ftgl-2.1.3_rc5 ) ) pam? ( virtual/pam ) truetype? ( media-libs/freetype:2 ) xinerama? ( x11-libs/libXinerama )
 0
 http://ftp.tux.org/pub/tux/bagleyd/xlockmore/xlockmore-5.37/xlockmore-5.37.tar.bz2
diff --git a/metadata/cache/x11-misc/xlockmore-5.38 b/metadata/cache/x11-misc/xlockmore-5.38
index 76d862667d13..79f527052c8c 100644
--- a/metadata/cache/x11-misc/xlockmore-5.38
+++ b/metadata/cache/x11-misc/xlockmore-5.38
@@ -1,4 +1,4 @@
-x11-libs/libX11 x11-libs/libXext x11-libs/libXmu x11-libs/libXpm x11-libs/libXt gtk? ( x11-libs/gtk+:2 ) imagemagick? ( media-gfx/imagemagick ) motif? ( >=x11-libs/openmotif-2.3:0 ) nas? ( media-libs/nas ) opengl? ( media-libs/mesa truetype? ( >=media-libs/ftgl-2.1.3_rc5 ) ) pam? ( virtual/pam ) truetype? ( media-libs/freetype:2 ) xinerama? ( x11-libs/libXinerama ) dev-util/pkgconfig x11-proto/xineramaproto || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+x11-libs/libX11 x11-libs/libXext x11-libs/libXmu x11-libs/libXpm x11-libs/libXt gtk? ( x11-libs/gtk+:2 ) imagemagick? ( media-gfx/imagemagick ) motif? ( >=x11-libs/openmotif-2.3:0 ) nas? ( media-libs/nas ) opengl? ( media-libs/mesa truetype? ( >=media-libs/ftgl-2.1.3_rc5 ) ) pam? ( virtual/pam ) truetype? ( media-libs/freetype:2 ) xinerama? ( x11-libs/libXinerama ) dev-util/pkgconfig x11-proto/xineramaproto || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 x11-libs/libX11 x11-libs/libXext x11-libs/libXmu x11-libs/libXpm x11-libs/libXt gtk? ( x11-libs/gtk+:2 ) imagemagick? ( media-gfx/imagemagick ) motif? ( >=x11-libs/openmotif-2.3:0 ) nas? ( media-libs/nas ) opengl? ( media-libs/mesa truetype? ( >=media-libs/ftgl-2.1.3_rc5 ) ) pam? ( virtual/pam ) truetype? ( media-libs/freetype:2 ) xinerama? ( x11-libs/libXinerama )
 0
 http://ftp.tux.org/pub/tux/bagleyd/xlockmore/xlockmore-5.38/xlockmore-5.38.tar.bz2
diff --git a/metadata/cache/x11-misc/xosview-1.9.2 b/metadata/cache/x11-misc/xosview-1.9.2
index eea2e5a4e716..f6291e71df0c 100644
--- a/metadata/cache/x11-misc/xosview-1.9.2
+++ b/metadata/cache/x11-misc/xosview-1.9.2
@@ -1,4 +1,4 @@
-x11-libs/libX11 x11-libs/libXpm x11-libs/libXt x11-proto/xproto || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+x11-libs/libX11 x11-libs/libXpm x11-libs/libXt x11-proto/xproto || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 x11-libs/libX11 x11-libs/libXpm x11-libs/libXt media-fonts/font-misc-misc
 0
 http://www.pogo.org.uk/~mark/xosview/releases/xosview-1.9.2.tar.gz
diff --git a/metadata/cache/x11-misc/xscreensaver-5.15 b/metadata/cache/x11-misc/xscreensaver-5.15
index c3460321249a..b100bffbc418 100644
--- a/metadata/cache/x11-misc/xscreensaver-5.15
+++ b/metadata/cache/x11-misc/xscreensaver-5.15
@@ -1,4 +1,4 @@
-dev-libs/libxml2 >=gnome-base/libglade-2 media-libs/netpbm x11-apps/appres x11-apps/xwininfo x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXmu x11-libs/libXrandr x11-libs/libXt x11-libs/libXxf86misc x11-libs/libXxf86vm jpeg? ( virtual/jpeg ) new-login? ( || ( x11-misc/lightdm gnome-base/gdm kde-base/kdm ) ) opengl? ( virtual/opengl ) pam? ( virtual/pam ) xinerama? ( x11-libs/libXinerama ) dev-util/intltool dev-util/pkgconfig sys-devel/bc sys-devel/gettext x11-proto/recordproto x11-proto/scrnsaverproto x11-proto/xextproto x11-proto/xf86miscproto x11-proto/xf86vidmodeproto xinerama? ( x11-proto/xineramaproto ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-libs/libxml2 >=gnome-base/libglade-2 media-libs/netpbm x11-apps/appres x11-apps/xwininfo x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXmu x11-libs/libXrandr x11-libs/libXt x11-libs/libXxf86misc x11-libs/libXxf86vm jpeg? ( virtual/jpeg ) new-login? ( || ( x11-misc/lightdm gnome-base/gdm kde-base/kdm ) ) opengl? ( virtual/opengl ) pam? ( virtual/pam ) xinerama? ( x11-libs/libXinerama ) dev-util/intltool dev-util/pkgconfig sys-devel/bc sys-devel/gettext x11-proto/recordproto x11-proto/scrnsaverproto x11-proto/xextproto x11-proto/xf86miscproto x11-proto/xf86vidmodeproto xinerama? ( x11-proto/xineramaproto ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-libs/libxml2 >=gnome-base/libglade-2 media-libs/netpbm x11-apps/appres x11-apps/xwininfo x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXmu x11-libs/libXrandr x11-libs/libXt x11-libs/libXxf86misc x11-libs/libXxf86vm jpeg? ( virtual/jpeg ) new-login? ( || ( x11-misc/lightdm gnome-base/gdm kde-base/kdm ) ) opengl? ( virtual/opengl ) pam? ( virtual/pam ) xinerama? ( x11-libs/libXinerama ) perl? ( dev-lang/perl dev-perl/libwww-perl virtual/perl-Digest-MD5 )
 0
 http://www.jwz.org/xscreensaver/xscreensaver-5.15.tar.gz
diff --git a/metadata/cache/x11-misc/xsensors-0.70 b/metadata/cache/x11-misc/xsensors-0.70
index dfe3e6dfe50f..8143f85a780a 100644
--- a/metadata/cache/x11-misc/xsensors-0.70
+++ b/metadata/cache/x11-misc/xsensors-0.70
@@ -1,4 +1,4 @@
-x11-libs/gtk+:2 >=sys-apps/lm_sensors-3 dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+x11-libs/gtk+:2 >=sys-apps/lm_sensors-3 dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 x11-libs/gtk+:2 >=sys-apps/lm_sensors-3
 0
 http://www.linuxhardware.org/xsensors/xsensors-0.70.tar.gz
diff --git a/metadata/cache/x11-misc/xsri-2.1.0-r1 b/metadata/cache/x11-misc/xsri-2.1.0-r1
index f0e2f5ee9735..d9cd50049c4e 100644
--- a/metadata/cache/x11-misc/xsri-2.1.0-r1
+++ b/metadata/cache/x11-misc/xsri-2.1.0-r1
@@ -1,4 +1,4 @@
-x11-libs/gtk+:2 dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=app-arch/rpm2targz-9.0.0.3g
+x11-libs/gtk+:2 dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=app-arch/rpm2targz-9.0.0.3g
 x11-libs/gtk+:2
 0
 mirror://fedora/5/source/SRPMS/xsri-2.1.0-9.2.1.src.rpm
diff --git a/metadata/cache/x11-misc/xteddy-2.2 b/metadata/cache/x11-misc/xteddy-2.2
index 83291460cab8..f24599b81e5d 100644
--- a/metadata/cache/x11-misc/xteddy-2.2
+++ b/metadata/cache/x11-misc/xteddy-2.2
@@ -1,4 +1,4 @@
-media-libs/imlib2 x11-libs/libX11 x11-libs/libXext dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+media-libs/imlib2 x11-libs/libX11 x11-libs/libXext dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 media-libs/imlib2 x11-libs/libX11 x11-libs/libXext
 0
 http://webstaff.itn.liu.se/~stegu/xteddy/xteddy-2.2.tar.gz
diff --git a/metadata/cache/x11-plugins/compiz-plugins-extra-0.8.6-r1 b/metadata/cache/x11-plugins/compiz-plugins-extra-0.8.6-r1
index 99388756e5d6..361c8c738c3e 100644
--- a/metadata/cache/x11-plugins/compiz-plugins-extra-0.8.6-r1
+++ b/metadata/cache/x11-plugins/compiz-plugins-extra-0.8.6-r1
@@ -1,4 +1,4 @@
->=gnome-base/librsvg-2.14.0:2 virtual/jpeg:0 >=x11-libs/compiz-bcop-0.8.4 >=x11-plugins/compiz-plugins-main-0.8.6 >=x11-wm/compiz-0.8.6[gconf?] libnotify? ( x11-libs/libnotify ) >=dev-util/intltool-0.35 >=dev-util/pkgconfig-0.19 >=sys-devel/gettext-0.15 x11-libs/cairo gconf? ( gnome-base/gconf:2 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+>=gnome-base/librsvg-2.14.0:2 virtual/jpeg:0 >=x11-libs/compiz-bcop-0.8.4 >=x11-plugins/compiz-plugins-main-0.8.6 >=x11-wm/compiz-0.8.6[gconf?] libnotify? ( x11-libs/libnotify ) >=dev-util/intltool-0.35 >=dev-util/pkgconfig-0.19 >=sys-devel/gettext-0.15 x11-libs/cairo gconf? ( gnome-base/gconf:2 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 >=gnome-base/librsvg-2.14.0:2 virtual/jpeg:0 >=x11-libs/compiz-bcop-0.8.4 >=x11-plugins/compiz-plugins-main-0.8.6 >=x11-wm/compiz-0.8.6[gconf?] libnotify? ( x11-libs/libnotify )
 0
 http://releases.compiz.org/0.8.6/compiz-plugins-extra-0.8.6.tar.bz2
diff --git a/metadata/cache/x11-plugins/compiz-plugins-main-0.8.6-r1 b/metadata/cache/x11-plugins/compiz-plugins-main-0.8.6-r1
index 93cdbe09bc40..ea5c909ac332 100644
--- a/metadata/cache/x11-plugins/compiz-plugins-main-0.8.6-r1
+++ b/metadata/cache/x11-plugins/compiz-plugins-main-0.8.6-r1
@@ -1,4 +1,4 @@
->=gnome-base/librsvg-2.14.0:2 virtual/jpeg:0 x11-libs/cairo >=x11-libs/compiz-bcop-0.8.4 >=x11-wm/compiz-0.8.6[gconf?] >=dev-util/intltool-0.35 >=dev-util/pkgconfig-0.19 >=sys-devel/gettext-0.15 gconf? ( gnome-base/gconf:2 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+>=gnome-base/librsvg-2.14.0:2 virtual/jpeg:0 x11-libs/cairo >=x11-libs/compiz-bcop-0.8.4 >=x11-wm/compiz-0.8.6[gconf?] >=dev-util/intltool-0.35 >=dev-util/pkgconfig-0.19 >=sys-devel/gettext-0.15 gconf? ( gnome-base/gconf:2 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 >=gnome-base/librsvg-2.14.0:2 virtual/jpeg:0 x11-libs/cairo >=x11-libs/compiz-bcop-0.8.4 >=x11-wm/compiz-0.8.6[gconf?]
 0
 http://releases.compiz.org/0.8.6/compiz-plugins-main-0.8.6.tar.bz2
diff --git a/metadata/cache/x11-plugins/enigmail-1.1.2-r2 b/metadata/cache/x11-plugins/enigmail-1.1.2-r2
index 57f8a4b68656..8e5b3315baae 100644
--- a/metadata/cache/x11-plugins/enigmail-1.1.2-r2
+++ b/metadata/cache/x11-plugins/enigmail-1.1.2-r2
@@ -1,4 +1,4 @@
->=mail-client/thunderbird-3.1.1-r1[system-sqlite=] x11-libs/libXrender x11-libs/libXt x11-libs/libXmu >=sys-libs/zlib-1.1.4 dev-util/pkgconfig =dev-lang/python-2*[threads] app-arch/zip app-arch/unzip >=app-text/hunspell-1.2 dev-libs/expat >=dev-libs/libIDL-0.8.0 >=dev-libs/libevent-1.4.7 >=x11-libs/cairo-1.8[X] >=x11-libs/gtk+-2.8.6:2 >=x11-libs/pango-1.10.1[X] virtual/jpeg virtual/freedesktop-icon-theme alsa? ( media-libs/alsa-lib ) dbus? ( >=dev-libs/dbus-glib-0.72 ) libnotify? ( >=x11-libs/libnotify-0.4 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) wifi? ( net-wireless/wireless-tools ) app-arch/unzip || ( >=sys-devel/automake-1.11.1 ) =sys-devel/autoconf-2.1* sys-devel/libtool
+>=mail-client/thunderbird-3.1.1-r1[system-sqlite=] x11-libs/libXrender x11-libs/libXt x11-libs/libXmu >=sys-libs/zlib-1.1.4 dev-util/pkgconfig =dev-lang/python-2*[threads] app-arch/zip app-arch/unzip >=app-text/hunspell-1.2 dev-libs/expat >=dev-libs/libIDL-0.8.0 >=dev-libs/libevent-1.4.7 >=x11-libs/cairo-1.8[X] >=x11-libs/gtk+-2.8.6:2 >=x11-libs/pango-1.10.1[X] virtual/jpeg virtual/freedesktop-icon-theme alsa? ( media-libs/alsa-lib ) dbus? ( >=dev-libs/dbus-glib-0.72 ) libnotify? ( >=x11-libs/libnotify-0.4 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) wifi? ( net-wireless/wireless-tools ) app-arch/unzip || ( >=sys-devel/automake-1.11.1:1.11 ) =sys-devel/autoconf-2.1* sys-devel/libtool
 >=mail-client/thunderbird-3.1.1-r1[system-sqlite=] gnome? ( >=gnome-base/gnome-vfs-2.16.3 >=gnome-base/libgnomeui-2.16.1 >=gnome-base/gconf-2.16.0 >=gnome-base/libgnome-2.16.0 ) system-sqlite? ( >=dev-db/sqlite-3.6.22-r2[fts3,secure-delete] ) || ( ( >=app-crypt/gnupg-2.0 || ( app-crypt/pinentry[gtk] app-crypt/pinentry-qt app-crypt/pinentry[qt4] ) ) =app-crypt/gnupg-1.4* ) x11-libs/libXrender x11-libs/libXt x11-libs/libXmu >=sys-libs/zlib-1.1.4 app-arch/zip app-arch/unzip >=app-text/hunspell-1.2 dev-libs/expat >=dev-libs/libIDL-0.8.0 >=dev-libs/libevent-1.4.7 >=x11-libs/cairo-1.8[X] >=x11-libs/gtk+-2.8.6:2 >=x11-libs/pango-1.10.1[X] virtual/jpeg virtual/freedesktop-icon-theme alsa? ( media-libs/alsa-lib ) dbus? ( >=dev-libs/dbus-glib-0.72 ) libnotify? ( >=x11-libs/libnotify-0.4 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) wifi? ( net-wireless/wireless-tools )
 0
 http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.1/source/thunderbird-3.1.1.source.tar.bz2 http://www.mozilla-enigmail.org/download/source/enigmail-1.1.2.tar.gz http://dev.gentoo.org/~anarchy/mozilla/patchsets/thunderbird-3.1-patches-0.8.tar.bz2
diff --git a/metadata/cache/x11-plugins/enigmail-1.1.2-r3 b/metadata/cache/x11-plugins/enigmail-1.1.2-r3
index da919a4d8df3..658931a8bd44 100644
--- a/metadata/cache/x11-plugins/enigmail-1.1.2-r3
+++ b/metadata/cache/x11-plugins/enigmail-1.1.2-r3
@@ -1,4 +1,4 @@
->=mail-client/thunderbird-3.1.1-r1[system-sqlite=] x11-libs/libXrender x11-libs/libXt x11-libs/libXmu >=sys-libs/zlib-1.1.4 dev-util/pkgconfig =dev-lang/python-2*[threads] app-arch/zip app-arch/unzip >=app-text/hunspell-1.2 dev-libs/expat >=dev-libs/libIDL-0.8.0 >=dev-libs/libevent-1.4.7 >=x11-libs/cairo-1.8[X] >=x11-libs/gtk+-2.8.6:2 >=x11-libs/pango-1.10.1[X] virtual/jpeg virtual/freedesktop-icon-theme alsa? ( media-libs/alsa-lib ) dbus? ( >=dev-libs/dbus-glib-0.72 ) libnotify? ( >=x11-libs/libnotify-0.4 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) wifi? ( net-wireless/wireless-tools ) app-arch/unzip || ( >=sys-devel/automake-1.11.1 ) =sys-devel/autoconf-2.1* sys-devel/libtool
+>=mail-client/thunderbird-3.1.1-r1[system-sqlite=] x11-libs/libXrender x11-libs/libXt x11-libs/libXmu >=sys-libs/zlib-1.1.4 dev-util/pkgconfig =dev-lang/python-2*[threads] app-arch/zip app-arch/unzip >=app-text/hunspell-1.2 dev-libs/expat >=dev-libs/libIDL-0.8.0 >=dev-libs/libevent-1.4.7 >=x11-libs/cairo-1.8[X] >=x11-libs/gtk+-2.8.6:2 >=x11-libs/pango-1.10.1[X] virtual/jpeg virtual/freedesktop-icon-theme alsa? ( media-libs/alsa-lib ) dbus? ( >=dev-libs/dbus-glib-0.72 ) libnotify? ( >=x11-libs/libnotify-0.4 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) wifi? ( net-wireless/wireless-tools ) app-arch/unzip || ( >=sys-devel/automake-1.11.1:1.11 ) =sys-devel/autoconf-2.1* sys-devel/libtool
 >=mail-client/thunderbird-3.1.1-r1[system-sqlite=] gnome? ( >=gnome-base/gnome-vfs-2.16.3 >=gnome-base/libgnomeui-2.16.1 >=gnome-base/gconf-2.16.0 >=gnome-base/libgnome-2.16.0 ) system-sqlite? ( >=dev-db/sqlite-3.6.22-r2[fts3,secure-delete] ) || ( ( >=app-crypt/gnupg-2.0 || ( app-crypt/pinentry[gtk] app-crypt/pinentry-qt app-crypt/pinentry[qt4] ) ) =app-crypt/gnupg-1.4* ) x11-libs/libXrender x11-libs/libXt x11-libs/libXmu >=sys-libs/zlib-1.1.4 app-arch/zip app-arch/unzip >=app-text/hunspell-1.2 dev-libs/expat >=dev-libs/libIDL-0.8.0 >=dev-libs/libevent-1.4.7 >=x11-libs/cairo-1.8[X] >=x11-libs/gtk+-2.8.6:2 >=x11-libs/pango-1.10.1[X] virtual/jpeg virtual/freedesktop-icon-theme alsa? ( media-libs/alsa-lib ) dbus? ( >=dev-libs/dbus-glib-0.72 ) libnotify? ( >=x11-libs/libnotify-0.4 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) wifi? ( net-wireless/wireless-tools )
 0
 http://releases.mozilla.org/pub/mozilla.org/thunderbird/releases/3.1.4/source/thunderbird-3.1.4.source.tar.bz2 http://www.mozilla-enigmail.org/download/source/enigmail-1.1.2.tar.gz http://dev.gentoo.org/~anarchy/mozilla/patchsets/thunderbird-3.1-patches-1.1.tar.bz2
diff --git a/metadata/cache/x11-plugins/pidgin-musictracker-0.4.21-r1 b/metadata/cache/x11-plugins/pidgin-musictracker-0.4.21-r1
index 04961bf3b04f..45d14eb8a256 100644
--- a/metadata/cache/x11-plugins/pidgin-musictracker-0.4.21-r1
+++ b/metadata/cache/x11-plugins/pidgin-musictracker-0.4.21-r1
@@ -1,4 +1,4 @@
->=net-im/pidgin-2.0.0 >=dev-libs/dbus-glib-0.73 dev-libs/libpcre >=sys-devel/gettext-0.17 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=net-im/pidgin-2.0.0 >=dev-libs/dbus-glib-0.73 dev-libs/libpcre >=sys-devel/gettext-0.17 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=net-im/pidgin-2.0.0 >=dev-libs/dbus-glib-0.73 dev-libs/libpcre >=sys-devel/gettext-0.17
 0
 http://pidgin-musictracker.googlecode.com/files/pidgin-musictracker-0.4.21.tar.bz2
diff --git a/metadata/cache/x11-plugins/pidgin-musictracker-0.4.22 b/metadata/cache/x11-plugins/pidgin-musictracker-0.4.22
index 028e215e90b9..6c6ffaa7c812 100644
--- a/metadata/cache/x11-plugins/pidgin-musictracker-0.4.22
+++ b/metadata/cache/x11-plugins/pidgin-musictracker-0.4.22
@@ -1,4 +1,4 @@
->=net-im/pidgin-2.0.0[gtk] >=dev-libs/dbus-glib-0.73 dev-libs/libpcre >=sys-devel/gettext-0.17 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=net-im/pidgin-2.0.0[gtk] >=dev-libs/dbus-glib-0.73 dev-libs/libpcre >=sys-devel/gettext-0.17 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=net-im/pidgin-2.0.0[gtk] >=dev-libs/dbus-glib-0.73 dev-libs/libpcre >=sys-devel/gettext-0.17
 0
 http://pidgin-musictracker.googlecode.com/files/pidgin-musictracker-0.4.22.tar.bz2
diff --git a/metadata/cache/x11-plugins/pidgin-privacy-please-0.6.4 b/metadata/cache/x11-plugins/pidgin-privacy-please-0.6.4
index b71f2d1c60f3..a0c6625da33b 100644
--- a/metadata/cache/x11-plugins/pidgin-privacy-please-0.6.4
+++ b/metadata/cache/x11-plugins/pidgin-privacy-please-0.6.4
@@ -1,4 +1,4 @@
-<net-im/pidgin-3[gtk] dev-util/pkgconfig sys-devel/gettext || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+<net-im/pidgin-3[gtk] dev-util/pkgconfig sys-devel/gettext || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 <net-im/pidgin-3[gtk]
 0
 http://pidgin-privacy-please.googlecode.com/files/pidgin-privacy-please-0.6.4.tar.gz
diff --git a/metadata/cache/x11-plugins/pidgin-privacy-please-0.7.1 b/metadata/cache/x11-plugins/pidgin-privacy-please-0.7.1
index 5dc79ef74174..9a9b33968fd9 100644
--- a/metadata/cache/x11-plugins/pidgin-privacy-please-0.7.1
+++ b/metadata/cache/x11-plugins/pidgin-privacy-please-0.7.1
@@ -1,4 +1,4 @@
-<net-im/pidgin-3[gtk] dev-util/pkgconfig sys-devel/gettext || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+<net-im/pidgin-3[gtk] dev-util/pkgconfig sys-devel/gettext || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 <net-im/pidgin-3[gtk]
 0
 http://pidgin-privacy-please.googlecode.com/files/pidgin-privacy-please-0.7.1.tar.gz
diff --git a/metadata/cache/x11-plugins/pidgin-sipe-1.12.0 b/metadata/cache/x11-plugins/pidgin-sipe-1.12.0
index 3892ab1a8885..ca2b0ff49367 100644
--- a/metadata/cache/x11-plugins/pidgin-sipe-1.12.0
+++ b/metadata/cache/x11-plugins/pidgin-sipe-1.12.0
@@ -1,4 +1,4 @@
-net-im/pidgin[gnutls] dev-util/intltool >=dev-libs/gmime-2.4.16 dev-libs/libxml2 kerberos? ( app-crypt/mit-krb5 ) voice? ( >=dev-libs/glib-2.28.0 >=net-libs/libnice-0.1.0 media-libs/gstreamer ) !voice? ( >=dev-libs/glib-2.12.0 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+net-im/pidgin[gnutls] dev-util/intltool >=dev-libs/gmime-2.4.16 dev-libs/libxml2 kerberos? ( app-crypt/mit-krb5 ) voice? ( >=dev-libs/glib-2.28.0 >=net-libs/libnice-0.1.0 media-libs/gstreamer ) !voice? ( >=dev-libs/glib-2.12.0 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 mirror://sourceforge/sipe/pidgin-sipe-1.12.0.tar.gz
diff --git a/metadata/cache/x11-plugins/pidgin-sipe-1.13.0 b/metadata/cache/x11-plugins/pidgin-sipe-1.13.0
index 373f44fbf25f..0b714b410323 100644
--- a/metadata/cache/x11-plugins/pidgin-sipe-1.13.0
+++ b/metadata/cache/x11-plugins/pidgin-sipe-1.13.0
@@ -1,4 +1,4 @@
-net-im/pidgin[gnutls] dev-util/intltool >=dev-libs/gmime-2.4.16 dev-libs/libxml2 kerberos? ( app-crypt/mit-krb5 ) voice? ( >=dev-libs/glib-2.28.0 >=net-libs/libnice-0.1.0 media-libs/gstreamer ) !voice? ( >=dev-libs/glib-2.12.0 ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+net-im/pidgin[gnutls] dev-util/intltool >=dev-libs/gmime-2.4.16 dev-libs/libxml2 kerberos? ( app-crypt/mit-krb5 ) voice? ( >=dev-libs/glib-2.28.0 >=net-libs/libnice-0.1.0 media-libs/gstreamer ) !voice? ( >=dev-libs/glib-2.12.0 ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 mirror://sourceforge/sipe/pidgin-sipe-1.13.0.tar.gz
diff --git a/metadata/cache/x11-plugins/wmbattery-2.40 b/metadata/cache/x11-plugins/wmbattery-2.40
index 8e36ec3c61af..1eb9c3d070a2 100644
--- a/metadata/cache/x11-plugins/wmbattery-2.40
+++ b/metadata/cache/x11-plugins/wmbattery-2.40
@@ -1,4 +1,4 @@
-sys-apps/apmd x11-libs/libX11 x11-libs/libXext x11-libs/libXpm || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+sys-apps/apmd x11-libs/libX11 x11-libs/libXext x11-libs/libXpm || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 sys-apps/apmd x11-libs/libX11 x11-libs/libXext x11-libs/libXpm
 0
 mirror://debian/pool/main/w/wmbattery/wmbattery_2.40.tar.gz
diff --git a/metadata/cache/x11-plugins/wmbiff-0.4.27 b/metadata/cache/x11-plugins/wmbiff-0.4.27
index d227bfb80b18..81209931cbac 100644
--- a/metadata/cache/x11-plugins/wmbiff-0.4.27
+++ b/metadata/cache/x11-plugins/wmbiff-0.4.27
@@ -1,4 +1,4 @@
-x11-libs/libX11 x11-libs/libXext x11-libs/libXpm crypt? ( >=net-libs/gnutls-1.2.3 >=dev-libs/libgcrypt-1.2.1 ) dev-util/pkgconfig x11-proto/xproto x11-proto/xextproto || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+x11-libs/libX11 x11-libs/libXext x11-libs/libXpm crypt? ( >=net-libs/gnutls-1.2.3 >=dev-libs/libgcrypt-1.2.1 ) dev-util/pkgconfig x11-proto/xproto x11-proto/xextproto || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 x11-libs/libX11 x11-libs/libXext x11-libs/libXpm crypt? ( >=net-libs/gnutls-1.2.3 >=dev-libs/libgcrypt-1.2.1 )
 0
 mirror://sourceforge/wmbiff/wmbiff-0.4.27.tar.gz
diff --git a/metadata/cache/x11-plugins/wmblob-1.0.3 b/metadata/cache/x11-plugins/wmblob-1.0.3
index 9a7d59334029..ffe81e8b4a60 100644
--- a/metadata/cache/x11-plugins/wmblob-1.0.3
+++ b/metadata/cache/x11-plugins/wmblob-1.0.3
@@ -1,4 +1,4 @@
-x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXpm x11-libs/libXext dev-util/pkgconfig x11-proto/xextproto x11-libs/libXt || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXpm x11-libs/libXext dev-util/pkgconfig x11-proto/xextproto x11-libs/libXt || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXpm x11-libs/libXext
 0
 mirror://debian/pool/main/w/wmblob/wmblob_1.0.3.orig.tar.gz
diff --git a/metadata/cache/x11-plugins/wmfire-1.2.4-r1 b/metadata/cache/x11-plugins/wmfire-1.2.4-r1
index 5f7537d8a4d2..39a4d4d936e5 100644
--- a/metadata/cache/x11-plugins/wmfire-1.2.4-r1
+++ b/metadata/cache/x11-plugins/wmfire-1.2.4-r1
@@ -1,4 +1,4 @@
-x11-libs/gtk+:2 gnome-base/libgtop:2 x11-libs/libX11 x11-libs/libXext session? ( x11-libs/libSM x11-libs/libICE ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+x11-libs/gtk+:2 gnome-base/libgtop:2 x11-libs/libX11 x11-libs/libXext session? ( x11-libs/libSM x11-libs/libICE ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 x11-libs/gtk+:2 gnome-base/libgtop:2 x11-libs/libX11 x11-libs/libXext session? ( x11-libs/libSM x11-libs/libICE )
 0
 http://www.swanson.ukfsn.org/wmfire/wmfire-1.2.4.tar.gz
diff --git a/metadata/cache/x11-plugins/wmfire-1.2.4-r2 b/metadata/cache/x11-plugins/wmfire-1.2.4-r2
index 969e7d59d347..23b68d230bec 100644
--- a/metadata/cache/x11-plugins/wmfire-1.2.4-r2
+++ b/metadata/cache/x11-plugins/wmfire-1.2.4-r2
@@ -1,4 +1,4 @@
-x11-libs/gtk+:2 gnome-base/libgtop:2 x11-libs/libX11 x11-libs/libXext session? ( x11-libs/libSM x11-libs/libICE ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+x11-libs/gtk+:2 gnome-base/libgtop:2 x11-libs/libX11 x11-libs/libXext session? ( x11-libs/libSM x11-libs/libICE ) dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 x11-libs/gtk+:2 gnome-base/libgtop:2 x11-libs/libX11 x11-libs/libXext session? ( x11-libs/libSM x11-libs/libICE )
 0
 http://www.swanson.ukfsn.org/wmfire/wmfire-1.2.4.tar.gz
diff --git a/metadata/cache/x11-plugins/wmmemload-0.1.6-r1 b/metadata/cache/x11-plugins/wmmemload-0.1.6-r1
index e8cb48c50515..ea2d317a05c8 100644
--- a/metadata/cache/x11-plugins/wmmemload-0.1.6-r1
+++ b/metadata/cache/x11-plugins/wmmemload-0.1.6-r1
@@ -1,4 +1,4 @@
-x11-libs/libX11 x11-libs/libXext x11-libs/libXpm x11-proto/xextproto x11-libs/libICE x11-libs/libXt || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+x11-libs/libX11 x11-libs/libXext x11-libs/libXpm x11-proto/xextproto x11-libs/libICE x11-libs/libXt || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 x11-libs/libX11 x11-libs/libXext x11-libs/libXpm
 0
 http://markstaggs.net/wmmemload-download/wmmemload-0.1.6.tar.gz
diff --git a/metadata/cache/x11-plugins/wmmsg-1.0.1 b/metadata/cache/x11-plugins/wmmsg-1.0.1
index cf9c2e84da26..9a0782b0757c 100644
--- a/metadata/cache/x11-plugins/wmmsg-1.0.1
+++ b/metadata/cache/x11-plugins/wmmsg-1.0.1
@@ -1,4 +1,4 @@
-x11-libs/gtk+:2 media-libs/imlib2 x11-libs/libXpm x11-libs/libXext x11-libs/libX11 dev-util/pkgconfig x11-libs/libXt || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+x11-libs/gtk+:2 media-libs/imlib2 x11-libs/libXpm x11-libs/libXext x11-libs/libX11 dev-util/pkgconfig x11-libs/libXt || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 x11-libs/gtk+:2 media-libs/imlib2 x11-libs/libXpm x11-libs/libXext x11-libs/libX11
 0
 http://swapspace.net/~matt/wmmsg/wmmsg-1.0.1.tar.gz
diff --git a/metadata/cache/x11-plugins/wmmsg-1.0.1-r1 b/metadata/cache/x11-plugins/wmmsg-1.0.1-r1
index 0489b84c5066..42b737193bdd 100644
--- a/metadata/cache/x11-plugins/wmmsg-1.0.1-r1
+++ b/metadata/cache/x11-plugins/wmmsg-1.0.1-r1
@@ -1,4 +1,4 @@
-x11-libs/gtk+:2 media-libs/imlib2 x11-libs/libXpm x11-libs/libXext x11-libs/libX11 dev-util/pkgconfig x11-libs/libXt || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+x11-libs/gtk+:2 media-libs/imlib2 x11-libs/libXpm x11-libs/libXext x11-libs/libX11 dev-util/pkgconfig x11-libs/libXt || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 x11-libs/gtk+:2 media-libs/imlib2 x11-libs/libXpm x11-libs/libXext x11-libs/libX11
 0
 http://swapspace.net/~matt/wmmsg/wmmsg-1.0.1.tar.gz
diff --git a/metadata/cache/x11-terms/cxterm-5.2.3-r1 b/metadata/cache/x11-terms/cxterm-5.2.3-r1
index 82cd3f65bc12..669ad3fd8711 100644
--- a/metadata/cache/x11-terms/cxterm-5.2.3-r1
+++ b/metadata/cache/x11-terms/cxterm-5.2.3-r1
@@ -1,4 +1,4 @@
-sys-libs/ncurses x11-libs/libX11 x11-libs/libXaw x11-libs/libXmu || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+sys-libs/ncurses x11-libs/libX11 x11-libs/libXaw x11-libs/libXmu || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 sys-libs/ncurses x11-libs/libX11 x11-libs/libXaw x11-libs/libXmu
 0
 mirror://sourceforge/cxterm/cxterm-5.2.3.tgz
diff --git a/metadata/cache/x11-terms/eterm-0.9.5 b/metadata/cache/x11-terms/eterm-0.9.5
index fe594b6ef593..c1a0d53408db 100644
--- a/metadata/cache/x11-terms/eterm-0.9.5
+++ b/metadata/cache/x11-terms/eterm-0.9.5
@@ -1,4 +1,4 @@
-x11-libs/libX11 x11-libs/libXmu x11-libs/libXt x11-libs/libICE x11-libs/libSM x11-proto/xextproto x11-proto/xproto >=x11-libs/libast-0.6.1 media-libs/imlib2[X] media-fonts/font-misc-misc escreen? ( app-misc/screen ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+x11-libs/libX11 x11-libs/libXmu x11-libs/libXt x11-libs/libICE x11-libs/libSM x11-proto/xextproto x11-proto/xproto >=x11-libs/libast-0.6.1 media-libs/imlib2[X] media-fonts/font-misc-misc escreen? ( app-misc/screen ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 x11-libs/libX11 x11-libs/libXmu x11-libs/libXt x11-libs/libICE x11-libs/libSM x11-proto/xextproto x11-proto/xproto >=x11-libs/libast-0.6.1 media-libs/imlib2[X] media-fonts/font-misc-misc escreen? ( app-misc/screen )
 0
 http://www.eterm.org/download/Eterm-0.9.5.tar.gz !minimal? ( http://www.eterm.org/download/Eterm-bg-0.9.5.tar.gz ) mirror://sourceforge/eterm/Eterm-0.9.5.tar.gz !minimal? ( mirror://sourceforge/eterm/Eterm-bg-0.9.5.tar.gz )
diff --git a/metadata/cache/x11-terms/eterm-0.9.6 b/metadata/cache/x11-terms/eterm-0.9.6
index e63c8b00bbe4..e19d9742de6b 100644
--- a/metadata/cache/x11-terms/eterm-0.9.6
+++ b/metadata/cache/x11-terms/eterm-0.9.6
@@ -1,4 +1,4 @@
-x11-libs/libX11 x11-libs/libXmu x11-libs/libXt x11-libs/libICE x11-libs/libSM x11-proto/xextproto x11-proto/xproto >=x11-libs/libast-0.6.1 media-libs/imlib2[X] media-fonts/font-misc-misc escreen? ( app-misc/screen ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+x11-libs/libX11 x11-libs/libXmu x11-libs/libXt x11-libs/libICE x11-libs/libSM x11-proto/xextproto x11-proto/xproto >=x11-libs/libast-0.6.1 media-libs/imlib2[X] media-fonts/font-misc-misc escreen? ( app-misc/screen ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 x11-libs/libX11 x11-libs/libXmu x11-libs/libXt x11-libs/libICE x11-libs/libSM x11-proto/xextproto x11-proto/xproto >=x11-libs/libast-0.6.1 media-libs/imlib2[X] media-fonts/font-misc-misc escreen? ( app-misc/screen )
 0
 http://www.eterm.org/download/Eterm-0.9.6.tar.gz !minimal? ( http://www.eterm.org/download/Eterm-bg-0.9.6.tar.gz )
diff --git a/metadata/cache/x11-terms/eterm-9999 b/metadata/cache/x11-terms/eterm-9999
index ab7b29703fac..21fb0c440c5b 100644
--- a/metadata/cache/x11-terms/eterm-9999
+++ b/metadata/cache/x11-terms/eterm-9999
@@ -1,4 +1,4 @@
-x11-libs/libX11 x11-libs/libXmu x11-libs/libXt x11-libs/libICE x11-libs/libSM x11-proto/xextproto x11-proto/xproto >=x11-libs/libast-0.6.1 media-libs/imlib2[X] media-fonts/font-misc-misc escreen? ( app-misc/screen ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/subversion net-misc/rsync
+x11-libs/libX11 x11-libs/libXmu x11-libs/libXt x11-libs/libICE x11-libs/libSM x11-proto/xextproto x11-proto/xproto >=x11-libs/libast-0.6.1 media-libs/imlib2[X] media-fonts/font-misc-misc escreen? ( app-misc/screen ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool dev-vcs/subversion net-misc/rsync
 x11-libs/libX11 x11-libs/libXmu x11-libs/libXt x11-libs/libICE x11-libs/libSM x11-proto/xextproto x11-proto/xproto >=x11-libs/libast-0.6.1 media-libs/imlib2[X] media-fonts/font-misc-misc escreen? ( app-misc/screen )
 0
 
diff --git a/metadata/cache/x11-terms/mlterm-3.0.5 b/metadata/cache/x11-terms/mlterm-3.0.5
index 523b2b491af5..776fefdca5be 100644
--- a/metadata/cache/x11-terms/mlterm-3.0.5
+++ b/metadata/cache/x11-terms/mlterm-3.0.5
@@ -1,4 +1,4 @@
-|| ( sys-libs/libutempter sys-apps/utempter ) x11-libs/libX11 x11-libs/libICE x11-libs/libSM gtk? ( x11-libs/gtk+:2 ) xft? ( x11-libs/libXft ) bidi? ( >=dev-libs/fribidi-0.10.4 ) ibus? ( >=app-i18n/ibus-1.3 ) libssh2? ( net-libs/libssh2 ) nls? ( virtual/libintl ) uim? ( >=app-i18n/uim-1.0 ) scim? ( >=app-i18n/scim-1.4 ) m17n-lib? ( >=dev-libs/m17n-lib-1.2.0 ) dev-util/pkgconfig nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+|| ( sys-libs/libutempter sys-apps/utempter ) x11-libs/libX11 x11-libs/libICE x11-libs/libSM gtk? ( x11-libs/gtk+:2 ) xft? ( x11-libs/libXft ) bidi? ( >=dev-libs/fribidi-0.10.4 ) ibus? ( >=app-i18n/ibus-1.3 ) libssh2? ( net-libs/libssh2 ) nls? ( virtual/libintl ) uim? ( >=app-i18n/uim-1.0 ) scim? ( >=app-i18n/scim-1.4 ) m17n-lib? ( >=dev-libs/m17n-lib-1.2.0 ) dev-util/pkgconfig nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 || ( sys-libs/libutempter sys-apps/utempter ) x11-libs/libX11 x11-libs/libICE x11-libs/libSM gtk? ( x11-libs/gtk+:2 ) xft? ( x11-libs/libXft ) bidi? ( >=dev-libs/fribidi-0.10.4 ) ibus? ( >=app-i18n/ibus-1.3 ) libssh2? ( net-libs/libssh2 ) nls? ( virtual/libintl ) uim? ( >=app-i18n/uim-1.0 ) scim? ( >=app-i18n/scim-1.4 ) m17n-lib? ( >=dev-libs/m17n-lib-1.2.0 )
 0
 mirror://sourceforge/mlterm/mlterm-3.0.5.tar.gz
diff --git a/metadata/cache/x11-terms/mlterm-3.0.6 b/metadata/cache/x11-terms/mlterm-3.0.6
index f1a9bc18806e..c1434df60982 100644
--- a/metadata/cache/x11-terms/mlterm-3.0.6
+++ b/metadata/cache/x11-terms/mlterm-3.0.6
@@ -1,4 +1,4 @@
-|| ( sys-libs/libutempter sys-apps/utempter ) x11-libs/libX11 x11-libs/libICE x11-libs/libSM gtk? ( x11-libs/gtk+:2 ) xft? ( x11-libs/libXft ) bidi? ( >=dev-libs/fribidi-0.10.4 ) ibus? ( >=app-i18n/ibus-1.3 ) libssh2? ( net-libs/libssh2 ) nls? ( virtual/libintl ) uim? ( >=app-i18n/uim-1.0 ) scim? ( >=app-i18n/scim-1.4 ) m17n-lib? ( >=dev-libs/m17n-lib-1.2.0 ) dev-util/pkgconfig nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+|| ( sys-libs/libutempter sys-apps/utempter ) x11-libs/libX11 x11-libs/libICE x11-libs/libSM gtk? ( x11-libs/gtk+:2 ) xft? ( x11-libs/libXft ) bidi? ( >=dev-libs/fribidi-0.10.4 ) ibus? ( >=app-i18n/ibus-1.3 ) libssh2? ( net-libs/libssh2 ) nls? ( virtual/libintl ) uim? ( >=app-i18n/uim-1.0 ) scim? ( >=app-i18n/scim-1.4 ) m17n-lib? ( >=dev-libs/m17n-lib-1.2.0 ) dev-util/pkgconfig nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 || ( sys-libs/libutempter sys-apps/utempter ) x11-libs/libX11 x11-libs/libICE x11-libs/libSM gtk? ( x11-libs/gtk+:2 ) xft? ( x11-libs/libXft ) bidi? ( >=dev-libs/fribidi-0.10.4 ) ibus? ( >=app-i18n/ibus-1.3 ) libssh2? ( net-libs/libssh2 ) nls? ( virtual/libintl ) uim? ( >=app-i18n/uim-1.0 ) scim? ( >=app-i18n/scim-1.4 ) m17n-lib? ( >=dev-libs/m17n-lib-1.2.0 )
 0
 mirror://sourceforge/mlterm/mlterm-3.0.6.tar.gz
diff --git a/metadata/cache/x11-terms/mlterm-3.0.7 b/metadata/cache/x11-terms/mlterm-3.0.7
index 4931abc04ecd..24ff23eb2ffc 100644
--- a/metadata/cache/x11-terms/mlterm-3.0.7
+++ b/metadata/cache/x11-terms/mlterm-3.0.7
@@ -1,4 +1,4 @@
-|| ( sys-libs/libutempter sys-apps/utempter ) x11-libs/libX11 x11-libs/libICE x11-libs/libSM gtk? ( x11-libs/gtk+:2 ) xft? ( x11-libs/libXft ) bidi? ( >=dev-libs/fribidi-0.10.4 ) ibus? ( >=app-i18n/ibus-1.3 ) libssh2? ( net-libs/libssh2 ) nls? ( virtual/libintl ) uim? ( >=app-i18n/uim-1.0 ) scim? ( >=app-i18n/scim-1.4 ) m17n-lib? ( >=dev-libs/m17n-lib-1.2.0 ) dev-util/pkgconfig nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+|| ( sys-libs/libutempter sys-apps/utempter ) x11-libs/libX11 x11-libs/libICE x11-libs/libSM gtk? ( x11-libs/gtk+:2 ) xft? ( x11-libs/libXft ) bidi? ( >=dev-libs/fribidi-0.10.4 ) ibus? ( >=app-i18n/ibus-1.3 ) libssh2? ( net-libs/libssh2 ) nls? ( virtual/libintl ) uim? ( >=app-i18n/uim-1.0 ) scim? ( >=app-i18n/scim-1.4 ) m17n-lib? ( >=dev-libs/m17n-lib-1.2.0 ) dev-util/pkgconfig nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 || ( sys-libs/libutempter sys-apps/utempter ) x11-libs/libX11 x11-libs/libICE x11-libs/libSM gtk? ( x11-libs/gtk+:2 ) xft? ( x11-libs/libXft ) bidi? ( >=dev-libs/fribidi-0.10.4 ) ibus? ( >=app-i18n/ibus-1.3 ) libssh2? ( net-libs/libssh2 ) nls? ( virtual/libintl ) uim? ( >=app-i18n/uim-1.0 ) scim? ( >=app-i18n/scim-1.4 ) m17n-lib? ( >=dev-libs/m17n-lib-1.2.0 )
 0
 mirror://sourceforge/mlterm/mlterm-3.0.7.tar.gz
diff --git a/metadata/cache/x11-terms/mlterm-3.0.8 b/metadata/cache/x11-terms/mlterm-3.0.8
index 8c215b3cb28a..c6036ab5f171 100644
--- a/metadata/cache/x11-terms/mlterm-3.0.8
+++ b/metadata/cache/x11-terms/mlterm-3.0.8
@@ -1,4 +1,4 @@
-|| ( sys-libs/libutempter sys-apps/utempter ) x11-libs/libX11 x11-libs/libICE x11-libs/libSM gtk? ( x11-libs/gtk+:2 ) xft? ( x11-libs/libXft ) bidi? ( >=dev-libs/fribidi-0.10.4 ) ibus? ( >=app-i18n/ibus-1.3 ) libssh2? ( net-libs/libssh2 ) nls? ( virtual/libintl ) uim? ( >=app-i18n/uim-1.0 ) scim? ( >=app-i18n/scim-1.4 ) m17n-lib? ( >=dev-libs/m17n-lib-1.2.0 ) dev-util/pkgconfig nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+|| ( sys-libs/libutempter sys-apps/utempter ) x11-libs/libX11 x11-libs/libICE x11-libs/libSM gtk? ( x11-libs/gtk+:2 ) xft? ( x11-libs/libXft ) bidi? ( >=dev-libs/fribidi-0.10.4 ) ibus? ( >=app-i18n/ibus-1.3 ) libssh2? ( net-libs/libssh2 ) nls? ( virtual/libintl ) uim? ( >=app-i18n/uim-1.0 ) scim? ( >=app-i18n/scim-1.4 ) m17n-lib? ( >=dev-libs/m17n-lib-1.2.0 ) dev-util/pkgconfig nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 || ( sys-libs/libutempter sys-apps/utempter ) x11-libs/libX11 x11-libs/libICE x11-libs/libSM gtk? ( x11-libs/gtk+:2 ) xft? ( x11-libs/libXft ) bidi? ( >=dev-libs/fribidi-0.10.4 ) ibus? ( >=app-i18n/ibus-1.3 ) libssh2? ( net-libs/libssh2 ) nls? ( virtual/libintl ) uim? ( >=app-i18n/uim-1.0 ) scim? ( >=app-i18n/scim-1.4 ) m17n-lib? ( >=dev-libs/m17n-lib-1.2.0 )
 0
 mirror://sourceforge/mlterm/mlterm-3.0.8.tar.gz
diff --git a/metadata/cache/x11-terms/mlterm-3.0.9 b/metadata/cache/x11-terms/mlterm-3.0.9
index 2026026efbff..17e2d1dbd287 100644
--- a/metadata/cache/x11-terms/mlterm-3.0.9
+++ b/metadata/cache/x11-terms/mlterm-3.0.9
@@ -1,4 +1,4 @@
-|| ( sys-libs/libutempter sys-apps/utempter ) x11-libs/libX11 x11-libs/libICE x11-libs/libSM gtk? ( x11-libs/gtk+:2 ) xft? ( x11-libs/libXft ) bidi? ( >=dev-libs/fribidi-0.10.4 ) ibus? ( >=app-i18n/ibus-1.3 ) libssh2? ( net-libs/libssh2 ) nls? ( virtual/libintl ) uim? ( >=app-i18n/uim-1.0 ) scim? ( >=app-i18n/scim-1.4 ) m17n-lib? ( >=dev-libs/m17n-lib-1.2.0 ) dev-util/pkgconfig nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+|| ( sys-libs/libutempter sys-apps/utempter ) x11-libs/libX11 x11-libs/libICE x11-libs/libSM gtk? ( x11-libs/gtk+:2 ) xft? ( x11-libs/libXft ) bidi? ( >=dev-libs/fribidi-0.10.4 ) ibus? ( >=app-i18n/ibus-1.3 ) libssh2? ( net-libs/libssh2 ) nls? ( virtual/libintl ) uim? ( >=app-i18n/uim-1.0 ) scim? ( >=app-i18n/scim-1.4 ) m17n-lib? ( >=dev-libs/m17n-lib-1.2.0 ) dev-util/pkgconfig nls? ( sys-devel/gettext ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 || ( sys-libs/libutempter sys-apps/utempter ) x11-libs/libX11 x11-libs/libICE x11-libs/libSM gtk? ( x11-libs/gtk+:2 ) xft? ( x11-libs/libXft ) bidi? ( >=dev-libs/fribidi-0.10.4 ) ibus? ( >=app-i18n/ibus-1.3 ) libssh2? ( net-libs/libssh2 ) nls? ( virtual/libintl ) uim? ( >=app-i18n/uim-1.0 ) scim? ( >=app-i18n/scim-1.4 ) m17n-lib? ( >=dev-libs/m17n-lib-1.2.0 )
 0
 mirror://sourceforge/mlterm/mlterm-3.0.9.tar.gz
diff --git a/metadata/cache/x11-terms/mrxvt-0.5.4 b/metadata/cache/x11-terms/mrxvt-0.5.4
index 883ec831aeae..815856f4f25a 100644
--- a/metadata/cache/x11-terms/mrxvt-0.5.4
+++ b/metadata/cache/x11-terms/mrxvt-0.5.4
@@ -1,4 +1,4 @@
-png? ( media-libs/libpng ) utempter? ( sys-libs/libutempter ) jpeg? ( virtual/jpeg ) truetype? ( x11-libs/libXft media-libs/fontconfig media-libs/freetype ) x11-libs/libX11 x11-libs/libXt xpm? ( x11-libs/libXpm ) x11-libs/libXrender x11-proto/xproto || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+png? ( media-libs/libpng ) utempter? ( sys-libs/libutempter ) jpeg? ( virtual/jpeg ) truetype? ( x11-libs/libXft media-libs/fontconfig media-libs/freetype ) x11-libs/libX11 x11-libs/libXt xpm? ( x11-libs/libXpm ) x11-libs/libXrender x11-proto/xproto || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 png? ( media-libs/libpng ) utempter? ( sys-libs/libutempter ) jpeg? ( virtual/jpeg ) truetype? ( x11-libs/libXft media-libs/fontconfig media-libs/freetype ) x11-libs/libX11 x11-libs/libXt xpm? ( x11-libs/libXpm ) x11-libs/libXrender
 0
 mirror://sourceforge/materm/mrxvt-0.5.4.tar.gz
diff --git a/metadata/cache/x11-terms/rxvt-unicode-9.12-r1 b/metadata/cache/x11-terms/rxvt-unicode-9.12-r1
index fb0287739b09..8cb278631a20 100644
--- a/metadata/cache/x11-terms/rxvt-unicode-9.12-r1
+++ b/metadata/cache/x11-terms/rxvt-unicode-9.12-r1
@@ -1,4 +1,4 @@
-x11-libs/libX11 x11-libs/libXft x11-libs/libXrender >=sys-libs/ncurses-5.7-r6 afterimage? ( || ( media-libs/libafterimage x11-wm/afterstep ) ) perl? ( dev-lang/perl ) pixbuf? ( x11-libs/gdk-pixbuf x11-libs/gtk+:2 ) kernel_Darwin? ( dev-perl/Mac-Pasteboard ) dev-util/pkgconfig x11-proto/xproto || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+x11-libs/libX11 x11-libs/libXft x11-libs/libXrender >=sys-libs/ncurses-5.7-r6 afterimage? ( || ( media-libs/libafterimage x11-wm/afterstep ) ) perl? ( dev-lang/perl ) pixbuf? ( x11-libs/gdk-pixbuf x11-libs/gtk+:2 ) kernel_Darwin? ( dev-perl/Mac-Pasteboard ) dev-util/pkgconfig x11-proto/xproto || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 x11-libs/libX11 x11-libs/libXft x11-libs/libXrender >=sys-libs/ncurses-5.7-r6 afterimage? ( || ( media-libs/libafterimage x11-wm/afterstep ) ) perl? ( dev-lang/perl ) pixbuf? ( x11-libs/gdk-pixbuf x11-libs/gtk+:2 ) kernel_Darwin? ( dev-perl/Mac-Pasteboard )
 0
 http://dist.schmorp.de/rxvt-unicode/Attic/rxvt-unicode-9.12.tar.bz2
diff --git a/metadata/cache/x11-terms/rxvt-unicode-9.14 b/metadata/cache/x11-terms/rxvt-unicode-9.14
index 0f1f504fe0e3..7bd0b8c74895 100644
--- a/metadata/cache/x11-terms/rxvt-unicode-9.14
+++ b/metadata/cache/x11-terms/rxvt-unicode-9.14
@@ -1,4 +1,4 @@
->=sys-libs/ncurses-5.7-r6 afterimage? ( || ( media-libs/libafterimage x11-wm/afterstep ) ) kernel_Darwin? ( dev-perl/Mac-Pasteboard ) media-libs/fontconfig perl? ( dev-lang/perl ) pixbuf? ( x11-libs/gdk-pixbuf x11-libs/gtk+:2 ) startup-notification? ( x11-libs/startup-notification ) x11-libs/libX11 x11-libs/libXft x11-libs/libXrender dev-util/pkgconfig x11-proto/xproto || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=sys-libs/ncurses-5.7-r6 afterimage? ( || ( media-libs/libafterimage x11-wm/afterstep ) ) kernel_Darwin? ( dev-perl/Mac-Pasteboard ) media-libs/fontconfig perl? ( dev-lang/perl ) pixbuf? ( x11-libs/gdk-pixbuf x11-libs/gtk+:2 ) startup-notification? ( x11-libs/startup-notification ) x11-libs/libX11 x11-libs/libXft x11-libs/libXrender dev-util/pkgconfig x11-proto/xproto || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=sys-libs/ncurses-5.7-r6 afterimage? ( || ( media-libs/libafterimage x11-wm/afterstep ) ) kernel_Darwin? ( dev-perl/Mac-Pasteboard ) media-libs/fontconfig perl? ( dev-lang/perl ) pixbuf? ( x11-libs/gdk-pixbuf x11-libs/gtk+:2 ) startup-notification? ( x11-libs/startup-notification ) x11-libs/libX11 x11-libs/libXft x11-libs/libXrender
 0
 http://dist.schmorp.de/rxvt-unicode/Attic/rxvt-unicode-9.14.tar.bz2
diff --git a/metadata/cache/x11-terms/rxvt-unicode-9.15 b/metadata/cache/x11-terms/rxvt-unicode-9.15
index 5447a2892d01..2b6295a2e51c 100644
--- a/metadata/cache/x11-terms/rxvt-unicode-9.15
+++ b/metadata/cache/x11-terms/rxvt-unicode-9.15
@@ -1,4 +1,4 @@
->=sys-libs/ncurses-5.7-r6 afterimage? ( || ( media-libs/libafterimage x11-wm/afterstep ) ) kernel_Darwin? ( dev-perl/Mac-Pasteboard ) media-libs/fontconfig perl? ( dev-lang/perl ) pixbuf? ( x11-libs/gdk-pixbuf x11-libs/gtk+:2 ) startup-notification? ( x11-libs/startup-notification ) x11-libs/libX11 x11-libs/libXrender xft? ( x11-libs/libXft ) dev-util/pkgconfig x11-proto/xproto || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=sys-libs/ncurses-5.7-r6 afterimage? ( || ( media-libs/libafterimage x11-wm/afterstep ) ) kernel_Darwin? ( dev-perl/Mac-Pasteboard ) media-libs/fontconfig perl? ( dev-lang/perl ) pixbuf? ( x11-libs/gdk-pixbuf x11-libs/gtk+:2 ) startup-notification? ( x11-libs/startup-notification ) x11-libs/libX11 x11-libs/libXrender xft? ( x11-libs/libXft ) dev-util/pkgconfig x11-proto/xproto || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=sys-libs/ncurses-5.7-r6 afterimage? ( || ( media-libs/libafterimage x11-wm/afterstep ) ) kernel_Darwin? ( dev-perl/Mac-Pasteboard ) media-libs/fontconfig perl? ( dev-lang/perl ) pixbuf? ( x11-libs/gdk-pixbuf x11-libs/gtk+:2 ) startup-notification? ( x11-libs/startup-notification ) x11-libs/libX11 x11-libs/libXrender xft? ( x11-libs/libXft )
 0
 http://dist.schmorp.de/rxvt-unicode/Attic/rxvt-unicode-9.15.tar.bz2
diff --git a/metadata/cache/x11-themes/fvwm-themes-0.7.0 b/metadata/cache/x11-themes/fvwm-themes-0.7.0
index 2f4a9fa81105..27f37899cd77 100644
--- a/metadata/cache/x11-themes/fvwm-themes-0.7.0
+++ b/metadata/cache/x11-themes/fvwm-themes-0.7.0
@@ -1,4 +1,4 @@
->=x11-wm/fvwm-2.6.2 gnome? ( || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] ) ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=x11-wm/fvwm-2.6.2 gnome? ( || ( media-gfx/imagemagick media-gfx/graphicsmagick[imagemagick] ) ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=x11-wm/fvwm-2.6.2
 0
 mirror://sourceforge/fvwm-themes/fvwm-themes-0.7.0.tar.bz2
diff --git a/metadata/cache/x11-themes/gnome-icon-theme-2.91.7 b/metadata/cache/x11-themes/gnome-icon-theme-2.91.7
index 547b843f8e10..a0ade5a028c7 100644
--- a/metadata/cache/x11-themes/gnome-icon-theme-2.91.7
+++ b/metadata/cache/x11-themes/gnome-icon-theme-2.91.7
@@ -1,4 +1,4 @@
->=x11-themes/hicolor-icon-theme-0.10 >=x11-misc/icon-naming-utils-0.8.7 >=dev-util/pkgconfig-0.19 >=dev-util/intltool-0.40 sys-devel/gettext >=sys-apps/sed-4 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=x11-themes/hicolor-icon-theme-0.10 >=x11-misc/icon-naming-utils-0.8.7 >=dev-util/pkgconfig-0.19 >=dev-util/intltool-0.40 sys-devel/gettext >=sys-apps/sed-4 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=x11-themes/hicolor-icon-theme-0.10
 0
 mirror://gnome/sources/gnome-icon-theme/2.91/gnome-icon-theme-2.91.7.tar.bz2 branding? ( http://www.mail-archive.com/tango-artists@lists.freedesktop.org/msg00043/tango-gentoo-v1.1.tar.gz )
diff --git a/metadata/cache/x11-themes/gnome-icon-theme-3.0.0 b/metadata/cache/x11-themes/gnome-icon-theme-3.0.0
index b148aff28dfc..36fa238f33f8 100644
--- a/metadata/cache/x11-themes/gnome-icon-theme-3.0.0
+++ b/metadata/cache/x11-themes/gnome-icon-theme-3.0.0
@@ -1,4 +1,4 @@
->=x11-themes/hicolor-icon-theme-0.10 >=x11-misc/icon-naming-utils-0.8.7 >=dev-util/pkgconfig-0.19 >=dev-util/intltool-0.40 sys-devel/gettext >=sys-apps/sed-4 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=x11-themes/hicolor-icon-theme-0.10 >=x11-misc/icon-naming-utils-0.8.7 >=dev-util/pkgconfig-0.19 >=dev-util/intltool-0.40 sys-devel/gettext >=sys-apps/sed-4 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=x11-themes/hicolor-icon-theme-0.10
 0
 mirror://gnome/sources/gnome-icon-theme/3.0/gnome-icon-theme-3.0.0.tar.bz2 branding? ( http://www.mail-archive.com/tango-artists@lists.freedesktop.org/msg00043/tango-gentoo-v1.1.tar.gz )
diff --git a/metadata/cache/x11-themes/gnome-icon-theme-3.2.1.2 b/metadata/cache/x11-themes/gnome-icon-theme-3.2.1.2
index 4abcdc19fbd8..bfa897b0944d 100644
--- a/metadata/cache/x11-themes/gnome-icon-theme-3.2.1.2
+++ b/metadata/cache/x11-themes/gnome-icon-theme-3.2.1.2
@@ -1,4 +1,4 @@
->=x11-themes/hicolor-icon-theme-0.10 >=x11-misc/icon-naming-utils-0.8.7 >=dev-util/pkgconfig-0.19 >=dev-util/intltool-0.40 sys-devel/gettext app-arch/xz-utils >=sys-apps/sed-4 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=x11-themes/hicolor-icon-theme-0.10 >=x11-misc/icon-naming-utils-0.8.7 >=dev-util/pkgconfig-0.19 >=dev-util/intltool-0.40 sys-devel/gettext app-arch/xz-utils >=sys-apps/sed-4 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=x11-themes/hicolor-icon-theme-0.10
 0
 mirror://gnome/sources/gnome-icon-theme/3.2/gnome-icon-theme-3.2.1.2.tar.xz branding? ( http://www.mail-archive.com/tango-artists@lists.freedesktop.org/msg00043/tango-gentoo-v1.1.tar.gz )
diff --git a/metadata/cache/x11-themes/gnome-icon-theme-extras-2.30.1 b/metadata/cache/x11-themes/gnome-icon-theme-extras-2.30.1
index 3e370d83ab6f..09e9f47387c0 100644
--- a/metadata/cache/x11-themes/gnome-icon-theme-extras-2.30.1
+++ b/metadata/cache/x11-themes/gnome-icon-theme-extras-2.30.1
@@ -1,4 +1,4 @@
->=x11-themes/hicolor-icon-theme-0.10 >=x11-misc/icon-naming-utils-0.8.7 >=dev-util/pkgconfig-0.19 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+>=x11-themes/hicolor-icon-theme-0.10 >=x11-misc/icon-naming-utils-0.8.7 >=dev-util/pkgconfig-0.19 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 >=x11-themes/hicolor-icon-theme-0.10
 0
 mirror://gnome/sources/gnome-icon-theme-extras/2.30/gnome-icon-theme-extras-2.30.1.tar.bz2
diff --git a/metadata/cache/x11-themes/gnome-icon-theme-extras-3.0.0 b/metadata/cache/x11-themes/gnome-icon-theme-extras-3.0.0
index 266d3501667d..1eef91448343 100644
--- a/metadata/cache/x11-themes/gnome-icon-theme-extras-3.0.0
+++ b/metadata/cache/x11-themes/gnome-icon-theme-extras-3.0.0
@@ -1,4 +1,4 @@
->=x11-themes/hicolor-icon-theme-0.10 >=x11-misc/icon-naming-utils-0.8.7 >=dev-util/pkgconfig-0.19 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+>=x11-themes/hicolor-icon-theme-0.10 >=x11-misc/icon-naming-utils-0.8.7 >=dev-util/pkgconfig-0.19 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 >=x11-themes/hicolor-icon-theme-0.10
 0
 mirror://gnome/sources/gnome-icon-theme-extras/3.0/gnome-icon-theme-extras-3.0.0.tar.bz2
diff --git a/metadata/cache/x11-themes/gnome-themes-extras-2.22.0-r1 b/metadata/cache/x11-themes/gnome-themes-extras-2.22.0-r1
index 6331a12b0a10..368a4e12b550 100644
--- a/metadata/cache/x11-themes/gnome-themes-extras-2.22.0-r1
+++ b/metadata/cache/x11-themes/gnome-themes-extras-2.22.0-r1
@@ -1,4 +1,4 @@
->=x11-libs/gtk+-2.6:2 >=x11-themes/gtk-engines-2.14:2 >=x11-misc/icon-naming-utils-0.8.1 gnome-base/librsvg dev-util/pkgconfig >=dev-util/intltool-0.23 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+>=x11-libs/gtk+-2.6:2 >=x11-themes/gtk-engines-2.14:2 >=x11-misc/icon-naming-utils-0.8.1 gnome-base/librsvg dev-util/pkgconfig >=dev-util/intltool-0.23 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 >=x11-libs/gtk+-2.6:2 >=x11-themes/gtk-engines-2.14:2 >=x11-misc/icon-naming-utils-0.8.1 gnome-base/librsvg
 0
 mirror://gnome/sources/gnome-themes-extras/2.22/gnome-themes-extras-2.22.0.tar.bz2
diff --git a/metadata/cache/x11-themes/gtk-engines-candido-0.9.1 b/metadata/cache/x11-themes/gtk-engines-candido-0.9.1
index bdb2b6b3a992..eeb746104023 100644
--- a/metadata/cache/x11-themes/gtk-engines-candido-0.9.1
+++ b/metadata/cache/x11-themes/gtk-engines-candido-0.9.1
@@ -1,4 +1,4 @@
->=x11-libs/gtk+-2.8:2 dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=x11-libs/gtk+-2.8:2 dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=x11-libs/gtk+-2.8:2
 0
 mirror://berlios/candido/candido-engine-0.9.1.tar.bz2
diff --git a/metadata/cache/x11-themes/gtk-engines-cleanice-2.4.1 b/metadata/cache/x11-themes/gtk-engines-cleanice-2.4.1
index 349b8252bd20..0bb15f726271 100644
--- a/metadata/cache/x11-themes/gtk-engines-cleanice-2.4.1
+++ b/metadata/cache/x11-themes/gtk-engines-cleanice-2.4.1
@@ -1,4 +1,4 @@
->=x11-libs/gtk+-2.4:2 dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=x11-libs/gtk+-2.4:2 dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=x11-libs/gtk+-2.4:2
 2
 mirror://sourceforge/elysium-project/gtk-engines-cleanice-2.4.1.tar.gz
diff --git a/metadata/cache/x11-themes/gtk-engines-dwerg-0.8 b/metadata/cache/x11-themes/gtk-engines-dwerg-0.8
index a2bfc456ce45..07ad4a8136e1 100644
--- a/metadata/cache/x11-themes/gtk-engines-dwerg-0.8
+++ b/metadata/cache/x11-themes/gtk-engines-dwerg-0.8
@@ -1,4 +1,4 @@
-x11-libs/gtk+:2 dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+x11-libs/gtk+:2 dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 x11-libs/gtk+:2
 2
 http://download.freshmeat.net/themes/dwerg/dwerg-default-0.8.tar.gz
diff --git a/metadata/cache/x11-themes/gtk-engines-experience-0.10.4 b/metadata/cache/x11-themes/gtk-engines-experience-0.10.4
index c363e65a53ea..8aaf06fcae0d 100644
--- a/metadata/cache/x11-themes/gtk-engines-experience-0.10.4
+++ b/metadata/cache/x11-themes/gtk-engines-experience-0.10.4
@@ -1,4 +1,4 @@
->=x11-libs/gtk+-2.6:2 >=dev-util/pkgconfig-0.9 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=x11-libs/gtk+-2.6:2 >=dev-util/pkgconfig-0.9 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=x11-libs/gtk+-2.6:2
 2
 http://benjamin.sipsolutions.net/experience/experience-0.10.4.tar.bz2
diff --git a/metadata/cache/x11-themes/gtk-engines-flat-2.0-r2 b/metadata/cache/x11-themes/gtk-engines-flat-2.0-r2
index e8079837b984..f46c7642de5d 100644
--- a/metadata/cache/x11-themes/gtk-engines-flat-2.0-r2
+++ b/metadata/cache/x11-themes/gtk-engines-flat-2.0-r2
@@ -1,4 +1,4 @@
-x11-libs/gtk+:2 dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+x11-libs/gtk+:2 dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 x11-libs/gtk+:2
 2
 http://download.freshmeat.net/themes/gtk2flat/gtk2flat-default.tar.gz
diff --git a/metadata/cache/x11-themes/gtk-engines-nimbus-0.1.4 b/metadata/cache/x11-themes/gtk-engines-nimbus-0.1.4
index e312cd634883..74c7e82a97b7 100644
--- a/metadata/cache/x11-themes/gtk-engines-nimbus-0.1.4
+++ b/metadata/cache/x11-themes/gtk-engines-nimbus-0.1.4
@@ -1,4 +1,4 @@
->=x11-libs/gtk+-2.6:2 >=x11-misc/icon-naming-utils-0.8.1 dev-util/pkgconfig dev-util/intltool kernel_Interix? ( || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool ) >=sys-apps/sed-4
+>=x11-libs/gtk+-2.6:2 >=x11-misc/icon-naming-utils-0.8.1 dev-util/pkgconfig dev-util/intltool kernel_Interix? ( || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool ) >=sys-apps/sed-4
 >=x11-libs/gtk+-2.6:2
 0
 http://dlc.sun.com/osol/jds/downloads/extras/nimbus/nimbus-0.1.4.tar.bz2
diff --git a/metadata/cache/x11-themes/gtk-engines-nimbus-0.1.7 b/metadata/cache/x11-themes/gtk-engines-nimbus-0.1.7
index 0bd7feccab52..af9731673741 100644
--- a/metadata/cache/x11-themes/gtk-engines-nimbus-0.1.7
+++ b/metadata/cache/x11-themes/gtk-engines-nimbus-0.1.7
@@ -1,4 +1,4 @@
-x11-libs/gtk+:2 >=x11-misc/icon-naming-utils-0.8.1 dev-util/pkgconfig dev-util/intltool kernel_Interix? ( || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool ) >=sys-apps/sed-4
+x11-libs/gtk+:2 >=x11-misc/icon-naming-utils-0.8.1 dev-util/pkgconfig dev-util/intltool kernel_Interix? ( || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool ) >=sys-apps/sed-4
 x11-libs/gtk+:2
 0
 http://dlc.sun.com/osol/jds/downloads/extras/nimbus/nimbus-0.1.7.tar.bz2
diff --git a/metadata/cache/x11-themes/gtk-engines-qtpixmap-0.28-r2 b/metadata/cache/x11-themes/gtk-engines-qtpixmap-0.28-r2
index 74a37008d84f..e26982dc3685 100644
--- a/metadata/cache/x11-themes/gtk-engines-qtpixmap-0.28-r2
+++ b/metadata/cache/x11-themes/gtk-engines-qtpixmap-0.28-r2
@@ -1,4 +1,4 @@
-x11-libs/gtk+:2 dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+x11-libs/gtk+:2 dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 x11-libs/gtk+:2
 0
 http://www.cpdrummond.freeuk.com/QtPixmap-0.28.tar.gz
diff --git a/metadata/cache/x11-themes/gtk-engines-quartz-0.2 b/metadata/cache/x11-themes/gtk-engines-quartz-0.2
index cfc5d3d91202..452c9343ec16 100644
--- a/metadata/cache/x11-themes/gtk-engines-quartz-0.2
+++ b/metadata/cache/x11-themes/gtk-engines-quartz-0.2
@@ -1,4 +1,4 @@
->=x11-libs/gtk+-2.10:2 dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=x11-libs/gtk+-2.10:2 dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=x11-libs/gtk+-2.10:2
 0
 http://downloads.sourceforge.net/project/gtk-osx/GTK%20Quartz%20Engine/gtk-quartz-engine-0.2.tar.gz
diff --git a/metadata/cache/x11-themes/gtk-engines-rezlooks-0.6 b/metadata/cache/x11-themes/gtk-engines-rezlooks-0.6
index 0badc6c53135..fe6001294c35 100644
--- a/metadata/cache/x11-themes/gtk-engines-rezlooks-0.6
+++ b/metadata/cache/x11-themes/gtk-engines-rezlooks-0.6
@@ -1,4 +1,4 @@
->=x11-libs/gtk+-2.8:2 dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=x11-libs/gtk+-2.8:2 dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=x11-libs/gtk+-2.8:2
 0
 http://www.gnome-look.org/content/files/39179-rezlooks-0.6.tar.gz
diff --git a/metadata/cache/x11-themes/gtk-engines-ubuntulooks-0.9.12-r3 b/metadata/cache/x11-themes/gtk-engines-ubuntulooks-0.9.12-r3
index 5caaa3a3ec5a..e4e700b77bb3 100644
--- a/metadata/cache/x11-themes/gtk-engines-ubuntulooks-0.9.12-r3
+++ b/metadata/cache/x11-themes/gtk-engines-ubuntulooks-0.9.12-r3
@@ -1,4 +1,4 @@
->=x11-libs/gtk+-2.8:2 dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=x11-libs/gtk+-2.8:2 dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=x11-libs/gtk+-2.8:2
 0
 mirror://ubuntu/pool/main/u/ubuntulooks/ubuntulooks_0.9.12.orig.tar.gz mirror://ubuntu/pool/main/u/ubuntulooks/ubuntulooks_0.9.12-12.diff.gz
diff --git a/metadata/cache/x11-themes/redhat-artwork-5.0.8-r4 b/metadata/cache/x11-themes/redhat-artwork-5.0.8-r4
index 3736f3c7a851..3a9c1ecc10f1 100644
--- a/metadata/cache/x11-themes/redhat-artwork-5.0.8-r4
+++ b/metadata/cache/x11-themes/redhat-artwork-5.0.8-r4
@@ -1,4 +1,4 @@
-x11-libs/gtk+:2 dev-util/pkgconfig dev-util/intltool media-gfx/icon-slicer >=app-arch/rpm2targz-9.0.0.3g || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+x11-libs/gtk+:2 dev-util/pkgconfig dev-util/intltool media-gfx/icon-slicer >=app-arch/rpm2targz-9.0.0.3g || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 x11-libs/gtk+:2
 0
 http://download.fedora.redhat.com/pub/fedora/linux/core/development/source/SRPMS/redhat-artwork-5.0.8-4.fc7.src.rpm
diff --git a/metadata/cache/x11-themes/sound-theme-freedesktop-0.7 b/metadata/cache/x11-themes/sound-theme-freedesktop-0.7
index 3bd13ba0e494..73813dac9729 100644
--- a/metadata/cache/x11-themes/sound-theme-freedesktop-0.7
+++ b/metadata/cache/x11-themes/sound-theme-freedesktop-0.7
@@ -1,4 +1,4 @@
-sys-devel/gettext dev-libs/glib:2 >=dev-util/intltool-0.40 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+sys-devel/gettext dev-libs/glib:2 >=dev-util/intltool-0.40 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 
 0
 http://cgit.freedesktop.org/sound-theme-freedesktop/snapshot/sound-theme-freedesktop-0.7.tar.bz2
diff --git a/metadata/cache/x11-themes/tangerine-icon-theme-0.26 b/metadata/cache/x11-themes/tangerine-icon-theme-0.26
index 34c94c098b97..6da8178b038b 100644
--- a/metadata/cache/x11-themes/tangerine-icon-theme-0.26
+++ b/metadata/cache/x11-themes/tangerine-icon-theme-0.26
@@ -1,4 +1,4 @@
->=gnome-base/librsvg-2.12.3 || ( media-gfx/imagemagick[png?] media-gfx/graphicsmagick[imagemagick,png?] ) >=x11-misc/icon-naming-utils-0.8.2 dev-util/pkgconfig dev-util/intltool sys-devel/gettext || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+>=gnome-base/librsvg-2.12.3 || ( media-gfx/imagemagick[png?] media-gfx/graphicsmagick[imagemagick,png?] ) >=x11-misc/icon-naming-utils-0.8.2 dev-util/pkgconfig dev-util/intltool sys-devel/gettext || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 >=x11-themes/gnome-icon-theme-2.24
 0
 mirror://gentoo/tangerine-icon-theme_0.26.tar.gz http://www.gentoo.org/images/gentoo-logo.svg
diff --git a/metadata/cache/x11-themes/tango-icon-theme-extras-0.1.0-r1 b/metadata/cache/x11-themes/tango-icon-theme-extras-0.1.0-r1
index c9cda82bd3f1..b212e4aebcfd 100644
--- a/metadata/cache/x11-themes/tango-icon-theme-extras-0.1.0-r1
+++ b/metadata/cache/x11-themes/tango-icon-theme-extras-0.1.0-r1
@@ -1,4 +1,4 @@
->=x11-themes/tango-icon-theme-0.8.90 dev-util/pkgconfig >=gnome-base/librsvg-2.12.3 || ( media-gfx/imagemagick[png?] media-gfx/graphicsmagick[imagemagick,png?] ) >=x11-misc/icon-naming-utils-0.8.90 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+>=x11-themes/tango-icon-theme-0.8.90 dev-util/pkgconfig >=gnome-base/librsvg-2.12.3 || ( media-gfx/imagemagick[png?] media-gfx/graphicsmagick[imagemagick,png?] ) >=x11-misc/icon-naming-utils-0.8.90 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 >=x11-themes/tango-icon-theme-0.8.90
 0
 http://tango.freedesktop.org/releases/tango-icon-theme-extras-0.1.0.tar.gz
diff --git a/metadata/cache/x11-wm/afterstep-2.2.11 b/metadata/cache/x11-wm/afterstep-2.2.11
index 8d93ed0f5e1e..ee92fb2b5aeb 100644
--- a/metadata/cache/x11-wm/afterstep-2.2.11
+++ b/metadata/cache/x11-wm/afterstep-2.2.11
@@ -1,4 +1,4 @@
-media-libs/freetype alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) jpeg? ( virtual/jpeg ) gif? ( >=media-libs/giflib-4.1.0 ) gtk? ( x11-libs/gtk+:2 ) png? ( media-libs/libpng:0 ) svg? ( gnome-base/librsvg:2 ) tiff? ( media-libs/tiff:0 ) x11-libs/libICE x11-libs/libXext x11-libs/libSM x11-libs/libXmu x11-libs/libXt x11-libs/libX11 x11-libs/libXpm x11-libs/libXrender xinerama? ( x11-libs/libXinerama ) !!media-libs/libafterimage x11-proto/xextproto x11-proto/xproto xinerama? ( x11-proto/xineramaproto ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+media-libs/freetype alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) jpeg? ( virtual/jpeg ) gif? ( >=media-libs/giflib-4.1.0 ) gtk? ( x11-libs/gtk+:2 ) png? ( media-libs/libpng:0 ) svg? ( gnome-base/librsvg:2 ) tiff? ( media-libs/tiff:0 ) x11-libs/libICE x11-libs/libXext x11-libs/libSM x11-libs/libXmu x11-libs/libXt x11-libs/libX11 x11-libs/libXpm x11-libs/libXrender xinerama? ( x11-libs/libXinerama ) !!media-libs/libafterimage x11-proto/xextproto x11-proto/xproto xinerama? ( x11-proto/xineramaproto ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 media-libs/freetype alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) jpeg? ( virtual/jpeg ) gif? ( >=media-libs/giflib-4.1.0 ) gtk? ( x11-libs/gtk+:2 ) png? ( media-libs/libpng:0 ) svg? ( gnome-base/librsvg:2 ) tiff? ( media-libs/tiff:0 ) x11-libs/libICE x11-libs/libXext x11-libs/libSM x11-libs/libXmu x11-libs/libXt x11-libs/libX11 x11-libs/libXpm x11-libs/libXrender xinerama? ( x11-libs/libXinerama )
 0
 ftp://ftp.afterstep.org/stable/AfterStep-2.2.11.tar.bz2 mirror://sourceforge/afterstep/AfterStep-2.2.11.tar.bz2
diff --git a/metadata/cache/x11-wm/afterstep-2.2.9 b/metadata/cache/x11-wm/afterstep-2.2.9
index 07d98836a761..8c4ba21dd5ec 100644
--- a/metadata/cache/x11-wm/afterstep-2.2.9
+++ b/metadata/cache/x11-wm/afterstep-2.2.9
@@ -1,4 +1,4 @@
-media-libs/freetype alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) jpeg? ( virtual/jpeg ) gif? ( >=media-libs/giflib-4.1.0 ) gtk? ( x11-libs/gtk+:2 ) png? ( media-libs/libpng:0 ) svg? ( gnome-base/librsvg:2 ) tiff? ( media-libs/tiff:0 ) x11-libs/libICE x11-libs/libXext x11-libs/libSM x11-libs/libXmu x11-libs/libXt x11-libs/libX11 x11-libs/libXpm x11-libs/libXrender xinerama? ( x11-libs/libXinerama ) x11-proto/xextproto x11-proto/xproto xinerama? ( x11-proto/xineramaproto ) !!media-libs/libafterimage || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+media-libs/freetype alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) jpeg? ( virtual/jpeg ) gif? ( >=media-libs/giflib-4.1.0 ) gtk? ( x11-libs/gtk+:2 ) png? ( media-libs/libpng:0 ) svg? ( gnome-base/librsvg:2 ) tiff? ( media-libs/tiff:0 ) x11-libs/libICE x11-libs/libXext x11-libs/libSM x11-libs/libXmu x11-libs/libXt x11-libs/libX11 x11-libs/libXpm x11-libs/libXrender xinerama? ( x11-libs/libXinerama ) x11-proto/xextproto x11-proto/xproto xinerama? ( x11-proto/xineramaproto ) !!media-libs/libafterimage || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 media-libs/freetype alsa? ( media-libs/alsa-lib ) dbus? ( sys-apps/dbus ) jpeg? ( virtual/jpeg ) gif? ( >=media-libs/giflib-4.1.0 ) gtk? ( x11-libs/gtk+:2 ) png? ( media-libs/libpng:0 ) svg? ( gnome-base/librsvg:2 ) tiff? ( media-libs/tiff:0 ) x11-libs/libICE x11-libs/libXext x11-libs/libSM x11-libs/libXmu x11-libs/libXt x11-libs/libX11 x11-libs/libXpm x11-libs/libXrender xinerama? ( x11-libs/libXinerama )
 0
 ftp://ftp.afterstep.org/stable/AfterStep-2.2.9.tar.bz2
diff --git a/metadata/cache/x11-wm/compiz-0.8.6-r3 b/metadata/cache/x11-wm/compiz-0.8.6-r3
index 0e8bb6781d37..63f3b00abd77 100644
--- a/metadata/cache/x11-wm/compiz-0.8.6-r3
+++ b/metadata/cache/x11-wm/compiz-0.8.6-r3
@@ -1,4 +1,4 @@
-dev-libs/glib:2 dev-libs/libxml2:2 dev-libs/libxslt media-libs/libpng >=media-libs/mesa-6.5.1-r1 >=x11-base/xorg-server-1.1.1-r1 >=x11-libs/libX11-1.4 x11-libs/libxcb x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXinerama x11-libs/libXrandr x11-libs/libICE x11-libs/libSM >=x11-libs/libXrender-0.8.4 >=x11-libs/startup-notification-0.7 cairo? ( x11-libs/cairo[X] ) fuse? ( sys-fs/fuse ) gnome? ( >=gnome-base/gnome-control-center-2.16.1:2 gnome-base/gnome-desktop:2 gconf? ( gnome-base/gconf:2 ) ) gtk? ( >=x11-libs/gtk+-2.8.0:2 >=x11-libs/libwnck-2.18.3:1 x11-libs/pango ) kde? ( || ( >=kde-base/kwin-4.2.0 kde-base/kwin:live ) ) svg? ( >=gnome-base/librsvg-2.14.0:2 >=x11-libs/cairo-1.0 ) dev-util/pkgconfig x11-proto/damageproto x11-proto/xineramaproto || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+dev-libs/glib:2 dev-libs/libxml2:2 dev-libs/libxslt media-libs/libpng >=media-libs/mesa-6.5.1-r1 >=x11-base/xorg-server-1.1.1-r1 >=x11-libs/libX11-1.4 x11-libs/libxcb x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXinerama x11-libs/libXrandr x11-libs/libICE x11-libs/libSM >=x11-libs/libXrender-0.8.4 >=x11-libs/startup-notification-0.7 cairo? ( x11-libs/cairo[X] ) fuse? ( sys-fs/fuse ) gnome? ( >=gnome-base/gnome-control-center-2.16.1:2 gnome-base/gnome-desktop:2 gconf? ( gnome-base/gconf:2 ) ) gtk? ( >=x11-libs/gtk+-2.8.0:2 >=x11-libs/libwnck-2.18.3:1 x11-libs/pango ) kde? ( || ( >=kde-base/kwin-4.2.0 kde-base/kwin:live ) ) svg? ( >=gnome-base/librsvg-2.14.0:2 >=x11-libs/cairo-1.0 ) dev-util/pkgconfig x11-proto/damageproto x11-proto/xineramaproto || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 dev-libs/glib:2 dev-libs/libxml2:2 dev-libs/libxslt media-libs/libpng >=media-libs/mesa-6.5.1-r1 >=x11-base/xorg-server-1.1.1-r1 >=x11-libs/libX11-1.4 x11-libs/libxcb x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXinerama x11-libs/libXrandr x11-libs/libICE x11-libs/libSM >=x11-libs/libXrender-0.8.4 >=x11-libs/startup-notification-0.7 cairo? ( x11-libs/cairo[X] ) fuse? ( sys-fs/fuse ) gnome? ( >=gnome-base/gnome-control-center-2.16.1:2 gnome-base/gnome-desktop:2 gconf? ( gnome-base/gconf:2 ) ) gtk? ( >=x11-libs/gtk+-2.8.0:2 >=x11-libs/libwnck-2.18.3:1 x11-libs/pango ) kde? ( || ( >=kde-base/kwin-4.2.0 kde-base/kwin:live ) ) svg? ( >=gnome-base/librsvg-2.14.0:2 >=x11-libs/cairo-1.0 ) x11-apps/mesa-progs x11-apps/xvinfo
 0
 http://releases.compiz.org/0.8.6/compiz-0.8.6.tar.bz2
diff --git a/metadata/cache/x11-wm/enlightenment-0.16.9999 b/metadata/cache/x11-wm/enlightenment-0.16.9999
index 14f252b94cfd..1e2c0fe8794c 100644
--- a/metadata/cache/x11-wm/enlightenment-0.16.9999
+++ b/metadata/cache/x11-wm/enlightenment-0.16.9999
@@ -1,4 +1,4 @@
-pulseaudio? ( media-sound/pulseaudio ) dbus? ( sys-apps/dbus ) pango? ( x11-libs/pango ) =media-libs/freetype-2* >=media-libs/imlib2-1.3.0[X] x11-libs/libSM x11-libs/libICE x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXdamage x11-libs/libXxf86vm x11-libs/libXft xrandr? ( x11-libs/libXrandr ) x11-libs/libXrender x11-misc/xbitmaps xinerama? ( x11-libs/libXinerama ) xcomposite? ( x11-libs/libXcomposite ) nls? ( virtual/libintl ) virtual/libiconv dev-util/pkgconfig x11-proto/xextproto x11-proto/xf86vidmodeproto xinerama? ( x11-proto/xineramaproto ) xcomposite? ( x11-proto/compositeproto ) x11-proto/xproto nls? ( sys-devel/gettext ) dev-vcs/subversion net-misc/rsync || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+pulseaudio? ( media-sound/pulseaudio ) dbus? ( sys-apps/dbus ) pango? ( x11-libs/pango ) =media-libs/freetype-2* >=media-libs/imlib2-1.3.0[X] x11-libs/libSM x11-libs/libICE x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXdamage x11-libs/libXxf86vm x11-libs/libXft xrandr? ( x11-libs/libXrandr ) x11-libs/libXrender x11-misc/xbitmaps xinerama? ( x11-libs/libXinerama ) xcomposite? ( x11-libs/libXcomposite ) nls? ( virtual/libintl ) virtual/libiconv dev-util/pkgconfig x11-proto/xextproto x11-proto/xf86vidmodeproto xinerama? ( x11-proto/xineramaproto ) xcomposite? ( x11-proto/compositeproto ) x11-proto/xproto nls? ( sys-devel/gettext ) dev-vcs/subversion net-misc/rsync || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 pulseaudio? ( media-sound/pulseaudio ) dbus? ( sys-apps/dbus ) pango? ( x11-libs/pango ) =media-libs/freetype-2* >=media-libs/imlib2-1.3.0[X] x11-libs/libSM x11-libs/libICE x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes x11-libs/libXdamage x11-libs/libXxf86vm x11-libs/libXft xrandr? ( x11-libs/libXrandr ) x11-libs/libXrender x11-misc/xbitmaps xinerama? ( x11-libs/libXinerama ) xcomposite? ( x11-libs/libXcomposite ) nls? ( virtual/libintl ) virtual/libiconv
 0
 
diff --git a/metadata/cache/x11-wm/icewm-1.2.37 b/metadata/cache/x11-wm/icewm-1.2.37
index df1668f14b0d..0c9bc73c61d8 100644
--- a/metadata/cache/x11-wm/icewm-1.2.37
+++ b/metadata/cache/x11-wm/icewm-1.2.37
@@ -1,4 +1,4 @@
-x11-libs/libX11 x11-libs/libXrandr x11-libs/libXext x11-libs/libXpm x11-libs/libXrender x11-libs/libXft x11-libs/libSM x11-libs/libICE xinerama? ( x11-libs/libXinerama ) gnome? ( gnome-base/gnome-desktop:2 gnome-base/libgnomeui ) imlib? ( >=media-libs/imlib-1.9.10-r1 ) nls? ( sys-devel/gettext ) truetype? ( >=media-libs/freetype-2.0.9 ) media-libs/giflib x11-proto/xproto x11-proto/xextproto xinerama? ( x11-proto/xineramaproto ) >=sys-apps/sed-4 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+x11-libs/libX11 x11-libs/libXrandr x11-libs/libXext x11-libs/libXpm x11-libs/libXrender x11-libs/libXft x11-libs/libSM x11-libs/libICE xinerama? ( x11-libs/libXinerama ) gnome? ( gnome-base/gnome-desktop:2 gnome-base/libgnomeui ) imlib? ( >=media-libs/imlib-1.9.10-r1 ) nls? ( sys-devel/gettext ) truetype? ( >=media-libs/freetype-2.0.9 ) media-libs/giflib x11-proto/xproto x11-proto/xextproto xinerama? ( x11-proto/xineramaproto ) >=sys-apps/sed-4 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 x11-libs/libX11 x11-libs/libXrandr x11-libs/libXext x11-libs/libXpm x11-libs/libXrender x11-libs/libXft x11-libs/libSM x11-libs/libICE xinerama? ( x11-libs/libXinerama ) gnome? ( gnome-base/gnome-desktop:2 gnome-base/libgnomeui ) imlib? ( >=media-libs/imlib-1.9.10-r1 ) nls? ( sys-devel/gettext ) truetype? ( >=media-libs/freetype-2.0.9 ) media-libs/giflib
 0
 mirror://sourceforge/icewm/icewm-1.2.37.tar.gz
diff --git a/metadata/cache/x11-wm/openbox-3.5.0-r1 b/metadata/cache/x11-wm/openbox-3.5.0-r1
index ab4a1370dbb5..e5d7923f1196 100644
--- a/metadata/cache/x11-wm/openbox-3.5.0-r1
+++ b/metadata/cache/x11-wm/openbox-3.5.0-r1
@@ -1,4 +1,4 @@
-dev-libs/glib:2 >=dev-libs/libxml2-2.0 dev-python/pyxdg >=media-libs/fontconfig-2 x11-libs/libXft x11-libs/libXrandr x11-libs/libXt >=x11-libs/pango-1.8[X] imlib? ( media-libs/imlib2 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) x11-libs/libXinerama sys-devel/gettext dev-util/pkgconfig x11-proto/xextproto x11-proto/xf86vidmodeproto x11-proto/xineramaproto || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-libs/glib:2 >=dev-libs/libxml2-2.0 dev-python/pyxdg >=media-libs/fontconfig-2 x11-libs/libXft x11-libs/libXrandr x11-libs/libXt >=x11-libs/pango-1.8[X] imlib? ( media-libs/imlib2 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) x11-libs/libXinerama sys-devel/gettext dev-util/pkgconfig x11-proto/xextproto x11-proto/xf86vidmodeproto x11-proto/xineramaproto || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-libs/glib:2 >=dev-libs/libxml2-2.0 dev-python/pyxdg >=media-libs/fontconfig-2 x11-libs/libXft x11-libs/libXrandr x11-libs/libXt >=x11-libs/pango-1.8[X] imlib? ( media-libs/imlib2 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) x11-libs/libXinerama
 3
 http://openbox.org/dist/openbox/openbox-3.5.0.tar.gz
diff --git a/metadata/cache/x11-wm/openbox-3.5.0_p20111019 b/metadata/cache/x11-wm/openbox-3.5.0_p20111019
index 0681760a539c..5dbaee50c111 100644
--- a/metadata/cache/x11-wm/openbox-3.5.0_p20111019
+++ b/metadata/cache/x11-wm/openbox-3.5.0_p20111019
@@ -1,4 +1,4 @@
-dev-libs/glib:2 >=dev-libs/libxml2-2.0 dev-python/pyxdg >=media-libs/fontconfig-2 x11-libs/libXft x11-libs/libXrandr x11-libs/libXt >=x11-libs/pango-1.8[X] imlib? ( media-libs/imlib2 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) x11-libs/libXinerama sys-devel/gettext dev-util/pkgconfig x11-proto/xextproto x11-proto/xf86vidmodeproto x11-proto/xineramaproto || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-libs/glib:2 >=dev-libs/libxml2-2.0 dev-python/pyxdg >=media-libs/fontconfig-2 x11-libs/libXft x11-libs/libXrandr x11-libs/libXt >=x11-libs/pango-1.8[X] imlib? ( media-libs/imlib2 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) x11-libs/libXinerama sys-devel/gettext dev-util/pkgconfig x11-proto/xextproto x11-proto/xf86vidmodeproto x11-proto/xineramaproto || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-libs/glib:2 >=dev-libs/libxml2-2.0 dev-python/pyxdg >=media-libs/fontconfig-2 x11-libs/libXft x11-libs/libXrandr x11-libs/libXt >=x11-libs/pango-1.8[X] imlib? ( media-libs/imlib2 ) startup-notification? ( >=x11-libs/startup-notification-0.8 ) x11-libs/libXinerama
 3
 http://dev.gentoo.org/~hwoarang/distfiles/openbox-3.5.0_p20111019.tar.gz
diff --git a/metadata/cache/x11-wm/ratpoison-1.4.5 b/metadata/cache/x11-wm/ratpoison-1.4.5
index 45d64a027f26..d7e40507a11b 100644
--- a/metadata/cache/x11-wm/ratpoison-1.4.5
+++ b/metadata/cache/x11-wm/ratpoison-1.4.5
@@ -1,4 +1,4 @@
-x11-libs/libXinerama x11-libs/libXtst virtual/perl-PodParser emacs? ( virtual/emacs ) history? ( sys-libs/readline ) xft? ( x11-libs/libXft ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+x11-libs/libXinerama x11-libs/libXtst virtual/perl-PodParser emacs? ( virtual/emacs ) history? ( sys-libs/readline ) xft? ( x11-libs/libXft ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 x11-libs/libXinerama x11-libs/libXtst virtual/perl-PodParser emacs? ( virtual/emacs ) history? ( sys-libs/readline ) xft? ( x11-libs/libXft )
 0
 http://savannah.nongnu.org/download/ratpoison/ratpoison-1.4.5.tar.gz
diff --git a/metadata/cache/x11-wm/selectwm-0.4.1 b/metadata/cache/x11-wm/selectwm-0.4.1
index 9b24aecf04d5..cb0feb953f07 100644
--- a/metadata/cache/x11-wm/selectwm-0.4.1
+++ b/metadata/cache/x11-wm/selectwm-0.4.1
@@ -1,4 +1,4 @@
-x11-libs/gtk+:2 dev-libs/glib:2 dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+x11-libs/gtk+:2 dev-libs/glib:2 dev-util/pkgconfig || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 x11-libs/gtk+:2 dev-libs/glib:2
 2
 http://ordiluc.net/selectwm/selectwm-0.4.1.tar.bz2
diff --git a/metadata/cache/x11-wm/windowmaker-0.92.0-r11 b/metadata/cache/x11-wm/windowmaker-0.92.0-r11
index f1f706ec2ab2..54fb5c4e692d 100644
--- a/metadata/cache/x11-wm/windowmaker-0.92.0-r11
+++ b/metadata/cache/x11-wm/windowmaker-0.92.0-r11
@@ -1,4 +1,4 @@
-media-libs/fontconfig >=x11-libs/libXft-2.1.0 x11-libs/libXt x11-libs/libXv gif? ( >=media-libs/giflib-4.1.0-r3 ) png? ( media-libs/libpng:0 ) jpeg? ( virtual/jpeg ) tiff? ( media-libs/tiff:0 ) xinerama? ( x11-libs/libXinerama ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+media-libs/fontconfig >=x11-libs/libXft-2.1.0 x11-libs/libXt x11-libs/libXv gif? ( >=media-libs/giflib-4.1.0-r3 ) png? ( media-libs/libpng:0 ) jpeg? ( virtual/jpeg ) tiff? ( media-libs/tiff:0 ) xinerama? ( x11-libs/libXinerama ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 media-libs/fontconfig >=x11-libs/libXft-2.1.0 x11-libs/libXt x11-libs/libXv gif? ( >=media-libs/giflib-4.1.0-r3 ) png? ( media-libs/libpng:0 ) jpeg? ( virtual/jpeg ) tiff? ( media-libs/tiff:0 ) xinerama? ( x11-libs/libXinerama ) nls? ( >=sys-devel/gettext-0.10.39 )
 0
 ftp://ftp.windowmaker.info/pub/source/release/WindowMaker-0.92.0.tar.gz http://www.windowmaker.info/pub/source/release/WindowMaker-extra-0.1.tar.gz mirror://gentoo/windowmaker-0.92.0-patchset-5.tar.bz2
diff --git a/metadata/cache/x11-wm/windowmaker-0.95.1 b/metadata/cache/x11-wm/windowmaker-0.95.1
index 3754b21c1e40..3dd5e44efcc7 100644
--- a/metadata/cache/x11-wm/windowmaker-0.95.1
+++ b/metadata/cache/x11-wm/windowmaker-0.95.1
@@ -1,4 +1,4 @@
-media-libs/fontconfig >=x11-libs/libXft-2.1.0 x11-libs/libXmu x11-libs/libXt x11-libs/libXv gif? ( >=media-libs/giflib-4.1.0-r3 ) png? ( media-libs/libpng:0 ) jpeg? ( virtual/jpeg ) tiff? ( media-libs/tiff:0 ) xinerama? ( x11-libs/libXinerama ) xrandr? ( x11-libs/libXrandr ) || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+media-libs/fontconfig >=x11-libs/libXft-2.1.0 x11-libs/libXmu x11-libs/libXt x11-libs/libXv gif? ( >=media-libs/giflib-4.1.0-r3 ) png? ( media-libs/libpng:0 ) jpeg? ( virtual/jpeg ) tiff? ( media-libs/tiff:0 ) xinerama? ( x11-libs/libXinerama ) xrandr? ( x11-libs/libXrandr ) || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 media-libs/fontconfig >=x11-libs/libXft-2.1.0 x11-libs/libXmu x11-libs/libXt x11-libs/libXv gif? ( >=media-libs/giflib-4.1.0-r3 ) png? ( media-libs/libpng:0 ) jpeg? ( virtual/jpeg ) tiff? ( media-libs/tiff:0 ) xinerama? ( x11-libs/libXinerama ) xrandr? ( x11-libs/libXrandr ) nls? ( >=sys-devel/gettext-0.10.39 )
 0
 http://dev.gentoo.org/~voyageur/distfiles/WindowMaker-0.95.1.tar.gz http://www.windowmaker.org/pub/source/release/WindowMaker-extra-0.1.tar.gz
diff --git a/metadata/cache/xfce-base/exo-0.6.2-r1 b/metadata/cache/xfce-base/exo-0.6.2-r1
index 88cb2e5cc5ae..1efec9beb956 100644
--- a/metadata/cache/xfce-base/exo-0.6.2-r1
+++ b/metadata/cache/xfce-base/exo-0.6.2-r1
@@ -1,4 +1,4 @@
->=dev-lang/perl-5.6 >=dev-libs/glib-2.18 dev-perl/URI >=x11-libs/gtk+-2.14:2 >=xfce-base/libxfce4util-4.8 python? ( >=dev-python/pygtk-2.4 ) dev-util/intltool dev-util/pkgconfig sys-devel/gettext python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) ) >=sys-apps/sed-4 >=dev-util/xfce4-dev-tools-4.9.1 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-lang/perl-5.6 >=dev-libs/glib-2.18 dev-perl/URI >=x11-libs/gtk+-2.14:2 >=xfce-base/libxfce4util-4.8 python? ( >=dev-python/pygtk-2.4 ) dev-util/intltool dev-util/pkgconfig sys-devel/gettext python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) ) >=sys-apps/sed-4 >=dev-util/xfce4-dev-tools-4.9.1 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=dev-lang/perl-5.6 >=dev-libs/glib-2.18 dev-perl/URI >=x11-libs/gtk+-2.14:2 >=xfce-base/libxfce4util-4.8 python? ( >=dev-python/pygtk-2.4 ) python? ( || ( =dev-lang/python-2.7* =dev-lang/python-2.6* ) )
 0
 mirror://xfce/src/xfce/exo/0.6/exo-0.6.2.tar.bz2
diff --git a/metadata/cache/xfce-base/xfce4-session-4.8.3-r1 b/metadata/cache/xfce-base/xfce4-session-4.8.3-r1
index d79f0938c50c..6b3da391abf5 100644
--- a/metadata/cache/xfce-base/xfce4-session-4.8.3-r1
+++ b/metadata/cache/xfce-base/xfce4-session-4.8.3-r1
@@ -1,4 +1,4 @@
->=dev-libs/dbus-glib-0.92 x11-apps/iceauth x11-libs/libSM >=x11-libs/libwnck-2.22:1 x11-libs/libX11 >=xfce-base/libxfce4util-4.8 >=xfce-base/libxfce4ui-4.8 >=xfce-base/xfconf-4.8 >=xfce-base/xfce-utils-4.8 gnome? ( gnome-base/gconf:2 ) gnome-keyring? ( gnome-base/libgnome-keyring ) xfce_plugins_logout? ( >=xfce-base/xfce4-panel-4.8 ) dev-util/intltool dev-util/pkgconfig sys-devel/gettext >=sys-apps/sed-4 >=dev-util/xfce4-dev-tools-4.9.1 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-libs/dbus-glib-0.92 x11-apps/iceauth x11-libs/libSM >=x11-libs/libwnck-2.22:1 x11-libs/libX11 >=xfce-base/libxfce4util-4.8 >=xfce-base/libxfce4ui-4.8 >=xfce-base/xfconf-4.8 >=xfce-base/xfce-utils-4.8 gnome? ( gnome-base/gconf:2 ) gnome-keyring? ( gnome-base/libgnome-keyring ) xfce_plugins_logout? ( >=xfce-base/xfce4-panel-4.8 ) dev-util/intltool dev-util/pkgconfig sys-devel/gettext >=sys-apps/sed-4 >=dev-util/xfce4-dev-tools-4.9.1 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=dev-libs/dbus-glib-0.92 x11-apps/iceauth x11-libs/libSM >=x11-libs/libwnck-2.22:1 x11-libs/libX11 >=xfce-base/libxfce4util-4.8 >=xfce-base/libxfce4ui-4.8 >=xfce-base/xfconf-4.8 >=xfce-base/xfce-utils-4.8 gnome? ( gnome-base/gconf:2 ) gnome-keyring? ( gnome-base/libgnome-keyring ) xfce_plugins_logout? ( >=xfce-base/xfce4-panel-4.8 ) consolekit? ( || ( sys-auth/consolekit sys-apps/systemd ) ) policykit? ( >=sys-auth/polkit-0.102 ) udev? ( sys-power/upower )
 0
 mirror://xfce/src/xfce/xfce4-session/4.8/xfce4-session-4.8.3.tar.bz2
diff --git a/metadata/cache/xfce-extra/thunar-media-tags-plugin-0.2.0 b/metadata/cache/xfce-extra/thunar-media-tags-plugin-0.2.0
index b42e950a5fc5..719ba13e8a27 100644
--- a/metadata/cache/xfce-extra/thunar-media-tags-plugin-0.2.0
+++ b/metadata/cache/xfce-extra/thunar-media-tags-plugin-0.2.0
@@ -1,4 +1,4 @@
->=media-libs/taglib-1.6 >=x11-libs/gtk+-2.12:2 >=xfce-base/exo-0.6 >=xfce-base/thunar-1.2 dev-util/intltool dev-util/pkgconfig >=sys-apps/sed-4 >=dev-util/xfce4-dev-tools-4.9.1 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=media-libs/taglib-1.6 >=x11-libs/gtk+-2.12:2 >=xfce-base/exo-0.6 >=xfce-base/thunar-1.2 dev-util/intltool dev-util/pkgconfig >=sys-apps/sed-4 >=dev-util/xfce4-dev-tools-4.9.1 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=media-libs/taglib-1.6 >=x11-libs/gtk+-2.12:2 >=xfce-base/exo-0.6 >=xfce-base/thunar-1.2
 0
 mirror://xfce/src/thunar-plugins/thunar-media-tags-plugin/0.2/thunar-media-tags-plugin-0.2.0.tar.bz2
diff --git a/metadata/cache/xfce-extra/thunar-shares-plugin-0.2.0_p20101105 b/metadata/cache/xfce-extra/thunar-shares-plugin-0.2.0_p20101105
index ff6855e61da8..82dc5de4847f 100644
--- a/metadata/cache/xfce-extra/thunar-shares-plugin-0.2.0_p20101105
+++ b/metadata/cache/xfce-extra/thunar-shares-plugin-0.2.0_p20101105
@@ -1,4 +1,4 @@
->=dev-libs/glib-2.18:2 >=x11-libs/gtk+-2.12:2 >=xfce-base/thunar-1.1.0 dev-util/intltool dev-util/pkgconfig >=sys-apps/sed-4 >=dev-util/xfce4-dev-tools-4.9.1 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-libs/glib-2.18:2 >=x11-libs/gtk+-2.12:2 >=xfce-base/thunar-1.1.0 dev-util/intltool dev-util/pkgconfig >=sys-apps/sed-4 >=dev-util/xfce4-dev-tools-4.9.1 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=dev-libs/glib-2.18:2 >=x11-libs/gtk+-2.12:2 >=xfce-base/thunar-1.1.0
 0
 mirror://gentoo/thunar-shares-plugin-0.2.0_p20101105.tar.bz2
diff --git a/metadata/cache/xfce-extra/transd-0_p20110501 b/metadata/cache/xfce-extra/transd-0_p20110501
index 6399efc16339..b1366b38f31a 100644
--- a/metadata/cache/xfce-extra/transd-0_p20110501
+++ b/metadata/cache/xfce-extra/transd-0_p20110501
@@ -1,4 +1,4 @@
-x11-libs/libX11 >=xfce-base/libxfcegui4-4.8 dev-util/intltool dev-util/pkgconfig >=sys-apps/sed-4 dev-util/intltool >=dev-util/xfce4-dev-tools-4.9.1 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+x11-libs/libX11 >=xfce-base/libxfcegui4-4.8 dev-util/intltool dev-util/pkgconfig >=sys-apps/sed-4 dev-util/intltool >=dev-util/xfce4-dev-tools-4.9.1 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 x11-libs/libX11 >=xfce-base/libxfcegui4-4.8
 0
 mirror://gentoo/transd-0_p20110501.tar.xz
diff --git a/metadata/cache/xfce-extra/xfce4-cellmodem-plugin-0.0.5 b/metadata/cache/xfce-extra/xfce4-cellmodem-plugin-0.0.5
index 050e5ead91de..56d3759b9492 100644
--- a/metadata/cache/xfce-extra/xfce4-cellmodem-plugin-0.0.5
+++ b/metadata/cache/xfce-extra/xfce4-cellmodem-plugin-0.0.5
@@ -1,4 +1,4 @@
->=xfce-base/xfce4-panel-4.8 >=xfce-base/libxfcegui4-4.8 sys-apps/pciutils[zlib] virtual/libusb:0 dev-util/intltool dev-util/pkgconfig >=sys-apps/sed-4 dev-util/intltool >=dev-util/xfce4-dev-tools-4.9.1 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=xfce-base/xfce4-panel-4.8 >=xfce-base/libxfcegui4-4.8 sys-apps/pciutils[zlib] virtual/libusb:0 dev-util/intltool dev-util/pkgconfig >=sys-apps/sed-4 dev-util/intltool >=dev-util/xfce4-dev-tools-4.9.1 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=xfce-base/xfce4-panel-4.8 >=xfce-base/libxfcegui4-4.8 sys-apps/pciutils[zlib] virtual/libusb:0
 0
 mirror://xfce/src/panel-plugins/xfce4-cellmodem-plugin/0.0/xfce4-cellmodem-plugin-0.0.5.tar.gz
diff --git a/metadata/cache/xfce-extra/xfce4-clipman-plugin-1.1.3 b/metadata/cache/xfce-extra/xfce4-clipman-plugin-1.1.3
index e0351c4c5e56..089fe94de98b 100644
--- a/metadata/cache/xfce-extra/xfce4-clipman-plugin-1.1.3
+++ b/metadata/cache/xfce-extra/xfce4-clipman-plugin-1.1.3
@@ -1,4 +1,4 @@
->=dev-libs/glib-2.16:2 dev-libs/libunique:1 >=gnome-base/libglade-2.6:2.0 >=x11-libs/gtk+-2.10:2 >=xfce-base/libxfce4util-4.8 >=xfce-base/libxfcegui4-4.8 >=xfce-base/xfce4-panel-4.8 >=xfce-base/xfconf-4.8 >=xfce-base/exo-0.6 dev-util/intltool dev-util/pkgconfig sys-devel/gettext >=sys-apps/sed-4 >=dev-util/xfce4-dev-tools-4.9.1 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-libs/glib-2.16:2 dev-libs/libunique:1 >=gnome-base/libglade-2.6:2.0 >=x11-libs/gtk+-2.10:2 >=xfce-base/libxfce4util-4.8 >=xfce-base/libxfcegui4-4.8 >=xfce-base/xfce4-panel-4.8 >=xfce-base/xfconf-4.8 >=xfce-base/exo-0.6 dev-util/intltool dev-util/pkgconfig sys-devel/gettext >=sys-apps/sed-4 >=dev-util/xfce4-dev-tools-4.9.1 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=dev-libs/glib-2.16:2 dev-libs/libunique:1 >=gnome-base/libglade-2.6:2.0 >=x11-libs/gtk+-2.10:2 >=xfce-base/libxfce4util-4.8 >=xfce-base/libxfcegui4-4.8 >=xfce-base/xfce4-panel-4.8 >=xfce-base/xfconf-4.8 >=xfce-base/exo-0.6
 0
 mirror://xfce/src/panel-plugins/xfce4-clipman-plugin/1.1/xfce4-clipman-plugin-1.1.3.tar.bz2
diff --git a/metadata/cache/xfce-extra/xfce4-dict-0.6.0 b/metadata/cache/xfce-extra/xfce4-dict-0.6.0
index 313604721920..97ed789c3df2 100644
--- a/metadata/cache/xfce-extra/xfce4-dict-0.6.0
+++ b/metadata/cache/xfce-extra/xfce4-dict-0.6.0
@@ -1,4 +1,4 @@
->=dev-libs/glib-2.6:2 >=x11-libs/gtk+-2.6:2 >=xfce-base/libxfcegui4-4.8 >=xfce-base/libxfce4util-4.8 >=xfce-base/xfce4-panel-4.8 dev-util/intltool dev-util/pkgconfig >=sys-apps/sed-4 >=dev-util/xfce4-dev-tools-4.9.1 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-libs/glib-2.6:2 >=x11-libs/gtk+-2.6:2 >=xfce-base/libxfcegui4-4.8 >=xfce-base/libxfce4util-4.8 >=xfce-base/xfce4-panel-4.8 dev-util/intltool dev-util/pkgconfig >=sys-apps/sed-4 >=dev-util/xfce4-dev-tools-4.9.1 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=dev-libs/glib-2.6:2 >=x11-libs/gtk+-2.6:2 >=xfce-base/libxfcegui4-4.8 >=xfce-base/libxfce4util-4.8 >=xfce-base/xfce4-panel-4.8
 0
 mirror://xfce/src/apps/xfce4-dict/0.6/xfce4-dict-0.6.0.tar.bz2
diff --git a/metadata/cache/xfce-extra/xfce4-diskperf-plugin-2.3.0 b/metadata/cache/xfce-extra/xfce4-diskperf-plugin-2.3.0
index 32417066f239..89647dbfd2ae 100644
--- a/metadata/cache/xfce-extra/xfce4-diskperf-plugin-2.3.0
+++ b/metadata/cache/xfce-extra/xfce4-diskperf-plugin-2.3.0
@@ -1,4 +1,4 @@
->=xfce-base/libxfcegui4-4.8 >=xfce-base/xfce4-panel-4.8 dev-util/pkgconfig dev-util/intltool >=sys-apps/sed-4 >=dev-util/xfce4-dev-tools-4.9.1 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=xfce-base/libxfcegui4-4.8 >=xfce-base/xfce4-panel-4.8 dev-util/pkgconfig dev-util/intltool >=sys-apps/sed-4 >=dev-util/xfce4-dev-tools-4.9.1 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=xfce-base/libxfcegui4-4.8 >=xfce-base/xfce4-panel-4.8
 0
 mirror://xfce/src/panel-plugins/xfce4-diskperf-plugin/2.3/xfce4-diskperf-plugin-2.3.0.tar.bz2
diff --git a/metadata/cache/xfce-extra/xfce4-linelight-plugin-0.1.6-r1 b/metadata/cache/xfce-extra/xfce4-linelight-plugin-0.1.6-r1
index 217589cc1ff0..6121b7f74c32 100644
--- a/metadata/cache/xfce-extra/xfce4-linelight-plugin-0.1.6-r1
+++ b/metadata/cache/xfce-extra/xfce4-linelight-plugin-0.1.6-r1
@@ -1,4 +1,4 @@
->=xfce-base/xfce4-panel-4.8 >=xfce-base/libxfcegui4-4.8 >=x11-libs/gtk+-2.12:2 >=dev-libs/glib-2.18:2 dev-util/pkgconfig sys-devel/gettext >=sys-apps/sed-4 >=dev-util/xfce4-dev-tools-4.9.1 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=xfce-base/xfce4-panel-4.8 >=xfce-base/libxfcegui4-4.8 >=x11-libs/gtk+-2.12:2 >=dev-libs/glib-2.18:2 dev-util/pkgconfig sys-devel/gettext >=sys-apps/sed-4 >=dev-util/xfce4-dev-tools-4.9.1 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=xfce-base/xfce4-panel-4.8 >=xfce-base/libxfcegui4-4.8 >=x11-libs/gtk+-2.12:2 >=dev-libs/glib-2.18:2 sys-apps/mlocate
 0
 mirror://xfce/src/panel-plugins/xfce4-linelight-plugin/0.1/xfce4-linelight-plugin-0.1.6.tar.bz2
diff --git a/metadata/cache/xfce-extra/xfce4-mailwatch-plugin-1.1.0 b/metadata/cache/xfce-extra/xfce4-mailwatch-plugin-1.1.0
index 3830ff06913d..87bd5dd97e83 100644
--- a/metadata/cache/xfce-extra/xfce4-mailwatch-plugin-1.1.0
+++ b/metadata/cache/xfce-extra/xfce4-mailwatch-plugin-1.1.0
@@ -1,4 +1,4 @@
->=xfce-base/libxfce4util-4.8 >=xfce-base/libxfcegui4-4.8 >=xfce-base/xfce4-panel-4.8 ssl? ( >=net-libs/gnutls-1.2 ) dev-util/intltool dev-util/pkgconfig >=sys-apps/sed-4 >=dev-util/xfce4-dev-tools-4.9.1 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=xfce-base/libxfce4util-4.8 >=xfce-base/libxfcegui4-4.8 >=xfce-base/xfce4-panel-4.8 ssl? ( >=net-libs/gnutls-1.2 ) dev-util/intltool dev-util/pkgconfig >=sys-apps/sed-4 >=dev-util/xfce4-dev-tools-4.9.1 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=xfce-base/libxfce4util-4.8 >=xfce-base/libxfcegui4-4.8 >=xfce-base/xfce4-panel-4.8 ssl? ( >=net-libs/gnutls-1.2 )
 0
 mirror://gentoo/xfce4-mailwatch-plugin-1.1.0.tar.bz2
diff --git a/metadata/cache/xfce-extra/xfce4-messenger-plugin-0.1.0 b/metadata/cache/xfce-extra/xfce4-messenger-plugin-0.1.0
index 8c3c99f91aa7..d3068e8891c5 100644
--- a/metadata/cache/xfce-extra/xfce4-messenger-plugin-0.1.0
+++ b/metadata/cache/xfce-extra/xfce4-messenger-plugin-0.1.0
@@ -1,4 +1,4 @@
-dev-libs/dbus-glib >=dev-libs/glib-2 sys-apps/dbus x11-libs/gtk+:2 >=xfce-base/libxfce4util-4.8 >=xfce-base/libxfcegui4-4.8 >=xfce-base/xfce4-panel-4.8 dev-util/intltool dev-util/pkgconfig >=sys-apps/sed-4 >=dev-util/xfce4-dev-tools-4.9.1 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+dev-libs/dbus-glib >=dev-libs/glib-2 sys-apps/dbus x11-libs/gtk+:2 >=xfce-base/libxfce4util-4.8 >=xfce-base/libxfcegui4-4.8 >=xfce-base/xfce4-panel-4.8 dev-util/intltool dev-util/pkgconfig >=sys-apps/sed-4 >=dev-util/xfce4-dev-tools-4.9.1 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 dev-libs/dbus-glib >=dev-libs/glib-2 sys-apps/dbus x11-libs/gtk+:2 >=xfce-base/libxfce4util-4.8 >=xfce-base/libxfcegui4-4.8 >=xfce-base/xfce4-panel-4.8
 0
 mirror://debian/pool/main/x/xfce4-messenger-plugin/xfce4-messenger-plugin_0.1.0.orig.tar.gz mirror://debian/pool/main/x/xfce4-messenger-plugin/xfce4-messenger-plugin_0.1.0-5.debian.tar.gz
diff --git a/metadata/cache/xfce-extra/xfce4-places-plugin-1.2.0-r1 b/metadata/cache/xfce-extra/xfce4-places-plugin-1.2.0-r1
index 1492f4112f39..239229b35183 100644
--- a/metadata/cache/xfce-extra/xfce4-places-plugin-1.2.0-r1
+++ b/metadata/cache/xfce-extra/xfce4-places-plugin-1.2.0-r1
@@ -1,4 +1,4 @@
->=dev-libs/glib-2.22 >=x11-libs/gtk+-2.14:2 >=xfce-base/exo-0.6 >=xfce-base/libxfce4ui-4.8 >=xfce-base/libxfce4util-4.8 >=xfce-base/xfce4-panel-4.8 libnotify? ( >=x11-libs/libnotify-0.7 ) dev-util/intltool dev-util/pkgconfig >=sys-apps/sed-4 >=dev-util/xfce4-dev-tools-4.9.1 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-libs/glib-2.22 >=x11-libs/gtk+-2.14:2 >=xfce-base/exo-0.6 >=xfce-base/libxfce4ui-4.8 >=xfce-base/libxfce4util-4.8 >=xfce-base/xfce4-panel-4.8 libnotify? ( >=x11-libs/libnotify-0.7 ) dev-util/intltool dev-util/pkgconfig >=sys-apps/sed-4 >=dev-util/xfce4-dev-tools-4.9.1 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=dev-libs/glib-2.22 >=x11-libs/gtk+-2.14:2 >=xfce-base/exo-0.6 >=xfce-base/libxfce4ui-4.8 >=xfce-base/libxfce4util-4.8 >=xfce-base/xfce4-panel-4.8 libnotify? ( >=x11-libs/libnotify-0.7 )
 0
 mirror://xfce/src/panel-plugins/xfce4-places-plugin/1.2/xfce4-places-plugin-1.2.0.tar.bz2 mirror://debian/pool/main/x/xfce4-places-plugin/xfce4-places-plugin_1.2.0-3.debian.tar.gz
diff --git a/metadata/cache/xfce-extra/xfce4-quicklauncher-plugin-1.9.4-r1 b/metadata/cache/xfce-extra/xfce4-quicklauncher-plugin-1.9.4-r1
index 8f94aca4ddff..941c0ba6085e 100644
--- a/metadata/cache/xfce-extra/xfce4-quicklauncher-plugin-1.9.4-r1
+++ b/metadata/cache/xfce-extra/xfce4-quicklauncher-plugin-1.9.4-r1
@@ -1,4 +1,4 @@
->=xfce-base/xfce4-panel-4.8 >=xfce-base/libxfcegui4-4.8 dev-util/pkgconfig dev-util/intltool >=sys-apps/sed-4 dev-util/intltool >=dev-util/xfce4-dev-tools-4.9.1 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=xfce-base/xfce4-panel-4.8 >=xfce-base/libxfcegui4-4.8 dev-util/pkgconfig dev-util/intltool >=sys-apps/sed-4 dev-util/intltool >=dev-util/xfce4-dev-tools-4.9.1 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=xfce-base/xfce4-panel-4.8 >=xfce-base/libxfcegui4-4.8
 0
 mirror://xfce/src/panel-plugins/xfce4-quicklauncher-plugin/1.9/xfce4-quicklauncher-plugin-1.9.4.tar.bz2
diff --git a/metadata/cache/xfce-extra/xfce4-screenshooter-1.8.0 b/metadata/cache/xfce-extra/xfce4-screenshooter-1.8.0
index a39a0a0edd19..8c62d6e47e74 100644
--- a/metadata/cache/xfce-extra/xfce4-screenshooter-1.8.0
+++ b/metadata/cache/xfce-extra/xfce4-screenshooter-1.8.0
@@ -1,4 +1,4 @@
->=dev-libs/glib-2.16:2 >=net-libs/libsoup-2.26.0 >=x11-libs/gdk-pixbuf-2.16:2 >=x11-libs/gtk+-2.16:2 x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes >=xfce-base/exo-0.5 >=xfce-base/xfce4-panel-4.8 >=xfce-base/libxfce4util-4.8 >=xfce-base/libxfce4ui-4.8 dev-util/intltool dev-util/pkgconfig >=sys-apps/sed-4 >=dev-util/xfce4-dev-tools-4.9.1 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=dev-libs/glib-2.16:2 >=net-libs/libsoup-2.26.0 >=x11-libs/gdk-pixbuf-2.16:2 >=x11-libs/gtk+-2.16:2 x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes >=xfce-base/exo-0.5 >=xfce-base/xfce4-panel-4.8 >=xfce-base/libxfce4util-4.8 >=xfce-base/libxfce4ui-4.8 dev-util/intltool dev-util/pkgconfig >=sys-apps/sed-4 >=dev-util/xfce4-dev-tools-4.9.1 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=dev-libs/glib-2.16:2 >=net-libs/libsoup-2.26.0 >=x11-libs/gdk-pixbuf-2.16:2 >=x11-libs/gtk+-2.16:2 x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes >=xfce-base/exo-0.5 >=xfce-base/xfce4-panel-4.8 >=xfce-base/libxfce4util-4.8 >=xfce-base/libxfce4ui-4.8
 0
 mirror://xfce/src/apps/xfce4-screenshooter/1.8/xfce4-screenshooter-1.8.0.tar.bz2
diff --git a/metadata/cache/xfce-extra/xfce4-sensors-plugin-1.2.3 b/metadata/cache/xfce-extra/xfce4-sensors-plugin-1.2.3
index acd061e73858..21dd73a704f5 100644
--- a/metadata/cache/xfce-extra/xfce4-sensors-plugin-1.2.3
+++ b/metadata/cache/xfce-extra/xfce4-sensors-plugin-1.2.3
@@ -1,4 +1,4 @@
->=x11-libs/gtk+-2.10:2 >=xfce-base/libxfce4ui-4.6 >=xfce-base/xfce4-panel-4.4 hddtemp? ( app-admin/hddtemp net-analyzer/gnu-netcat ) libnotify? ( >=x11-libs/libnotify-0.4 ) lm_sensors? ( >=sys-apps/lm_sensors-3.1.0 ) video_cards_nvidia? ( media-video/nvidia-settings ) dev-util/intltool dev-util/pkgconfig >=sys-apps/sed-4 >=dev-util/xfce4-dev-tools-4.9.1 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=x11-libs/gtk+-2.10:2 >=xfce-base/libxfce4ui-4.6 >=xfce-base/xfce4-panel-4.4 hddtemp? ( app-admin/hddtemp net-analyzer/gnu-netcat ) libnotify? ( >=x11-libs/libnotify-0.4 ) lm_sensors? ( >=sys-apps/lm_sensors-3.1.0 ) video_cards_nvidia? ( media-video/nvidia-settings ) dev-util/intltool dev-util/pkgconfig >=sys-apps/sed-4 >=dev-util/xfce4-dev-tools-4.9.1 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=x11-libs/gtk+-2.10:2 >=xfce-base/libxfce4ui-4.6 >=xfce-base/xfce4-panel-4.4 hddtemp? ( app-admin/hddtemp net-analyzer/gnu-netcat ) libnotify? ( >=x11-libs/libnotify-0.4 ) lm_sensors? ( >=sys-apps/lm_sensors-3.1.0 ) video_cards_nvidia? ( media-video/nvidia-settings )
 0
 mirror://xfce/src/panel-plugins/xfce4-sensors-plugin/1.2/xfce4-sensors-plugin-1.2.3.tar.bz2
diff --git a/metadata/cache/xfce-extra/xfce4-smartbookmark-plugin-0.4.2 b/metadata/cache/xfce-extra/xfce4-smartbookmark-plugin-0.4.2
index beb29cc88d07..13bcde9618ef 100644
--- a/metadata/cache/xfce-extra/xfce4-smartbookmark-plugin-0.4.2
+++ b/metadata/cache/xfce-extra/xfce4-smartbookmark-plugin-0.4.2
@@ -1,4 +1,4 @@
->=xfce-base/libxfcegui4-4.8 >=xfce-base/xfce4-panel-4.8 dev-util/pkgconfig dev-util/intltool >=sys-apps/sed-4 >=dev-util/xfce4-dev-tools-4.9.1 || ( >=sys-devel/automake-1.11.1 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+>=xfce-base/libxfcegui4-4.8 >=xfce-base/xfce4-panel-4.8 dev-util/pkgconfig dev-util/intltool >=sys-apps/sed-4 >=dev-util/xfce4-dev-tools-4.9.1 || ( >=sys-devel/automake-1.11.1:1.11 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 >=xfce-base/libxfcegui4-4.8 >=xfce-base/xfce4-panel-4.8 xfce-base/xfce-utils
 0
 mirror://xfce/src/panel-plugins/xfce4-smartbookmark-plugin/0.4/xfce4-smartbookmark-plugin-0.4.2.tar.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 417727cfd655..ec15732259b9 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Wed, 21 Mar 2012 11:36:46 +0000
+Thu, 22 Mar 2012 05:36:47 +0000
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 417727cfd655..ec15732259b9 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Wed, 21 Mar 2012 11:36:46 +0000
+Thu, 22 Mar 2012 05:36:47 +0000
diff --git a/metadata/herds.xml b/metadata/herds.xml
index c95bd44e71c0..25835e5001da 100644
--- a/metadata/herds.xml
+++ b/metadata/herds.xml
@@ -20,7 +20,7 @@
    always a description without a lang attribute. Also there are no overlapping
    descriptions allowed (multiple description tags with the same language)
 
-   $Header: /var/cvsroot/gentoo/xml/htdocs/proj/en/metastructure/herds/herds.xml,v 1.911 2012/03/18 19:27:51 pacho Exp $
+   $Header: /var/cvsroot/gentoo/xml/htdocs/proj/en/metastructure/herds/herds.xml,v 1.912 2012/03/21 11:40:44 pacho Exp $
 
 -->
 <herds>
@@ -1405,11 +1405,6 @@
       <name>Christian Ruppert</name>
   </maintainer>
 </herd>
-<herd>
-  <name>text-markup</name>
-  <email>text-markup@gentoo.org</email>
-  <description>Docbook-xml, Docbook-sgml, TeX and text utilities</description>
-</herd>
 <herd>
   <name>antivirus</name>
   <email>antivirus@gentoo.org</email>
@@ -1593,11 +1588,6 @@
     <name>Stanislav Ochotnický</name>
   </maintainer>
 </herd>
-<herd>
-  <name>net-zope</name>
-  <email>net-zope@gentoo.org</email>
-  <description>Zope and ZProduct packages</description>
-</herd>
 <herd>
   <name>dev-embedded</name>
   <email>dev-embedded@gentoo.org</email>
@@ -2192,11 +2182,6 @@
   <description>Handles all issues with VMware and VMware-related ebuilds in Gentoo</description>
     <maintainingproject>/proj/en/virtualization/vmware/index.xml</maintainingproject>
 </herd>
-<herd>
-  <name>www-servers</name>
-  <email>www-servers@gentoo.org</email>
-  <description>Web servers other than Apache</description>
-</herd>
 <herd>
   <name>nx</name>
   <email>nx@gentoo.org</email>
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index a7baa5b4bd6b..5267a152bc94 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Wed, 21 Mar 2012 11:36:48 +0000
+Thu, 22 Mar 2012 05:36:49 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 43f3fe1296be..11af6d964794 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Wed Mar 21 11:36:46 UTC 2012
+Thu Mar 22 05:36:47 UTC 2012
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 545a9a8af60f..94f85e40285d 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Wed, 21 Mar 2012 12:00:01 +0000
+Thu, 22 Mar 2012 06:00:01 +0000
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 2f41c4392429..9a9f20281b10 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1332329701 Wed Mar 21 11:35:01 2012 UTC
+1332394501 Thu Mar 22 05:35:01 2012 UTC
diff --git a/net-analyzer/bigeye/bigeye-0.3-r3.ebuild b/net-analyzer/bigeye/bigeye-0.3-r3.ebuild
index e99493ad13a2..3eee911f9fda 100644
--- a/net-analyzer/bigeye/bigeye-0.3-r3.ebuild
+++ b/net-analyzer/bigeye/bigeye-0.3-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/bigeye/bigeye-0.3-r3.ebuild,v 1.1 2011/08/01 01:41:43 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/bigeye/bigeye-0.3-r3.ebuild,v 1.2 2012/03/21 15:24:40 tomka Exp $
 
 EAPI="4"
 
@@ -13,7 +13,7 @@ SRC_URI="http://violating.us/projects/bigeye/download/${P}.tgz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc x86"
 IUSE=""
 
 DEPEND=""
diff --git a/net-analyzer/iptraf-ng/Manifest b/net-analyzer/iptraf-ng/Manifest
index a75df80e7f8d..b0509ecd2de1 100644
--- a/net-analyzer/iptraf-ng/Manifest
+++ b/net-analyzer/iptraf-ng/Manifest
@@ -1,3 +1,4 @@
 DIST iptraf-ng-1.0.2.tar.gz 876720 RMD160 0184ab4e2757cb11949d586d8447999a927f9c2a SHA1 bf606a6433e624fc5390fb4cd8ca6c1a8c4c77d9 SHA256 3df2bf83f86084367030a536d124b6a2b516c3531ba558f2c51c1cde99cba550
 DIST iptraf-ng-1.1.0.tar.gz 686018 RMD160 e8c2c55823c12d19c515dc51fc2fb06c3adc05fd SHA1 d4713d4897a0e86383eb65ceeeb37747cf4a0755 SHA256 e5dc15447b2780557532404ded82c716f30fff04e1cb2365c135bad63f94b6a8
+DIST iptraf-ng-1.1.1.20120321.tar.xz 381948 RMD160 08f4ae309c2b0edfd611091783bc76f8ad0631a7 SHA1 d6f796a523039d4d3ad96f395c0e36b5f9ace9c7 SHA256 c342768961668bc614f04427261764fa7186bdb9614e96bfe76a75922d008e75
 DIST iptraf-ng-1.1.1.tar.gz 684453 RMD160 29a2474c5327709bcf4e1ac805514602d494d493 SHA1 7aae1ec9b61e7994c0d0a6aa9b98a4f30a5bebb0 SHA256 02aaf76d4f16e48224a534ef7d64d4b3a5ee0ede53b46cacd35842abb7b9a681
diff --git a/net-analyzer/iptraf-ng/iptraf-ng-1.1.1.20120321.ebuild b/net-analyzer/iptraf-ng/iptraf-ng-1.1.1.20120321.ebuild
new file mode 100644
index 000000000000..ec014368cf83
--- /dev/null
+++ b/net-analyzer/iptraf-ng/iptraf-ng-1.1.1.20120321.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/iptraf-ng/iptraf-ng-1.1.1.20120321.ebuild,v 1.1 2012/03/21 19:05:42 jer Exp $
+
+EAPI=4
+
+DESCRIPTION="A console-based network monitoring utility"
+HOMEPAGE="http://fedorahosted.org/iptraf-ng/"
+SRC_URI="http://dev.gentoo.org/~jer/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE=""
+
+RDEPEND=">=sys-libs/ncurses-5.7-r7"
+DEPEND="${RDEPEND}
+	!net-analyzer/iptraf"
+
+DOCS="CHANGES FAQ README RELEASE-NOTES"
+
+src_prepare() {
+	./autogen.sh
+}
+
+src_install() {
+	default
+	dohtml -r Documentation
+	keepdir /var/{lib,log,lock}/iptraf-ng #376157
+}
diff --git a/net-analyzer/leechcraft-networkmonitor/Manifest b/net-analyzer/leechcraft-networkmonitor/Manifest
index 82981786c7aa..4eb4c41f47fc 100644
--- a/net-analyzer/leechcraft-networkmonitor/Manifest
+++ b/net-analyzer/leechcraft-networkmonitor/Manifest
@@ -1,3 +1,3 @@
 DIST leechcraft-0.4.99.tar.xz 4601736 RMD160 343e64a430cd55f401989b1c89a74a9c2ddf1e33 SHA1 c8275ea635d7ea579b95a70e64372658928752f7 SHA256 967ca3a9b942d71da7f4818ba912f12b386b553fe4abded04c7d1956473e4e42
-DIST leechcraft-0.5.0.tar.xz 4691312 RMD160 4ea82848fe59fcd1159fa835dfb94ff81775f964 SHA1 0d01a9b38fd1ce136d678803a1270538fb8e3cc4 SHA256 ef0802442b803079dc491f73ff0294cb8560d86fbea44c8e57b3d54fdf3b88fa
-DIST leechcraft-0.5.60.tar.xz 2048000 RMD160 505a90f631779a1918ea814602288732b4f8af89 SHA1 b03ce9bb160c00c6be2f50af4e061c5d7777d630 SHA256 b7ee7aff4b07fa383da169346979701f4a428fc29d4e8b77a31f27561b025baf
+DIST leechcraft-0.5.0.tar.xz 7240 RMD160 41109d2b24cf188f31bafc9d65950ecb223f1fb7 SHA1 e32a08d9926a8351fcdbc13649e0fe83bbefb84a SHA256 762751d75d2bfa76656b8a88feae193af3c9467f74749ba182212bbe72eea1fc
+DIST leechcraft-0.5.60.tar.xz 4743936 RMD160 e845b9f9e7b0bdebd2c99822ffd3e15c019f6051 SHA1 2941679520e6871372eac31d1e683615a8dd64e6 SHA256 477d8fc54167798337e64324575d12cf1cace4d6502bb14d892edd2ed4b5a7f4
diff --git a/net-analyzer/rrdtool/rrdtool-1.4.5-r1.ebuild b/net-analyzer/rrdtool/rrdtool-1.4.5-r1.ebuild
index 04615f091aa8..02e1f6e95c8c 100644
--- a/net-analyzer/rrdtool/rrdtool-1.4.5-r1.ebuild
+++ b/net-analyzer/rrdtool/rrdtool-1.4.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/rrdtool-1.4.5-r1.ebuild,v 1.8 2012/01/31 19:33:29 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/rrdtool-1.4.5-r1.ebuild,v 1.9 2012/03/22 03:24:47 jer Exp $
 
 EAPI="3"
 
@@ -110,17 +110,17 @@ src_install() {
 pkg_postinst() {
 	use python && distutils_pkg_postinst
 
-	ewarn "rrdtool dump 1.3 does emit completely legal xml. Basically this means that"
-	ewarn "it contains an xml header and a DOCTYPE definition. Unfortunately this"
-	ewarn "causes older versions of rrdtool restore to be unhappy."
+	ewarn "Since version 1.3, rrdtool dump emits completely legal xml. Basically this"
+	ewarn "means that it contains an xml header and a DOCTYPE definition. Unfortunately"
+	ewarn "this causes older versions of rrdtool restore to be unhappy."
 	ewarn
 	ewarn "To restore a new dump with an old rrdtool restore version, either remove"
 	ewarn "the xml header and the doctype by hand (both on the first line of the dump)"
 	ewarn "or use rrdtool dump --no-header."
 	ewarn
-	ewarn "Note: rrdtool-1.3.x doesn't have any default font bundled. Thus if you've"
-	ewarn "upgraded from rrdtool-1.2.x and don't have any font installed to make"
-	ewarn "lables visible, please, install some font, e.g. media-fonts/dejavu."
+	ewarn ">=net-analyzer/rrdtool-1.3 does not have any default font bundled. Thus if"
+	ewarn ">you've upgraded from rrdtool-1.2.x and don't have any font installed to make"
+	ewarn ">lables visible, please, install some font, e.g. media-fonts/dejavu."
 }
 
 pkg_postrm() {
diff --git a/net-analyzer/rrdtool/rrdtool-1.4.5-r2.ebuild b/net-analyzer/rrdtool/rrdtool-1.4.5-r2.ebuild
index e3b4de6a2ca2..490426230f62 100644
--- a/net-analyzer/rrdtool/rrdtool-1.4.5-r2.ebuild
+++ b/net-analyzer/rrdtool/rrdtool-1.4.5-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/rrdtool-1.4.5-r2.ebuild,v 1.1 2012/01/14 18:20:26 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/rrdtool/rrdtool-1.4.5-r2.ebuild,v 1.2 2012/03/22 03:24:47 jer Exp $
 
 EAPI="3"
 
@@ -111,17 +111,17 @@ src_install() {
 pkg_postinst() {
 	use python && distutils_pkg_postinst
 
-	ewarn "rrdtool dump 1.3 does emit completely legal xml. Basically this means that"
-	ewarn "it contains an xml header and a DOCTYPE definition. Unfortunately this"
-	ewarn "causes older versions of rrdtool restore to be unhappy."
+	ewarn "Since version 1.3, rrdtool dump emits completely legal xml.  Basically this"
+	ewarn "means that it contains an xml header and a DOCTYPE definition.  Unfortunately"
+	ewarn "this causes older versions of rrdtool restore to be unhappy."
 	ewarn
 	ewarn "To restore a new dump with an old rrdtool restore version, either remove"
 	ewarn "the xml header and the doctype by hand (both on the first line of the dump)"
 	ewarn "or use rrdtool dump --no-header."
 	ewarn
-	ewarn "Note: rrdtool-1.3.x doesn't have any default font bundled. Thus if you've"
-	ewarn "upgraded from rrdtool-1.2.x and don't have any font installed to make"
-	ewarn "lables visible, please, install some font, e.g. media-fonts/dejavu."
+	ewarn ">=net-analyzer/rrdtool-1.3 does not have any default font bundled. Thus if"
+	ewarn ">you've upgraded from rrdtool-1.2.x and don't have any font installed to make"
+	ewarn ">lables visible, please, install some font, e.g.  media-fonts/dejavu."
 }
 
 pkg_postrm() {
diff --git a/net-analyzer/thc-ipv6/Manifest b/net-analyzer/thc-ipv6/Manifest
index 30555bdc03ea..0023953055c2 100644
--- a/net-analyzer/thc-ipv6/Manifest
+++ b/net-analyzer/thc-ipv6/Manifest
@@ -1,2 +1,3 @@
 DIST thc-ipv6-1.4.tar.gz 91846 RMD160 d89f52776e755cf4926a0b93974c4da7c5235e44 SHA1 7034f4b5580511fb63fa0c927bfdaaab28c46335 SHA256 4e6e5e55c27373dccafb631f98662d47edc81720ae40e8017a40697a3fbf6a13
 DIST thc-ipv6-1.6.tar.gz 98197 RMD160 0b94a97b96c81e66ee471a256b9c19d8b7462f9a SHA1 8b055c0711c900e52db14f8842b4b9cbd47cd80a SHA256 2d4cb9c591f6ce6a632ad970b13a13972e5bf18edd489ae631363e9e4824980c
+DIST thc-ipv6-1.8.tar.gz 133268 RMD160 0425bac3e4f21f58248ecaeabd945a4ffaaf6f05 SHA1 36754bb4ee947ba1a45dc23950b5515f84f185e7 SHA256 93c6730008ac45c918e2ef505c40e7cb93e4b7895b5c950d0465b326ac05e08f
diff --git a/net-analyzer/thc-ipv6/thc-ipv6-1.8.ebuild b/net-analyzer/thc-ipv6/thc-ipv6-1.8.ebuild
new file mode 100644
index 000000000000..f4d3dc052d83
--- /dev/null
+++ b/net-analyzer/thc-ipv6/thc-ipv6-1.8.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/thc-ipv6/thc-ipv6-1.8.ebuild,v 1.1 2012/03/21 18:57:06 xmw Exp $
+
+EAPI=4
+
+inherit eutils
+
+DESCRIPTION="complete tool set to attack the inherent protocol weaknesses of IPV6 and ICMP6"
+HOMEPAGE="http://freeworld.thc.org/thc-ipv6/"
+SRC_URI="http://freeworld.thc.org/releases/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="net-libs/libpcap
+	dev-libs/openssl"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.4-Makefile.patch
+}
+
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="/usr" install
+	dodoc CHANGES README
+}
diff --git a/net-ftp/leechcraft-lcftp/Manifest b/net-ftp/leechcraft-lcftp/Manifest
index 82981786c7aa..4eb4c41f47fc 100644
--- a/net-ftp/leechcraft-lcftp/Manifest
+++ b/net-ftp/leechcraft-lcftp/Manifest
@@ -1,3 +1,3 @@
 DIST leechcraft-0.4.99.tar.xz 4601736 RMD160 343e64a430cd55f401989b1c89a74a9c2ddf1e33 SHA1 c8275ea635d7ea579b95a70e64372658928752f7 SHA256 967ca3a9b942d71da7f4818ba912f12b386b553fe4abded04c7d1956473e4e42
-DIST leechcraft-0.5.0.tar.xz 4691312 RMD160 4ea82848fe59fcd1159fa835dfb94ff81775f964 SHA1 0d01a9b38fd1ce136d678803a1270538fb8e3cc4 SHA256 ef0802442b803079dc491f73ff0294cb8560d86fbea44c8e57b3d54fdf3b88fa
-DIST leechcraft-0.5.60.tar.xz 2048000 RMD160 505a90f631779a1918ea814602288732b4f8af89 SHA1 b03ce9bb160c00c6be2f50af4e061c5d7777d630 SHA256 b7ee7aff4b07fa383da169346979701f4a428fc29d4e8b77a31f27561b025baf
+DIST leechcraft-0.5.0.tar.xz 7240 RMD160 41109d2b24cf188f31bafc9d65950ecb223f1fb7 SHA1 e32a08d9926a8351fcdbc13649e0fe83bbefb84a SHA256 762751d75d2bfa76656b8a88feae193af3c9467f74749ba182212bbe72eea1fc
+DIST leechcraft-0.5.60.tar.xz 4743936 RMD160 e845b9f9e7b0bdebd2c99822ffd3e15c019f6051 SHA1 2941679520e6871372eac31d1e683615a8dd64e6 SHA256 477d8fc54167798337e64324575d12cf1cace4d6502bb14d892edd2ed4b5a7f4
diff --git a/net-im/leechcraft-azoth/Manifest b/net-im/leechcraft-azoth/Manifest
index 82981786c7aa..4eb4c41f47fc 100644
--- a/net-im/leechcraft-azoth/Manifest
+++ b/net-im/leechcraft-azoth/Manifest
@@ -1,3 +1,3 @@
 DIST leechcraft-0.4.99.tar.xz 4601736 RMD160 343e64a430cd55f401989b1c89a74a9c2ddf1e33 SHA1 c8275ea635d7ea579b95a70e64372658928752f7 SHA256 967ca3a9b942d71da7f4818ba912f12b386b553fe4abded04c7d1956473e4e42
-DIST leechcraft-0.5.0.tar.xz 4691312 RMD160 4ea82848fe59fcd1159fa835dfb94ff81775f964 SHA1 0d01a9b38fd1ce136d678803a1270538fb8e3cc4 SHA256 ef0802442b803079dc491f73ff0294cb8560d86fbea44c8e57b3d54fdf3b88fa
-DIST leechcraft-0.5.60.tar.xz 2048000 RMD160 505a90f631779a1918ea814602288732b4f8af89 SHA1 b03ce9bb160c00c6be2f50af4e061c5d7777d630 SHA256 b7ee7aff4b07fa383da169346979701f4a428fc29d4e8b77a31f27561b025baf
+DIST leechcraft-0.5.0.tar.xz 7240 RMD160 41109d2b24cf188f31bafc9d65950ecb223f1fb7 SHA1 e32a08d9926a8351fcdbc13649e0fe83bbefb84a SHA256 762751d75d2bfa76656b8a88feae193af3c9467f74749ba182212bbe72eea1fc
+DIST leechcraft-0.5.60.tar.xz 4743936 RMD160 e845b9f9e7b0bdebd2c99822ffd3e15c019f6051 SHA1 2941679520e6871372eac31d1e683615a8dd64e6 SHA256 477d8fc54167798337e64324575d12cf1cace4d6502bb14d892edd2ed4b5a7f4
diff --git a/net-libs/dslib/Manifest b/net-libs/dslib/Manifest
index c1e85592af1e..0783981b9718 100644
--- a/net-libs/dslib/Manifest
+++ b/net-libs/dslib/Manifest
@@ -1,2 +1,2 @@
 DIST dslib-1.7.tar.gz 176336 RMD160 c4b603488228a30f38586c2946215b229e230ff0 SHA1 01e50c647bbca6a259a2f926b25863b99e3c8548 SHA256 49565ab2a68d447b1f904e63b71248e18613b34adc2f73d11f0b2ad941a60081
-DIST dslib-2.0.tar.gz 82356 RMD160 6fd726c5ab4daf86e1521b5382487dfaeeaec501 SHA1 ae49552737f85684c30bd856b4f6ee62e62a2c0e SHA256 70f44b8bd024573341daea1f910bfef7f38182e4a90c03adde975440a4f86e48
+DIST dslib-2.0.2.tar.gz 82377 RMD160 e091f2adc9897a8e6e3abb9406e4e9e25ff43e6c SHA1 0af22640efdae4da170009022a5907a4e95d072d SHA256 91db34c2668b342c6d1f4b2929426b29749c59f500481edaecfe2ff97fd276f3
diff --git a/net-libs/dslib/dslib-2.0.ebuild b/net-libs/dslib/dslib-2.0.2.ebuild
similarity index 81%
rename from net-libs/dslib/dslib-2.0.ebuild
rename to net-libs/dslib/dslib-2.0.2.ebuild
index e194814e327f..496b72aeaf46 100644
--- a/net-libs/dslib/dslib-2.0.ebuild
+++ b/net-libs/dslib/dslib-2.0.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/dslib/dslib-2.0.ebuild,v 1.1 2012/02/28 15:06:02 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/dslib/dslib-2.0.2.ebuild,v 1.1 2012/03/21 21:36:43 scarabeus Exp $
 
 EAPI=4
 
@@ -10,7 +10,7 @@ inherit distutils
 
 DESCRIPTION="Library to access Czech eGov system \"Datove schranky\""
 HOMEPAGE="http://labs.nic.cz/page/969/datovka/"
-SRC_URI="http://www.nic.cz/public_media/datove_schranky/releases/datovka-2.0/src/${P}.tar.gz"
+SRC_URI="http://www.nic.cz/public_media/datove_schranky/releases/datovka-2.0.2/src/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/net-misc/leechcraft-advancednotifications/Manifest b/net-misc/leechcraft-advancednotifications/Manifest
index 82981786c7aa..4eb4c41f47fc 100644
--- a/net-misc/leechcraft-advancednotifications/Manifest
+++ b/net-misc/leechcraft-advancednotifications/Manifest
@@ -1,3 +1,3 @@
 DIST leechcraft-0.4.99.tar.xz 4601736 RMD160 343e64a430cd55f401989b1c89a74a9c2ddf1e33 SHA1 c8275ea635d7ea579b95a70e64372658928752f7 SHA256 967ca3a9b942d71da7f4818ba912f12b386b553fe4abded04c7d1956473e4e42
-DIST leechcraft-0.5.0.tar.xz 4691312 RMD160 4ea82848fe59fcd1159fa835dfb94ff81775f964 SHA1 0d01a9b38fd1ce136d678803a1270538fb8e3cc4 SHA256 ef0802442b803079dc491f73ff0294cb8560d86fbea44c8e57b3d54fdf3b88fa
-DIST leechcraft-0.5.60.tar.xz 2048000 RMD160 505a90f631779a1918ea814602288732b4f8af89 SHA1 b03ce9bb160c00c6be2f50af4e061c5d7777d630 SHA256 b7ee7aff4b07fa383da169346979701f4a428fc29d4e8b77a31f27561b025baf
+DIST leechcraft-0.5.0.tar.xz 7240 RMD160 41109d2b24cf188f31bafc9d65950ecb223f1fb7 SHA1 e32a08d9926a8351fcdbc13649e0fe83bbefb84a SHA256 762751d75d2bfa76656b8a88feae193af3c9467f74749ba182212bbe72eea1fc
+DIST leechcraft-0.5.60.tar.xz 4743936 RMD160 e845b9f9e7b0bdebd2c99822ffd3e15c019f6051 SHA1 2941679520e6871372eac31d1e683615a8dd64e6 SHA256 477d8fc54167798337e64324575d12cf1cace4d6502bb14d892edd2ed4b5a7f4
diff --git a/net-misc/leechcraft-anhero/Manifest b/net-misc/leechcraft-anhero/Manifest
index 82981786c7aa..4eb4c41f47fc 100644
--- a/net-misc/leechcraft-anhero/Manifest
+++ b/net-misc/leechcraft-anhero/Manifest
@@ -1,3 +1,3 @@
 DIST leechcraft-0.4.99.tar.xz 4601736 RMD160 343e64a430cd55f401989b1c89a74a9c2ddf1e33 SHA1 c8275ea635d7ea579b95a70e64372658928752f7 SHA256 967ca3a9b942d71da7f4818ba912f12b386b553fe4abded04c7d1956473e4e42
-DIST leechcraft-0.5.0.tar.xz 4691312 RMD160 4ea82848fe59fcd1159fa835dfb94ff81775f964 SHA1 0d01a9b38fd1ce136d678803a1270538fb8e3cc4 SHA256 ef0802442b803079dc491f73ff0294cb8560d86fbea44c8e57b3d54fdf3b88fa
-DIST leechcraft-0.5.60.tar.xz 2048000 RMD160 505a90f631779a1918ea814602288732b4f8af89 SHA1 b03ce9bb160c00c6be2f50af4e061c5d7777d630 SHA256 b7ee7aff4b07fa383da169346979701f4a428fc29d4e8b77a31f27561b025baf
+DIST leechcraft-0.5.0.tar.xz 7240 RMD160 41109d2b24cf188f31bafc9d65950ecb223f1fb7 SHA1 e32a08d9926a8351fcdbc13649e0fe83bbefb84a SHA256 762751d75d2bfa76656b8a88feae193af3c9467f74749ba182212bbe72eea1fc
+DIST leechcraft-0.5.60.tar.xz 4743936 RMD160 e845b9f9e7b0bdebd2c99822ffd3e15c019f6051 SHA1 2941679520e6871372eac31d1e683615a8dd64e6 SHA256 477d8fc54167798337e64324575d12cf1cace4d6502bb14d892edd2ed4b5a7f4
diff --git a/net-misc/leechcraft-auscrie/Manifest b/net-misc/leechcraft-auscrie/Manifest
index 82981786c7aa..4eb4c41f47fc 100644
--- a/net-misc/leechcraft-auscrie/Manifest
+++ b/net-misc/leechcraft-auscrie/Manifest
@@ -1,3 +1,3 @@
 DIST leechcraft-0.4.99.tar.xz 4601736 RMD160 343e64a430cd55f401989b1c89a74a9c2ddf1e33 SHA1 c8275ea635d7ea579b95a70e64372658928752f7 SHA256 967ca3a9b942d71da7f4818ba912f12b386b553fe4abded04c7d1956473e4e42
-DIST leechcraft-0.5.0.tar.xz 4691312 RMD160 4ea82848fe59fcd1159fa835dfb94ff81775f964 SHA1 0d01a9b38fd1ce136d678803a1270538fb8e3cc4 SHA256 ef0802442b803079dc491f73ff0294cb8560d86fbea44c8e57b3d54fdf3b88fa
-DIST leechcraft-0.5.60.tar.xz 2048000 RMD160 505a90f631779a1918ea814602288732b4f8af89 SHA1 b03ce9bb160c00c6be2f50af4e061c5d7777d630 SHA256 b7ee7aff4b07fa383da169346979701f4a428fc29d4e8b77a31f27561b025baf
+DIST leechcraft-0.5.0.tar.xz 7240 RMD160 41109d2b24cf188f31bafc9d65950ecb223f1fb7 SHA1 e32a08d9926a8351fcdbc13649e0fe83bbefb84a SHA256 762751d75d2bfa76656b8a88feae193af3c9467f74749ba182212bbe72eea1fc
+DIST leechcraft-0.5.60.tar.xz 4743936 RMD160 e845b9f9e7b0bdebd2c99822ffd3e15c019f6051 SHA1 2941679520e6871372eac31d1e683615a8dd64e6 SHA256 477d8fc54167798337e64324575d12cf1cace4d6502bb14d892edd2ed4b5a7f4
diff --git a/net-misc/leechcraft-core/Manifest b/net-misc/leechcraft-core/Manifest
index 82981786c7aa..4eb4c41f47fc 100644
--- a/net-misc/leechcraft-core/Manifest
+++ b/net-misc/leechcraft-core/Manifest
@@ -1,3 +1,3 @@
 DIST leechcraft-0.4.99.tar.xz 4601736 RMD160 343e64a430cd55f401989b1c89a74a9c2ddf1e33 SHA1 c8275ea635d7ea579b95a70e64372658928752f7 SHA256 967ca3a9b942d71da7f4818ba912f12b386b553fe4abded04c7d1956473e4e42
-DIST leechcraft-0.5.0.tar.xz 4691312 RMD160 4ea82848fe59fcd1159fa835dfb94ff81775f964 SHA1 0d01a9b38fd1ce136d678803a1270538fb8e3cc4 SHA256 ef0802442b803079dc491f73ff0294cb8560d86fbea44c8e57b3d54fdf3b88fa
-DIST leechcraft-0.5.60.tar.xz 2048000 RMD160 505a90f631779a1918ea814602288732b4f8af89 SHA1 b03ce9bb160c00c6be2f50af4e061c5d7777d630 SHA256 b7ee7aff4b07fa383da169346979701f4a428fc29d4e8b77a31f27561b025baf
+DIST leechcraft-0.5.0.tar.xz 7240 RMD160 41109d2b24cf188f31bafc9d65950ecb223f1fb7 SHA1 e32a08d9926a8351fcdbc13649e0fe83bbefb84a SHA256 762751d75d2bfa76656b8a88feae193af3c9467f74749ba182212bbe72eea1fc
+DIST leechcraft-0.5.60.tar.xz 4743936 RMD160 e845b9f9e7b0bdebd2c99822ffd3e15c019f6051 SHA1 2941679520e6871372eac31d1e683615a8dd64e6 SHA256 477d8fc54167798337e64324575d12cf1cace4d6502bb14d892edd2ed4b5a7f4
diff --git a/net-misc/leechcraft-cstp/Manifest b/net-misc/leechcraft-cstp/Manifest
index 82981786c7aa..4eb4c41f47fc 100644
--- a/net-misc/leechcraft-cstp/Manifest
+++ b/net-misc/leechcraft-cstp/Manifest
@@ -1,3 +1,3 @@
 DIST leechcraft-0.4.99.tar.xz 4601736 RMD160 343e64a430cd55f401989b1c89a74a9c2ddf1e33 SHA1 c8275ea635d7ea579b95a70e64372658928752f7 SHA256 967ca3a9b942d71da7f4818ba912f12b386b553fe4abded04c7d1956473e4e42
-DIST leechcraft-0.5.0.tar.xz 4691312 RMD160 4ea82848fe59fcd1159fa835dfb94ff81775f964 SHA1 0d01a9b38fd1ce136d678803a1270538fb8e3cc4 SHA256 ef0802442b803079dc491f73ff0294cb8560d86fbea44c8e57b3d54fdf3b88fa
-DIST leechcraft-0.5.60.tar.xz 2048000 RMD160 505a90f631779a1918ea814602288732b4f8af89 SHA1 b03ce9bb160c00c6be2f50af4e061c5d7777d630 SHA256 b7ee7aff4b07fa383da169346979701f4a428fc29d4e8b77a31f27561b025baf
+DIST leechcraft-0.5.0.tar.xz 7240 RMD160 41109d2b24cf188f31bafc9d65950ecb223f1fb7 SHA1 e32a08d9926a8351fcdbc13649e0fe83bbefb84a SHA256 762751d75d2bfa76656b8a88feae193af3c9467f74749ba182212bbe72eea1fc
+DIST leechcraft-0.5.60.tar.xz 4743936 RMD160 e845b9f9e7b0bdebd2c99822ffd3e15c019f6051 SHA1 2941679520e6871372eac31d1e683615a8dd64e6 SHA256 477d8fc54167798337e64324575d12cf1cace4d6502bb14d892edd2ed4b5a7f4
diff --git a/net-misc/leechcraft-dbusmanager/Manifest b/net-misc/leechcraft-dbusmanager/Manifest
index 82981786c7aa..4eb4c41f47fc 100644
--- a/net-misc/leechcraft-dbusmanager/Manifest
+++ b/net-misc/leechcraft-dbusmanager/Manifest
@@ -1,3 +1,3 @@
 DIST leechcraft-0.4.99.tar.xz 4601736 RMD160 343e64a430cd55f401989b1c89a74a9c2ddf1e33 SHA1 c8275ea635d7ea579b95a70e64372658928752f7 SHA256 967ca3a9b942d71da7f4818ba912f12b386b553fe4abded04c7d1956473e4e42
-DIST leechcraft-0.5.0.tar.xz 4691312 RMD160 4ea82848fe59fcd1159fa835dfb94ff81775f964 SHA1 0d01a9b38fd1ce136d678803a1270538fb8e3cc4 SHA256 ef0802442b803079dc491f73ff0294cb8560d86fbea44c8e57b3d54fdf3b88fa
-DIST leechcraft-0.5.60.tar.xz 2048000 RMD160 505a90f631779a1918ea814602288732b4f8af89 SHA1 b03ce9bb160c00c6be2f50af4e061c5d7777d630 SHA256 b7ee7aff4b07fa383da169346979701f4a428fc29d4e8b77a31f27561b025baf
+DIST leechcraft-0.5.0.tar.xz 7240 RMD160 41109d2b24cf188f31bafc9d65950ecb223f1fb7 SHA1 e32a08d9926a8351fcdbc13649e0fe83bbefb84a SHA256 762751d75d2bfa76656b8a88feae193af3c9467f74749ba182212bbe72eea1fc
+DIST leechcraft-0.5.60.tar.xz 4743936 RMD160 e845b9f9e7b0bdebd2c99822ffd3e15c019f6051 SHA1 2941679520e6871372eac31d1e683615a8dd64e6 SHA256 477d8fc54167798337e64324575d12cf1cace4d6502bb14d892edd2ed4b5a7f4
diff --git a/net-misc/leechcraft-gacts/Manifest b/net-misc/leechcraft-gacts/Manifest
index f2e9e42534d8..aa8502e2b992 100644
--- a/net-misc/leechcraft-gacts/Manifest
+++ b/net-misc/leechcraft-gacts/Manifest
@@ -1 +1 @@
-DIST leechcraft-0.5.60.tar.xz 2048000 RMD160 505a90f631779a1918ea814602288732b4f8af89 SHA1 b03ce9bb160c00c6be2f50af4e061c5d7777d630 SHA256 b7ee7aff4b07fa383da169346979701f4a428fc29d4e8b77a31f27561b025baf
+DIST leechcraft-0.5.60.tar.xz 4743936 RMD160 e845b9f9e7b0bdebd2c99822ffd3e15c019f6051 SHA1 2941679520e6871372eac31d1e683615a8dd64e6 SHA256 477d8fc54167798337e64324575d12cf1cace4d6502bb14d892edd2ed4b5a7f4
diff --git a/net-misc/leechcraft-glance/Manifest b/net-misc/leechcraft-glance/Manifest
index 82981786c7aa..4eb4c41f47fc 100644
--- a/net-misc/leechcraft-glance/Manifest
+++ b/net-misc/leechcraft-glance/Manifest
@@ -1,3 +1,3 @@
 DIST leechcraft-0.4.99.tar.xz 4601736 RMD160 343e64a430cd55f401989b1c89a74a9c2ddf1e33 SHA1 c8275ea635d7ea579b95a70e64372658928752f7 SHA256 967ca3a9b942d71da7f4818ba912f12b386b553fe4abded04c7d1956473e4e42
-DIST leechcraft-0.5.0.tar.xz 4691312 RMD160 4ea82848fe59fcd1159fa835dfb94ff81775f964 SHA1 0d01a9b38fd1ce136d678803a1270538fb8e3cc4 SHA256 ef0802442b803079dc491f73ff0294cb8560d86fbea44c8e57b3d54fdf3b88fa
-DIST leechcraft-0.5.60.tar.xz 2048000 RMD160 505a90f631779a1918ea814602288732b4f8af89 SHA1 b03ce9bb160c00c6be2f50af4e061c5d7777d630 SHA256 b7ee7aff4b07fa383da169346979701f4a428fc29d4e8b77a31f27561b025baf
+DIST leechcraft-0.5.0.tar.xz 7240 RMD160 41109d2b24cf188f31bafc9d65950ecb223f1fb7 SHA1 e32a08d9926a8351fcdbc13649e0fe83bbefb84a SHA256 762751d75d2bfa76656b8a88feae193af3c9467f74749ba182212bbe72eea1fc
+DIST leechcraft-0.5.60.tar.xz 4743936 RMD160 e845b9f9e7b0bdebd2c99822ffd3e15c019f6051 SHA1 2941679520e6871372eac31d1e683615a8dd64e6 SHA256 477d8fc54167798337e64324575d12cf1cace4d6502bb14d892edd2ed4b5a7f4
diff --git a/net-misc/leechcraft-historyholder/Manifest b/net-misc/leechcraft-historyholder/Manifest
index 82981786c7aa..4eb4c41f47fc 100644
--- a/net-misc/leechcraft-historyholder/Manifest
+++ b/net-misc/leechcraft-historyholder/Manifest
@@ -1,3 +1,3 @@
 DIST leechcraft-0.4.99.tar.xz 4601736 RMD160 343e64a430cd55f401989b1c89a74a9c2ddf1e33 SHA1 c8275ea635d7ea579b95a70e64372658928752f7 SHA256 967ca3a9b942d71da7f4818ba912f12b386b553fe4abded04c7d1956473e4e42
-DIST leechcraft-0.5.0.tar.xz 4691312 RMD160 4ea82848fe59fcd1159fa835dfb94ff81775f964 SHA1 0d01a9b38fd1ce136d678803a1270538fb8e3cc4 SHA256 ef0802442b803079dc491f73ff0294cb8560d86fbea44c8e57b3d54fdf3b88fa
-DIST leechcraft-0.5.60.tar.xz 2048000 RMD160 505a90f631779a1918ea814602288732b4f8af89 SHA1 b03ce9bb160c00c6be2f50af4e061c5d7777d630 SHA256 b7ee7aff4b07fa383da169346979701f4a428fc29d4e8b77a31f27561b025baf
+DIST leechcraft-0.5.0.tar.xz 7240 RMD160 41109d2b24cf188f31bafc9d65950ecb223f1fb7 SHA1 e32a08d9926a8351fcdbc13649e0fe83bbefb84a SHA256 762751d75d2bfa76656b8a88feae193af3c9467f74749ba182212bbe72eea1fc
+DIST leechcraft-0.5.60.tar.xz 4743936 RMD160 e845b9f9e7b0bdebd2c99822ffd3e15c019f6051 SHA1 2941679520e6871372eac31d1e683615a8dd64e6 SHA256 477d8fc54167798337e64324575d12cf1cace4d6502bb14d892edd2ed4b5a7f4
diff --git a/net-misc/leechcraft-kinotify/Manifest b/net-misc/leechcraft-kinotify/Manifest
index 82981786c7aa..4eb4c41f47fc 100644
--- a/net-misc/leechcraft-kinotify/Manifest
+++ b/net-misc/leechcraft-kinotify/Manifest
@@ -1,3 +1,3 @@
 DIST leechcraft-0.4.99.tar.xz 4601736 RMD160 343e64a430cd55f401989b1c89a74a9c2ddf1e33 SHA1 c8275ea635d7ea579b95a70e64372658928752f7 SHA256 967ca3a9b942d71da7f4818ba912f12b386b553fe4abded04c7d1956473e4e42
-DIST leechcraft-0.5.0.tar.xz 4691312 RMD160 4ea82848fe59fcd1159fa835dfb94ff81775f964 SHA1 0d01a9b38fd1ce136d678803a1270538fb8e3cc4 SHA256 ef0802442b803079dc491f73ff0294cb8560d86fbea44c8e57b3d54fdf3b88fa
-DIST leechcraft-0.5.60.tar.xz 2048000 RMD160 505a90f631779a1918ea814602288732b4f8af89 SHA1 b03ce9bb160c00c6be2f50af4e061c5d7777d630 SHA256 b7ee7aff4b07fa383da169346979701f4a428fc29d4e8b77a31f27561b025baf
+DIST leechcraft-0.5.0.tar.xz 7240 RMD160 41109d2b24cf188f31bafc9d65950ecb223f1fb7 SHA1 e32a08d9926a8351fcdbc13649e0fe83bbefb84a SHA256 762751d75d2bfa76656b8a88feae193af3c9467f74749ba182212bbe72eea1fc
+DIST leechcraft-0.5.60.tar.xz 4743936 RMD160 e845b9f9e7b0bdebd2c99822ffd3e15c019f6051 SHA1 2941679520e6871372eac31d1e683615a8dd64e6 SHA256 477d8fc54167798337e64324575d12cf1cace4d6502bb14d892edd2ed4b5a7f4
diff --git a/net-misc/leechcraft-knowhow/Manifest b/net-misc/leechcraft-knowhow/Manifest
index 82981786c7aa..4eb4c41f47fc 100644
--- a/net-misc/leechcraft-knowhow/Manifest
+++ b/net-misc/leechcraft-knowhow/Manifest
@@ -1,3 +1,3 @@
 DIST leechcraft-0.4.99.tar.xz 4601736 RMD160 343e64a430cd55f401989b1c89a74a9c2ddf1e33 SHA1 c8275ea635d7ea579b95a70e64372658928752f7 SHA256 967ca3a9b942d71da7f4818ba912f12b386b553fe4abded04c7d1956473e4e42
-DIST leechcraft-0.5.0.tar.xz 4691312 RMD160 4ea82848fe59fcd1159fa835dfb94ff81775f964 SHA1 0d01a9b38fd1ce136d678803a1270538fb8e3cc4 SHA256 ef0802442b803079dc491f73ff0294cb8560d86fbea44c8e57b3d54fdf3b88fa
-DIST leechcraft-0.5.60.tar.xz 2048000 RMD160 505a90f631779a1918ea814602288732b4f8af89 SHA1 b03ce9bb160c00c6be2f50af4e061c5d7777d630 SHA256 b7ee7aff4b07fa383da169346979701f4a428fc29d4e8b77a31f27561b025baf
+DIST leechcraft-0.5.0.tar.xz 7240 RMD160 41109d2b24cf188f31bafc9d65950ecb223f1fb7 SHA1 e32a08d9926a8351fcdbc13649e0fe83bbefb84a SHA256 762751d75d2bfa76656b8a88feae193af3c9467f74749ba182212bbe72eea1fc
+DIST leechcraft-0.5.60.tar.xz 4743936 RMD160 e845b9f9e7b0bdebd2c99822ffd3e15c019f6051 SHA1 2941679520e6871372eac31d1e683615a8dd64e6 SHA256 477d8fc54167798337e64324575d12cf1cace4d6502bb14d892edd2ed4b5a7f4
diff --git a/net-misc/leechcraft-lackman/Manifest b/net-misc/leechcraft-lackman/Manifest
index 82981786c7aa..4eb4c41f47fc 100644
--- a/net-misc/leechcraft-lackman/Manifest
+++ b/net-misc/leechcraft-lackman/Manifest
@@ -1,3 +1,3 @@
 DIST leechcraft-0.4.99.tar.xz 4601736 RMD160 343e64a430cd55f401989b1c89a74a9c2ddf1e33 SHA1 c8275ea635d7ea579b95a70e64372658928752f7 SHA256 967ca3a9b942d71da7f4818ba912f12b386b553fe4abded04c7d1956473e4e42
-DIST leechcraft-0.5.0.tar.xz 4691312 RMD160 4ea82848fe59fcd1159fa835dfb94ff81775f964 SHA1 0d01a9b38fd1ce136d678803a1270538fb8e3cc4 SHA256 ef0802442b803079dc491f73ff0294cb8560d86fbea44c8e57b3d54fdf3b88fa
-DIST leechcraft-0.5.60.tar.xz 2048000 RMD160 505a90f631779a1918ea814602288732b4f8af89 SHA1 b03ce9bb160c00c6be2f50af4e061c5d7777d630 SHA256 b7ee7aff4b07fa383da169346979701f4a428fc29d4e8b77a31f27561b025baf
+DIST leechcraft-0.5.0.tar.xz 7240 RMD160 41109d2b24cf188f31bafc9d65950ecb223f1fb7 SHA1 e32a08d9926a8351fcdbc13649e0fe83bbefb84a SHA256 762751d75d2bfa76656b8a88feae193af3c9467f74749ba182212bbe72eea1fc
+DIST leechcraft-0.5.60.tar.xz 4743936 RMD160 e845b9f9e7b0bdebd2c99822ffd3e15c019f6051 SHA1 2941679520e6871372eac31d1e683615a8dd64e6 SHA256 477d8fc54167798337e64324575d12cf1cace4d6502bb14d892edd2ed4b5a7f4
diff --git a/net-misc/leechcraft-liznoo/Manifest b/net-misc/leechcraft-liznoo/Manifest
index f2e9e42534d8..aa8502e2b992 100644
--- a/net-misc/leechcraft-liznoo/Manifest
+++ b/net-misc/leechcraft-liznoo/Manifest
@@ -1 +1 @@
-DIST leechcraft-0.5.60.tar.xz 2048000 RMD160 505a90f631779a1918ea814602288732b4f8af89 SHA1 b03ce9bb160c00c6be2f50af4e061c5d7777d630 SHA256 b7ee7aff4b07fa383da169346979701f4a428fc29d4e8b77a31f27561b025baf
+DIST leechcraft-0.5.60.tar.xz 4743936 RMD160 e845b9f9e7b0bdebd2c99822ffd3e15c019f6051 SHA1 2941679520e6871372eac31d1e683615a8dd64e6 SHA256 477d8fc54167798337e64324575d12cf1cace4d6502bb14d892edd2ed4b5a7f4
diff --git a/net-misc/leechcraft-netstoremanager/Manifest b/net-misc/leechcraft-netstoremanager/Manifest
index f2e9e42534d8..aa8502e2b992 100644
--- a/net-misc/leechcraft-netstoremanager/Manifest
+++ b/net-misc/leechcraft-netstoremanager/Manifest
@@ -1 +1 @@
-DIST leechcraft-0.5.60.tar.xz 2048000 RMD160 505a90f631779a1918ea814602288732b4f8af89 SHA1 b03ce9bb160c00c6be2f50af4e061c5d7777d630 SHA256 b7ee7aff4b07fa383da169346979701f4a428fc29d4e8b77a31f27561b025baf
+DIST leechcraft-0.5.60.tar.xz 4743936 RMD160 e845b9f9e7b0bdebd2c99822ffd3e15c019f6051 SHA1 2941679520e6871372eac31d1e683615a8dd64e6 SHA256 477d8fc54167798337e64324575d12cf1cace4d6502bb14d892edd2ed4b5a7f4
diff --git a/net-misc/leechcraft-newlife/Manifest b/net-misc/leechcraft-newlife/Manifest
index 82981786c7aa..4eb4c41f47fc 100644
--- a/net-misc/leechcraft-newlife/Manifest
+++ b/net-misc/leechcraft-newlife/Manifest
@@ -1,3 +1,3 @@
 DIST leechcraft-0.4.99.tar.xz 4601736 RMD160 343e64a430cd55f401989b1c89a74a9c2ddf1e33 SHA1 c8275ea635d7ea579b95a70e64372658928752f7 SHA256 967ca3a9b942d71da7f4818ba912f12b386b553fe4abded04c7d1956473e4e42
-DIST leechcraft-0.5.0.tar.xz 4691312 RMD160 4ea82848fe59fcd1159fa835dfb94ff81775f964 SHA1 0d01a9b38fd1ce136d678803a1270538fb8e3cc4 SHA256 ef0802442b803079dc491f73ff0294cb8560d86fbea44c8e57b3d54fdf3b88fa
-DIST leechcraft-0.5.60.tar.xz 2048000 RMD160 505a90f631779a1918ea814602288732b4f8af89 SHA1 b03ce9bb160c00c6be2f50af4e061c5d7777d630 SHA256 b7ee7aff4b07fa383da169346979701f4a428fc29d4e8b77a31f27561b025baf
+DIST leechcraft-0.5.0.tar.xz 7240 RMD160 41109d2b24cf188f31bafc9d65950ecb223f1fb7 SHA1 e32a08d9926a8351fcdbc13649e0fe83bbefb84a SHA256 762751d75d2bfa76656b8a88feae193af3c9467f74749ba182212bbe72eea1fc
+DIST leechcraft-0.5.60.tar.xz 4743936 RMD160 e845b9f9e7b0bdebd2c99822ffd3e15c019f6051 SHA1 2941679520e6871372eac31d1e683615a8dd64e6 SHA256 477d8fc54167798337e64324575d12cf1cace4d6502bb14d892edd2ed4b5a7f4
diff --git a/net-misc/leechcraft-pintab/Manifest b/net-misc/leechcraft-pintab/Manifest
index f2e9e42534d8..aa8502e2b992 100644
--- a/net-misc/leechcraft-pintab/Manifest
+++ b/net-misc/leechcraft-pintab/Manifest
@@ -1 +1 @@
-DIST leechcraft-0.5.60.tar.xz 2048000 RMD160 505a90f631779a1918ea814602288732b4f8af89 SHA1 b03ce9bb160c00c6be2f50af4e061c5d7777d630 SHA256 b7ee7aff4b07fa383da169346979701f4a428fc29d4e8b77a31f27561b025baf
+DIST leechcraft-0.5.60.tar.xz 4743936 RMD160 e845b9f9e7b0bdebd2c99822ffd3e15c019f6051 SHA1 2941679520e6871372eac31d1e683615a8dd64e6 SHA256 477d8fc54167798337e64324575d12cf1cace4d6502bb14d892edd2ed4b5a7f4
diff --git a/net-misc/leechcraft-qrosp/Manifest b/net-misc/leechcraft-qrosp/Manifest
index 82981786c7aa..4eb4c41f47fc 100644
--- a/net-misc/leechcraft-qrosp/Manifest
+++ b/net-misc/leechcraft-qrosp/Manifest
@@ -1,3 +1,3 @@
 DIST leechcraft-0.4.99.tar.xz 4601736 RMD160 343e64a430cd55f401989b1c89a74a9c2ddf1e33 SHA1 c8275ea635d7ea579b95a70e64372658928752f7 SHA256 967ca3a9b942d71da7f4818ba912f12b386b553fe4abded04c7d1956473e4e42
-DIST leechcraft-0.5.0.tar.xz 4691312 RMD160 4ea82848fe59fcd1159fa835dfb94ff81775f964 SHA1 0d01a9b38fd1ce136d678803a1270538fb8e3cc4 SHA256 ef0802442b803079dc491f73ff0294cb8560d86fbea44c8e57b3d54fdf3b88fa
-DIST leechcraft-0.5.60.tar.xz 2048000 RMD160 505a90f631779a1918ea814602288732b4f8af89 SHA1 b03ce9bb160c00c6be2f50af4e061c5d7777d630 SHA256 b7ee7aff4b07fa383da169346979701f4a428fc29d4e8b77a31f27561b025baf
+DIST leechcraft-0.5.0.tar.xz 7240 RMD160 41109d2b24cf188f31bafc9d65950ecb223f1fb7 SHA1 e32a08d9926a8351fcdbc13649e0fe83bbefb84a SHA256 762751d75d2bfa76656b8a88feae193af3c9467f74749ba182212bbe72eea1fc
+DIST leechcraft-0.5.60.tar.xz 4743936 RMD160 e845b9f9e7b0bdebd2c99822ffd3e15c019f6051 SHA1 2941679520e6871372eac31d1e683615a8dd64e6 SHA256 477d8fc54167798337e64324575d12cf1cace4d6502bb14d892edd2ed4b5a7f4
diff --git a/net-misc/leechcraft-secman/Manifest b/net-misc/leechcraft-secman/Manifest
index 82981786c7aa..4eb4c41f47fc 100644
--- a/net-misc/leechcraft-secman/Manifest
+++ b/net-misc/leechcraft-secman/Manifest
@@ -1,3 +1,3 @@
 DIST leechcraft-0.4.99.tar.xz 4601736 RMD160 343e64a430cd55f401989b1c89a74a9c2ddf1e33 SHA1 c8275ea635d7ea579b95a70e64372658928752f7 SHA256 967ca3a9b942d71da7f4818ba912f12b386b553fe4abded04c7d1956473e4e42
-DIST leechcraft-0.5.0.tar.xz 4691312 RMD160 4ea82848fe59fcd1159fa835dfb94ff81775f964 SHA1 0d01a9b38fd1ce136d678803a1270538fb8e3cc4 SHA256 ef0802442b803079dc491f73ff0294cb8560d86fbea44c8e57b3d54fdf3b88fa
-DIST leechcraft-0.5.60.tar.xz 2048000 RMD160 505a90f631779a1918ea814602288732b4f8af89 SHA1 b03ce9bb160c00c6be2f50af4e061c5d7777d630 SHA256 b7ee7aff4b07fa383da169346979701f4a428fc29d4e8b77a31f27561b025baf
+DIST leechcraft-0.5.0.tar.xz 7240 RMD160 41109d2b24cf188f31bafc9d65950ecb223f1fb7 SHA1 e32a08d9926a8351fcdbc13649e0fe83bbefb84a SHA256 762751d75d2bfa76656b8a88feae193af3c9467f74749ba182212bbe72eea1fc
+DIST leechcraft-0.5.60.tar.xz 4743936 RMD160 e845b9f9e7b0bdebd2c99822ffd3e15c019f6051 SHA1 2941679520e6871372eac31d1e683615a8dd64e6 SHA256 477d8fc54167798337e64324575d12cf1cace4d6502bb14d892edd2ed4b5a7f4
diff --git a/net-misc/leechcraft-sidebar/Manifest b/net-misc/leechcraft-sidebar/Manifest
index f2e9e42534d8..aa8502e2b992 100644
--- a/net-misc/leechcraft-sidebar/Manifest
+++ b/net-misc/leechcraft-sidebar/Manifest
@@ -1 +1 @@
-DIST leechcraft-0.5.60.tar.xz 2048000 RMD160 505a90f631779a1918ea814602288732b4f8af89 SHA1 b03ce9bb160c00c6be2f50af4e061c5d7777d630 SHA256 b7ee7aff4b07fa383da169346979701f4a428fc29d4e8b77a31f27561b025baf
+DIST leechcraft-0.5.60.tar.xz 4743936 RMD160 e845b9f9e7b0bdebd2c99822ffd3e15c019f6051 SHA1 2941679520e6871372eac31d1e683615a8dd64e6 SHA256 477d8fc54167798337e64324575d12cf1cace4d6502bb14d892edd2ed4b5a7f4
diff --git a/net-misc/leechcraft-summary/Manifest b/net-misc/leechcraft-summary/Manifest
index 82981786c7aa..4eb4c41f47fc 100644
--- a/net-misc/leechcraft-summary/Manifest
+++ b/net-misc/leechcraft-summary/Manifest
@@ -1,3 +1,3 @@
 DIST leechcraft-0.4.99.tar.xz 4601736 RMD160 343e64a430cd55f401989b1c89a74a9c2ddf1e33 SHA1 c8275ea635d7ea579b95a70e64372658928752f7 SHA256 967ca3a9b942d71da7f4818ba912f12b386b553fe4abded04c7d1956473e4e42
-DIST leechcraft-0.5.0.tar.xz 4691312 RMD160 4ea82848fe59fcd1159fa835dfb94ff81775f964 SHA1 0d01a9b38fd1ce136d678803a1270538fb8e3cc4 SHA256 ef0802442b803079dc491f73ff0294cb8560d86fbea44c8e57b3d54fdf3b88fa
-DIST leechcraft-0.5.60.tar.xz 2048000 RMD160 505a90f631779a1918ea814602288732b4f8af89 SHA1 b03ce9bb160c00c6be2f50af4e061c5d7777d630 SHA256 b7ee7aff4b07fa383da169346979701f4a428fc29d4e8b77a31f27561b025baf
+DIST leechcraft-0.5.0.tar.xz 7240 RMD160 41109d2b24cf188f31bafc9d65950ecb223f1fb7 SHA1 e32a08d9926a8351fcdbc13649e0fe83bbefb84a SHA256 762751d75d2bfa76656b8a88feae193af3c9467f74749ba182212bbe72eea1fc
+DIST leechcraft-0.5.60.tar.xz 4743936 RMD160 e845b9f9e7b0bdebd2c99822ffd3e15c019f6051 SHA1 2941679520e6871372eac31d1e683615a8dd64e6 SHA256 477d8fc54167798337e64324575d12cf1cace4d6502bb14d892edd2ed4b5a7f4
diff --git a/net-misc/leechcraft-tabpp/Manifest b/net-misc/leechcraft-tabpp/Manifest
index 82981786c7aa..4eb4c41f47fc 100644
--- a/net-misc/leechcraft-tabpp/Manifest
+++ b/net-misc/leechcraft-tabpp/Manifest
@@ -1,3 +1,3 @@
 DIST leechcraft-0.4.99.tar.xz 4601736 RMD160 343e64a430cd55f401989b1c89a74a9c2ddf1e33 SHA1 c8275ea635d7ea579b95a70e64372658928752f7 SHA256 967ca3a9b942d71da7f4818ba912f12b386b553fe4abded04c7d1956473e4e42
-DIST leechcraft-0.5.0.tar.xz 4691312 RMD160 4ea82848fe59fcd1159fa835dfb94ff81775f964 SHA1 0d01a9b38fd1ce136d678803a1270538fb8e3cc4 SHA256 ef0802442b803079dc491f73ff0294cb8560d86fbea44c8e57b3d54fdf3b88fa
-DIST leechcraft-0.5.60.tar.xz 2048000 RMD160 505a90f631779a1918ea814602288732b4f8af89 SHA1 b03ce9bb160c00c6be2f50af4e061c5d7777d630 SHA256 b7ee7aff4b07fa383da169346979701f4a428fc29d4e8b77a31f27561b025baf
+DIST leechcraft-0.5.0.tar.xz 7240 RMD160 41109d2b24cf188f31bafc9d65950ecb223f1fb7 SHA1 e32a08d9926a8351fcdbc13649e0fe83bbefb84a SHA256 762751d75d2bfa76656b8a88feae193af3c9467f74749ba182212bbe72eea1fc
+DIST leechcraft-0.5.60.tar.xz 4743936 RMD160 e845b9f9e7b0bdebd2c99822ffd3e15c019f6051 SHA1 2941679520e6871372eac31d1e683615a8dd64e6 SHA256 477d8fc54167798337e64324575d12cf1cace4d6502bb14d892edd2ed4b5a7f4
diff --git a/net-misc/leechcraft-tabsessmanager/Manifest b/net-misc/leechcraft-tabsessmanager/Manifest
index f2e9e42534d8..aa8502e2b992 100644
--- a/net-misc/leechcraft-tabsessmanager/Manifest
+++ b/net-misc/leechcraft-tabsessmanager/Manifest
@@ -1 +1 @@
-DIST leechcraft-0.5.60.tar.xz 2048000 RMD160 505a90f631779a1918ea814602288732b4f8af89 SHA1 b03ce9bb160c00c6be2f50af4e061c5d7777d630 SHA256 b7ee7aff4b07fa383da169346979701f4a428fc29d4e8b77a31f27561b025baf
+DIST leechcraft-0.5.60.tar.xz 4743936 RMD160 e845b9f9e7b0bdebd2c99822ffd3e15c019f6051 SHA1 2941679520e6871372eac31d1e683615a8dd64e6 SHA256 477d8fc54167798337e64324575d12cf1cace4d6502bb14d892edd2ed4b5a7f4
diff --git a/net-misc/leechcraft-tabslist/Manifest b/net-misc/leechcraft-tabslist/Manifest
index 82981786c7aa..4eb4c41f47fc 100644
--- a/net-misc/leechcraft-tabslist/Manifest
+++ b/net-misc/leechcraft-tabslist/Manifest
@@ -1,3 +1,3 @@
 DIST leechcraft-0.4.99.tar.xz 4601736 RMD160 343e64a430cd55f401989b1c89a74a9c2ddf1e33 SHA1 c8275ea635d7ea579b95a70e64372658928752f7 SHA256 967ca3a9b942d71da7f4818ba912f12b386b553fe4abded04c7d1956473e4e42
-DIST leechcraft-0.5.0.tar.xz 4691312 RMD160 4ea82848fe59fcd1159fa835dfb94ff81775f964 SHA1 0d01a9b38fd1ce136d678803a1270538fb8e3cc4 SHA256 ef0802442b803079dc491f73ff0294cb8560d86fbea44c8e57b3d54fdf3b88fa
-DIST leechcraft-0.5.60.tar.xz 2048000 RMD160 505a90f631779a1918ea814602288732b4f8af89 SHA1 b03ce9bb160c00c6be2f50af4e061c5d7777d630 SHA256 b7ee7aff4b07fa383da169346979701f4a428fc29d4e8b77a31f27561b025baf
+DIST leechcraft-0.5.0.tar.xz 7240 RMD160 41109d2b24cf188f31bafc9d65950ecb223f1fb7 SHA1 e32a08d9926a8351fcdbc13649e0fe83bbefb84a SHA256 762751d75d2bfa76656b8a88feae193af3c9467f74749ba182212bbe72eea1fc
+DIST leechcraft-0.5.60.tar.xz 4743936 RMD160 e845b9f9e7b0bdebd2c99822ffd3e15c019f6051 SHA1 2941679520e6871372eac31d1e683615a8dd64e6 SHA256 477d8fc54167798337e64324575d12cf1cace4d6502bb14d892edd2ed4b5a7f4
diff --git a/net-misc/youtube-dl/Manifest b/net-misc/youtube-dl/Manifest
index 8c8a6abe0bc4..fb9bd0611357 100644
--- a/net-misc/youtube-dl/Manifest
+++ b/net-misc/youtube-dl/Manifest
@@ -1,4 +1,2 @@
-DIST youtube-dl-2011.08.04.tar.gz 24577 RMD160 0f1f4a09dc13d28b23fc33085c2ab11a8ed5ba14 SHA1 751a23da86b9a972ac44d52f94919e2afc668c15 SHA256 d8ac3a3872e527274adfaa3f57cfda78113ab74402c44906fb747df4e1d40c3d
-DIST youtube-dl-2011.11.23.tar.gz 68096 RMD160 a8fe8be8cb3e1017d6ece3ce7d7584f6613288dc SHA1 4a5a4ae732b94f5d2f68bce47550f6269c3b3f58 SHA256 68729c1872836bc390b9621909a2b8f15ef3311cd19d9f59223bbe6db15bcd37
-DIST youtube-dl-2011.12.18.tar.gz 73012 RMD160 d27d29cb41826715ac66728b3e4f6fe1dc289cca SHA1 a35a53bc4b42de42771cf06803ca68d6705df2e6 SHA256 26cd01ce33934d65abb1fa4dfa9552551d06f804371a2557a476d3630553a871
 DIST youtube-dl-2012.01.08.tar.gz 74533 RMD160 1b249b63972abdd9dfcabfced83d3953fef9f959 SHA1 12d07f7ad771f59fc0154da21345c50f5f155422 SHA256 9655ac2d0a161502ae7da51bf1fdba769fe4f81dd587ee13e6e306fc6136defb
+DIST youtube-dl-2012.02.27.tar.gz 75108 RMD160 3e7edd4fe1747a54bf5a844910cb5d41d16d529d SHA1 66eee68273753e7d0c9c29072fece3dd9c0f297c SHA256 cac5966e0637ed737704e31390dd9c9701b6c3d721a9bc2bdcae9aa09495cf6e
diff --git a/net-misc/youtube-dl/youtube-dl-2011.08.04.ebuild b/net-misc/youtube-dl/youtube-dl-2011.08.04.ebuild
deleted file mode 100644
index eef289033167..000000000000
--- a/net-misc/youtube-dl/youtube-dl-2011.08.04.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/youtube-dl/youtube-dl-2011.08.04.ebuild,v 1.8 2012/02/10 04:11:03 patrick Exp $
-
-EAPI=3
-PYTHON_DEPEND=2:2.5
-
-inherit python
-
-DESCRIPTION="A small command-line program to download videos from YouTube."
-HOMEPAGE="http://rg3.github.com/youtube-dl/"
-SRC_URI="http://github.com/rg3/${PN}/tarball/${PV} -> ${P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="amd64 ~arm hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
-IUSE=""
-
-pkg_setup() {
-	python_set_active_version 2
-}
-
-src_install() {
-	newbin rg3-${PN}*/${PN} ${PN} || die
-	python_convert_shebangs -r 2 "${D}"
-}
diff --git a/net-misc/youtube-dl/youtube-dl-2011.11.23.ebuild b/net-misc/youtube-dl/youtube-dl-2011.11.23.ebuild
deleted file mode 100644
index 5df2ce72c053..000000000000
--- a/net-misc/youtube-dl/youtube-dl-2011.11.23.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/youtube-dl/youtube-dl-2011.11.23.ebuild,v 1.2 2011/12/11 00:42:03 floppym Exp $
-
-EAPI=3
-PYTHON_DEPEND=2:2.5
-
-inherit python
-
-DESCRIPTION="A small command-line program to download videos from YouTube."
-HOMEPAGE="http://rg3.github.com/youtube-dl/"
-SRC_URI="http://github.com/rg3/${PN}/tarball/${PV} -> ${P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
-IUSE=""
-
-pkg_setup() { :; }
-
-src_install() {
-	newbin rg3-${PN}*/${PN} ${PN} || die
-	python_convert_shebangs -r 2 "${D}"
-}
diff --git a/net-misc/youtube-dl/youtube-dl-2011.12.18.ebuild b/net-misc/youtube-dl/youtube-dl-2012.02.27.ebuild
similarity index 92%
rename from net-misc/youtube-dl/youtube-dl-2011.12.18.ebuild
rename to net-misc/youtube-dl/youtube-dl-2012.02.27.ebuild
index 66a3e9b26a61..0883967bef49 100644
--- a/net-misc/youtube-dl/youtube-dl-2011.12.18.ebuild
+++ b/net-misc/youtube-dl/youtube-dl-2012.02.27.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/youtube-dl/youtube-dl-2011.12.18.ebuild,v 1.1 2012/01/03 15:12:25 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/youtube-dl/youtube-dl-2012.02.27.ebuild,v 1.1 2012/03/21 15:18:18 patrick Exp $
 
 EAPI=3
 PYTHON_DEPEND=2:2.5
diff --git a/net-news/leechcraft-aggregator/Manifest b/net-news/leechcraft-aggregator/Manifest
index 82981786c7aa..4eb4c41f47fc 100644
--- a/net-news/leechcraft-aggregator/Manifest
+++ b/net-news/leechcraft-aggregator/Manifest
@@ -1,3 +1,3 @@
 DIST leechcraft-0.4.99.tar.xz 4601736 RMD160 343e64a430cd55f401989b1c89a74a9c2ddf1e33 SHA1 c8275ea635d7ea579b95a70e64372658928752f7 SHA256 967ca3a9b942d71da7f4818ba912f12b386b553fe4abded04c7d1956473e4e42
-DIST leechcraft-0.5.0.tar.xz 4691312 RMD160 4ea82848fe59fcd1159fa835dfb94ff81775f964 SHA1 0d01a9b38fd1ce136d678803a1270538fb8e3cc4 SHA256 ef0802442b803079dc491f73ff0294cb8560d86fbea44c8e57b3d54fdf3b88fa
-DIST leechcraft-0.5.60.tar.xz 2048000 RMD160 505a90f631779a1918ea814602288732b4f8af89 SHA1 b03ce9bb160c00c6be2f50af4e061c5d7777d630 SHA256 b7ee7aff4b07fa383da169346979701f4a428fc29d4e8b77a31f27561b025baf
+DIST leechcraft-0.5.0.tar.xz 7240 RMD160 41109d2b24cf188f31bafc9d65950ecb223f1fb7 SHA1 e32a08d9926a8351fcdbc13649e0fe83bbefb84a SHA256 762751d75d2bfa76656b8a88feae193af3c9467f74749ba182212bbe72eea1fc
+DIST leechcraft-0.5.60.tar.xz 4743936 RMD160 e845b9f9e7b0bdebd2c99822ffd3e15c019f6051 SHA1 2941679520e6871372eac31d1e683615a8dd64e6 SHA256 477d8fc54167798337e64324575d12cf1cace4d6502bb14d892edd2ed4b5a7f4
diff --git a/net-p2p/leechcraft-bittorrent/Manifest b/net-p2p/leechcraft-bittorrent/Manifest
index 82981786c7aa..4eb4c41f47fc 100644
--- a/net-p2p/leechcraft-bittorrent/Manifest
+++ b/net-p2p/leechcraft-bittorrent/Manifest
@@ -1,3 +1,3 @@
 DIST leechcraft-0.4.99.tar.xz 4601736 RMD160 343e64a430cd55f401989b1c89a74a9c2ddf1e33 SHA1 c8275ea635d7ea579b95a70e64372658928752f7 SHA256 967ca3a9b942d71da7f4818ba912f12b386b553fe4abded04c7d1956473e4e42
-DIST leechcraft-0.5.0.tar.xz 4691312 RMD160 4ea82848fe59fcd1159fa835dfb94ff81775f964 SHA1 0d01a9b38fd1ce136d678803a1270538fb8e3cc4 SHA256 ef0802442b803079dc491f73ff0294cb8560d86fbea44c8e57b3d54fdf3b88fa
-DIST leechcraft-0.5.60.tar.xz 2048000 RMD160 505a90f631779a1918ea814602288732b4f8af89 SHA1 b03ce9bb160c00c6be2f50af4e061c5d7777d630 SHA256 b7ee7aff4b07fa383da169346979701f4a428fc29d4e8b77a31f27561b025baf
+DIST leechcraft-0.5.0.tar.xz 7240 RMD160 41109d2b24cf188f31bafc9d65950ecb223f1fb7 SHA1 e32a08d9926a8351fcdbc13649e0fe83bbefb84a SHA256 762751d75d2bfa76656b8a88feae193af3c9467f74749ba182212bbe72eea1fc
+DIST leechcraft-0.5.60.tar.xz 4743936 RMD160 e845b9f9e7b0bdebd2c99822ffd3e15c019f6051 SHA1 2941679520e6871372eac31d1e683615a8dd64e6 SHA256 477d8fc54167798337e64324575d12cf1cace4d6502bb14d892edd2ed4b5a7f4
diff --git a/net-p2p/leechcraft-eiskaltdcpp/Manifest b/net-p2p/leechcraft-eiskaltdcpp/Manifest
index 82981786c7aa..4eb4c41f47fc 100644
--- a/net-p2p/leechcraft-eiskaltdcpp/Manifest
+++ b/net-p2p/leechcraft-eiskaltdcpp/Manifest
@@ -1,3 +1,3 @@
 DIST leechcraft-0.4.99.tar.xz 4601736 RMD160 343e64a430cd55f401989b1c89a74a9c2ddf1e33 SHA1 c8275ea635d7ea579b95a70e64372658928752f7 SHA256 967ca3a9b942d71da7f4818ba912f12b386b553fe4abded04c7d1956473e4e42
-DIST leechcraft-0.5.0.tar.xz 4691312 RMD160 4ea82848fe59fcd1159fa835dfb94ff81775f964 SHA1 0d01a9b38fd1ce136d678803a1270538fb8e3cc4 SHA256 ef0802442b803079dc491f73ff0294cb8560d86fbea44c8e57b3d54fdf3b88fa
-DIST leechcraft-0.5.60.tar.xz 2048000 RMD160 505a90f631779a1918ea814602288732b4f8af89 SHA1 b03ce9bb160c00c6be2f50af4e061c5d7777d630 SHA256 b7ee7aff4b07fa383da169346979701f4a428fc29d4e8b77a31f27561b025baf
+DIST leechcraft-0.5.0.tar.xz 7240 RMD160 41109d2b24cf188f31bafc9d65950ecb223f1fb7 SHA1 e32a08d9926a8351fcdbc13649e0fe83bbefb84a SHA256 762751d75d2bfa76656b8a88feae193af3c9467f74749ba182212bbe72eea1fc
+DIST leechcraft-0.5.60.tar.xz 4743936 RMD160 e845b9f9e7b0bdebd2c99822ffd3e15c019f6051 SHA1 2941679520e6871372eac31d1e683615a8dd64e6 SHA256 477d8fc54167798337e64324575d12cf1cace4d6502bb14d892edd2ed4b5a7f4
diff --git a/sci-chemistry/aria/aria-2.3.2-r3.ebuild b/sci-chemistry/aria/aria-2.3.2-r3.ebuild
new file mode 100644
index 000000000000..0d417c1cdad7
--- /dev/null
+++ b/sci-chemistry/aria/aria-2.3.2-r3.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/aria/aria-2.3.2-r3.ebuild,v 1.1 2012/03/21 11:48:20 jlec Exp $
+
+EAPI=3
+
+PYTHON_DEPEND="2"
+PYTHON_USE_WITH="tk"
+
+inherit base eutils python versionator
+
+MY_P="${PN}$(get_version_component_range 1-2 ${PV})"
+
+DESCRIPTION="Automated NOE assignment and NMR structure calculation"
+HOMEPAGE="http://aria.pasteur.fr/"
+SRC_URI="http://aria.pasteur.fr/archives/${MY_P}.2.tar.gz"
+
+SLOT="0"
+LICENSE="cns"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="examples"
+
+RDEPEND="
+	sci-chemistry/clashlist
+	sci-chemistry/procheck
+	sci-libs/clashscore-db
+	dev-python/numpy
+	dev-python/matplotlib[tk]
+	>=sci-chemistry/cns-1.2.1-r7[aria,openmp]
+	>=dev-lang/tk-8.3
+	>=sci-chemistry/ccpn-2.0.5
+	>=dev-tcltk/tix-8.1.4"
+DEPEND="${RDEPEND}"
+
+RESTRICT="fetch"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_nofetch(){
+	einfo "Go to ${HOMEPAGE}, download ${A}"
+	einfo "and place it in ${DISTDIR}"
+}
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-python.patch \
+		"${FILESDIR}"/${P}-through-space-2.patch
+}
+
+src_test(){
+	export CCPNMR_TOP_DIR="${EPREFIX}"/$(python_get_sitedir)
+	export PYTHONPATH=.:${CCPNMR_TOP_DIR}/ccpn/python
+	$(PYTHON) check.py || die
+}
+
+src_install(){
+	insinto "$(python_get_sitedir)/${PN}"
+	doins -r src aria2.py || die "failed to install ${PN}"
+	insinto "$(python_get_sitedir)/${PN}"/cns
+	doins -r cns/{protocols,toppar,src/helplib} || die "failed to install cns part"
+
+	if use examples; then
+		insinto /usr/share/${P}/
+		doins -r examples || die
+	fi
+
+	# ENV
+	cat >> "${T}"/20aria <<- EOF
+	ARIA2="${EPREFIX}/$(python_get_sitedir)/${PN}"
+	EOF
+
+	doenvd "${T}"/20aria
+
+	# Launch Wrapper
+	cat >> "${T}"/aria <<- EOF
+	#!/bin/sh
+	export CCPNMR_TOP_DIR="${EPREFIX}/$(python_get_sitedir)"
+	export PYTHONPATH="${EPREFIX}/$(python_get_sitedir)/ccpn/python"
+	exec "$(PYTHON)" -O "\${ARIA2}"/aria2.py \$@
+	EOF
+
+	dobin "${T}"/aria || die "failed to install wrapper"
+	dosym aria /usr/bin/aria2
+
+	dodoc README || die
+}
+
+pkg_postinst() {
+	python_mod_optimize ${PN}
+}
+
+pkg_postrm() {
+	python_mod_cleanup ${PN}
+}
diff --git a/sci-chemistry/aria/files/aria-2.3.2-through-space-2.patch b/sci-chemistry/aria/files/aria-2.3.2-through-space-2.patch
new file mode 100644
index 000000000000..6a363d098632
--- /dev/null
+++ b/sci-chemistry/aria/files/aria-2.3.2-through-space-2.patch
@@ -0,0 +1,139 @@
+ src/py/aria/exportToCcpn.py   |   24 +++++++++++-------------
+ src/py/aria/importFromCcpn.py |   32 ++++++++++++--------------------
+ 2 files changed, 23 insertions(+), 33 deletions(-)
+
+diff --git a/src/py/aria/exportToCcpn.py b/src/py/aria/exportToCcpn.py
+index c742a88..aae7b7d 100644
+--- a/src/py/aria/exportToCcpn.py
++++ b/src/py/aria/exportToCcpn.py
+@@ -1,5 +1,5 @@
+ from ccpnmr.analysis.core.ConstraintBasic import makeNmrConstraintStore, makeStructureGeneration, getFixedResonance
+-from ccpnmr.analysis.core.ExperimentBasic import getOnebondDataDims
++from ccpnmr.analysis.core.ExperimentBasic import getOnebondDataDims, getThroughSpaceDataDims
+ from ccpnmr.analysis.core.AssignmentBasic import assignAtomsToRes, assignResToDim
+ from ccpnmr.analysis.core.PeakBasic       import pickPeak, setManualPeakIntensity
+ from ccpnmr.analysis.core.MoleculeBasic   import DEFAULT_ISOTOPES
+@@ -791,12 +791,13 @@ def getPeakAssignmentsFromAria2(project, ariaRestraints, namesDict=None,
+     ariaDims = ariaDimDict.get(spectrum)
+     if not ariaDims:
+       ariaDims = [] #[0,1,2]
++      throughSpaceDataDims = getThroughSpaceDataDims(spectrum)
+ 
+       dataDims = spectrum.sortedDataDims()
+       if len(dataDims) == 3:
+         for dataDim in dataDims:
+           expDimRef = dataDim.findFirstDataDimRef().expDimRef
+-          if '1H' in expDimRef.isotopeCodes: # 0 or 2
++          if dataDim in throughSpaceDataDims: # 0 or 2
+             if onebondDims.get(dataDim.dim):
+               if ppmX1 is None:
+                 ariaDims.append(2)
+@@ -816,21 +817,18 @@ def getPeakAssignmentsFromAria2(project, ariaRestraints, namesDict=None,
+               ariaDims.append(1)
+ 
+       else:
+-        transfer = spectrum.experiment.findFirstExpTransfer(transferType='through-space') or \
+-                   spectrum.experiment.findFirstExpTransfer(transferType='NOESY')
+ 
++        i = 0
+         for dataDim in dataDims:
+-          expDimRefs = [dataDimRef.expDimRef for dataDimRef in dataDim.dataDimRefs]
+-          i = 0
+-          for expDimRef in transfer.sortedExpDimRefs():
+-            if expDimRef in expDimRefs:
+-              ariaDims.append(i)
+-              boundDim = onebondDims.get(dataDim.dim)
+-              if boundDim:
+-                ariaDims.append(i+1)
+-
++          if dataDim in throughSpaceDataDims:
++            ariaDims.append(i)
++            boundDim = onebondDims.get(dataDim.dim)
++            if boundDim:
++              ariaDims.append(i+1)
++            
+             i += 2
+ 
++
+       ariaDimDict[spectrum] = ariaDims
+ 
+     if namesDict:
+diff --git a/src/py/aria/importFromCcpn.py b/src/py/aria/importFromCcpn.py
+index a65ae3e..f63ba16 100644
+--- a/src/py/aria/importFromCcpn.py
++++ b/src/py/aria/importFromCcpn.py
+@@ -165,7 +165,7 @@ def getStructureEnsembles(project, ccpChains):
+             
+     return ensembles
+ 
+-def getNoesyPeakLists(project, molSystem=None):
++def getNoesyPeakLists(project, molSystem=None, excludeSimulated=True):
+     """Descrn: Get the NOE peak lists from a CCPN project. Can filter if appropriate to a given
+                molecular system if passed in.
+        Inputs: Implementation.Project, ccp.molecule.MolSystem.MolSystem
+@@ -196,19 +196,10 @@ def getNoesyPeakLists(project, molSystem=None):
+  
+         for spectrum in experiment.dataSources:
+             if (spectrum.dataType == 'processed') and (spectrum.numDim > 1):
+-
+-                isotopes = []
+-                for dataDim in spectrum.dataDims:
+-                    for expDimRef in dataDim.expDim.expDimRefs:
+-                        if expDimRef.measurementType in ('shift','Shift'):
+-                            isotope = ','.join(expDimRef.isotopeCodes)
+-                            isotopes.append(isotope)
+-                            break
+-
+-                if isotopes.count('1H') > 1:
+-                    for peakList in spectrum.peakLists:
+-                        if peakList.findFirstPeak():
+-                            peakLists.append(peakList)
++                for peakList in spectrum.sortedPeakLists():
++                    if excludeSimulated and peakList.isSimulated:
++                        continue
++                    peakLists.append(peakList)
+ 
+ 
+     return peakLists
+@@ -490,7 +481,10 @@ def makeAriaChain(ccpChain):
+     # Does below work for DNA/RNA?
+ 
+     aria_settings = ChainSettings()
+-    aria_settings['type'] = chainTypeMapping[ccpChain.molecule.molType]
++    # wb104: below changed 31 Oct 2011 to try and get around case when molType is None
++    #aria_settings['type'] = chainTypeMapping[ccpChain.molecule.molType]
++    molType = ccpChain.molecule.molType or 'protein'
++    aria_settings['type'] = chainTypeMapping[molType]
+ 
+     aria_chain = Chain(settings=aria_settings, segid=string_to_segid(ccpChain.code))
+ 
+@@ -952,8 +946,6 @@ def makeAriaSpectrum(peakList, ariaMolecule, filterRejected=True):
+     expDimRefDict = {}
+ 
+     for expDimRef in transfer.sortedExpDimRefs():
+-        if expDimRef.isotopeCodes != ('1H',):
+-            raise Exception('Not an H-H experiment')
+ 
+         onebondTransfer = expDimRef.findFirstExpTransfer(transferType='onebond')
+ 
+@@ -1095,7 +1087,7 @@ def getAriaAtomsFromResonance(resonance, ariaMolecule, cache={}):
+ 
+     # TJS modify to return just a list of atoms, rather than a list of list
+     ariaAtoms = []
+-    for atom in atomSet.sortedAtoms():
++    for atom in atomSet.atoms:
+         ariaAtom = ariaResidue.atoms.get(atom.name)
+         if not ariaAtom:
+             messager.warning('Could not find ARIA Atom for CCPN atom %d%s %s' % (residue.seqCode,residue.ccpCode, atom.name))
+@@ -1256,9 +1248,9 @@ def getAriaDistanceRestraintsList(constraint_list, constraint_type, aria_mol):
+         restraint.setWeight(weight)
+ 
+ 
+-        for constrItem in distConstr.sortedItems():
++        for constrItem in distConstr.items:
+ 
+-            reso1, reso2 = constrItem.sortedResonances()
++            reso1, reso2 = constrItem.resonances
+ 
+             # TJS fix for mapping prochirals
+             # always use real resonnances where possible
diff --git a/sci-chemistry/cns/cns-1.2.1-r7.ebuild b/sci-chemistry/cns/cns-1.2.1-r7.ebuild
index 64faf0bedc57..6e9f87cf971b 100644
--- a/sci-chemistry/cns/cns-1.2.1-r7.ebuild
+++ b/sci-chemistry/cns/cns-1.2.1-r7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/cns/cns-1.2.1-r7.ebuild,v 1.1 2011/08/30 13:48:39 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/cns/cns-1.2.1-r7.ebuild,v 1.2 2012/03/21 18:26:15 jlec Exp $
 
 EAPI=3
 
@@ -140,7 +140,7 @@ src_compile() {
 		LD=$(tc-getFC) \
 		CCFLAGS="${CFLAGS} -DCNS_ARCH_TYPE_\$(CNS_ARCH_TYPE) \$(EXT_CCFLAGS)" \
 		LDFLAGS="${LDFLAGS}" \
-		F77OPT="${FFLAGS:- -O2} ${MALIGN}" \
+		F77OPT="${FCFLAGS:- -O2} ${MALIGN}" \
 		F77STD="${GLOBALS}" \
 		OMPLIB="${OMPLIB}" \
 		compiler="${COMP}" \
diff --git a/sci-chemistry/mm-align/Manifest b/sci-chemistry/mm-align/Manifest
new file mode 100644
index 000000000000..d8eb281d9efa
--- /dev/null
+++ b/sci-chemistry/mm-align/Manifest
@@ -0,0 +1 @@
+DIST MM-align-20120321.tar.xz 20072 RMD160 3bf453c062f9f06e5b4da2f2a174fb15403e9df5 SHA1 94c9633511794e1b71e2d2cbc9447c6f3fde9d2f SHA256 0158a93a06257b885630ab7bed3b7bf8dca2ee12217c84d019829a1e34f3eeb3
diff --git a/sci-chemistry/mm-align/files/CMakeLists.txt b/sci-chemistry/mm-align/files/CMakeLists.txt
new file mode 100644
index 000000000000..635ffdd67418
--- /dev/null
+++ b/sci-chemistry/mm-align/files/CMakeLists.txt
@@ -0,0 +1,5 @@
+cmake_minimum_required (VERSION 2.6)
+project (MM-align Fortran)
+add_executable(MMalign MM-align.f)
+
+install (TARGETS MMalign DESTINATION bin)
diff --git a/sci-chemistry/mm-align/metadata.xml b/sci-chemistry/mm-align/metadata.xml
new file mode 100644
index 000000000000..6a27c1a3ac5f
--- /dev/null
+++ b/sci-chemistry/mm-align/metadata.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>sci-chemistry</herd>
+	<maintainer>
+		<email>jlec@gentoo.org</email>
+	</maintainer>
+	<longdescription>
+MM-align is an algorithm for structurally aligning multiple-chain 
+protein-protein complexes. The algorithm is built on a heuristic 
+iteration of a modified Needleman-Wunsch dynamic programming (DP) 
+algorithm, with the alignment score specified by the inter-complex residue 
+distances. The multiple chains in each complex are first joined, in every 
+possible order, and then simultaneously aligned with cross-chain alignments 
+prevented. The alignments of interface residues are enhanced by an 
+interface-specific weighting factor. An optimal alignment between two complexes,
+as well as the overall TM-score, will be reported for each comparison.
+What is the difference between TM-align and MM-align? TM-align is for aligning 
+monomer protein structures while MM-align is designed for aligning 
+multiple-chain protein complex structures. Although one can still use TM-align 
+to align protein complexes after manually joining the chains, this will lead 
+to suboptimal alignments with unphysical cross alignments. Therefore, the 
+best result will be obtained if one uses TM-align to monomer structures and 
+MM-align for multimer structures.
+</longdescription>
+</pkgmetadata>
diff --git a/sci-chemistry/mm-align/mm-align-20120321.ebuild b/sci-chemistry/mm-align/mm-align-20120321.ebuild
new file mode 100644
index 000000000000..e5b3c19faddf
--- /dev/null
+++ b/sci-chemistry/mm-align/mm-align-20120321.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/mm-align/mm-align-20120321.ebuild,v 1.1 2012/03/21 12:28:50 jlec Exp $
+
+EAPI=4
+
+inherit cmake-utils fortran-2
+
+DESCRIPTION="Protein Complex Structural Alignment"
+HOMEPAGE="http://zhanglab.ccmb.med.umich.edu/MM-align/"
+SRC_URI="http://dev.gentoo.org/~jlec/distfiles/MM-align-${PV}.tar.xz"
+
+SLOT="0"
+LICENSE="as-is"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+S="${WORKDIR}"
+
+src_prepare() {
+	cp "${FILESDIR}"/CMakeLists.txt . || die
+}
diff --git a/sci-chemistry/mmtk/Manifest b/sci-chemistry/mmtk/Manifest
new file mode 100644
index 000000000000..45525a082c53
--- /dev/null
+++ b/sci-chemistry/mmtk/Manifest
@@ -0,0 +1 @@
+DIST MMTK-2.7.5.tar.gz 1269533 RMD160 2fb4a020147c1ffed785a0b471128736c46fa2a4 SHA1 b4f274e6c5472f4450120278789c5e382db4007e SHA256 34cb5636643805d52903a58a96215bf81b3229bfb34cac754a3d715aadad3dfe
diff --git a/sci-chemistry/mmtk/metadata.xml b/sci-chemistry/mmtk/metadata.xml
new file mode 100644
index 000000000000..17d378df8960
--- /dev/null
+++ b/sci-chemistry/mmtk/metadata.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>sci-chemistry</herd>
+	<maintainer>
+		<email>jlec@gentoo.org</email>
+	</maintainer>
+	<longdescription>
+The Molecular Modelling Toolkit (MMTK) is an Open Source program library for 
+molecular simulation applications. In addition to providing ready-to-use 
+implementations of standard algorithms, MMTK serves as a code basis that can be
+easily extended and modified to deal with standard and non-standard problems 
+in molecular simulations.
+
+The three most common usage patterns of MMTK are
+
+Writing Python scripts that make use of MMTK functions for standard simulation 
+and modelling applications. This is similar to using other simulation packages 
+with a scripting language (i.e. CHARMM or Gromos), but with the added 
+advantage of having access to lots of useful Python modules from elsewhere. 
+The example section shows what such scripts look like.
+Writing modules that interact closely with MMTK (and perhaps other packages) 
+to solve problems for which no standard solution exists. For example, adding 
+a particular force field term or a particular simulation or analysis 
+algorithm. There is not much competition for MMTK in that domain.
+Writing application programs in Python that use MMTK internally, for users that 
+do not need to know anything about such internals. Those programs can provide 
+easy-to-use graphical interfaces (see e.g. DomainFinder and nMOLDYN) or be 
+integrated into a Web service (see e.g. WEBnm@).
+</longdescription>
+</pkgmetadata>
diff --git a/sci-chemistry/mmtk/mmtk-2.7.5.ebuild b/sci-chemistry/mmtk/mmtk-2.7.5.ebuild
new file mode 100644
index 000000000000..5a0b10ce64a1
--- /dev/null
+++ b/sci-chemistry/mmtk/mmtk-2.7.5.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/mmtk/mmtk-2.7.5.ebuild,v 1.1 2012/03/21 11:45:27 jlec Exp $
+
+EAPI=4
+
+PYTHON_DEPEND="2"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.* 2.7-pypy-*"
+
+inherit distutils
+
+DL_ID=3794
+MY_PN=MMTK
+MY_P=${MY_PN}-${PV}
+
+PYTHON_MODNAME="${MY_PN}"
+
+DESCRIPTION="The Molecular Modelling Toolkit"
+HOMEPAGE="http://dirac.cnrs-orleans.fr/MMTK/"
+SRC_URI="https://sourcesup.cru.fr/frs/download.php/${DL_ID}/${MY_P}.tar.gz"
+
+SLOT="0"
+LICENSE="CeCILL-2"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="
+	dev-python/numpy
+	dev-python/scientificpython"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}"/${MY_P}
diff --git a/sci-chemistry/pdbmat/Manifest b/sci-chemistry/pdbmat/Manifest
new file mode 100644
index 000000000000..db536c35e973
--- /dev/null
+++ b/sci-chemistry/pdbmat/Manifest
@@ -0,0 +1 @@
+DIST pdbmat-3.89.tar.gz 124727 RMD160 8fa61884a89c8c615d1251ff9c337eaf81a70531 SHA1 e8784d36bd9f74b8605c6d9ec950195253850338 SHA256 98f75acd3da3f172213de0688825abad8b3a59c516b5b4ac411a494f6d355f72
diff --git a/sci-chemistry/pdbmat/files/CMakeLists.txt b/sci-chemistry/pdbmat/files/CMakeLists.txt
new file mode 100644
index 000000000000..2f1937d84b3f
--- /dev/null
+++ b/sci-chemistry/pdbmat/files/CMakeLists.txt
@@ -0,0 +1,14 @@
+cmake_minimum_required (VERSION 2.6)
+project (PDBMAT Fortran)
+
+option (EXAMPLES "Instal additional example files" OFF)
+
+add_executable(diagstd diagstd.f)
+add_executable(pdbmat pdbmat.f)
+
+install (TARGETS diagstd pdbmat DESTINATION bin)
+install (FILES diagstd.README pdbmat.README DESTINATION share/doc/pdbmat)
+
+if ( EXAMPLES )
+	install (DIRECTORY ../Try_ENM2011 DESTINATION share/pdbmat/examples)
+endif (EXAMPLES)
diff --git a/sci-chemistry/pdbmat/metadata.xml b/sci-chemistry/pdbmat/metadata.xml
new file mode 100644
index 000000000000..84b111c93278
--- /dev/null
+++ b/sci-chemistry/pdbmat/metadata.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>sci-chemistry</herd>
+	<maintainer>
+		<email>jlec@gentoo.org</email>
+	</maintainer>
+	<longdescription>
+A fortran program in which Tirion's model (also called the Elastic Network 
+Model) is implemented. Within the frame of this model, atoms (particles) 
+less than cutoff (angstroms) away from each others are linked by springs of 
+same strength. Alternatively, a list of interacting atoms can be given to the 
+program.
+Requirements: a file with the coordinates of the system, in PDB (Protein Data 
+Bank) or "x y z mass" format.
+
+Output: the hessian (the mass-weighted second derivatives of energy matrix), 
+in the "i j non-zero-ij-matrix-element" format.
+
+Diagstd, a fortran program with a standard diagonalization routine, can next 
+be used in order to obtain the corresponding normal modes of the system. If 
+the system is large, the RTB approximation can prove usefull (see below).
+</longdescription>
+</pkgmetadata>
diff --git a/sci-chemistry/pdbmat/pdbmat-3.89.ebuild b/sci-chemistry/pdbmat/pdbmat-3.89.ebuild
new file mode 100644
index 000000000000..598ca05c37c7
--- /dev/null
+++ b/sci-chemistry/pdbmat/pdbmat-3.89.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/pdbmat/pdbmat-3.89.ebuild,v 1.1 2012/03/21 13:47:43 jlec Exp $
+
+EAPI=4
+
+inherit cmake-utils fortran-2
+
+DESCRIPTION="Calculate Tirion's model from pdb structures"
+HOMEPAGE="http://ecole.modelisation.free.fr/modes.html"
+SRC_URI="http://ecole.modelisation.free.fr/enm2011.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="as-is"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="examples"
+
+S="${WORKDIR}"/Source_ENM2011
+
+src_prepare() {
+	cp "${FILESDIR}"/CMakeLists.txt . || die
+}
+
+src_configure() {
+	mycmakeargs=(
+		$(cmake-utils_use examples EXAMPLES)
+	)
+	cmake-utils_src_configure
+}
diff --git a/sci-chemistry/pymol-plugins-psico/Manifest b/sci-chemistry/pymol-plugins-psico/Manifest
new file mode 100644
index 000000000000..50761cd04a66
--- /dev/null
+++ b/sci-chemistry/pymol-plugins-psico/Manifest
@@ -0,0 +1 @@
+DIST pymol-plugins-psico-3.0.tar.gz 61723 RMD160 03a1a2f11538948e0f7d23d836d5ac493305b976 SHA1 9f81d7e2a24795c088b0b44e19dc457ca6922051 SHA256 8c87e59eab98b5d01759e0253c291c278bf5453846f748ac7d5ecc19bd510807
diff --git a/sci-chemistry/pymol-plugins-psico/metadata.xml b/sci-chemistry/pymol-plugins-psico/metadata.xml
new file mode 100644
index 000000000000..1837bbc07a6e
--- /dev/null
+++ b/sci-chemistry/pymol-plugins-psico/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>sci-chemistry</herd>
+	<maintainer>
+		<email>jlec@gentoo.org</email>
+	</maintainer>
+</pkgmetadata>
diff --git a/sci-chemistry/pymol-plugins-psico/pymol-plugins-psico-3.0.ebuild b/sci-chemistry/pymol-plugins-psico/pymol-plugins-psico-3.0.ebuild
new file mode 100644
index 000000000000..70ee82c4cb62
--- /dev/null
+++ b/sci-chemistry/pymol-plugins-psico/pymol-plugins-psico-3.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/pymol-plugins-psico/pymol-plugins-psico-3.0.ebuild,v 1.1 2012/03/21 17:16:48 jlec Exp $
+
+EAPI=4
+
+PYTHON_DEPEND="2"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.*"
+PYTHON_MODNAME="psico"
+
+inherit distutils vcs-snapshot
+
+DESCRIPTION="Pymol ScrIpt COllection"
+HOMEPAGE="https://github.com/speleo3/pymol-psico/"
+SRC_URI="https://github.com/speleo3/pymol-psico/tarball/${PV} -> ${P}.tar.gz"
+
+SLOT="0"
+KEYWORDS=""
+LICENSE="BSD-2"
+IUSE="minimal"
+
+RDEPEND="
+	dev-python/numpy
+	sci-biology/biopython
+	sci-chemistry/mmtk
+	!minimal? (
+		media-libs/qhull
+		media-video/mplayer
+		sci-biology/stride
+		sci-chemistry/dssp
+		sci-chemistry/mm-align
+		sci-chemistry/pdbmat
+		sci-chemistry/theseus
+		sci-chemistry/tm-align
+		sci-mathematics/diagrtb
+	)"
+
+pkg_postinst() {
+	if ! use minimal; then
+		elog "For full functionality you need to get DynDom from"
+		elog "http://fizz.cmp.uea.ac.uk/dyndom/dyndomMain.do"
+	fi
+}
diff --git a/sci-chemistry/theseus/Manifest b/sci-chemistry/theseus/Manifest
new file mode 100644
index 000000000000..9b1bf7ce1a6b
--- /dev/null
+++ b/sci-chemistry/theseus/Manifest
@@ -0,0 +1 @@
+DIST theseus_1.6.2.tar.gz 1214732 RMD160 94d041766eeb0394317be6626244ce97dd9ea8ee SHA1 1ef5e560a0ca27627437564cf72e28dd5fbb9cc4 SHA256 2e23f19e8417b3ddf700168c387a9b927b1372f20ba9e983ad2880da7e43be82
diff --git a/sci-chemistry/theseus/metadata.xml b/sci-chemistry/theseus/metadata.xml
new file mode 100644
index 000000000000..4c0f3f21f3d7
--- /dev/null
+++ b/sci-chemistry/theseus/metadata.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!-- 
+$Header: /var/cvsroot/gentoo-x86/sci-chemistry/theseus/metadata.xml,v 1.1 2012/03/21 13:17:03 jlec Exp $
+
+This is the example metadata file.
+The root element of this file is <pkgmetadata>. Within this element a 
+number of subelements are allowed: herd, maintainer, and 
+longdescription. herd is a required subelement.
+
+For a full description look at:
+http://www.gentoo.org/proj/en/devrel/handbook/handbook.xml?part=2&chap=4
+
+
+Before committing, please remove the comments from this file. They are 
+not relevant for general metadata.xml files.
+-->
+<pkgmetadata>
+	<!-- <herd>some-herd</herd> -->
+	<maintainer>
+		<email>@gentoo.org</email>
+		<!--  <description>Description of the maintainership</description> -->
+	</maintainer>
+	<!-- <longdescription>Long description of the package</longdescription> -->
+	<!--
+<use>
+  <flag name='flag'>Description of how USE='flag' affects this package</flag>
+  <flag name='userland_GNU'>Description of how USERLAND='GNU' affects this
+	  package</flag>
+  <flag name='aspell'>Uses <pkg>app-text/aspell</pkg> for spell checking.
+	  Requires an installed dictionary from <cat>app-dicts</cat></flag>
+</use>
+-->
+</pkgmetadata>
diff --git a/sci-chemistry/theseus/theseus-1.6.2-r1.ebuild b/sci-chemistry/theseus/theseus-1.6.2-r1.ebuild
new file mode 100644
index 000000000000..d898a5dd3661
--- /dev/null
+++ b/sci-chemistry/theseus/theseus-1.6.2-r1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/theseus/theseus-1.6.2-r1.ebuild,v 1.1 2012/03/21 16:11:49 jlec Exp $
+
+EAPI=4
+
+inherit multilib toolchain-funcs
+
+DESCRIPTION="maximum likelihood superpositioning and analysis of macromolecular structures"
+HOMEPAGE="http://www.theseus3d.org/"
+SRC_URI="http://www.theseus3d.org/src/${PN}_${PV}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-3"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="examples"
+
+RDEPEND="
+	sci-libs/gsl
+	|| (
+		sci-biology/probcons
+		sci-biology/mafft
+		sci-biology/t-coffee
+		sci-biology/kalign
+		sci-biology/clustalw
+		sci-biology/muscle
+		)"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+S="${WORKDIR}"/${PN}_src/
+
+src_prepare() {
+	cat >> make.inc <<- EOF
+	ARCH = $(tc-getAR)
+	ARCHFLAGS = -rvs
+	RANLIB = $(tc-getRANLIB)
+	LOCALLIBDIR = "${EPREFIX}/usr/$(get_libdir)
+	SYSLIBS = $(pkg-config --libs gsl) -lpthread
+	LIBS = -ldistfit -lmsa -ldssplite -ldltmath -lDLTutils -ltheseus
+	LIBDIR = -L./lib
+	INSTALLDIR = "${ED}"/usr/bin
+	OPT =
+	WARN = -Wall -pedantic -std=c99 #-Wstrict-aliasing=2
+	CFLAGS = ${CFLAGS} \$(WARN) #-force_cpusubtype_ALL -mmacosx-version-min=10.4 -arch x86_64 -arch i386 #-DNDEBUG
+	CC = $(tc-getCC)
+	EOF
+
+	sed \
+		-e 's|theseus:|theseus: libs|g' \
+		-e '/-o theseus/s:$(CC):$(CC) ${LDFLAGS}:g' \
+		-i Makefile || die
+
+	sed \
+		-e 's:/usr/local/bin/::g' \
+		-e 's:/usr/bin/::g' \
+		-i theseus_align || die
+}
+
+src_install() {
+	dobin theseus theseus_align
+	dodoc theseus_man.pdf README AUTHORS
+	use examples && insinto /usr/share/${PN} && doins -r examples
+}
diff --git a/sci-chemistry/tm-align/Manifest b/sci-chemistry/tm-align/Manifest
new file mode 100644
index 000000000000..59df8230458e
--- /dev/null
+++ b/sci-chemistry/tm-align/Manifest
@@ -0,0 +1 @@
+DIST TMtools20120124.tar.gz 919534 RMD160 38b2625622c3ef6a46ddfadf645b52ffe5d2d1f8 SHA1 26e511e6f9ab25e2da80b6e2043acfbff23170b7 SHA256 0464557cdcbfb5559b96859f851f938ef63ada8bf990b9a2c4e49ec3659cc7c4
diff --git a/sci-chemistry/tm-align/files/CMakeLists.txt b/sci-chemistry/tm-align/files/CMakeLists.txt
new file mode 100644
index 000000000000..506ef136309e
--- /dev/null
+++ b/sci-chemistry/tm-align/files/CMakeLists.txt
@@ -0,0 +1,6 @@
+cmake_minimum_required (VERSION 2.6)
+project (TMTools Fortran)
+add_executable(TMalign TMalign.f)
+add_executable(TMscore TMscore.f)
+
+install (TARGETS TMalign TMscore DESTINATION bin)
diff --git a/sci-chemistry/tm-align/metadata.xml b/sci-chemistry/tm-align/metadata.xml
new file mode 100644
index 000000000000..da6700a6429b
--- /dev/null
+++ b/sci-chemistry/tm-align/metadata.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>sci-chemistry</herd>
+	<maintainer>
+		<email>jlec@gentoo.org</email>
+	</maintainer>
+	<longdescription>
+TM-align is a computer algorithm for protein structure alignment using dynamic 
+programming and TM-score rotation matrix. An optimal alignment between two 
+proteins, as well as the TM-score, will be reported for each comparison. The 
+value of TM-score lies in (0,1]. In general, a comparison of TM-score smaller
+0.2 indicates that there is no similarity between two structures; a TM-score 
+greater 0.5 means the structures share the same fold.
+
+What is the difference between TM-score and TM-align? The TM-score program 
+is to compare two models based on their given and known residue equivalency. 
+It is usually NOT applied to compare two proteins of different sequences. The 
+TM-align is a structural alignment program for comparing two proteins whose 
+sequences can be different. The TM-align will first find the best equivalent 
+residues of two proteins based on the structure similarity and then output a 
+TM-score. The TM-score values in both programs have the same definition.
+</longdescription>
+</pkgmetadata>
diff --git a/sci-chemistry/tm-align/tm-align-20120124.ebuild b/sci-chemistry/tm-align/tm-align-20120124.ebuild
new file mode 100644
index 000000000000..a6f7c565e0bd
--- /dev/null
+++ b/sci-chemistry/tm-align/tm-align-20120124.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-chemistry/tm-align/tm-align-20120124.ebuild,v 1.1 2012/03/21 12:18:47 jlec Exp $
+
+EAPI=4
+
+inherit cmake-utils fortran-2
+
+DESCRIPTION="Quick & Accurate Structural Alignment"
+HOMEPAGE="http://zhanglab.ccmb.med.umich.edu/TM-align/"
+SRC_URI="http://zhanglab.ccmb.med.umich.edu/TM-align/TMtools${PV}.tar.gz"
+
+SLOT="0"
+LICENSE="as-is"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="static custom-cflags"
+
+S="${WORKDIR}"
+
+src_prepare() {
+	cp "${FILESDIR}"/CMakeLists.txt . || die
+	use static && append-fflags -static && append-ldflags -static
+	# recommended by upstream
+	use custom-cflags || replace-flags -O* -O3 && append-fflags -ffast-math
+}
diff --git a/sci-mathematics/diagrtb/Manifest b/sci-mathematics/diagrtb/Manifest
new file mode 100644
index 000000000000..9fdc1d737680
--- /dev/null
+++ b/sci-mathematics/diagrtb/Manifest
@@ -0,0 +1 @@
+DIST diagrtb-2.64.tar.gz 2429842 RMD160 00a4d4a2d815e60d3f1fa9648c2b0df13fd91fd7 SHA1 e79ede62842541e9673db0dda2ee8ac779cb6792 SHA256 bbab6ed2f9eeae1c64d0d55764908748a5e321589df81c7d87647623950b7aa0
diff --git a/sci-mathematics/diagrtb/diagrtb-2.64.ebuild b/sci-mathematics/diagrtb/diagrtb-2.64.ebuild
new file mode 100644
index 000000000000..a780ae71707b
--- /dev/null
+++ b/sci-mathematics/diagrtb/diagrtb-2.64.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/diagrtb/diagrtb-2.64.ebuild,v 1.1 2012/03/21 13:57:18 jlec Exp $
+
+EAPI=4
+
+inherit cmake-utils fortran-2
+
+DESCRIPTION="Calculation of some eigenvectors of a large real, symmetrical, matrix"
+HOMEPAGE="http://ecole.modelisation.free.fr/modes.html"
+SRC_URI="http://ecole.modelisation.free.fr/rtb2011.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="as-is"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="examples"
+
+S="${WORKDIR}"/Source_RTB2011
+
+src_prepare() {
+	cp "${FILESDIR}"/CMakeLists.txt . || die
+}
+
+src_configure() {
+	mycmakeargs=(
+		$(cmake-utils_use examples EXAMPLES)
+	)
+	cmake-utils_src_configure
+}
diff --git a/sci-mathematics/diagrtb/files/CMakeLists.txt b/sci-mathematics/diagrtb/files/CMakeLists.txt
new file mode 100644
index 000000000000..d1eb6c62f09f
--- /dev/null
+++ b/sci-mathematics/diagrtb/files/CMakeLists.txt
@@ -0,0 +1,13 @@
+cmake_minimum_required (VERSION 2.6)
+project (DIAGRTB Fortran)
+
+option (EXAMPLES "Instal additional example files" OFF)
+
+add_executable(diagrtb diagrtb.f)
+
+install (TARGETS diagrtb DESTINATION bin)
+install (FILES diagrtb.README DESTINATION share/doc/diagrtb)
+
+if ( EXAMPLES )
+	install (DIRECTORY ../Try_RTB2011 DESTINATION share/diagrtb/examples)
+endif (EXAMPLES)
diff --git a/sci-mathematics/diagrtb/metadata.xml b/sci-mathematics/diagrtb/metadata.xml
new file mode 100644
index 000000000000..b2b6df7d599c
--- /dev/null
+++ b/sci-mathematics/diagrtb/metadata.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<herd>sci-chemistry</herd>
+	<maintainer>
+		<email>jlec@gentoo.org</email>
+	</maintainer>
+	<longdescription>
+A fortran program for the calculation of some eigenvectors of a large real, 
+symmetrical, matrix.
+If the matrix was obtained, for instance, with the PDBMAT program, these 
+eigenvectors correspond to the low-frequency normal modes (i.e., mostly 
+those with a collective character) of the system. Note that in the case of 
+proteins, low-frequency normal modes thus obtained are found to be very close 
+to those obtained with standard, much more realistic (e.g., all atoms with 
+empirical force fields), models.
+
+The method used rests upon the RTB approximation (standing for 
+Rotations-Translations-of-Blocks). Within the frame of this approximation, 
+blocks of n (n=1,2,...) consecutive monomers (amino-acid residues) are 
+assumed to behave like rigid bodies.
+
+Requirements: a matrix in the "i j non-zero-ij-matrix-element" format. 
+A file with the coordinates of the system, in the PDB or "x y z mass 
+block-number" format.
+</longdescription>
+</pkgmetadata>
diff --git a/sci-physics/espresso/Manifest b/sci-physics/espresso/Manifest
index 92d5707096e9..9519d8f55b15 100644
--- a/sci-physics/espresso/Manifest
+++ b/sci-physics/espresso/Manifest
@@ -1 +1 @@
-DIST espresso-3.0.2.tar.gz 6694706 RMD160 1a66eacf78babae960e484db0c923d55b366f519 SHA1 695115971e48f5b469c53abbc3468d8b5ba0bd2e SHA256 e5287ef3f9402ac57e65713875bb12b5c834388a35911a7893c491534195ac1e
+DIST espresso-3.1.0.tar.gz 8999207 RMD160 ff10d59710385ebf533e8986e22174c2d17e6351 SHA1 7ea63e10b5303509c10264063c4eca8ce59f0251 SHA256 72a8b9711a95b32cf6361d8f3b2712a37bcade592996686f5cec1506fe82f1e6
diff --git a/sci-physics/espresso/espresso-3.0.2.ebuild b/sci-physics/espresso/espresso-3.1.0.ebuild
similarity index 76%
rename from sci-physics/espresso/espresso-3.0.2.ebuild
rename to sci-physics/espresso/espresso-3.1.0.ebuild
index 3fa1fc0264f5..6f06b12c6b90 100644
--- a/sci-physics/espresso/espresso-3.0.2.ebuild
+++ b/sci-physics/espresso/espresso-3.1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-physics/espresso/espresso-3.0.2.ebuild,v 1.2 2012/02/23 17:04:57 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-physics/espresso/espresso-3.1.0.ebuild,v 1.1 2012/03/22 03:45:19 ottxor Exp $
 
 EAPI=4
 
@@ -9,7 +9,7 @@ inherit autotools-utils savedconfig
 DESCRIPTION="Extensible Simulation Package for Research on Soft matter"
 HOMEPAGE="http://www.espressomd.org"
 
-if [ "${PV%9999}" != "${PV}" ]; then
+if [[ ${PV} = 9999 ]]; then
 	EGIT_REPO_URI="git://git.savannah.nongnu.org/espressomd.git"
 	EGIT_BRANCH="master"
 	inherit git-2
@@ -33,8 +33,9 @@ RDEPEND="
 	X? ( x11-libs/libX11 )"
 
 DEPEND="${RDEPEND}
+	dev-lang/python
 	doc? (
-		|| ( <app-doc/doxygen-1.7.6.1[-nodot] >=app-doc/doxygen-1.7.6.1[dot] )
+		app-doc/doxygen[-nodot]
 		virtual/latex-base )"
 
 DOCS=( AUTHORS NEWS README ChangeLog )
@@ -57,10 +58,13 @@ src_configure() {
 
 src_compile() {
 	autotools-utils_src_compile
-	use doc && autotools-utils_src_compile doc
+	use doc && autotools-utils_src_compile ug doxygen tutorials
+	[[ ${PV} = 9999 ]] && use doc && autotools-utils_src_compile dg
 }
 
 src_install() {
+	local i
+
 	autotools-utils_src_install
 
 	insinto /usr/share/${PN}
@@ -69,11 +73,13 @@ src_install() {
 	save_config ${AUTOTOOLS_BUILD_DIR}/src/myconfig-final.h
 
 	if use doc; then
-		local where="."
-		[ "${PV%9999}" != "${PV}" ] && where="${AUTOTOOLS_BUILD_DIR}"
-		newdoc ${where}/doc/ug/ug.pdf user_guide.pdf
-		dohtml -r ${AUTOTOOLS_BUILD_DIR}/doc/dg/html/*
-		newdoc ${where}/doc/tutorials/tut2/tut2.pdf tutorial.pdf
+		[[ ${PV} = 9999 ]] && \
+			newdoc ${AUTOTOOLS_BUILD_DIR}/doc/dg/dg.pdf developer_guide.pdf
+		newdoc ${AUTOTOOLS_BUILD_DIR}/doc/ug/ug.pdf user_guide.pdf
+		dohtml -r ${AUTOTOOLS_BUILD_DIR}/doc/doxygen/html/*
+		for i in ${AUTOTOOLS_BUILD_DIR}/doc/tutorials/*/[0-9]*.pdf; do
+			newdoc ${i} tutorial_${i##*/}
+		done
 	fi
 
 	if use examples; then
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index ce4b05a2376b..82720ff5e006 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -3,9 +3,7 @@ DIST portage-2.1.10.49.tar.bz2 803941 RMD160 088a21151b66c7fdb4ed39c46b25fee1b4e
 DIST portage-2.1.6.13.patch.bz2 177383 RMD160 ef6388ca4a55a7defb319d54c9d80625cb8e12dc SHA1 5298feb6f881c25abdbde4a353d341fd36fdee51 SHA256 2cc897b6fa43b3329ef51f6304c064237be6bc326f1f0c221a19c0f96b69cd9c
 DIST portage-2.1.6.7.patch.bz2 50118 RMD160 cc0a322570829c8dec9aa4886deb5741f0efb489 SHA1 02021be38b0f829d45b342483834652a1985a952 SHA256 5f0605b51a24d23703330b040d2f7154322284db3e0cefa7499002ff1fa733c0
 DIST portage-2.1.6.tar.bz2 518771 RMD160 766ff4eb92497894f4c8678a9c4bc2756e4d9c63 SHA1 a28b191904296b551b22a7af83dacd1c336340a5 SHA256 b1c507445b3858449c861568f477e1cfab8b2326ded906b852c5193fb3839647
-DIST portage-2.2.0_alpha84.tar.bz2 781776 RMD160 a65a67fd1539d86935e3874f2322eba4aa62b6a1 SHA1 7d3359fce4461d7fbb4b2a45e859c9dba17247fa SHA256 3bafc462e362b3cf99eac84e8c23439c230b2e14309fd431f93e8d1e2eb70a07
 DIST portage-2.2.0_alpha88.tar.bz2 803852 RMD160 9c6a87c2a8de996286e74245faeaacf89fab0aea SHA1 d2f698470f0df250f51f937d78ea484d27ad0068 SHA256 75b74a87c4f4b1a13857f62aeb42522b491b06b66fe686ef4036993f55125130
 DIST portage-2.2.0_alpha89.patch.bz2 4205 RMD160 ff17958771ee571ccc45604682882356d2d54e5e SHA1 bf5ed24e13f89bcad128e8773f40ceea8bbd8ed2 SHA256 677bc5cce25723cefbdb8f147ac6fc7162d541eb0a149fbd1b96d79f4b2a07d1
-DIST portage-2.2.0_alpha90.patch.bz2 9840 RMD160 f2d767e60a05099e770b2ce87910000b66dd2cfb SHA1 f16654dc2cf62b9158b1174f989d8cdd7473f080 SHA256 f64d071473bf3f46376720cd6f03e63d557bfe1f17b8dd423c183f7a427884f0
 DIST portage-2.2.0_alpha93.patch.bz2 33531 RMD160 7925fd9877eb3858d585c6c8f79f74ad3db86b3e SHA1 43ece92c03957fa4f705baab5ec48ba376e62eac SHA256 98284fd7982327f22999e867c457e1c4bd8c1dce20bde6c529af3c574bff8891
 DIST portage-man-pl-2.1.2.tar.bz2 53893 RMD160 46c3656b40bf4ad2530ab2b5fbc563708b86748c SHA1 c3151e0b330c589625830e54053fbc676b2c64de SHA256 960eaa7c6f3a2af44bdc665266a8e884628a562373cc477d301597ecc5ef961f
diff --git a/sys-apps/portage/portage-2.2.0_alpha84.ebuild b/sys-apps/portage/portage-2.2.0_alpha84.ebuild
deleted file mode 100644
index 5bca92a0fbfa..000000000000
--- a/sys-apps/portage/portage-2.2.0_alpha84.ebuild
+++ /dev/null
@@ -1,435 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2.0_alpha84.ebuild,v 1.2 2012/02/18 23:11:02 zmedico Exp $
-
-# Require EAPI 2 since we now require at least python-2.6 (for python 3
-# syntax support) which also requires EAPI 2.
-EAPI=3
-inherit eutils multilib python
-
-DESCRIPTION="Portage is the package management and distribution system for Gentoo"
-HOMEPAGE="http://www.gentoo.org/proj/en/portage/index.xml"
-LICENSE="GPL-2"
-KEYWORDS="~sparc-fbsd ~x86-fbsd"
-SLOT="0"
-IUSE="build doc epydoc +ipc linguas_pl python2 python3 selinux xattr"
-
-# Import of the io module in python-2.6 raises ImportError for the
-# thread module if threading is disabled.
-python_dep="python3? ( =dev-lang/python-3* )
-	!python2? ( !python3? (
-		|| ( >=dev-lang/python-2.7 dev-lang/python:2.6[threads] )
-	) )
-	python2? ( !python3? ( || ( dev-lang/python:2.7 dev-lang/python:2.6[threads] ) ) )"
-
-# The pysqlite blocker is for bug #282760.
-DEPEND="${python_dep}
-	!build? ( >=sys-apps/sed-4.0.5 )
-	doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 )
-	epydoc? ( >=dev-python/epydoc-2.0 !<=dev-python/pysqlite-2.4.1 )"
-# Require sandbox-2.2 for bug #288863.
-# For xattr, we can spawn getfattr and setfattr from sys-apps/attr, but that's
-# quite slow, so it's not considered in the dependencies as an alternative to
-# to python-3.3 / pyxattr. Also, xattr support is only tested with Linux, so
-# for now, don't pull in xattr deps for other kernels.
-RDEPEND="${python_dep}
-	!build? ( >=sys-apps/sed-4.0.5
-		>=app-shells/bash-3.2_p17
-		>=app-admin/eselect-1.2 )
-	elibc_FreeBSD? ( sys-freebsd/freebsd-bin )
-	elibc_glibc? ( >=sys-apps/sandbox-2.2 )
-	elibc_uclibc? ( >=sys-apps/sandbox-2.2 )
-	>=app-misc/pax-utils-0.1.17
-	xattr? ( kernel_linux? ( || ( >=dev-lang/python-3.3_pre20110902 dev-python/pyxattr ) ) )
-	selinux? ( || ( >=sys-libs/libselinux-2.0.94[python] <sys-libs/libselinux-2.0.94 ) )
-	!<app-shells/bash-3.2_p17
-	!<app-admin/logrotate-3.8.0"
-PDEPEND="
-	!build? (
-		>=net-misc/rsync-2.6.4
-		userland_GNU? ( >=sys-apps/coreutils-6.4 )
-	)"
-# coreutils-6.4 rdep is for date format in emerge-webrsync #164532
-# NOTE: FEATURES=install-sources requires debugedit and rsync
-
-SRC_ARCHIVES="http://dev.gentoo.org/~zmedico/portage/archives"
-
-prefix_src_archives() {
-	local x y
-	for x in ${@}; do
-		for y in ${SRC_ARCHIVES}; do
-			echo ${y}/${x}
-		done
-	done
-}
-
-PV_PL="2.1.2"
-PATCHVER_PL=""
-TARBALL_PV=2.2.0_alpha84
-SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.bz2
-	$(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2)
-	linguas_pl? ( mirror://gentoo/${PN}-man-pl-${PV_PL}.tar.bz2
-		$(prefix_src_archives ${PN}-man-pl-${PV_PL}.tar.bz2) )"
-
-PATCHVER=
-[[ $TARBALL_PV = $PV ]] || PATCHVER=$PV
-if [ -n "${PATCHVER}" ]; then
-	SRC_URI="${SRC_URI} mirror://gentoo/${PN}-${PATCHVER}.patch.bz2
-	$(prefix_src_archives ${PN}-${PATCHVER}.patch.bz2)"
-fi
-
-S="${WORKDIR}"/${PN}-${TARBALL_PV}
-S_PL="${WORKDIR}"/${PN}-${PV_PL}
-
-compatible_python_is_selected() {
-	[[ $(/usr/bin/python -c 'import sys ; sys.stdout.write(sys.hexversion >= 0x2060000 and "good" or "bad")') = good ]]
-}
-
-pkg_setup() {
-	# Bug #359731 - Die early if get_libdir fails.
-	[[ -z $(get_libdir) ]] && \
-		die "get_libdir returned an empty string"
-
-	if use python2 && use python3 ; then
-		ewarn "Both python2 and python3 USE flags are enabled, but only one"
-		ewarn "can be in the shebangs. Using python3."
-	fi
-	if ! use python2 && ! use python3 && ! compatible_python_is_selected ; then
-		ewarn "Attempting to select a compatible default python interpreter"
-		local x success=0
-		for x in /usr/bin/python2.* ; do
-			x=${x#/usr/bin/python2.}
-			if [[ $x -ge 6 ]] 2>/dev/null ; then
-				eselect python set python2.$x
-				if compatible_python_is_selected ; then
-					elog "Default python interpreter is now set to python-2.$x"
-					success=1
-					break
-				fi
-			fi
-		done
-		if [ $success != 1 ] ; then
-			eerror "Unable to select a compatible default python interpreter!"
-			die "This version of portage requires at least python-2.6 to be selected as the default python interpreter (see \`eselect python --help\`)."
-		fi
-	fi
-
-	if use python3; then
-		python_set_active_version 3
-	elif use python2; then
-		python_set_active_version 2
-	fi
-}
-
-src_prepare() {
-	if [ -n "${PATCHVER}" ] ; then
-		if [[ -L $S/bin/ebuild-helpers/portageq ]] ; then
-			rm "$S/bin/ebuild-helpers/portageq" \
-				|| die "failed to remove portageq helper symlink"
-		fi
-		epatch "${WORKDIR}/${PN}-${PATCHVER}.patch"
-	fi
-	einfo "Setting portage.VERSION to ${PVR} ..."
-	sed -e "s/^VERSION=.*/VERSION=\"${PVR}\"/" -i pym/portage/__init__.py || \
-		die "Failed to patch portage.VERSION"
-	sed -e "1s/VERSION/${PVR}/" -i doc/fragment/version || \
-		die "Failed to patch VERSION in doc/fragment/version"
-	sed -e "1s/VERSION/${PVR}/" -i man/* || \
-		die "Failed to patch VERSION in man page headers"
-
-	if ! use ipc ; then
-		einfo "Disabling ipc..."
-		sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \
-			-i pym/_emerge/AbstractEbuildProcess.py || \
-			die "failed to patch AbstractEbuildProcess.py"
-	fi
-
-	if use xattr && use kernel_linux ; then
-		einfo "Adding FEATURES=xattr to make.globals ..."
-		echo -e '\nFEATURES="${FEATURES} xattr"' >> cnf/make.globals \
-			|| die "failed to append to make.globals"
-	fi
-
-	if use python3; then
-		einfo "Converting shebangs for python3..."
-		python_convert_shebangs -r 3 .
-	elif use python2; then
-		einfo "Converting shebangs for python2..."
-		python_convert_shebangs -r 2 .
-	fi
-
-	if [[ -n ${EPREFIX} ]] ; then
-		einfo "Setting portage.const.EPREFIX ..."
-		sed -e "s|^\(SANDBOX_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/sandbox\"\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(FAKEROOT_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/fakeroot\"\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(BASH_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/bash\"\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(MOVE_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/mv\"\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(PRELINK_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/sbin/prelink\"\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(EPREFIX[[:space:]]*=[[:space:]]*\"\).*|\\1${EPREFIX}\"|" \
-			-i pym/portage/const.py || \
-			die "Failed to patch portage.const.EPREFIX"
-
-		einfo "Prefixing shebangs ..."
-		find . -type f -print0 | \
-		while read -r -d $'\0' ; do
-			local shebang=$(head -n1 "$REPLY")
-			if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then
-				sed -i -e "1s:.*:#!${EPREFIX}${shebang:2}:" "$REPLY" || \
-					die "sed failed"
-			fi
-		done
-
-		einfo "Adjusting make.globals ..."
-		sed -e 's|^SYNC=.*|SYNC="rsync://rsync.prefix.freens.org/gentoo-portage-prefix"|' \
-			-e "s|^\(PORTDIR=\)\(/usr/portage\)|\\1\"${EPREFIX}\\2\"|" \
-			-e "s|^\(PORTAGE_TMPDIR=\)\(/var/tmp\)|\\1\"${EPREFIX}\\2\"|" \
-			-i cnf/make.globals || die "sed failed"
-
-		einfo "Adding FEATURES=force-prefix to make.globals ..."
-		echo -e '\nFEATURES="${FEATURES} force-prefix"' >> cnf/make.globals \
-			|| die "failed to append to make.globals"
-	fi
-
-}
-
-src_compile() {
-	if use doc; then
-		cd "${S}"/doc
-		touch fragment/date
-		make xhtml xhtml-nochunks || die "failed to make docs"
-	fi
-
-	if use epydoc; then
-		einfo "Generating api docs"
-		mkdir "${WORKDIR}"/api
-		local my_modules epydoc_opts=""
-		my_modules="$(find "${S}/pym" -name "*.py" \
-			| sed -e 's:/__init__.py$::' -e 's:\.py$::' -e "s:^${S}/pym/::" \
-			 -e 's:/:.:g' | sort)" || die "error listing modules"
-		# workaround for bug 282760
-		> "$S/pym/pysqlite2.py"
-		PYTHONPATH=${S}/pym:${PYTHONPATH:+:}${PYTHONPATH} \
-			epydoc -o "${WORKDIR}"/api \
-			-qqqqq --no-frames --show-imports $epydoc_opts \
-			--name "${PN}" --url "${HOMEPAGE}" \
-			${my_modules} || die "epydoc failed"
-		rm "$S/pym/pysqlite2.py"
-	fi
-}
-
-src_test() {
-	# make files executable, in case they were created by patch
-	find bin -type f | xargs chmod +x
-	./pym/portage/tests/runTests || die "test(s) failed"
-}
-
-src_install() {
-	local libdir=$(get_libdir)
-	local portage_base="/usr/${libdir}/portage"
-	local portage_share_config=/usr/share/portage/config
-
-	cd "${S}"/cnf
-	insinto /etc
-	doins etc-update.conf dispatch-conf.conf || die
-
-	insinto "$portage_share_config/sets"
-	doins "$S"/cnf/sets/*.conf || die
-	insinto "$portage_share_config"
-	doins "$S/cnf/make.globals" || die
-	if [ -f "make.conf.${ARCH}".diff ]; then
-		patch make.conf "make.conf.${ARCH}".diff || \
-			die "Failed to patch make.conf.example"
-		newins make.conf make.conf.example || die
-	else
-		eerror ""
-		eerror "Portage does not have an arch-specific configuration for this arch."
-		eerror "Please notify the arch maintainer about this issue. Using generic."
-		eerror ""
-		newins make.conf make.conf.example || die
-	fi
-
-	dosym ..${portage_share_config}/make.globals /etc/make.globals
-
-	insinto /etc/logrotate.d
-	doins "${S}"/cnf/logrotate.d/elog-save-summary || die
-
-	# BSD and OSX need a sed wrapper so that find/xargs work properly
-	if use userland_GNU; then
-		rm "${S}"/bin/ebuild-helpers/sed || die "Failed to remove sed wrapper"
-	fi
-
-	local x symlinks files
-
-	cd "$S" || die "cd failed"
-	for x in $(find bin -type d) ; do
-		exeinto $portage_base/$x || die "exeinto failed"
-		cd "$S"/$x || die "cd failed"
-		files=$(find . -mindepth 1 -maxdepth 1 -type f ! -type l)
-		if [ -n "$files" ] ; then
-			doexe $files || die "doexe failed"
-		fi
-		symlinks=$(find . -mindepth 1 -maxdepth 1 -type l)
-		if [ -n "$symlinks" ] ; then
-			cp -P $symlinks "$ED$portage_base/$x" || die "cp failed"
-		fi
-	done
-
-	cd "$S" || die "cd failed"
-	for x in $(find pym/* -type d ! -path "pym/portage/tests*") ; do
-		insinto $portage_base/$x || die "insinto failed"
-		cd "$S"/$x || die "cd failed"
-		# __pycache__ directories contain no py files
-		[[ "*.py" != $(echo *.py) ]] || continue
-		doins *.py || die "doins failed"
-		symlinks=$(find . -mindepth 1 -maxdepth 1 -type l)
-		if [ -n "$symlinks" ] ; then
-			cp -P $symlinks "$ED$portage_base/$x" || die "cp failed"
-		fi
-	done
-
-	# We install some minimal tests for use as a preinst sanity check.
-	# These tests must be able to run without a full source tree and
-	# without relying on a previous portage instance being installed.
-	cd "$S" || die "cd failed"
-	exeinto $portage_base/pym/portage/tests || die
-	doexe pym/portage/tests/runTests || die
-	insinto $portage_base/pym/portage/tests || die
-	doins pym/portage/tests/*.py || die
-	insinto $portage_base/pym/portage/tests/lint || die
-	doins pym/portage/tests/lint/*.py || die
-	doins pym/portage/tests/lint/__test__ || die
-
-	# Symlinks to directories cause up/downgrade issues and the use of these
-	# modules outside of portage is probably negligible.
-	for x in "${ED}${portage_base}/pym/"{cache,elog_modules} ; do
-		[ ! -L "${x}" ] && continue
-		die "symlink to directory will cause upgrade/downgrade issues: '${x}'"
-	done
-
-	doman "${S}"/man/*.[0-9]
-	if use linguas_pl; then
-		doman -i18n=pl "${S_PL}"/man/pl/*.[0-9]
-		doman -i18n=pl_PL.UTF-8 "${S_PL}"/man/pl_PL.UTF-8/*.[0-9]
-	fi
-
-	dodoc "${S}"/{ChangeLog,NEWS,RELEASE-NOTES}
-	use doc && dohtml -r "${S}"/doc/*
-	use epydoc && dohtml -r "${WORKDIR}"/api
-
-	dodir /usr/bin
-	for x in ebuild egencache emerge portageq quickpkg repoman ; do
-		dosym ../${libdir}/portage/bin/${x} /usr/bin/${x}
-	done
-
-	dodir /usr/sbin
-	local my_syms="archive-conf
-		dispatch-conf
-		emaint
-		emerge-webrsync
-		env-update
-		etc-update
-		fixpackages
-		regenworld"
-	local x
-	for x in ${my_syms}; do
-		dosym ../${libdir}/portage/bin/${x} /usr/sbin/${x}
-	done
-	dosym env-update /usr/sbin/update-env
-	dosym etc-update /usr/sbin/update-etc
-
-	dodir /etc/portage
-	keepdir /etc/portage
-}
-
-pkg_preinst() {
-	if [[ $ROOT == / ]] ; then
-		# Run some minimal tests as a sanity check.
-		local test_runner=$(find "$ED" -name runTests)
-		if [[ -n $test_runner && -x $test_runner ]] ; then
-			einfo "Running preinst sanity tests..."
-			"$test_runner" || die "preinst sanity tests failed"
-		fi
-	fi
-
-	if ! use build && ! has_version dev-python/pycrypto && \
-		! has_version '>=dev-lang/python-2.6[ssl]' ; then
-		ewarn "If you are an ebuild developer and you plan to commit ebuilds"
-		ewarn "with this system then please install dev-python/pycrypto or"
-		ewarn "enable the ssl USE flag for >=dev-lang/python-2.6 in order"
-		ewarn "to enable RMD160 hash support."
-		ewarn "See bug #198398 for more information."
-	fi
-	if [ -f "${EROOT}/etc/make.globals" ]; then
-		rm "${EROOT}/etc/make.globals"
-	fi
-
-	has_version "<${CATEGORY}/${PN}-2.2_alpha" \
-		&& MINOR_UPGRADE=true || MINOR_UPGRADE=false
-
-	has_version "<=${CATEGORY}/${PN}-2.2_pre5" \
-		&& WORLD_MIGRATION_UPGRADE=true || WORLD_MIGRATION_UPGRADE=false
-
-	# If portage-2.1.6 is installed and the preserved_libs_registry exists,
-	# assume that the NEEDED.ELF.2 files have already been generated.
-	has_version "<=${CATEGORY}/${PN}-2.2_pre7" && \
-		! ( [ -e "${EROOT}"var/lib/portage/preserved_libs_registry ] && \
-		has_version ">=${CATEGORY}/${PN}-2.1.6_rc" ) \
-		&& NEEDED_REBUILD_UPGRADE=true || NEEDED_REBUILD_UPGRADE=false
-
-	[[ -n $PORTDIR_OVERLAY ]] && has_version "<${CATEGORY}/${PN}-2.1.6.12" \
-		&& REPO_LAYOUT_CONF_WARN=true || REPO_LAYOUT_CONF_WARN=false
-}
-
-pkg_postinst() {
-	# Compile all source files recursively. Any orphans
-	# will be identified and removed in postrm.
-	python_mod_optimize /usr/$(get_libdir)/portage/pym
-
-	if $WORLD_MIGRATION_UPGRADE ; then
-		einfo "moving set references from the worldfile into world_sets"
-		cd "${EROOT}/var/lib/portage/"
-		grep "^@" world >> world_sets
-		sed -i -e '/^@/d' world
-	fi
-
-	if $NEEDED_REBUILD_UPGRADE ; then
-		einfo "rebuilding NEEDED.ELF.2 files"
-		for cpv in "${EROOT}/var/db/pkg"/*/*; do
-			if [ -f "${cpv}/NEEDED" ]; then
-				rm -f "${cpv}/NEEDED.ELF.2"
-				while read line; do
-					filename=${line% *}
-					needed=${line#* }
-					needed=${needed//+/++}
-					needed=${needed//#/##}
-					needed=${needed//%/%%}
-					newline=$(scanelf -BF "%a;%F;%S;%r;${needed}" $filename)
-					newline=${newline//  -  }
-					echo "${newline:3}" >> "${cpv}/NEEDED.ELF.2"
-				done < "${cpv}/NEEDED"
-			fi
-		done
-	fi
-
-	if $REPO_LAYOUT_CONF_WARN ; then
-		ewarn
-		echo "If you want overlay eclasses to override eclasses from" \
-			"other repos then see the portage(5) man page" \
-			"for information about the new layout.conf and repos.conf" \
-			"configuration files." \
-			| fmt -w 75 | while read -r ; do ewarn "$REPLY" ; done
-		ewarn
-	fi
-
-	if $MINOR_UPGRADE ; then
-		elog "If you're upgrading from a pre-2.2 version of portage you might"
-		elog "want to remerge world (emerge -e world) to take full advantage"
-		elog "of some of the new features in 2.2."
-		elog "This is not required however for portage to function properly."
-		elog
-	fi
-}
-
-pkg_postrm() {
-	python_mod_cleanup /usr/$(get_libdir)/portage/pym
-}
diff --git a/sys-apps/portage/portage-2.2.0_alpha90.ebuild b/sys-apps/portage/portage-2.2.0_alpha90.ebuild
deleted file mode 100644
index d525949abb2d..000000000000
--- a/sys-apps/portage/portage-2.2.0_alpha90.ebuild
+++ /dev/null
@@ -1,461 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/portage/portage-2.2.0_alpha90.ebuild,v 1.1 2012/03/05 07:58:28 zmedico Exp $
-
-# Require EAPI 2 since we now require at least python-2.6 (for python 3
-# syntax support) which also requires EAPI 2.
-EAPI=3
-inherit eutils multilib python
-
-DESCRIPTION="Portage is the package management and distribution system for Gentoo"
-HOMEPAGE="http://www.gentoo.org/proj/en/portage/index.xml"
-LICENSE="GPL-2"
-KEYWORDS="~sparc-fbsd ~x86-fbsd"
-SLOT="0"
-IUSE="build doc epydoc +ipc linguas_pl pypy1_8 python2 python3 selinux xattr"
-
-# Import of the io module in python-2.6 raises ImportError for the
-# thread module if threading is disabled.
-python_dep="python3? ( =dev-lang/python-3* )
-	!pypy1_8? ( !python2? ( !python3? (
-		|| ( >=dev-lang/python-2.7 dev-lang/python:2.6[threads] )
-	) ) )
-	pypy1_8? ( !python2? ( !python3? ( dev-python/pypy:1.8[bzip2] ) ) )
-	python2? ( !python3? ( || ( dev-lang/python:2.7 dev-lang/python:2.6[threads] ) ) )"
-
-# The pysqlite blocker is for bug #282760.
-DEPEND="${python_dep}
-	!build? ( >=sys-apps/sed-4.0.5 )
-	doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 )
-	epydoc? ( >=dev-python/epydoc-2.0 !<=dev-python/pysqlite-2.4.1 )"
-# Require sandbox-2.2 for bug #288863.
-# For xattr, we can spawn getfattr and setfattr from sys-apps/attr, but that's
-# quite slow, so it's not considered in the dependencies as an alternative to
-# to python-3.3 / pyxattr. Also, xattr support is only tested with Linux, so
-# for now, don't pull in xattr deps for other kernels.
-RDEPEND="${python_dep}
-	!build? ( >=sys-apps/sed-4.0.5
-		>=app-shells/bash-3.2_p17
-		>=app-admin/eselect-1.2 )
-	elibc_FreeBSD? ( sys-freebsd/freebsd-bin )
-	elibc_glibc? ( >=sys-apps/sandbox-2.2 )
-	elibc_uclibc? ( >=sys-apps/sandbox-2.2 )
-	>=app-misc/pax-utils-0.1.17
-	xattr? ( kernel_linux? ( || ( >=dev-lang/python-3.3_pre20110902 dev-python/pyxattr ) ) )
-	selinux? ( || ( >=sys-libs/libselinux-2.0.94[python] <sys-libs/libselinux-2.0.94 ) )
-	!<app-shells/bash-3.2_p17
-	!<app-admin/logrotate-3.8.0"
-PDEPEND="
-	!build? (
-		>=net-misc/rsync-2.6.4
-		userland_GNU? ( >=sys-apps/coreutils-6.4 )
-	)"
-# coreutils-6.4 rdep is for date format in emerge-webrsync #164532
-# NOTE: FEATURES=install-sources requires debugedit and rsync
-
-SRC_ARCHIVES="http://dev.gentoo.org/~zmedico/portage/archives"
-
-prefix_src_archives() {
-	local x y
-	for x in ${@}; do
-		for y in ${SRC_ARCHIVES}; do
-			echo ${y}/${x}
-		done
-	done
-}
-
-PV_PL="2.1.2"
-PATCHVER_PL=""
-TARBALL_PV=2.2.0_alpha88
-SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.bz2
-	$(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2)
-	linguas_pl? ( mirror://gentoo/${PN}-man-pl-${PV_PL}.tar.bz2
-		$(prefix_src_archives ${PN}-man-pl-${PV_PL}.tar.bz2) )"
-
-PATCHVER=
-[[ $TARBALL_PV = $PV ]] || PATCHVER=$PV
-if [ -n "${PATCHVER}" ]; then
-	SRC_URI="${SRC_URI} mirror://gentoo/${PN}-${PATCHVER}.patch.bz2
-	$(prefix_src_archives ${PN}-${PATCHVER}.patch.bz2)"
-fi
-
-S="${WORKDIR}"/${PN}-${TARBALL_PV}
-S_PL="${WORKDIR}"/${PN}-${PV_PL}
-
-compatible_python_is_selected() {
-	[[ $("${EPREFIX}/usr/bin/python" -c 'import sys ; sys.stdout.write(sys.hexversion >= 0x2060000 and "good" or "bad")') = good ]]
-}
-
-current_python_has_xattr() {
-	[[ $("${EPREFIX}/usr/bin/python" -c 'import sys ; sys.stdout.write(sys.hexversion >= 0x3030000 and "yes" or "no")') = yes ]] || \
-	"${EPREFIX}/usr/bin/python" -c 'import xattr' 2>/dev/null
-}
-
-pkg_setup() {
-	# Bug #359731 - Die early if get_libdir fails.
-	[[ -z $(get_libdir) ]] && \
-		die "get_libdir returned an empty string"
-
-	if use python2 && use python3 ; then
-		ewarn "Both python2 and python3 USE flags are enabled, but only one"
-		ewarn "can be in the shebangs. Using python3."
-	fi
-	if use pypy1_8 && use python3 ; then
-		ewarn "Both pypy1_8 and python3 USE flags are enabled, but only one"
-		ewarn "can be in the shebangs. Using python3."
-	fi
-	if use pypy1_8 && use python2 ; then
-		ewarn "Both pypy1_8 and python2 USE flags are enabled, but only one"
-		ewarn "can be in the shebangs. Using python2"
-	fi
-	if ! use pypy1_8 && ! use python2 && ! use python3 && \
-		! compatible_python_is_selected ; then
-		ewarn "Attempting to select a compatible default python interpreter"
-		local x success=0
-		for x in /usr/bin/python2.* ; do
-			x=${x#/usr/bin/python2.}
-			if [[ $x -ge 6 ]] 2>/dev/null ; then
-				eselect python set python2.$x
-				if compatible_python_is_selected ; then
-					elog "Default python interpreter is now set to python-2.$x"
-					success=1
-					break
-				fi
-			fi
-		done
-		if [ $success != 1 ] ; then
-			eerror "Unable to select a compatible default python interpreter!"
-			die "This version of portage requires at least python-2.6 to be selected as the default python interpreter (see \`eselect python --help\`)."
-		fi
-	fi
-
-	if use python3; then
-		python_set_active_version 3
-	elif use python2; then
-		python_set_active_version 2
-	elif use pypy1_8; then
-		python_set_active_version 2.7-pypy-1.8
-	fi
-}
-
-src_prepare() {
-	if [ -n "${PATCHVER}" ] ; then
-		if [[ -L $S/bin/ebuild-helpers/portageq ]] ; then
-			rm "$S/bin/ebuild-helpers/portageq" \
-				|| die "failed to remove portageq helper symlink"
-		fi
-		epatch "${WORKDIR}/${PN}-${PATCHVER}.patch"
-	fi
-	einfo "Setting portage.VERSION to ${PVR} ..."
-	sed -e "s/^VERSION=.*/VERSION=\"${PVR}\"/" -i pym/portage/__init__.py || \
-		die "Failed to patch portage.VERSION"
-	sed -e "1s/VERSION/${PVR}/" -i doc/fragment/version || \
-		die "Failed to patch VERSION in doc/fragment/version"
-	sed -e "1s/VERSION/${PVR}/" -i man/* || \
-		die "Failed to patch VERSION in man page headers"
-
-	if ! use ipc ; then
-		einfo "Disabling ipc..."
-		sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \
-			-i pym/_emerge/AbstractEbuildProcess.py || \
-			die "failed to patch AbstractEbuildProcess.py"
-	fi
-
-	if use xattr && use kernel_linux ; then
-		einfo "Adding FEATURES=xattr to make.globals ..."
-		echo -e '\nFEATURES="${FEATURES} xattr"' >> cnf/make.globals \
-			|| die "failed to append to make.globals"
-	fi
-
-	if use python3; then
-		einfo "Converting shebangs for python3..."
-		python_convert_shebangs -r 3 .
-	elif use python2; then
-		einfo "Converting shebangs for python2..."
-		python_convert_shebangs -r 2 .
-	elif use pypy1_8; then
-		einfo "Converting shebangs for pypy-c1.8..."
-		python_convert_shebangs -r 2.7-pypy-1.8 .
-	fi
-
-	if [[ -n ${EPREFIX} ]] ; then
-		einfo "Setting portage.const.EPREFIX ..."
-		sed -e "s|^\(SANDBOX_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/sandbox\"\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(FAKEROOT_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/bin/fakeroot\"\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(BASH_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/bash\"\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(MOVE_BINARY[[:space:]]*=[[:space:]]*\"\)\(/bin/mv\"\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(PRELINK_BINARY[[:space:]]*=[[:space:]]*\"\)\(/usr/sbin/prelink\"\)|\\1${EPREFIX}\\2|" \
-			-e "s|^\(EPREFIX[[:space:]]*=[[:space:]]*\"\).*|\\1${EPREFIX}\"|" \
-			-i pym/portage/const.py || \
-			die "Failed to patch portage.const.EPREFIX"
-
-		einfo "Prefixing shebangs ..."
-		find . -type f -print0 | \
-		while read -r -d $'\0' ; do
-			local shebang=$(head -n1 "$REPLY")
-			if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then
-				sed -i -e "1s:.*:#!${EPREFIX}${shebang:2}:" "$REPLY" || \
-					die "sed failed"
-			fi
-		done
-
-		einfo "Adjusting make.globals ..."
-		sed -e 's|^SYNC=.*|SYNC="rsync://rsync.prefix.freens.org/gentoo-portage-prefix"|' \
-			-e "s|^\(PORTDIR=\)\(/usr/portage\)|\\1\"${EPREFIX}\\2\"|" \
-			-e "s|^\(PORTAGE_TMPDIR=\)\(/var/tmp\)|\\1\"${EPREFIX}\\2\"|" \
-			-i cnf/make.globals || die "sed failed"
-
-		einfo "Adding FEATURES=force-prefix to make.globals ..."
-		echo -e '\nFEATURES="${FEATURES} force-prefix"' >> cnf/make.globals \
-			|| die "failed to append to make.globals"
-	fi
-
-}
-
-src_compile() {
-	if use doc; then
-		cd "${S}"/doc
-		touch fragment/date
-		make xhtml xhtml-nochunks || die "failed to make docs"
-	fi
-
-	if use epydoc; then
-		einfo "Generating api docs"
-		mkdir "${WORKDIR}"/api
-		local my_modules epydoc_opts=""
-		my_modules="$(find "${S}/pym" -name "*.py" \
-			| sed -e 's:/__init__.py$::' -e 's:\.py$::' -e "s:^${S}/pym/::" \
-			 -e 's:/:.:g' | sort)" || die "error listing modules"
-		# workaround for bug 282760
-		> "$S/pym/pysqlite2.py"
-		PYTHONPATH=${S}/pym:${PYTHONPATH:+:}${PYTHONPATH} \
-			epydoc -o "${WORKDIR}"/api \
-			-qqqqq --no-frames --show-imports $epydoc_opts \
-			--name "${PN}" --url "${HOMEPAGE}" \
-			${my_modules} || die "epydoc failed"
-		rm "$S/pym/pysqlite2.py"
-	fi
-}
-
-src_test() {
-	# make files executable, in case they were created by patch
-	find bin -type f | xargs chmod +x
-	./pym/portage/tests/runTests || die "test(s) failed"
-}
-
-src_install() {
-	local libdir=$(get_libdir)
-	local portage_base="/usr/${libdir}/portage"
-	local portage_share_config=/usr/share/portage/config
-
-	cd "${S}"/cnf
-	insinto /etc
-	doins etc-update.conf dispatch-conf.conf || die
-
-	insinto "$portage_share_config/sets"
-	doins "$S"/cnf/sets/*.conf || die
-	insinto "$portage_share_config"
-	doins "$S/cnf/make.globals" || die
-	if [ -f "make.conf.${ARCH}".diff ]; then
-		patch make.conf "make.conf.${ARCH}".diff || \
-			die "Failed to patch make.conf.example"
-		newins make.conf make.conf.example || die
-	else
-		eerror ""
-		eerror "Portage does not have an arch-specific configuration for this arch."
-		eerror "Please notify the arch maintainer about this issue. Using generic."
-		eerror ""
-		newins make.conf make.conf.example || die
-	fi
-
-	dosym ..${portage_share_config}/make.globals /etc/make.globals
-
-	insinto /etc/logrotate.d
-	doins "${S}"/cnf/logrotate.d/elog-save-summary || die
-
-	# BSD and OSX need a sed wrapper so that find/xargs work properly
-	if use userland_GNU; then
-		rm "${S}"/bin/ebuild-helpers/sed || die "Failed to remove sed wrapper"
-	fi
-
-	local x symlinks files
-
-	cd "$S" || die "cd failed"
-	for x in $(find bin -type d) ; do
-		exeinto $portage_base/$x || die "exeinto failed"
-		cd "$S"/$x || die "cd failed"
-		files=$(find . -mindepth 1 -maxdepth 1 -type f ! -type l)
-		if [ -n "$files" ] ; then
-			doexe $files || die "doexe failed"
-		fi
-		symlinks=$(find . -mindepth 1 -maxdepth 1 -type l)
-		if [ -n "$symlinks" ] ; then
-			cp -P $symlinks "$ED$portage_base/$x" || die "cp failed"
-		fi
-	done
-
-	cd "$S" || die "cd failed"
-	for x in $(find pym/* -type d ! -path "pym/portage/tests*") ; do
-		insinto $portage_base/$x || die "insinto failed"
-		cd "$S"/$x || die "cd failed"
-		# __pycache__ directories contain no py files
-		[[ "*.py" != $(echo *.py) ]] || continue
-		doins *.py || die "doins failed"
-		symlinks=$(find . -mindepth 1 -maxdepth 1 -type l)
-		if [ -n "$symlinks" ] ; then
-			cp -P $symlinks "$ED$portage_base/$x" || die "cp failed"
-		fi
-	done
-
-	# We install some minimal tests for use as a preinst sanity check.
-	# These tests must be able to run without a full source tree and
-	# without relying on a previous portage instance being installed.
-	cd "$S" || die "cd failed"
-	exeinto $portage_base/pym/portage/tests || die
-	doexe pym/portage/tests/runTests || die
-	insinto $portage_base/pym/portage/tests || die
-	doins pym/portage/tests/*.py || die
-	insinto $portage_base/pym/portage/tests/lint || die
-	doins pym/portage/tests/lint/*.py || die
-	doins pym/portage/tests/lint/__test__ || die
-
-	# Symlinks to directories cause up/downgrade issues and the use of these
-	# modules outside of portage is probably negligible.
-	for x in "${ED}${portage_base}/pym/"{cache,elog_modules} ; do
-		[ ! -L "${x}" ] && continue
-		die "symlink to directory will cause upgrade/downgrade issues: '${x}'"
-	done
-
-	doman "${S}"/man/*.[0-9]
-	if use linguas_pl; then
-		doman -i18n=pl "${S_PL}"/man/pl/*.[0-9]
-		doman -i18n=pl_PL.UTF-8 "${S_PL}"/man/pl_PL.UTF-8/*.[0-9]
-	fi
-
-	dodoc "${S}"/{ChangeLog,NEWS,RELEASE-NOTES}
-	use doc && dohtml -r "${S}"/doc/*
-	use epydoc && dohtml -r "${WORKDIR}"/api
-
-	dodir /usr/bin
-	for x in ebuild egencache emerge portageq quickpkg repoman ; do
-		dosym ../${libdir}/portage/bin/${x} /usr/bin/${x}
-	done
-
-	dodir /usr/sbin
-	local my_syms="archive-conf
-		dispatch-conf
-		emaint
-		emerge-webrsync
-		env-update
-		etc-update
-		fixpackages
-		regenworld"
-	local x
-	for x in ${my_syms}; do
-		dosym ../${libdir}/portage/bin/${x} /usr/sbin/${x}
-	done
-	dosym env-update /usr/sbin/update-env
-	dosym etc-update /usr/sbin/update-etc
-
-	dodir /etc/portage
-	keepdir /etc/portage
-}
-
-pkg_preinst() {
-	if [[ $ROOT == / ]] ; then
-		# Run some minimal tests as a sanity check.
-		local test_runner=$(find "$ED" -name runTests)
-		if [[ -n $test_runner && -x $test_runner ]] ; then
-			einfo "Running preinst sanity tests..."
-			"$test_runner" || die "preinst sanity tests failed"
-		fi
-	fi
-
-	if use xattr && ! current_python_has_xattr ; then
-		ewarn "For optimal performance in xattr handling, install"
-		ewarn "dev-python/pyxattr, or install >=dev-lang/python-3.3 and"
-		ewarn "enable USE=python3 for $CATEGORY/$PN."
-	fi
-
-	if ! use build && ! has_version dev-python/pycrypto && \
-		! has_version '>=dev-lang/python-2.6[ssl]' ; then
-		ewarn "If you are an ebuild developer and you plan to commit ebuilds"
-		ewarn "with this system then please install dev-python/pycrypto or"
-		ewarn "enable the ssl USE flag for >=dev-lang/python-2.6 in order"
-		ewarn "to enable RMD160 hash support."
-		ewarn "See bug #198398 for more information."
-	fi
-	if [ -f "${EROOT}/etc/make.globals" ]; then
-		rm "${EROOT}/etc/make.globals"
-	fi
-
-	has_version "<${CATEGORY}/${PN}-2.2_alpha" \
-		&& MINOR_UPGRADE=true || MINOR_UPGRADE=false
-
-	has_version "<=${CATEGORY}/${PN}-2.2_pre5" \
-		&& WORLD_MIGRATION_UPGRADE=true || WORLD_MIGRATION_UPGRADE=false
-
-	# If portage-2.1.6 is installed and the preserved_libs_registry exists,
-	# assume that the NEEDED.ELF.2 files have already been generated.
-	has_version "<=${CATEGORY}/${PN}-2.2_pre7" && \
-		! ( [ -e "${EROOT}"var/lib/portage/preserved_libs_registry ] && \
-		has_version ">=${CATEGORY}/${PN}-2.1.6_rc" ) \
-		&& NEEDED_REBUILD_UPGRADE=true || NEEDED_REBUILD_UPGRADE=false
-
-	[[ -n $PORTDIR_OVERLAY ]] && has_version "<${CATEGORY}/${PN}-2.1.6.12" \
-		&& REPO_LAYOUT_CONF_WARN=true || REPO_LAYOUT_CONF_WARN=false
-}
-
-pkg_postinst() {
-	# Compile all source files recursively. Any orphans
-	# will be identified and removed in postrm.
-	python_mod_optimize /usr/$(get_libdir)/portage/pym
-
-	if $WORLD_MIGRATION_UPGRADE ; then
-		einfo "moving set references from the worldfile into world_sets"
-		cd "${EROOT}/var/lib/portage/"
-		grep "^@" world >> world_sets
-		sed -i -e '/^@/d' world
-	fi
-
-	if $NEEDED_REBUILD_UPGRADE ; then
-		einfo "rebuilding NEEDED.ELF.2 files"
-		for cpv in "${EROOT}/var/db/pkg"/*/*; do
-			if [ -f "${cpv}/NEEDED" ]; then
-				rm -f "${cpv}/NEEDED.ELF.2"
-				while read line; do
-					filename=${line% *}
-					needed=${line#* }
-					needed=${needed//+/++}
-					needed=${needed//#/##}
-					needed=${needed//%/%%}
-					newline=$(scanelf -BF "%a;%F;%S;%r;${needed}" $filename)
-					newline=${newline//  -  }
-					echo "${newline:3}" >> "${cpv}/NEEDED.ELF.2"
-				done < "${cpv}/NEEDED"
-			fi
-		done
-	fi
-
-	if $REPO_LAYOUT_CONF_WARN ; then
-		ewarn
-		echo "If you want overlay eclasses to override eclasses from" \
-			"other repos then see the portage(5) man page" \
-			"for information about the new layout.conf and repos.conf" \
-			"configuration files." \
-			| fmt -w 75 | while read -r ; do ewarn "$REPLY" ; done
-		ewarn
-	fi
-
-	if $MINOR_UPGRADE ; then
-		elog "If you're upgrading from a pre-2.2 version of portage you might"
-		elog "want to remerge world (emerge -e world) to take full advantage"
-		elog "of some of the new features in 2.2."
-		elog "This is not required however for portage to function properly."
-		elog
-	fi
-}
-
-pkg_postrm() {
-	python_mod_cleanup /usr/$(get_libdir)/portage/pym
-}
diff --git a/sys-auth/pam_krb5/pam_krb5-4.5.ebuild b/sys-auth/pam_krb5/pam_krb5-4.5.ebuild
index 8977092b2d99..00c030a784bd 100644
--- a/sys-auth/pam_krb5/pam_krb5-4.5.ebuild
+++ b/sys-auth/pam_krb5/pam_krb5-4.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/pam_krb5/pam_krb5-4.5.ebuild,v 1.1 2011/12/26 18:59:39 eras Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/pam_krb5/pam_krb5-4.5.ebuild,v 1.2 2012/03/21 12:05:36 ago Exp $
 
 EAPI=4
 
@@ -12,7 +12,7 @@ SRC_URI="http://archives.eyrie.org/software/kerberos/pam-krb5-${PV}.tar.gz"
 
 LICENSE="|| ( BSD-2 GPL-2 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
 IUSE=""
 
 DEPEND="virtual/krb5
diff --git a/sys-fs/udev-init-scripts/udev-init-scripts-10.ebuild b/sys-fs/udev-init-scripts/udev-init-scripts-10.ebuild
index 087e97e60544..ba3ff4301fb6 100644
--- a/sys-fs/udev-init-scripts/udev-init-scripts-10.ebuild
+++ b/sys-fs/udev-init-scripts/udev-init-scripts-10.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev-init-scripts/udev-init-scripts-10.ebuild,v 1.2 2012/03/20 12:35:05 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev-init-scripts/udev-init-scripts-10.ebuild,v 1.4 2012/03/21 21:34:10 williamh Exp $
 
 EAPI=4
 
 EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/udev-gentoo-scripts.git"
 
-[ "${PV}" = "9999" ] && vcs=git-2
-inherit $vcs
-unset vcs
+if [ "${PV}" = "9999" ]; then
+	inherit git-2
+fi
 
 DESCRIPTION="udev startup scripts for openrc"
 HOMEPAGE="http://www.gentoo.org"
@@ -26,6 +26,7 @@ DEPEND="!<sys-fs/udev-182"
 RDEPEND="${DEPEND}
 	>=sys-fs/udev-182
 	sys-apps/openrc"
+RESTRICT="test"
 
 	src_compile()
 {
diff --git a/sys-fs/udev-init-scripts/udev-init-scripts-9999.ebuild b/sys-fs/udev-init-scripts/udev-init-scripts-9999.ebuild
index 3bf497c3e4c2..af8b813d19cb 100644
--- a/sys-fs/udev-init-scripts/udev-init-scripts-9999.ebuild
+++ b/sys-fs/udev-init-scripts/udev-init-scripts-9999.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev-init-scripts/udev-init-scripts-9999.ebuild,v 1.4 2012/03/20 12:35:05 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev-init-scripts/udev-init-scripts-9999.ebuild,v 1.7 2012/03/21 21:53:16 williamh Exp $
 
 EAPI=4
 
 EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/udev-gentoo-scripts.git"
 
-[ "${PV}" = "9999" ] && vcs=git-2
-inherit $vcs
-unset vcs
+if [ "${PV}" = "9999" ]; then
+	inherit git-2
+fi
 
 DESCRIPTION="udev startup scripts for openrc"
 HOMEPAGE="http://www.gentoo.org"
diff --git a/sys-kernel/genkernel/Manifest b/sys-kernel/genkernel/Manifest
index bd1f2492a595..931e475452aa 100644
--- a/sys-kernel/genkernel/Manifest
+++ b/sys-kernel/genkernel/Manifest
@@ -20,6 +20,7 @@ DIST genkernel-3.4.22.1.tar.bz2 183960 RMD160 643a3fc55b24683754221c0b2fd823ab15
 DIST genkernel-3.4.23.1.tar.bz2 211403 RMD160 b14a7093748b9612e75e6ae8757576dbabcc6691 SHA1 dd794de49a76658ae868c5c7dd5ce51b2cc46bb2 SHA256 9419d506bf9678d9ac4600eb396c7c40dc11c4a3314b0214cfd6194693cb23cf
 DIST genkernel-3.4.24.tar.bz2 211436 RMD160 3d29afb7c7bfac64e9cd09f1213fa5913de36643 SHA1 61629d89379b20b6b788c4c88153d6fe294ed657 SHA256 55611c867f1dc96c8711faabb8c17f62b1c5f8be27eb423e39fd53846552476c
 DIST genkernel-3.4.25.1.tar.bz2 192800 RMD160 208e8e0d19ffb98db9e633556fd6c669fd0f81ff SHA1 c65b7e7cf267ff4f9606f46e0247601fcfeb6256 SHA256 561950ba57c2f327364fe07c9310e98c430925d0f758f59a8ce57b9a48305db4
+DIST genkernel-3.4.26.tar.bz2 216493 RMD160 675667d6c7c16a576a5d4279506b9113d63021ed SHA1 a0ed95f626259d25acb8aa977bb6ed135f22b1ba SHA256 793a203f3cf81f4ffeb2856e694997b85f863b276e1a32fbad97fd6219b72481
 DIST gnupg-1.4.11.tar.bz2 3407075 RMD160 9daf2dedfd4c6211fc13b8cdee8f08b8f5925378 SHA1 78e22f5cca88514ee71034aafff539c33f3c6676 SHA256 d18ceeac16e554a501170b9bfde611625252d0fe9448685a69c93bf149ee6ef6
 DIST mdadm-3.1.4.tar.bz2 288578 RMD160 f41a2be4158efac08dbe2e95f1c6812609475fad SHA1 4ee43922d38b15a930daaaa026ef1b4efacdbc8a SHA256 849ad0ad4ad3c1d2d8806a16b30e1f59ab2daf313cb103807207f7cba889ea63
 DIST mdadm-3.1.5.tar.bz2 292709 RMD160 e0542c4556988cae551b3399f0f0d27e42b68bda SHA1 e71859f16e1184df2c033a9e24a6f3f262bbf9a5 SHA256 1d547d0b36a88968e9fc9fb08b0e64de54a53f3d1cfa3656a9f319180f0727d3
diff --git a/sys-kernel/genkernel/genkernel-3.4.26.ebuild b/sys-kernel/genkernel/genkernel-3.4.26.ebuild
new file mode 100644
index 000000000000..afd93d2a8423
--- /dev/null
+++ b/sys-kernel/genkernel/genkernel-3.4.26.ebuild
@@ -0,0 +1,155 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/genkernel/genkernel-3.4.26.ebuild,v 1.1 2012/03/22 03:16:35 sping Exp $
+
+# genkernel-9999        -> latest Git branch "master"
+# genkernel-VERSION     -> normal genkernel release
+
+VERSION_BUSYBOX='1.19.3'
+VERSION_DMRAID='1.0.0.rc16-3'
+VERSION_MDADM='3.1.5'
+VERSION_E2FSPROGS='1.42'
+VERSION_FUSE='2.8.6'
+VERSION_ISCSI='2.0-872'
+VERSION_LVM='2.02.88'
+VERSION_UNIONFS_FUSE='0.24'
+VERSION_GPG='1.4.11'
+
+MY_HOME="http://wolf31o2.org"
+RH_HOME="ftp://sources.redhat.com/pub"
+DM_HOME="http://people.redhat.com/~heinzm/sw/dmraid/src"
+BB_HOME="http://www.busybox.net/downloads"
+
+COMMON_URI="${DM_HOME}/dmraid-${VERSION_DMRAID}.tar.bz2
+		${DM_HOME}/old/dmraid-${VERSION_DMRAID}.tar.bz2
+		mirror://kernel/linux/utils/raid/mdadm/mdadm-${VERSION_MDADM}.tar.bz2
+		${RH_HOME}/lvm2/LVM2.${VERSION_LVM}.tgz
+		${RH_HOME}/lvm2/old/LVM2.${VERSION_LVM}.tgz
+		${BB_HOME}/busybox-${VERSION_BUSYBOX}.tar.bz2
+		mirror://kernel/linux/kernel/people/mnc/open-iscsi/releases/open-iscsi-${VERSION_ISCSI}.tar.gz
+		mirror://sourceforge/e2fsprogs/e2fsprogs-${VERSION_E2FSPROGS}.tar.gz
+		mirror://sourceforge/fuse/fuse-${VERSION_FUSE}.tar.gz
+		http://podgorny.cz/unionfs-fuse/releases/unionfs-fuse-${VERSION_UNIONFS_FUSE}.tar.bz2
+		mirror://gnupg/gnupg/gnupg-${VERSION_GPG}.tar.bz2"
+
+if [[ ${PV} == 9999* ]]
+then
+	EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/${PN}.git
+		http://git.overlays.gentoo.org/gitroot/proj/${PN}.git"
+	inherit git-2 bash-completion eutils
+	S="${WORKDIR}/${PN}"
+	SRC_URI="${COMMON_URI}"
+	KEYWORDS=""
+else
+	inherit bash-completion eutils
+	SRC_URI="mirror://gentoo/${P}.tar.bz2
+		${MY_HOME}/sources/genkernel/${P}.tar.bz2
+		${COMMON_URI}"
+	# Please don't touch individual KEYWORDS.  Since this is maintained/tested by
+	# Release Engineering, it's easier for us to deal with all arches at once.
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+fi
+
+DESCRIPTION="Gentoo automatic kernel building scripts"
+HOMEPAGE="http://www.gentoo.org"
+
+LICENSE="GPL-2"
+SLOT="0"
+RESTRICT=""
+IUSE="ibm selinux"
+
+DEPEND="sys-fs/e2fsprogs
+	selinux? ( sys-libs/libselinux )"
+RDEPEND="${DEPEND}
+		app-arch/cpio
+		app-misc/pax-utils
+		!<sys-apps/openrc-0.9.9"
+# pax-utils is used for lddtree
+
+if [[ ${PV} == 9999* ]]; then
+	DEPEND="${DEPEND} app-text/asciidoc"
+fi
+
+src_unpack() {
+	if [[ ${PV} == 9999* ]] ; then
+		git-2_src_unpack
+	else
+		unpack ${P}.tar.bz2
+	fi
+	use selinux && sed -i 's/###//g' "${S}"/gen_compile.sh
+}
+
+src_compile() {
+	if [[ ${PV} == 9999* ]]; then
+		emake || die
+	fi
+}
+
+src_install() {
+	# This block updates genkernel.conf
+	sed \
+		-e "s:VERSION_BUSYBOX:$VERSION_BUSYBOX:" \
+		-e "s:VERSION_MDADM:$VERSION_MDADM:" \
+		-e "s:VERSION_DMRAID:$VERSION_DMRAID:" \
+		-e "s:VERSION_E2FSPROGS:$VERSION_E2FSPROGS:" \
+		-e "s:VERSION_FUSE:$VERSION_FUSE:" \
+		-e "s:VERSION_ISCSI:$VERSION_ISCSI:" \
+		-e "s:VERSION_LVM:$VERSION_LVM:" \
+		-e "s:VERSION_UNIONFS_FUSE:$VERSION_UNIONFS_FUSE:" \
+		-e "s:VERSION_GPG:$VERSION_GPG:" \
+		"${S}"/genkernel.conf > "${T}"/genkernel.conf \
+		|| die "Could not adjust versions"
+	insinto /etc
+	doins "${T}"/genkernel.conf || die "doins genkernel.conf"
+
+	doman genkernel.8 || die "doman"
+	dodoc AUTHORS ChangeLog README TODO || die "dodoc"
+
+	dobin genkernel || die "dobin genkernel"
+
+	rm -f genkernel genkernel.8 AUTHORS ChangeLog README TODO genkernel.conf
+
+	insinto /usr/share/genkernel
+	doins -r "${S}"/* || die "doins"
+	use ibm && cp "${S}"/ppc64/kernel-2.6-pSeries "${S}"/ppc64/kernel-2.6 || \
+		cp "${S}"/arch/ppc64/kernel-2.6.g5 "${S}"/arch/ppc64/kernel-2.6
+
+	# Copy files to /var/cache/genkernel/src
+	elog "Copying files to /var/cache/genkernel/src..."
+	mkdir -p "${D}"/var/cache/genkernel/src
+	cp -f \
+		"${DISTDIR}"/mdadm-${VERSION_MDADM}.tar.bz2 \
+		"${DISTDIR}"/dmraid-${VERSION_DMRAID}.tar.bz2 \
+		"${DISTDIR}"/LVM2.${VERSION_LVM}.tgz \
+		"${DISTDIR}"/e2fsprogs-${VERSION_E2FSPROGS}.tar.gz \
+		"${DISTDIR}"/busybox-${VERSION_BUSYBOX}.tar.bz2 \
+		"${DISTDIR}"/fuse-${VERSION_FUSE}.tar.gz \
+		"${DISTDIR}"/unionfs-fuse-${VERSION_UNIONFS_FUSE}.tar.bz2 \
+		"${DISTDIR}"/gnupg-${VERSION_GPG}.tar.bz2 \
+		"${DISTDIR}"/open-iscsi-${VERSION_ISCSI}.tar.gz \
+		"${D}"/var/cache/genkernel/src || die "Copying distfiles..."
+
+	dobashcompletion "${FILESDIR}"/genkernel.bash
+	insinto /etc
+	doins "${FILESDIR}"/initramfs.mounts
+}
+
+pkg_postinst() {
+	echo
+	elog 'Documentation is available in the genkernel manual page'
+	elog 'as well as the following URL:'
+	echo
+	elog 'http://www.gentoo.org/doc/en/genkernel.xml'
+	echo
+	ewarn "This package is known to not work with reiser4.  If you are running"
+	ewarn "reiser4 and have a problem, do not file a bug.  We know it does not"
+	ewarn "work and we don't plan on fixing it since reiser4 is the one that is"
+	ewarn "broken in this regard.  Try using a sane filesystem like ext3 or"
+	ewarn "even reiser3."
+	echo
+	ewarn "The LUKS support has changed from versions prior to 3.4.4.  Now,"
+	ewarn "you use crypt_root=/dev/blah instead of real_root=luks:/dev/blah."
+	echo
+
+	bash-completion_pkg_postinst
+}
diff --git a/sys-kernel/hardened-sources/Manifest b/sys-kernel/hardened-sources/Manifest
index 22e48af68637..378cbb60cca5 100644
--- a/sys-kernel/hardened-sources/Manifest
+++ b/sys-kernel/hardened-sources/Manifest
@@ -20,8 +20,6 @@ DIST genpatches-3.0-5.base.tar.bz2 112593 RMD160 0f0731dd5565622817c43cc15c133e0
 DIST genpatches-3.0-5.extras.tar.bz2 17207 RMD160 0f04fef1fe76c9b9cbe7c497faae19b015caff72 SHA1 89935647c22c0a8b98dd568e97312ca64378a263 SHA256 ec88ca4408c668a2c4d2d25c3d4a8c67fad4bb08133db91bbb929c0053305fda
 DIST genpatches-3.0-7.base.tar.bz2 127115 RMD160 9d4a1a2a6e4f9bff5a4a8b6f1e58987f22869506 SHA1 cbe9679466e09ccc5f7b28a51fdccbb3a06a5389 SHA256 08fb2362a96b8c88028167226aaaf1855363426e2f90d60daa81649b7c5ffd6f
 DIST genpatches-3.0-7.extras.tar.bz2 17200 RMD160 74dd8384f2e1e9741b547a59eb15dd8fd87f935a SHA1 94f26f6a8876e340965c65ad1204c1b911d42498 SHA256 259f669c55dfe9b9420b0e2875af0c404f333961b19e5cdd40d8df5f07fc698b
-DIST genpatches-3.1-12.base.tar.bz2 238027 RMD160 b2500215987bb105c33e5e0b8e6777e7e3917c88 SHA1 f86522866d908cac030d46cafbe98ff18fc0e14e SHA256 c797eaf64d65755f0509cd632813e48a3f7a205cfa43dc9e9f42b701a3cae129
-DIST genpatches-3.1-12.extras.tar.bz2 17197 RMD160 a275874317e13fc9f372eb6cdb08b79d67df5201 SHA1 85ed96b1602df0f1f68bc8c88de905cf5d1b0a5e SHA256 aee5dcccb9abc251d31caa0d565b78800cbc8e111cfa02b433cf6ebbdf04d4ea
 DIST genpatches-3.1-8.base.tar.bz2 164116 RMD160 619061ed81cee8ca391937f4b15c2805948e168e SHA1 abc55d0cad5b98461441c3790a7356d869ec90cf SHA256 c35165f1931f93ccfe477f11d5e842c2510097f017293a55aaa34dce903a2da9
 DIST genpatches-3.1-8.extras.tar.bz2 17200 RMD160 fa8aa6ba8bc1e554758017d371769536d025bdc1 SHA1 47240cdc21d69d2af05d0b2bd7dcbb1615508f86 SHA256 b108dbf3b5ddad1701cacd2f1c936a63b60d1a4cd86fd7f9311230e3bacac56b
 DIST genpatches-3.2-10.base.tar.bz2 178347 RMD160 691fdbc19146a2b90ca61856f20b4f1125c4985d SHA1 27364c81a14a475e962b271154ffea37be601122 SHA256 f230d4fd3dcd169fa24366a1c4a0f272675529e14d9b8f1154b037250771b4d9
@@ -47,7 +45,6 @@ DIST hardened-patches-2.6.39-7.extras.tar.bz2 554731 RMD160 6d0214550484fcfcebf8
 DIST hardened-patches-2.6.39-9.extras.tar.bz2 520242 RMD160 36f4ff9410447c73799d3265aba88693d418b2f5 SHA1 f4e609542977e83b6fa0af06c0b812745bc476fc SHA256 352e0bb2d4f4a20e86d8e6d518dbae0f0d8ee072176a9b8181f8f09fcfaac77e
 DIST hardened-patches-3.0.4-5.extras.tar.bz2 458822 RMD160 e2a609e70a0897a1378da230ee3eda7caae10ab9 SHA1 0e542aeb1d83fc525aeab1588c004d88f0312fbc SHA256 981d2ba33c8282146df3920f8ee133515c3badeec43072c3e8f6f7765eff0de3
 DIST hardened-patches-3.0.4-6.extras.tar.bz2 475630 RMD160 d1810c18572ab742e93cbcb8c53c0eac5ab40ee7 SHA1 e5e10063325c2dd425b463f628baabc457d99e28 SHA256 8d37f296d0f578a5148caa9f967a3628021196533792f5184157d4420971ec91
-DIST hardened-patches-3.1.10-1.extras.tar.bz2 522103 RMD160 23f72c9137557a7ccc456bea691da7876e6aee77 SHA1 95a6b5f0591f3df6c463ca5dc3247cee5d29706c SHA256 f42f89af7f2983c5f13dffba32d12c8d898221d692b2715d01c76d9510858266
 DIST hardened-patches-3.1.5-1.extras.tar.bz2 514517 RMD160 f4e68b456311300765c07217a1dd0ae79f7b505a SHA1 918bca15180498c10f026f6878502ce3a32067f8 SHA256 96232a098ee8797349fbb5c79b0d3f437424fd2f10ef53ab6a87add9f9055b33
 DIST hardened-patches-3.2.11-1.extras.tar.bz2 504890 RMD160 be00ee149bb33bbeeaf0c9fa67fc1449704cb4ce SHA1 58ff19b7025356eff2395a5513f06df7f5138cbe SHA256 ee4fc083bc137b76f9d017b63497732c7e6985b16eedb1b6fcad1837411e684a
 DIST hardened-patches-3.2.2-2.extras.tar.bz2 549864 RMD160 13c1c5229cadf18c08a0836154e42b704886e4c3 SHA1 5084934b7e1b910866b3aba55372366b13df5f43 SHA256 ac5a31186deea2324442f0989bc897548d018d0fbd2fa1abcc7cd846b3271a19
diff --git a/sys-kernel/hardened-sources/hardened-sources-3.1.10.ebuild b/sys-kernel/hardened-sources/hardened-sources-3.1.10.ebuild
deleted file mode 100644
index b3637cea9d25..000000000000
--- a/sys-kernel/hardened-sources/hardened-sources-3.1.10.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/hardened-sources/hardened-sources-3.1.10.ebuild,v 1.1 2012/01/21 12:00:45 blueness Exp $
-
-EAPI="4"
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras"
-K_GENPATCHES_VER="12"
-K_DEBLOB_AVAILABLE="1"
-
-inherit kernel-2
-detect_version
-
-HGPV="${KV_MAJOR}.${KV_MINOR}.${KV_PATCH}-1"
-HGPV_URI="http://dev.gentoo.org/~blueness/hardened-sources/hardened-patches/hardened-patches-${HGPV}.extras.tar.bz2"
-SRC_URI="${KERNEL_URI} ${HGPV_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-UNIPATCH_LIST="${DISTDIR}/hardened-patches-${HGPV}.extras.tar.bz2"
-UNIPATCH_EXCLUDE="4200_fbcondecor-0.9.6.patch"
-
-DESCRIPTION="Hardened kernel sources (kernel series ${KV_MAJOR}.${KV_MINOR})"
-HOMEPAGE="http://www.gentoo.org/proj/en/hardened/"
-IUSE="deblob"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-RDEPEND=">=sys-devel/gcc-4.5"
-
-pkg_postinst() {
-	kernel-2_pkg_postinst
-
-	local GRADM_COMPAT="sys-apps/gradm-2.2.2*"
-
-	ewarn
-	ewarn "Hardened Gentoo provides three different predefined grsecurity level:"
-	ewarn "[server], [workstation], and [virtualization].  Those who intend to"
-	ewarn "use one of these predefined grsecurity levels should read the help"
-	ewarn "associated with the level.  Because some options require >=gcc-4.5,"
-	ewarn "users with more, than one version of gcc installed should use gcc-config"
-	ewarn "to select a compatible version."
-	ewarn
-	ewarn "Users of grsecurity's RBAC system must ensure they are using"
-	ewarn "${GRADM_COMPAT}, which is compatible with ${PF}."
-	ewarn "It is strongly recommended that the following command is issued"
-	ewarn "prior to booting a ${PF} kernel for the first time:"
-	ewarn
-	ewarn "emerge -na =${GRADM_COMPAT}"
-	ewarn
-}
diff --git a/sys-process/htop/Manifest b/sys-process/htop/Manifest
index 0a036fbe5ca4..89023b1fecb2 100644
--- a/sys-process/htop/Manifest
+++ b/sys-process/htop/Manifest
@@ -1,4 +1,2 @@
-DIST htop-0.8.3.tar.gz 428061 RMD160 ac1707c2f27ac1c6576601765bda4335e49d6aea SHA1 2a0bf90f160b3d019e26712c94db612d6ff9a429 SHA256 f03bac8999c57c399cbf4332831bcce905d0393d0f97f7e32a1407b48890dd9d
 DIST htop-0.9.tar.gz 418767 RMD160 ac0ef275e8ad5a27e5f35fa03800b15ef0966cfe SHA1 d755bff386c260c06162d50113794722e98e9200 SHA256 4de65c38e1886bccd30ed692b30eb9bf195240680781bfe1eaf5faf84ee6fbfd
 DIST htop-1.0.1.tar.gz 384683 RMD160 c13d438438c5ab8c15c056f7064ae6edb26ec8d9 SHA1 bad226ec887a2b7ea5042879ed18e067812d030e SHA256 07db2cbe02835f9e186b9610ecc3beca330a5c9beadb3b6069dd0a10561506f2
-DIST htop-1.0.tar.gz 386165 RMD160 55f2408c8dd0adb9a849858dc975a87034287bfc SHA1 9e9d5f9f2c39af0520a7ba67e7af67925334940a SHA256 242879b86db4b97e1090e7cd391247268ccbe90834ff34b6e8242926c9664852
diff --git a/sys-process/htop/files/htop-0.8.1-non-printable-char-filter.patch b/sys-process/htop/files/htop-0.8.1-non-printable-char-filter.patch
deleted file mode 100644
index cfbafe84fca5..000000000000
--- a/sys-process/htop/files/htop-0.8.1-non-printable-char-filter.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -u htop-0.8.1.orig/RichString.c htop-0.8.1/RichString.c
---- htop-0.8.1.orig/RichString.c	2008-03-09 03:23:49.000000000 +0100
-+++ htop-0.8.1/RichString.c	2008-11-29 19:07:29.284860473 +0100
-@@ -58,7 +58,7 @@
-    int last = MIN(RICHSTRING_MAXLEN - 1, len + this->len);
-    for (int i = this->len, j = 0; i < last; i++, j++) {
-       memset(&this->chstr[i], 0, sizeof(this->chstr[i]));
--      this->chstr[i].chars[0] = data[j];
-+      this->chstr[i].chars[0] = ((data[j] > 31) ? data[j] : '?' );
-       this->chstr[i].attr = attrs;
-    }
-    this->chstr[last].chars[0] = 0;
diff --git a/sys-process/htop/htop-0.8.3.ebuild b/sys-process/htop/htop-0.8.3.ebuild
deleted file mode 100644
index ba0fecb2a9cd..000000000000
--- a/sys-process/htop/htop-0.8.3.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/htop/htop-0.8.3.ebuild,v 1.10 2011/07/08 10:24:22 ssuominen Exp $
-
-EAPI=3
-inherit eutils flag-o-matic multilib
-
-DESCRIPTION="interactive process viewer"
-HOMEPAGE="http://htop.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
-IUSE="debug"
-
-RDEPEND="sys-libs/ncurses[unicode]"
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
-	if use elibc_FreeBSD && ! [[ -f ${ROOT}/proc/stat && -f ${ROOT}/proc/meminfo ]]; then
-		eerror
-		eerror "htop needs /proc mounted to compile and work, to mount it type"
-		eerror "mount -t linprocfs none /proc"
-		eerror "or uncomment the example in /etc/fstab"
-		eerror
-		die "htop needs /proc mounted"
-	fi
-
-	if ! has_version sys-process/lsof; then
-		ewarn "To use lsof features in htop(what processes are accessing"
-		ewarn "what files), you must have sys-process/lsof installed."
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.8.1-non-printable-char-filter.patch
-}
-
-src_configure() {
-	use debug && append-flags -DDEBUG
-	econf \
-		--enable-taskstats \
-		--enable-unicode
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc README ChangeLog TODO || die
-	rmdir "${ED}"/usr/{include,$(get_libdir)} || die
-}
diff --git a/sys-process/htop/htop-0.9-r1.ebuild b/sys-process/htop/htop-0.9-r1.ebuild
deleted file mode 100644
index ba9d4dfc5694..000000000000
--- a/sys-process/htop/htop-0.9-r1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/htop/htop-0.9-r1.ebuild,v 1.1 2011/07/09 21:01:46 ssuominen Exp $
-
-EAPI=4
-inherit autotools eutils flag-o-matic multilib
-
-DESCRIPTION="interactive process viewer"
-HOMEPAGE="http://htop.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
-IUSE="debug elibc_FreeBSD kernel_linux openvz unicode vserver"
-
-RDEPEND="sys-libs/ncurses[unicode?]"
-DEPEND="${RDEPEND}"
-
-DOCS=( ChangeLog README TODO )
-
-pkg_setup() {
-	if use elibc_FreeBSD && ! [[ -f ${ROOT}/proc/stat && -f ${ROOT}/proc/meminfo ]]; then
-		eerror
-		eerror "htop needs /proc mounted to compile and work, to mount it type"
-		eerror "mount -t linprocfs none /proc"
-		eerror "or uncomment the example in /etc/fstab"
-		eerror
-		die "htop needs /proc mounted"
-	fi
-
-	if ! has_version sys-process/lsof; then
-		ewarn "To use lsof features in htop(what processes are accessing"
-		ewarn "what files), you must have sys-process/lsof installed."
-	fi
-}
-
-src_prepare() {
-	sed -i -e '1c\#!'"${EPREFIX}"'/usr/bin/python' \
-		scripts/MakeHeader.py || die
-
-	epatch "${FILESDIR}"/${P}-debug.patch #352024, 372911
-	epatch "${FILESDIR}"/${P}-uclibc.patch #374595
-
-	eautoreconf
-}
-
-src_configure() {
-	use debug && append-flags -DDEBUG
-
-	econf \
-		$(use_enable openvz) \
-		$(use_enable kernel_linux cgroup) \
-		$(use_enable vserver) \
-		$(use_enable unicode) \
-		--enable-taskstats \
-		--without-valgrind
-}
diff --git a/sys-process/htop/htop-0.9.ebuild b/sys-process/htop/htop-0.9.ebuild
deleted file mode 100644
index c6db2f1ea92f..000000000000
--- a/sys-process/htop/htop-0.9.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/htop/htop-0.9.ebuild,v 1.11 2011/07/22 13:48:01 jer Exp $
-
-EAPI=3
-
-inherit eutils flag-o-matic multilib
-
-DESCRIPTION="interactive process viewer"
-HOMEPAGE="http://htop.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
-IUSE="debug elibc_FreeBSD kernel_linux openvz unicode vserver"
-
-RDEPEND="sys-libs/ncurses[unicode?]"
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
-	if use elibc_FreeBSD && ! [[ -f ${ROOT}/proc/stat && -f ${ROOT}/proc/meminfo ]]; then
-		eerror
-		eerror "htop needs /proc mounted to compile and work, to mount it type"
-		eerror "mount -t linprocfs none /proc"
-		eerror "or uncomment the example in /etc/fstab"
-		eerror
-		die "htop needs /proc mounted"
-	fi
-
-	if ! has_version sys-process/lsof; then
-		ewarn "To use lsof features in htop(what processes are accessing"
-		ewarn "what files), you must have sys-process/lsof installed."
-	fi
-}
-
-src_prepare() {
-	sed -i -e '1c\#!'"${EPREFIX}"'/usr/bin/python' \
-		scripts/MakeHeader.py || die
-
-	# bug 352024, 372911
-	epatch "${FILESDIR}/${P}-debug.patch"
-}
-
-src_configure() {
-	use debug && append-flags -DDEBUG
-
-	econf \
-		$(use_enable openvz) \
-		$(use_enable kernel_linux cgroup) \
-		$(use_enable vserver) \
-		$(use_enable unicode) \
-		--enable-taskstats \
-		--without-valgrind
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc ChangeLog README TODO
-}
diff --git a/sys-process/htop/htop-1.0.1.ebuild b/sys-process/htop/htop-1.0.1.ebuild
index 1d0e29e78707..7bb0c961ac51 100644
--- a/sys-process/htop/htop-1.0.1.ebuild
+++ b/sys-process/htop/htop-1.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/htop/htop-1.0.1.ebuild,v 1.1 2012/02/16 20:01:40 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/htop/htop-1.0.1.ebuild,v 1.2 2012/03/21 20:55:54 ssuominen Exp $
 
 EAPI=4
 
@@ -42,6 +42,7 @@ src_prepare() {
 }
 
 src_configure() {
+	[[ $CBUILD != $CHOST ]] && export ac_cv_file__proc_{meminfo,stat}=yes #328971
 
 	econf \
 		$(use_enable openvz) \
diff --git a/sys-process/htop/htop-1.0.ebuild b/sys-process/htop/htop-1.0.ebuild
deleted file mode 100644
index 7a5ebe2d0ca8..000000000000
--- a/sys-process/htop/htop-1.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/htop/htop-1.0.ebuild,v 1.2 2011/12/11 00:16:01 idl0r Exp $
-
-EAPI=4
-
-inherit autotools eutils flag-o-matic multilib
-
-DESCRIPTION="interactive process viewer"
-HOMEPAGE="http://htop.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
-IUSE="elibc_FreeBSD kernel_linux openvz unicode vserver"
-
-RDEPEND="sys-libs/ncurses[unicode?]"
-DEPEND="${RDEPEND}"
-
-DOCS=( ChangeLog README )
-
-pkg_setup() {
-	if use elibc_FreeBSD && ! [[ -f ${ROOT}/proc/stat && -f ${ROOT}/proc/meminfo ]]; then
-		eerror
-		eerror "htop needs /proc mounted to compile and work, to mount it type"
-		eerror "mount -t linprocfs none /proc"
-		eerror "or uncomment the example in /etc/fstab"
-		eerror
-		die "htop needs /proc mounted"
-	fi
-
-	if ! has_version sys-process/lsof; then
-		ewarn "To use lsof features in htop(what processes are accessing"
-		ewarn "what files), you must have sys-process/lsof installed."
-	fi
-}
-
-src_prepare() {
-	sed -i -e '1c\#!'"${EPREFIX}"'/usr/bin/python' \
-		scripts/MakeHeader.py || die
-}
-
-src_configure() {
-
-	econf \
-		$(use_enable openvz) \
-		$(use_enable kernel_linux cgroup) \
-		$(use_enable vserver) \
-		$(use_enable unicode) \
-		--enable-taskstats
-}
diff --git a/virtual/perl-Module-Pluggable/perl-Module-Pluggable-3.900.0-r1.ebuild b/virtual/perl-Module-Pluggable/perl-Module-Pluggable-3.900.0-r1.ebuild
index c9c0918fc94c..32683ac329f7 100644
--- a/virtual/perl-Module-Pluggable/perl-Module-Pluggable-3.900.0-r1.ebuild
+++ b/virtual/perl-Module-Pluggable/perl-Module-Pluggable-3.900.0-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/virtual/perl-Module-Pluggable/perl-Module-Pluggable-3.900.0-r1.ebuild,v 1.2 2011/06/28 19:55:12 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/virtual/perl-Module-Pluggable/perl-Module-Pluggable-3.900.0-r1.ebuild,v 1.3 2012/03/21 20:31:54 jer Exp $
 
 DESCRIPTION="Virtual for ${PN#perl-}"
 HOMEPAGE=""
@@ -8,7 +8,7 @@ SRC_URI=""
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 ~hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="|| ( =dev-lang/perl-5.14* ~dev-lang/perl-5.12.4 ~dev-lang/perl-5.12.3 ~dev-lang/perl-5.12.2 ~dev-lang/perl-5.10.1 ~perl-core/${PN#perl-}-${PV} )"
diff --git a/www-apache/mod_security/Manifest b/www-apache/mod_security/Manifest
index c1dd23260a9b..e612f43c0579 100644
--- a/www-apache/mod_security/Manifest
+++ b/www-apache/mod_security/Manifest
@@ -1,5 +1,4 @@
 DIST modsecurity-apache_2.5.12.tar.gz 1392209 RMD160 e7dae0754e5866c247083f1291bcd5cd08db87d5 SHA1 eb2068e5d31525fa53769dabd1a1c65896fd4e76 SHA256 168bb6591a0f9665169e0ed223a00d63a1c87e11d1e56388abcf431f30efaa84
 DIST modsecurity-apache_2.6.1.tar.gz 1161076 RMD160 9740690b772bf9e78dbf84a7eb3bdc0a042872a5 SHA1 dcd88621dfcc9d8607ca33d3c745a2cf671fc606 SHA256 e2e7d939f22ec05c0d17defd462724e181bfe947c5689b76cf88f96e8e423096
-DIST modsecurity-apache_2.6.2.tar.gz 731087 RMD160 9e75dbb790cc9f2b48a6d38beb5bd4c8755e013e SHA1 c9efe00b5acd04ade252f96065e969998e6103e3 SHA256 99eb400cb35a2a7cfd8069774bf39197e577a57d2c5126036c67f661268f3e5a
 DIST modsecurity-apache_2.6.3.tar.gz 780896 RMD160 102ce304bda05e6d0fd83ebeba27a88b5e0388fe SHA1 d21b8eab268f2614204323720159f7dfe3d9a205 SHA256 6ae9339623e582c965e6a188f7f61f540402a5af8c37cc7a8d22daa4565ca71b
-DIST modsecurity-apache_2.6.4.tar.gz 783102 RMD160 202222cc7451c3e6641113b03afbb11fdbc6d7a8 SHA1 362e34875e084e9d8eee8f6de5db5cab02f6311e SHA256 aa3f0024ea1f9e9cb4c47a0d9ca6582e781c469d12649376ac50b0b681927492
+DIST modsecurity-apache_2.6.5.tar.gz 781626 RMD160 e5df3c4915f08e902def1645dd18b21b78f21a94 SHA1 30f8363adee0684a8b63d6ca7abf5fd29a794f88 SHA256 5bc57fe42825e87fbccab1d88ba5480eaba32c5a166802ac7aa6daae19b44e5f
diff --git a/www-apache/mod_security/mod_security-2.6.2.ebuild b/www-apache/mod_security/mod_security-2.6.2.ebuild
deleted file mode 100644
index c54e0e90558d..000000000000
--- a/www-apache/mod_security/mod_security-2.6.2.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_security/mod_security-2.6.2.ebuild,v 1.1 2011/10/02 13:40:01 flameeyes Exp $
-
-EAPI=4
-
-inherit apache-module autotools
-
-MY_PN=modsecurity-apache
-MY_PV=${PV/_rc/-rc}
-MY_P=${MY_PN}_${MY_PV}
-
-DESCRIPTION="Web application firewall and Intrusion Detection System for Apache."
-HOMEPAGE="http://www.modsecurity.org/"
-SRC_URI="mirror://sourceforge/project/mod-security/${MY_PN}/${MY_PV}/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="geoip curl lua"
-
-DEPEND=">=dev-libs/libxml2-2.7.8
-	dev-libs/libpcre
-	lua? ( >=dev-lang/lua-5.1 )
-	curl? ( >=net-misc/curl-7.15.1 )
-	www-servers/apache[apache2_modules_unique_id]"
-RDEPEND="${DEPEND}
-	geoip? ( dev-libs/geoip )"
-PDEPEND="www-apache/modsecurity-crs"
-
-S="${WORKDIR}/${MY_P}"
-
-APACHE2_MOD_FILE="apache2/.libs/${PN}2.so"
-APACHE2_MOD_DEFINE="SECURITY"
-
-# Tests require symbols only defined within the Apache binary.
-RESTRICT=test
-
-need_apache2
-
-src_prepare() {
-	cp "${FILESDIR}"/modsecurity.conf "${T}"/79_modsecurity.conf || die
-
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--enable-shared --disable-static \
-		--with-apxs="${APXS}" \
-		$(use_enable curl mlogc) \
-		$(use_with lua) \
-		|| die "econf failed"
-}
-
-src_compile() {
-	if ! use geoip; then
-		sed -i -e '/SecGeoLookupDb/s:^:#:' \
-			"${T}"/79_modsecurity.conf || die
-	fi
-
-	emake || die
-}
-
-src_test() {
-	emake check || die
-}
-
-src_install() {
-	apache-module_src_install
-
-	# install manually rather than by using the APACHE2_MOD_CONF
-	# variable since we have to edit it to set things up properly.
-	insinto "${APACHE_MODULES_CONFDIR}"
-	doins "${T}"/79_modsecurity.conf
-
-	dodoc CHANGES
-
-	keepdir /var/cache/modsecurity
-	fowners apache:apache /var/cache/modsecurity
-	fperms 0770 /var/cache/modsecurity
-}
-
-pkg_postinst() {
-	if [[ -f "${ROOT}"/etc/apache/modules.d/99_mod_security.conf ]]; then
-		ewarn "You still have the configuration file 99_mod_security.conf."
-		ewarn "Please make sure to remove that and keep only 79_modsecurity.conf."
-		ewarn ""
-	fi
-	elog "The base configuration file has been renamed 79_modsecurity.conf"
-	elog "so that you can put your own configuration as 90_modsecurity_local.conf or"
-	elog "equivalent."
-	elog ""
-	elog "That would be the correct place for site-global security rules."
-	elog "Note: 80_modsecurity_crs.conf is used by www-apache/modsecurity-crs"
-}
diff --git a/www-apache/mod_security/mod_security-2.6.4.ebuild b/www-apache/mod_security/mod_security-2.6.5.ebuild
similarity index 97%
rename from www-apache/mod_security/mod_security-2.6.4.ebuild
rename to www-apache/mod_security/mod_security-2.6.5.ebuild
index 6a31f277f5ce..4e209b840289 100644
--- a/www-apache/mod_security/mod_security-2.6.4.ebuild
+++ b/www-apache/mod_security/mod_security-2.6.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_security/mod_security-2.6.4.ebuild,v 1.1 2012/03/09 20:34:05 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-apache/mod_security/mod_security-2.6.5.ebuild,v 1.1 2012/03/21 16:29:24 flameeyes Exp $
 
 EAPI=4
 
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 1d3f0bad2b7f..420b356061b1 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -1,4 +1,5 @@
 DIST chromium-17.0.963.79.tar.bz2 165966945 RMD160 8b206cda5a8ce32933cbab7f96e17bc2efbab715 SHA1 571cdefb61ef9741f326323a3e71ce9345b809cf SHA256 060ced63d5047f74549556d5a8c5f39df05e08bc8e2c9d7b6d0f269bb4e4353e
+DIST chromium-17.0.963.83.tar.bz2 165957162 RMD160 181f0d50f08c01f84ac3f342ac4b7d842cdd609e SHA1 ff847fb7fd84f342fc92263fe352a66ce292ea2a SHA256 fa1f684c3605b70243e337a98c4bf6e227da268cb0b8e2ebd42b6fccb798d93f
 DIST chromium-18.0.1025.108.tar.bz2 174570211 RMD160 a44ccd8ed9d4e5ab60a3609b2f8f7c330958f542 SHA1 e0d08c1e25c5f96c86d75a6b13cdba3cc55c6229 SHA256 3fb155eff0810398935bb45696063d6409cb120cf4ec0b949cf4f18591d90782
 DIST chromium-18.0.1025.113.tar.bz2 174653724 RMD160 151c34c4b8907f8e36f42e09786ff31258fcb826 SHA1 a3286be035804f19b4abec0e6cb8a031c20722b6 SHA256 9f1717b52bf56c38986d6aeaee0033b04d16a7247e3be929d87a99b970748575
 DIST chromium-19.0.1068.0.tar.bz2 176778060 RMD160 06ad55624ba8a61ca2dd669718f18e757198faaa SHA1 0342b136755d7174fda7ccfbdd4532273a3fa069 SHA256 733cd0238d353907dd494d7a5255d2d74171c727a7895ac47649baca6a579cf8
diff --git a/www-client/chromium/chromium-17.0.963.83.ebuild b/www-client/chromium/chromium-17.0.963.83.ebuild
new file mode 100644
index 000000000000..9fa693678656
--- /dev/null
+++ b/www-client/chromium/chromium-17.0.963.83.ebuild
@@ -0,0 +1,560 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-17.0.963.83.ebuild,v 1.1 2012/03/22 01:51:27 floppym Exp $
+
+EAPI="4"
+PYTHON_DEPEND="2:2.6"
+
+inherit eutils fdo-mime flag-o-matic gnome2-utils linux-info multilib \
+	pax-utils portability python toolchain-funcs versionator virtualx
+
+DESCRIPTION="Open-source version of Google Chrome web browser"
+HOMEPAGE="http://chromium.org/"
+SRC_URI="http://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="bindist cups custom-cflags gnome gnome-keyring kerberos pulseaudio"
+
+# en_US is ommitted on purpose from the list below. It must always be available.
+LANGS="am ar bg bn ca cs da de el en_GB es es_LA et fa fi fil fr gu he hi hr
+hu id it ja kn ko lt lv ml mr nb nl pl pt_BR pt_PT ro ru sk sl sr sv sw ta te th
+tr uk vi zh_CN zh_TW"
+for lang in ${LANGS}; do
+	IUSE+=" linguas_${lang}"
+done
+
+RDEPEND="app-arch/bzip2
+	cups? (
+		dev-libs/libgcrypt
+		>=net-print/cups-1.3.11
+	)
+	>=dev-lang/v8-3.7.6
+	dev-libs/dbus-glib
+	dev-libs/elfutils
+	>=dev-libs/icu-4.4.1
+	>=dev-libs/libevent-1.4.13
+	dev-libs/libxml2[icu]
+	dev-libs/libxslt
+	>=dev-libs/nss-3.12.3
+	gnome? ( >=gnome-base/gconf-2.24.0 )
+	gnome-keyring? ( >=gnome-base/gnome-keyring-2.28.2 )
+	>=media-libs/alsa-lib-1.0.19
+	media-libs/flac
+	virtual/jpeg
+	media-libs/libpng
+	>=media-libs/libwebp-0.1.2
+	media-libs/speex
+	pulseaudio? ( media-sound/pulseaudio )
+	sys-libs/zlib
+	x11-libs/gtk+:2
+	x11-libs/libXinerama
+	x11-libs/libXScrnSaver
+	x11-libs/libXtst
+	kerberos? ( virtual/krb5 )"
+DEPEND="${RDEPEND}
+	>=dev-lang/nacl-toolchain-newlib-0_p7311
+	dev-lang/perl
+	dev-lang/yasm
+	dev-python/simplejson
+	>=dev-util/gperf-3.0.3
+	>=dev-util/pkgconfig-0.23
+	>=sys-devel/bison-2.4.3
+	sys-devel/flex
+	>=sys-devel/make-3.81-r2
+	test? ( dev-python/pyftpdlib )"
+RDEPEND+="
+	!=www-client/chromium-9999
+	x11-misc/xdg-utils
+	virtual/ttf-fonts"
+
+gyp_use() {
+	if [[ $# -lt 2 ]]; then
+		echo "!!! usage: gyp_use <USEFLAG> <GYPFLAG>" >&2
+		return 1
+	fi
+	if use "$1"; then echo "-D$2=1"; else echo "-D$2=0"; fi
+}
+
+egyp() {
+	set -- build/gyp_chromium --depth=. "${@}"
+	echo "${@}" >&2
+	"${@}"
+}
+
+# Chromium uses different names for some langs,
+# return Chromium name corresponding to a Gentoo lang.
+chromium_lang() {
+	if [[ "$1" == "es_LA" ]]; then
+		echo "es_419"
+	else
+		echo "$1"
+	fi
+}
+
+get_bundled_v8_version() {
+	"$(PYTHON -2)" "${FILESDIR}"/extract_v8_version.py v8/src/version.cc
+}
+
+get_installed_v8_version() {
+	best_version dev-lang/v8 | sed -e 's@dev-lang/v8-@@g'
+}
+
+if ! has chromium-pkg_die ${EBUILD_DEATH_HOOKS}; then
+	EBUILD_DEATH_HOOKS+=" chromium-pkg_die";
+fi
+
+chromium-pkg_die() {
+	if [[ "${EBUILD_PHASE}" != "compile" ]]; then
+		return
+	fi
+
+	# Prevent user problems like bug #348235.
+	eshopts_push -s extglob
+	if is-flagq '-g?(gdb)?([1-9])'; then
+		ewarn
+		ewarn "You have enabled debug info (i.e. -g or -ggdb in your CFLAGS/CXXFLAGS)."
+		ewarn "Please try removing -g{,gdb} before reporting a bug."
+		ewarn
+	fi
+	eshopts_pop
+
+	# ccache often causes bogus compile failures, especially when the cache gets
+	# corrupted.
+	if has ccache ${FEATURES}; then
+		ewarn
+		ewarn "You have enabled ccache. Please try disabling ccache"
+		ewarn "before reporting a bug."
+		ewarn
+	fi
+
+	# No ricer bugs.
+	if use custom-cflags; then
+		ewarn
+		ewarn "You have enabled the custom-cflags USE flag."
+		ewarn "Please disable it before reporting a bug."
+		ewarn
+	fi
+
+	# If the system doesn't have enough memory, the compilation is known to
+	# fail. Print info about memory to recognize this condition.
+	einfo
+	einfo "$(grep MemTotal /proc/meminfo)"
+	einfo "$(grep SwapTotal /proc/meminfo)"
+	einfo
+}
+
+pkg_setup() {
+	if [[ "${SLOT}" == "0" ]]; then
+		CHROMIUM_SUFFIX=""
+	else
+		CHROMIUM_SUFFIX="-${SLOT}"
+	fi
+	CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser${CHROMIUM_SUFFIX}"
+
+	# Make sure the build system will use the right tools, bug #340795.
+	tc-export AR CC CXX RANLIB
+
+	# Make sure the build system will use the right python, bug #344367.
+	python_set_active_version 2
+	python_pkg_setup
+
+	if [[ "${MERGE_TYPE}" == "source" || "${MERGE_TYPE}" == "binary" ]]; then
+		# Fail if the kernel doesn't support features needed for sandboxing,
+		# bug #363907.
+		ERROR_PID_NS="PID_NS is required for sandbox to work"
+		ERROR_NET_NS="NET_NS is required for sandbox to work"
+		CONFIG_CHECK="~PID_NS ~NET_NS"
+		check_extra_config
+	fi
+
+	if use bindist; then
+		elog "bindist enabled: H.264 video support will be disabled."
+	else
+		elog "bindist disabled: Resulting binaries may not be legal to re-distribute."
+	fi
+}
+
+src_prepare() {
+	ln -s /usr/$(get_libdir)/nacl-toolchain-newlib \
+		native_client/toolchain/linux_x86_newlib || die
+
+	# zlib-1.2.5.1-r1 renames the OF macro in zconf.h, bug 383371.
+	sed -i '1i#define OF(x) x' \
+		third_party/zlib/contrib/minizip/{ioapi,{,un}zip}.c \
+		chrome/common/zip*.cc || die
+
+	# Revert WebKit changeset responsible for Gentoo bug #393471.
+	epatch "${FILESDIR}/${PN}-revert-jpeg-swizzle-r0.patch"
+
+	# Backport upstream fix for Gentoo bug #389479.
+	epatch "${FILESDIR}/${PN}-dev-shm-r0.patch"
+
+	# Fix crashes on illegal instructions, bug #401537.
+	epatch "${FILESDIR}/${PN}-media-no-sse-r0.patch"
+
+	epatch_user
+
+	# Remove most bundled libraries. Some are still needed.
+	find third_party -type f \! -iname '*.gyp*' \
+		\! -path 'third_party/WebKit/*' \
+		\! -path 'third_party/angle/*' \
+		\! -path 'third_party/cacheinvalidation/*' \
+		\! -path 'third_party/cld/*' \
+		\! -path 'third_party/expat/*' \
+		\! -path 'third_party/ffmpeg/*' \
+		\! -path 'third_party/flac/flac.h' \
+		\! -path 'third_party/gpsd/*' \
+		\! -path 'third_party/harfbuzz/*' \
+		\! -path 'third_party/hunspell/*' \
+		\! -path 'third_party/iccjpeg/*' \
+		\! -path 'third_party/jsoncpp/*' \
+		\! -path 'third_party/khronos/*' \
+		\! -path 'third_party/launchpad_translations/*' \
+		\! -path 'third_party/leveldb/*' \
+		\! -path 'third_party/leveldatabase/*' \
+		\! -path 'third_party/libjingle/*' \
+		\! -path 'third_party/libphonenumber/*' \
+		\! -path 'third_party/libvpx/*' \
+		\! -path 'third_party/lss/*' \
+		\! -path 'third_party/mesa/*' \
+		\! -path 'third_party/modp_b64/*' \
+		\! -path 'third_party/mongoose/*' \
+		\! -path 'third_party/npapi/*' \
+		\! -path 'third_party/openmax/*' \
+		\! -path 'third_party/ots/*' \
+		\! -path 'third_party/protobuf/*' \
+		\! -path 'third_party/scons-2.0.1/*' \
+		\! -path 'third_party/sfntly/*' \
+		\! -path 'third_party/skia/*' \
+		\! -path 'third_party/smhasher/*' \
+		\! -path 'third_party/speex/speex.h' \
+		\! -path 'third_party/sqlite/*' \
+		\! -path 'third_party/tcmalloc/*' \
+		\! -path 'third_party/tlslite/*' \
+		\! -path 'third_party/undoview/*' \
+		\! -path 'third_party/v8-i18n/*' \
+		\! -path 'third_party/webdriver/*' \
+		\! -path 'third_party/webgl_conformance/*' \
+		\! -path 'third_party/webrtc/*' \
+		\! -path 'third_party/zlib/contrib/minizip/*' \
+		-delete || die
+
+	local v8_bundled="$(get_bundled_v8_version)"
+	local v8_installed="$(get_installed_v8_version)"
+	elog "V8 version: bundled - ${v8_bundled}; installed - ${v8_installed}"
+
+	# Remove bundled v8.
+	find v8 -type f \! -iname '*.gyp*' -delete || die
+
+	# The implementation files include v8 headers with full path,
+	# like #include "v8/include/v8.h". Make sure the system headers
+	# will be used.
+	# TODO: find a solution that can be upstreamed.
+	rmdir v8/include || die
+	ln -s /usr/include v8/include || die
+
+	# Make sure the build system will use the right python, bug #344367.
+	# Only convert directories that need it, to save time.
+	python_convert_shebangs -q -r 2 build tools
+}
+
+src_configure() {
+	local myconf=""
+
+	# Never tell the build system to "enable" SSE2, it has a few unexpected
+	# additions, bug #336871.
+	myconf+=" -Ddisable_sse2=1"
+
+	# Use system-provided libraries.
+	# TODO: use_system_ffmpeg
+	# TODO: use_system_hunspell (upstream changes needed).
+	# TODO: use_system_ssl (http://crbug.com/58087).
+	# TODO: use_system_sqlite (http://crbug.com/22208).
+	# TODO: use_system_vpx
+	myconf+="
+		-Duse_system_bzip2=1
+		-Duse_system_flac=1
+		-Duse_system_icu=1
+		-Duse_system_libevent=1
+		-Duse_system_libjpeg=1
+		-Duse_system_libpng=1
+		-Duse_system_libwebp=1
+		-Duse_system_libxml=1
+		-Duse_system_speex=1
+		-Duse_system_v8=1
+		-Duse_system_xdg_utils=1
+		-Duse_system_yasm=1
+		-Duse_system_zlib=1"
+
+	# Optional dependencies.
+	# TODO: linux_link_kerberos, bug #381289.
+	myconf+="
+		$(gyp_use cups use_cups)
+		$(gyp_use gnome use_gconf)
+		$(gyp_use gnome-keyring use_gnome_keyring)
+		$(gyp_use gnome-keyring linux_link_gnome_keyring)
+		$(gyp_use kerberos use_kerberos)
+		$(gyp_use pulseaudio use_pulseaudio)"
+
+	# Enable sandbox.
+	myconf+="
+		-Dlinux_sandbox_path=${CHROMIUM_HOME}/chrome_sandbox
+		-Dlinux_sandbox_chrome_path=${CHROMIUM_HOME}/chrome"
+
+	# if host-is-pax; then
+	#	# Prevent the build from failing (bug #301880). The performance
+	#	# difference is very small.
+	#	myconf+=" -Dv8_use_snapshot=0"
+	# fi
+
+	# Our system ffmpeg should support more codecs than the bundled one
+	# for Chromium.
+	# myconf+=" -Dproprietary_codecs=1"
+
+	if ! use bindist; then
+		# Enable H.624 support in bundled ffmpeg.
+		myconf+=" -Dproprietary_codecs=1 -Dffmpeg_branding=Chrome"
+	fi
+
+	local myarch="$(tc-arch)"
+	if [[ $myarch = amd64 ]] ; then
+		myconf+=" -Dtarget_arch=x64"
+	elif [[ $myarch = x86 ]] ; then
+		myconf+=" -Dtarget_arch=ia32"
+	elif [[ $myarch = arm ]] ; then
+		# TODO: check this again after
+		# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=39509 is fixed.
+		append-flags -fno-tree-sink
+
+		myconf+=" -Dtarget_arch=arm -Ddisable_nacl=1 -Dlinux_use_tcmalloc=0"
+	else
+		die "Failed to determine target arch, got '$myarch'."
+	fi
+
+	# Make sure that -Werror doesn't get added to CFLAGS by the build system.
+	# Depending on GCC version the warnings are different and we don't want
+	# the build to fail because of that.
+	myconf+=" -Dwerror="
+
+	# Avoid CFLAGS problems, bug #352457, bug #390147.
+	if ! use custom-cflags; then
+		replace-flags "-Os" "-O2"
+		strip-flags
+	fi
+
+	egyp ${myconf} || die
+}
+
+src_compile() {
+	emake chrome chrome_sandbox chromedriver BUILDTYPE=Release V=1 || die
+	pax-mark m out/Release/chrome
+	if use test; then
+		emake {base,cacheinvalidation,crypto,googleurl,gpu,media,net,printing}_unittests BUILDTYPE=Release V=1 || die
+		pax-mark m out/Release/{base,cacheinvalidation,crypto,googleurl,gpu,media,net,printing}_unittests
+	fi
+}
+
+src_test() {
+	# For more info see bug #350349.
+	local mylocale='en_US.utf8'
+	if ! locale -a | grep -q "$mylocale"; then
+		eerror "${PN} requires ${mylocale} locale for tests"
+		eerror "Please read the following guides for more information:"
+		eerror "  http://www.gentoo.org/doc/en/guide-localization.xml"
+		eerror "  http://www.gentoo.org/doc/en/utf-8.xml"
+		die "locale ${mylocale} is not supported"
+	fi
+
+	# For more info see bug #370957.
+	if [[ $UID -eq 0 ]]; then
+		die "Tests must be run as non-root. Please use FEATURES=userpriv."
+	fi
+
+	# ICUStringConversionsTest: bug #350347.
+	# MessagePumpLibeventTest: bug #398501.
+	LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/base_unittests virtualmake \
+		'--gtest_filter=-ICUStringConversionsTest.*:MessagePumpLibeventTest.*'
+
+	LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/cacheinvalidation_unittests virtualmake
+	LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/crypto_unittests virtualmake
+	LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/googleurl_unittests virtualmake
+	LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/gpu_unittests virtualmake
+	LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/media_unittests virtualmake
+
+	# NetUtilTest: bug #361885.
+	# NetUtilTest.GenerateFileName: some locale-related mismatch.
+	# UDP: unstable, active development. We should revisit this later.
+	# CertDatabaseNSSTest.ImportCACertHierarchyTree: works in 18.x, broken here.
+	# CertDatabaseNSSTest.ImportServerCert_SelfSigned: bug #399269.
+	LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/net_unittests virtualmake \
+		'--gtest_filter=-NetUtilTest.IDNToUnicode*:NetUtilTest.FormatUrl*:NetUtilTest.GenerateFileName:*UDP*:CertDatabaseNSSTest.ImportCACertHierarchyTree:CertDatabaseNSSTest.ImportServerCert_SelfSigned:KeygenHandlerTest.*'
+
+	LC_ALL="${mylocale}" VIRTUALX_COMMAND=out/Release/printing_unittests virtualmake
+}
+
+src_install() {
+	exeinto "${CHROMIUM_HOME}"
+	doexe out/Release/chrome || die
+	doexe out/Release/chrome_sandbox || die
+	fperms 4755 "${CHROMIUM_HOME}/chrome_sandbox"
+
+	doexe out/Release/chromedriver || die
+
+	# Install Native Client files on platforms that support it.
+	insinto "${CHROMIUM_HOME}"
+	case "$(tc-arch)" in
+		amd64)
+			doexe out/Release/nacl_helper{,_bootstrap} || die
+			doins out/Release/nacl_irt_x86_64.nexe || die
+			doins out/Release/libppGoogleNaClPluginChrome.so || die
+		;;
+		x86)
+			doexe out/Release/nacl_helper{,_bootstrap} || die
+			doins out/Release/nacl_irt_x86_32.nexe || die
+			doins out/Release/libppGoogleNaClPluginChrome.so || die
+		;;
+	esac
+
+	newexe "${FILESDIR}"/chromium-launcher-r2.sh chromium-launcher.sh || die
+	if [[ "${CHROMIUM_SUFFIX}" != "" ]]; then
+		sed "s:chromium-browser:chromium-browser${CHROMIUM_SUFFIX}:g" \
+			-i "${ED}"/"${CHROMIUM_HOME}"/chromium-launcher.sh || die
+		sed "s:chromium.desktop:chromium${CHROMIUM_SUFFIX}.desktop:g" \
+			-i "${ED}"/"${CHROMIUM_HOME}"/chromium-launcher.sh || die
+		sed "s:plugins:plugins --user-data-dir=\${HOME}/.config/chromium${CHROMIUM_SUFFIX}:" \
+			-i "${ED}"/"${CHROMIUM_HOME}"/chromium-launcher.sh || die
+	fi
+
+	# It is important that we name the target "chromium-browser",
+	# xdg-utils expect it; bug #355517.
+	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium-browser${CHROMIUM_SUFFIX} || die
+	# keep the old symlink around for consistency
+	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium${CHROMIUM_SUFFIX} || die
+
+	# Allow users to override command-line options, bug #357629.
+	dodir /etc/chromium || die
+	insinto /etc/chromium
+	newins "${FILESDIR}/chromium.default" "default" || die
+
+	# Support LINGUAS, bug #332751.
+	local pak
+	for pak in out/Release/locales/*.pak; do
+		local pakbasename="$(basename ${pak})"
+		local pakname="${pakbasename%.pak}"
+		local langname="${pakname//-/_}"
+
+		# Do not issue warning for en_US locale. This is the fallback
+		# locale so it should always be installed.
+		if [[ "${langname}" == "en_US" ]]; then
+			continue
+		fi
+
+		local found=false
+		local lang
+		for lang in ${LANGS}; do
+			local crlang="$(chromium_lang ${lang})"
+			if [[ "${langname}" == "${crlang}" ]]; then
+				found=true
+				break
+			fi
+		done
+		if ! $found; then
+			ewarn "LINGUAS warning: no ${langname} in LANGS"
+		fi
+	done
+	local lang
+	for lang in ${LANGS}; do
+		local crlang="$(chromium_lang ${lang})"
+		local pakfile="out/Release/locales/${crlang//_/-}.pak"
+		if [ ! -f "${pakfile}" ]; then
+			ewarn "LINGUAS warning: no .pak file for ${lang} (${pakfile} not found)"
+		fi
+		if ! use linguas_${lang}; then
+			rm "${pakfile}" || die
+		fi
+	done
+
+	insinto "${CHROMIUM_HOME}"
+	doins out/Release/chrome.pak || die
+	doins out/Release/resources.pak || die
+
+	doins -r out/Release/locales || die
+	doins -r out/Release/resources || die
+
+	newman out/Release/chrome.1 chromium${CHROMIUM_SUFFIX}.1 || die
+	newman out/Release/chrome.1 chromium-browser${CHROMIUM_SUFFIX}.1 || die
+
+	# Chromium looks for these in its folder
+	# See media_posix.cc and base_paths_linux.cc
+	# dosym /usr/$(get_libdir)/libavcodec.so.52 "${CHROMIUM_HOME}" || die
+	# dosym /usr/$(get_libdir)/libavformat.so.52 "${CHROMIUM_HOME}" || die
+	# dosym /usr/$(get_libdir)/libavutil.so.50 "${CHROMIUM_HOME}" || die
+	doexe out/Release/libffmpegsumo.so || die
+
+	# Install icons and desktop entry.
+	for SIZE in 16 22 24 32 48 64 128 256 ; do
+		insinto /usr/share/icons/hicolor/${SIZE}x${SIZE}/apps
+		newins chrome/app/theme/chromium/product_logo_${SIZE}.png \
+			chromium-browser${CHROMIUM_SUFFIX}.png || die
+	done
+	local mime_types="text/html;text/xml;application/xhtml+xml;"
+	mime_types+="x-scheme-handler/http;x-scheme-handler/https;" # bug #360797
+	make_desktop_entry \
+		chromium-browser${CHROMIUM_SUFFIX} \
+		"Chromium${CHROMIUM_SUFFIX}" \
+		chromium-browser${CHROMIUM_SUFFIX} \
+		"Network;WebBrowser" \
+		"MimeType=${mime_types}\nStartupWMClass=chromium-browser"
+	sed -e "/^Exec/s/$/ %U/" -i "${ED}"/usr/share/applications/*.desktop || die
+
+	# Install GNOME default application entry (bug #303100).
+	if use gnome; then
+		dodir /usr/share/gnome-control-center/default-apps || die
+		insinto /usr/share/gnome-control-center/default-apps
+		newins "${FILESDIR}"/chromium-browser.xml chromium-browser${CHROMIUM_SUFFIX}.xml || die
+		if [[ "${CHROMIUM_SUFFIX}" != "" ]]; then
+			sed "s:chromium-browser:chromium-browser${CHROMIUM_SUFFIX}:g" -i \
+				"${ED}"/usr/share/gnome-control-center/default-apps/chromium-browser${CHROMIUM_SUFFIX}.xml
+		fi
+	fi
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+
+	# For more info see bug #292201, bug #352263, bug #361859.
+	elog
+	elog "Depending on your desktop environment, you may need"
+	elog "to install additional packages to get icons on the Downloads page."
+	elog
+	elog "For KDE, the required package is kde-base/oxygen-icons."
+	elog
+	elog "For other desktop environments, try one of the following:"
+	elog " - x11-themes/gnome-icon-theme"
+	elog " - x11-themes/tango-icon-theme"
+
+	# For more info see bug #359153.
+	elog
+	elog "Some web pages may require additional fonts to display properly."
+	elog "Try installing some of the following packages if some characters"
+	elog "are not displayed properly:"
+	elog " - media-fonts/arphicfonts"
+	elog " - media-fonts/bitstream-cyberbit"
+	elog " - media-fonts/droid"
+	elog " - media-fonts/ipamonafont"
+	elog " - media-fonts/ja-ipafonts"
+	elog " - media-fonts/takao-fonts"
+	elog " - media-fonts/wqy-microhei"
+	elog " - media-fonts/wqy-zenhei"
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/www-client/firefox-bin/Manifest b/www-client/firefox-bin/Manifest
index 813c1c6c84d8..da33649c8e98 100644
--- a/www-client/firefox-bin/Manifest
+++ b/www-client/firefox-bin/Manifest
@@ -82,6 +82,90 @@ DIST firefox-10.0.2-vi.xpi 262784 RMD160 779fb82c43a84adeb80dadc0da84f9f55bc25eb
 DIST firefox-10.0.2-zh-CN.xpi 256544 RMD160 c5e4db18405565f5d9605f102b8175b0b554cb7a SHA1 97ae38907beed6edfba2886b3db71ad928b2d915 SHA256 6b8f03e07ad020a9ba0a6935d916ef6c707b72faefd66049da4718d08d0bf0b9
 DIST firefox-10.0.2-zh-TW.xpi 257489 RMD160 311754a70e2f183c521e12c892a68748cc931125 SHA1 d312fb1fbfed7fa488d3b77c68bbf8bdd3908a4f SHA256 b17a795360b8272dfdbcdf4fdd4a67f544405a0c5557fedf31448ad962c66923
 DIST firefox-10.0.2-zu.xpi 246392 RMD160 4b4b6992f5a9ee280cc566ed8ae9771b85ca45d6 SHA1 fc556f6cade7e56b644d80d706f122f6efd71b20 SHA256 74f0dec5c9fa7576445c2d230074218d69b62921211a0cd72c1c0a99394d8e5b
+DIST firefox-10.0.3esr-af.xpi 238740 RMD160 c07ec0e6a17165ac0d8cf0e510c25cce2f094acc SHA1 954189a69a389ca3eb8812e0cae2b5ea3c7bcaee SHA256 d6442ab62a00d6ea606b237f7901b81c1a62c29ad4ae74e1a153ef1fd08cacf3
+DIST firefox-10.0.3esr-ak.xpi 240568 RMD160 e4ae6935ba2bd452eeea157589d35e2f91e16c3c SHA1 3a749735fe3c7418283049f22bd4cf5d94deac60 SHA256 22649466e787cf3d53c6662b09a973f042b898ce4813b72d4bfe6ab3dfef0aca
+DIST firefox-10.0.3esr-ar.xpi 263699 RMD160 cea3d00de0411eccd492ba7e13924a1fe4eed6a8 SHA1 97c7fba4aa8bd70da1c688f546ec6473b184c0dc SHA256 b0920d61c7daee82776bd919dbded765320cbe49f72087cf46e582647472ddab
+DIST firefox-10.0.3esr-as.xpi 278740 RMD160 23bf6f2b59e4eb3b30170eda0fbc738fec6b2b06 SHA1 d202fd6b3727a76a48b9f016c992fa0f678cdfc0 SHA256 8feefccb072329f30368d9cb725a7b13cbaa8ec428b2b542b92e348ed14074d5
+DIST firefox-10.0.3esr-ast.xpi 237972 RMD160 8bba309e0bc37b759ffa9decf57562f407da67fb SHA1 f52773137a258aff635f2bfe6fa22e7c1bc297d4 SHA256 75c645012d09d4259548debac425743fb96a60f70d45b341bdfb3f204fc5421d
+DIST firefox-10.0.3esr-be.xpi 245753 RMD160 9fbdb4aec90c143532cf3fae831abb6e8b44bd91 SHA1 28ab567d9525d8c4e1eb09df51e81e8c53c843c7 SHA256 b6f2ccbed8d0035cdaf1bcde179f630ea42be5f4e3f9897344e69c90d15a5c39
+DIST firefox-10.0.3esr-bg.xpi 276753 RMD160 736ab5d9fb89cff64cf0100029409679094aadcc SHA1 d3d559406e04bce58f435023d550a6cda0cd12bc SHA256 453ecf2726a21638bb51670bf7df6dceb22daf0711bc4afdb8f760296d9d2f6c
+DIST firefox-10.0.3esr-bn-BD.xpi 288290 RMD160 273750c82123994f2f6fd4fbf5595a40f3b1e0ea SHA1 da4668fb12fa1041212a2b615b522783e3153bad SHA256 c01814282253a3e18460a458403640bdeefa1a75693cdd5f04151c9e6cde90c3
+DIST firefox-10.0.3esr-bn-IN.xpi 319302 RMD160 23e6ea840e9a19ae73d18bbc62f55e617260d434 SHA1 24398f1cfcdbc1a496b0eb1d7d4224ab05c56172 SHA256 bff4d0ce4e7d35e96f4c82b95f2f6f544ba05ac1a89a06146274fba53ed80f42
+DIST firefox-10.0.3esr-br.xpi 247647 RMD160 21914296ee7cf4cc0e640df9686a1f690bb00e78 SHA1 e1e3a0dfbc27c0a958ac88dcf520c0eb60b199c6 SHA256 a5f5ec015112f807932b3d439027324f6c3e35a3073aabbe3c13e45e4166364e
+DIST firefox-10.0.3esr-bs.xpi 245305 RMD160 e90f8b3a7422e6434e2370fd7ba2d552436b0109 SHA1 bb4ddc49c3ce0af81fc746ef0fe9c0480c7e96ae SHA256 329e554135e62a3e86e2e96f03861507360a3b8bc36421dde01e18c7ebc1ee86
+DIST firefox-10.0.3esr-ca.xpi 248217 RMD160 afee7033898e4dad9e2a71a103c86beb0eef725f SHA1 ca6d7620912f646d279a0a15ee74c08efe572543 SHA256 aa047f65f97379061ff2465fea0ca4f37d3dd0a4eede927bbcf70a0999ad0ba9
+DIST firefox-10.0.3esr-cs.xpi 248767 RMD160 df97bc6fa1308a4d729ce4f79bbb1a120371703b SHA1 2ab35a47a4e1f5aeb2b5e70ec456fa729eed1a2c SHA256 0a31c19f48d3505a2015fe53102c2d8f32f6eb48237aaecc67b38a1a05aa4ccf
+DIST firefox-10.0.3esr-csb.xpi 266621 RMD160 ed89c91f532d28300671873a75e465833584cc13 SHA1 8c0e0b5c0e902d8c18b4ac7f3312d43e8f728def SHA256 a5841467315df6a71c2838723555a488c6418f47c886ae47053f5d126cf8abc7
+DIST firefox-10.0.3esr-cy.xpi 244194 RMD160 517726fcd3fad8c5e10a6f88deadd80bd9feb085 SHA1 99b2f23bc45e0998760c39e0be9a462a1ded6cc2 SHA256 0b8b98180d18acbcaf9ef344c9206a1609566da182c6ef20b547ade2b0d71d33
+DIST firefox-10.0.3esr-da.xpi 240325 RMD160 b3b5958af544d1f8131428e1b0d0265557ad968d SHA1 12af0d5da53d20d8eb1d2bf3f5c6b5a0a45ed643 SHA256 9a3f4b1935ee0046c5c32188c38a8513ad4a4719777af7f154dd2af611833480
+DIST firefox-10.0.3esr-de.xpi 249295 RMD160 686d2d7bbbbdbddf7c53f4bbc5bf8dab802aa9a0 SHA1 13ed81c7c040ecb1587d999f94b6f82c5ecfc47b SHA256 486087ab952a097bc4d37518afbc8988b56ebe54a98c4ab43486389501edf452
+DIST firefox-10.0.3esr-el.xpi 264377 RMD160 d85722c981bc38c6b3986d81e1d652a042ae3b95 SHA1 d70eb2ddee84128d2fe63a60d4d5671140cb6e76 SHA256 fbbe0a059f5562b62f4377f84412496b43fdbdee704bae25c5d4f87b4c52399d
+DIST firefox-10.0.3esr-en-GB.xpi 231191 RMD160 48d9ed7dfdee4353a914d20c505614179a522c94 SHA1 e9029198fa28d33df618f1fc3981172573a559ad SHA256 439f1398bf0e156afbbb53fca7d4b47e2f671b7c096e8d0dad1a3c789799d36a
+DIST firefox-10.0.3esr-en-ZA.xpi 233917 RMD160 081a1d266ae845d3d7188bf6bc0cc238f085e1a7 SHA1 4b58ed85266e67d0e348f6a3ae4847f9cb2a610e SHA256 5d50d56fb10c8225943632cbfdbb92876caff129bfd628de4a4dad945f445154
+DIST firefox-10.0.3esr-eo.xpi 240899 RMD160 00a8215c4f75b944e1a774dc08fcbec9a1f317ea SHA1 58ab2fe4368cd18896bb18df5bc61a222f00c2c5 SHA256 015f0c701ad9a655bd194e149f33f9bf92edbd924ef1e2b2e273c886e2703365
+DIST firefox-10.0.3esr-es-AR.xpi 245344 RMD160 3944f7b1529434c6b0bfc490e6812ef7b50c2d34 SHA1 73f692a31fcfe2e1f5ae8b62697112f8a0e40529 SHA256 51e35b96af4a2801da262e20dfdc6b17051aa7e044ee9732cbe3c0ef9c62ad12
+DIST firefox-10.0.3esr-es-CL.xpi 250202 RMD160 f61129fbb73c4cb2034493a69ce30d2eba9ba82c SHA1 4a0779653ad8674c0c94f0cf497d9989b02940ab SHA256 41192b3bae04d6a0b9a366538f84b8e463a245796bd4c765ad70a6730d8f5571
+DIST firefox-10.0.3esr-es-ES.xpi 215375 RMD160 ebabbd90a2c96bf6ae832434ff78f7f12b7f243f SHA1 0be41987f6c768da2026ab11c4976c271abfc347 SHA256 9ad97e3d4a87892fb2f867d39850fcbc01e7fcd601c6f494901cd5ae43d8abd3
+DIST firefox-10.0.3esr-es-MX.xpi 224149 RMD160 c00b33c32dab38ef320a3d2fc7f559c677ea22bb SHA1 ffc844dcde9fd9219f3118b6e3c0b086996c2c0d SHA256 b5eeec3ca5abc85da3afe6dcdcfebcb67a4fd4361f9696fec80e4df2d02167c2
+DIST firefox-10.0.3esr-et.xpi 242627 RMD160 f8b3b59fb894dd083491c55aede27483b62daa62 SHA1 eff16d66b5b4b8476928d09d74fe87926b8d2dc8 SHA256 231b17418364bf5e3cf08c049cb5d5e3290423e62b029d5e961c2bc09c7be4b5
+DIST firefox-10.0.3esr-eu.xpi 240247 RMD160 1d6ca4f5ee38c7bafb9cb27a67b8c166ad50684b SHA1 3111e2167f9c63d3fcc2a7f94959e4d919c6cb94 SHA256 b22ce9a255e22a10f523a6f61a2b7d2da400907bbcc5bc18bdeec5574264b5c5
+DIST firefox-10.0.3esr-fa.xpi 272850 RMD160 77f4274d08e494ac592b8d2e54d3e34cfd3f4db5 SHA1 0c023ee0420174307946a97af69ab8120407bea0 SHA256 44683f76eec96a43e26f519f08ad4c5317f0dd58cbebf1d08d8b635f8a22f929
+DIST firefox-10.0.3esr-fi.xpi 243627 RMD160 dffa4a08d9a7d536e4d5bd56b30ab7edf3a380cf SHA1 9ea3505e2b53d276cdb59c4e960a5a81ec9a3462 SHA256 5289afcc95216dff6bb5b5f5d484d70cc193eeb18a884753d1788e0e57997cd8
+DIST firefox-10.0.3esr-fr.xpi 249565 RMD160 d30b5072b087c2cc80d22e965eafd3e0c1aeac0f SHA1 fb9c7adb77a62543661af13300716ce0362e9293 SHA256 7c1f20eb2a3101bcb86c8bc600be25f18247884c0262a12d7e5fae51f66f1d70
+DIST firefox-10.0.3esr-fy-NL.xpi 249340 RMD160 4a0c8be7b9daddd63aef13c30664f55c00dce54f SHA1 e9fd94e0ad1006bc0680f1eda63381182c3ba4d7 SHA256 ec520b710ce213e77df58b44db6624f8c3441e75bd41b02be8691c3c82cf1b13
+DIST firefox-10.0.3esr-ga-IE.xpi 252020 RMD160 a0a8d54b442bd91d306e68405226545abba52a7e SHA1 c53b9c621d3e98c23df25b2f7fef3a5820c98c87 SHA256 323801727bf01718a31d217a52baf499865f4f29a48df4a35500716d3ad7d7fa
+DIST firefox-10.0.3esr-gd.xpi 253675 RMD160 2fe789a0b9758125f611b1d4166592bf65bdab63 SHA1 ccbfbe42dec8845e5c7ae2c5db5c0cc128fdd819 SHA256 bc0c8733dfc62f0806e9377f587860808e1412463038c61b818bdd53d045ff5e
+DIST firefox-10.0.3esr-gl.xpi 243247 RMD160 66185788200908879db12d52fcfa599192de9cb6 SHA1 ee6e05989fa0499647655968639a0d2ab7e26ab0 SHA256 17475d8200465ed080a816897275bcd9ca2dd4224204a86b262dfbd933faaead
+DIST firefox-10.0.3esr-gu-IN.xpi 275219 RMD160 97393b3706873ca7be30a4cbc9ffe7e000e6e209 SHA1 539ef69ea220539bec352f9b9e0530c32fedc126 SHA256 56683283fdb6dd8c287ddeb0ed5e8d3981be19437f50006ff2c0f4c648affc6f
+DIST firefox-10.0.3esr-he.xpi 264931 RMD160 0db4806b90e766583b7e30dcf899207a19f382a1 SHA1 c68d1ddc7332c03273abba31872da5723dc486d6 SHA256 d3c3c9c25f5d99ee4343c4942fdcc59d10dbe6462f7e648f2be35255d3713ee9
+DIST firefox-10.0.3esr-hi-IN.xpi 279998 RMD160 80e633bd311a2de0e78d8d4e535c49a3a9570f4c SHA1 9019531981188573916c9b63044cbe5f960a8a41 SHA256 8779197d71c197b38719decb88a732a31870d85b90364e430f2a216bc3e1f1bb
+DIST firefox-10.0.3esr-hr.xpi 249330 RMD160 e35d140d9d78e1e817ebfcede55c8f183410d655 SHA1 1ff8a2f2bc92e0f26a4212482d447c7ad6546a5b SHA256 6a8f4dcb2cbc53fd1c58930784c6008cf4a9b0358cac9dc6d11645142fe7f453
+DIST firefox-10.0.3esr-hu.xpi 253772 RMD160 8cb6c6b885b69ca661c95b02bf4d8964af63eda6 SHA1 4364702b015a92cb4c9124deab667e3bb067ce1b SHA256 c63bcd9fa07b0bc6f5b86d0ae360d8b2e0cc13029025bafc5c6ce8b78e4bfbd6
+DIST firefox-10.0.3esr-hy-AM.xpi 445449 RMD160 25c0b960bf2092bf097372098519a1ed8f55f2c5 SHA1 6a855a9d588abce18969af51f93f5ccc52b11c11 SHA256 1cde513a8b48879591676b9a29f7d8eec9c5b88f4e7fc0789b4b3c3e64910f5f
+DIST firefox-10.0.3esr-id.xpi 236821 RMD160 72a4bbdedb44041bf3b95edb8bbfb8b95f239d71 SHA1 292fbf9054fc8dabfe4e9b416577cc8c7f4a9b3e SHA256 eaf0c20250932d2ce8d5656d827090e6a405aebf43caf5bf16c8afee1d9f9e1a
+DIST firefox-10.0.3esr-is.xpi 243065 RMD160 baed31ff58db3f76db86e69225496cae2fa3500a SHA1 c1ea323a83ba45d88ec6d610fc2e93b8e1f0adbd SHA256 c97002dd720eac2e6cfff995d29b54816791d72a1802e48ce97a4d4c44f2717c
+DIST firefox-10.0.3esr-it.xpi 212714 RMD160 4a86ad3bf4657a04ee3bb60d38ff3b01ee0c13de SHA1 f34041abe0ecc89fa689695c197b2c02624f5553 SHA256 cfcfcc73c266214ca6534557382cd8977df9db77f43cb565b3bae8f454636c76
+DIST firefox-10.0.3esr-ja.xpi 273111 RMD160 e4dab92bfe5816b4b774d42567cbf8d076a50281 SHA1 f87e496d4bd40fec44689e1379b89adc7d2b4062 SHA256 208239da9d968406833d28084d61c7f3620637256a0ee5cbe85c00e5884428b2
+DIST firefox-10.0.3esr-kk.xpi 279772 RMD160 b44dfb77332781d15afe92765b7a722c85b14918 SHA1 c599dab2ac016c2b1598e8a1eab32136a949c347 SHA256 a5f30933d070cc7ee00b002c6299e9f33b8d95f54c92ee2355c47f8192671a6f
+DIST firefox-10.0.3esr-kn.xpi 299828 RMD160 68f9a9264322a2eee291b009c9b9119b99e41e3f SHA1 37d6f020429ad89485a5d65a203dfbc207c8a096 SHA256 69df90ebd7ab55ac96da83c4b07045c414e4334554ec26e19602c1910714e02d
+DIST firefox-10.0.3esr-ko.xpi 227940 RMD160 0a631d36208e6eebae06e15668e16b9dc3b3f43e SHA1 cfd45fc6be1ed3b1cb5b79251bf77c5f7052a4a6 SHA256 285c12a487b453de5815f9a5db11a3b9d62c03a9f3a4281b990314c4c6ea174c
+DIST firefox-10.0.3esr-ku.xpi 254707 RMD160 4dcd1b62f067d96c8cfbcd456b8bda4216ec0174 SHA1 55b62d362dd73ebd870a7815e7373289558794bf SHA256 8b8c534536e6d00d845011373a6195be2b0564571d2aa62549448ffa69245eab
+DIST firefox-10.0.3esr-lg.xpi 247671 RMD160 5fa9dc91966a0cf2578d78b2708204c4a5f7f4f4 SHA1 da3482523c460d2425adb7636628c26c5f7c41ed SHA256 df616b25658344f28b39c767c27444d146525d043e8079a1fa8e59a2f582aa5b
+DIST firefox-10.0.3esr-lt.xpi 330628 RMD160 aa8515c5352ae72118457c1b22f8ef255e38353b SHA1 dc1e7995785d68752963aa7d2c6360a1f2b6b49c SHA256 c3e542c8e9d37f426a797f0dcd39dac7d1ba999059af90d1879fe645db129dfe
+DIST firefox-10.0.3esr-lv.xpi 244349 RMD160 f2a5bd17123687bcb8ae3a9844ac2e357116a979 SHA1 710883835615fb9d4a840b95840129ccb2751416 SHA256 0acc63126fef2910a11f58965c994381df916f43b5c11c8730734c7da12356e7
+DIST firefox-10.0.3esr-mai.xpi 279250 RMD160 2743369dfd3ce54c0300694339e74419a660a386 SHA1 44f0f41b99bea24a7ffc32dbfb2ee65808628895 SHA256 3ab951d33133f419746a13b9c4fc7cdcffb8a21191c77a646d7d4e2274e4a85e
+DIST firefox-10.0.3esr-mk.xpi 272936 RMD160 d180176ac5317fc5fc36858226ed6f0a837dfe9c SHA1 cab4aeeaa327a83ad201e52de5cde1026a399421 SHA256 c5f29ddc6e17e37311ffdf230b1a2e6cd167c71b237ed4b4e17f5f6bc6b03990
+DIST firefox-10.0.3esr-ml.xpi 306673 RMD160 8005003446941a5459dba1151cd277b266e3330c SHA1 20177dc3b5d6946c941a13ec012f78b5eaf50634 SHA256 b2f22a38c8d7b2e488b621151d623f1049c75d7e475d8039561c98c5da313db6
+DIST firefox-10.0.3esr-mr.xpi 281455 RMD160 400574575b79df7af2adb9f229c44780a1783f13 SHA1 824639db110d2000403bc631a1aff59b8a005692 SHA256 72106fe8254c34412ed64ebc5b52f8e0e9de1ce77f27fa505a5bbdd94f5a0b40
+DIST firefox-10.0.3esr-nb-NO.xpi 241208 RMD160 5f5d5c2e77c0043a844f2fcbcf386311a69f61ee SHA1 3f75b0a4215f9dfa249f260a07f8b20f0bd1b7ab SHA256 51b59d1f0e894fe363d3dd95d40882035a29a86b2ebb0153aae5aa8755ddac29
+DIST firefox-10.0.3esr-nl.xpi 242398 RMD160 ef0ce65c7d6ebd10f09dd5bbf9b28cc68a495514 SHA1 ade54939bd9bb2f03f76a7cbc6f34e10281e2715 SHA256 78e1109cb3ae24ef0a0792006b252f565f19375da7d05f087cf6f9a4ce069010
+DIST firefox-10.0.3esr-nn-NO.xpi 242451 RMD160 49bc04d5d6a684e698ccc186d61a9a96482e9b51 SHA1 c7eff7e6292be06f363358e704dd076122a7489f SHA256 7e879102f746033fb511c5bcf3a16ec3ddb7452056a49e26227649bd4ef48ed4
+DIST firefox-10.0.3esr-nso.xpi 245692 RMD160 759ea819f7bf4b4015bf8d549a002b59dcd7ec84 SHA1 2b180a5fb813bae964b17f1f733d248a8b5dfad3 SHA256 a4f5fcf89cacfc982464be2bcefd4f498a88f4ed3fe932fbf4f81443f6241464
+DIST firefox-10.0.3esr-or.xpi 281684 RMD160 0cb0c829e3a2af1eab81d2abbabd90001c8d9177 SHA1 b615cf15e81621c6ff5761a85cb1a7fafdc260a7 SHA256 3eed6f872b53894fc81e06edf87b8997124903d41a38f3bd0486a14fc8ddedc0
+DIST firefox-10.0.3esr-pa-IN.xpi 282142 RMD160 735c2d86a0fd2eb34337554932165574d8d5a806 SHA1 5b9589527a3a7612f47e8711e92aa7e622b23fe8 SHA256 013a8470271c6b42868b858d74a02e7458f9c49d83ed0e33c735716489208b78
+DIST firefox-10.0.3esr-pl.xpi 252043 RMD160 4537b7d7fadcb62367717dbba2a176a828a0d58e SHA1 271e62ed0fea898ed2ac2cb022248a5bd21abee7 SHA256 72bbb1d2142ef543f196dafe8428b1f81e3b957f2efc96c76432d192313be2d0
+DIST firefox-10.0.3esr-pt-BR.xpi 246845 RMD160 276af04c3189574c5b1be137336d9ae644d6c2d0 SHA1 013142167876c836a4d8ff73cd35660d36c7f276 SHA256 f4c517fd862e9b75b659f04dc51bb61757158e9b374f4daafbd4da6abc934355
+DIST firefox-10.0.3esr-pt-PT.xpi 246471 RMD160 47da8dbae545b11481eb3bf56ff356e2722e2dfc SHA1 a6b85b14f069f24287bccbaaee58d7809ea97c44 SHA256 e56fd7f0882cef3664cd53c59e8513074421d304a3a22159858bccc3fb4c442b
+DIST firefox-10.0.3esr-rm.xpi 245768 RMD160 e478d37c91b68c09958f9afddcf909d9c0748ce4 SHA1 468a5be93d6e1aa1cd8af282cbd26218dc11d4de SHA256 f8990bed7dce752bd2c1941d6b5db462309fcced2574eaaca9a3f6b8ebe1fd15
+DIST firefox-10.0.3esr-ro.xpi 263249 RMD160 2b416ac944ea9cd340c8aaba493186150396f6c9 SHA1 ab1c35d4fbe5d1c0bdf516a028090958d7b8be38 SHA256 b9b8b21fbe3a2ddee00719aae54a43871711450c556ffc41811c4698455b7b4d
+DIST firefox-10.0.3esr-ru.xpi 254983 RMD160 40773401c553e2088e43a12a3b020e56966656ee SHA1 3051a2d959319380443520aa9c1144e020952321 SHA256 4c22777f4a53153443def6fffb955fde0f330d9c76d43c211224adbcaf737174
+DIST firefox-10.0.3esr-si.xpi 271987 RMD160 4a45e58c7fcc25dd29311a46caa393dfb2dc06d6 SHA1 a63f8f6c3efa43483979cc1c86b3f82c73b23227 SHA256 c7b6c4208df881f7cd0b2ba5b4abe3d465600a39b36f55902c5f33cacd263e09
+DIST firefox-10.0.3esr-sk.xpi 254286 RMD160 7e9dd01494f6c779db4b6505fa3a2c4e6c129914 SHA1 9e3e81c5c23a3179e3d3879da8c510854cb6fb0d SHA256 9dcb666108de17a8998d8254597f97f3764a6f780ed29d8a3c965dd7629dacde
+DIST firefox-10.0.3esr-sl.xpi 241031 RMD160 ed8069001afe568a402e76db6ea2c8efe5c37232 SHA1 09a887f6b66be325bf7759785b30a6814ec1e474 SHA256 167bc94c0c4fb83d3914a3aa8d5ce66c32a569320e2a3e4b46dd5574f84eabc1
+DIST firefox-10.0.3esr-son.xpi 239056 RMD160 a5643a1a336f301981aad5f1431319f9a166ed56 SHA1 73813d432842537961ba850848dd3ea98cead1b0 SHA256 7b10dd4550af4dc0246b687c9baa819955fe3857f187aec364e63ce561c058d9
+DIST firefox-10.0.3esr-sq.xpi 227694 RMD160 191395cb5b009d3fd1ac0d43ad69174f5f795481 SHA1 28397b14e9ef1ef840365b300257d5d09397b2be SHA256 24045060f6d78c43d2ab45b08200cff64b9bd8378f7c54bbd30ebade44a61b58
+DIST firefox-10.0.3esr-sr.xpi 277743 RMD160 ca74cd96d84b7eb4a5d8b7f425f4c5e7476ec066 SHA1 f0076ba596b8a1bdb3dc50c69c914d86edabf958 SHA256 713ccb1324fae7ac5b91ef2cf6dbca6576b373fde96c20fe13d61ce09e2b6376
+DIST firefox-10.0.3esr-sv-SE.xpi 278877 RMD160 eb20b7aa01b903b3b614bc48e9f6d5c16ad318a3 SHA1 ee0c0aaf02bfe17ef314853f32c103d82dc8533f SHA256 a32238b894fa4ff73099a1453a91089a3dc44fba611d0daddad2e136c2018b3a
+DIST firefox-10.0.3esr-ta-LK.xpi 290616 RMD160 ecab15c6e82994dd3b4dc34e31b5327d7c40467f SHA1 fada132388387cd0a0c94748eedfbe6c4f7658cf SHA256 2add299a37e3f4bb1f1478f31443ff51d014b7f32901a3d8c4e559d198212aef
+DIST firefox-10.0.3esr-ta.xpi 274053 RMD160 6865f1899c66ec1aeb432388eec972dfdeacb1b6 SHA1 614bfd4a5fdf1007a353cf8f8d96ffe38ac92bc1 SHA256 7d3c41194a4ebeab5af3c945d5b4fcd040fe27513b5789e4b5f934cbf51b21e1
+DIST firefox-10.0.3esr-te.xpi 289042 RMD160 0e6f26f06fe5f24e3ccf1c96e631a61ac22ffb84 SHA1 e550dcf020b9fc0dd42dcec013a9afdbad7d1900 SHA256 860ec1cf939e9f1d176de187af705ea75e910316e51137a11aa3173bccfeb198
+DIST firefox-10.0.3esr-th.xpi 272418 RMD160 c2a20aa40de1994c34aceff57ccb0942f26dedcf SHA1 866845f509b17138525058e1941b09e80ab05647 SHA256 10c3225f4e729106a5419124c5f4d706dab17f430b9414b0a5ca2e127442fb5e
+DIST firefox-10.0.3esr-tr.xpi 249915 RMD160 d69acb0815107536f29d34c8f140d067e8a414a8 SHA1 db10ff1fde50bb0c4b908d36dc75da1b416a0e68 SHA256 fdb56ff17c2a32a0bd8440bc7a3ffc471c4ca126c3bbafd021b9f285f6f77842
+DIST firefox-10.0.3esr-uk.xpi 279130 RMD160 eb60f796f11d22b945c8d9182c3bfad03daa883b SHA1 f2c104bf54aa8106f09ca033fb6cff52878ba868 SHA256 964b47334f0ffb2d391f3e049bb7b6532cd76a027bc924b2e4bcef6cacfbccab
+DIST firefox-10.0.3esr-vi.xpi 262784 RMD160 9e371105a4c4a169bdeeadedee1cc2b43c0f184e SHA1 1e8a84eb0f24e4e8be9db710eb8b7572bf73b016 SHA256 96a3a9e30b8528cb030a6a61d9c7b3e04ad216920303eea6a44a2469351dee60
+DIST firefox-10.0.3esr-zh-CN.xpi 256544 RMD160 39b8f49243efa9589e4a19295d6e3b280a770b25 SHA1 85d7eaf228250cbeec0a259b0ee040d1d7712962 SHA256 1fb0e63f2ca9b2641862b0c85eef2aaa74b29074dea25f42d70fe4e48905edaf
+DIST firefox-10.0.3esr-zh-TW.xpi 257489 RMD160 be46b9681d869437ff9574ceb476c9708ccd4a6d SHA1 5a2a35024ff27bcb07d6be974a0a858a9f041ed1 SHA256 df2243c0d27ada14d8faffe17892ee09f9ff19745808252946952a84b9887183
+DIST firefox-10.0.3esr-zu.xpi 246392 RMD160 ca177faec411efb5a42b9fe17faf2425ffb6bbe7 SHA1 0d8a70a8af1a12ea3851fa200cfa2f915f3c98a7 SHA256 b03779b3ebc7ef4fd4ff80731f2f7150b751c4fc2bbfd7d7beb77275f07a99fc
 DIST firefox-11.0-af.xpi 245646 RMD160 9877c64c43067b6f6255b45206f3a1a4ffd4214b SHA1 934e85611730ab3c47bc42499fc0543aa885d40f SHA256 bc70a8b5c0aad23c5f57e7e7ced8dfb5e21d96caac6314bbb58ecc127e068470
 DIST firefox-11.0-ak.xpi 247123 RMD160 2de28f297ea43418afb469cd8aab45b70b60a0ae SHA1 ed148cbc6d6d6b72147d7e395db9386727b4af4b SHA256 b0cf51bfe893c3f17777556d7a9dd87bd8a301a02e5b0d50a5f4ef5c7e2d513c
 DIST firefox-11.0-ar.xpi 270303 RMD160 4974989407e4f166e8418d46247bc374980b6329 SHA1 d9c43300acb42bbaed10434d9feb5472c1343471 SHA256 2b91b288345283d3fb57d9ccfc8a0e4c8dee065af8e73075e2d060a6dc10f9c2
@@ -167,6 +251,8 @@ DIST firefox-11.0-zh-CN.xpi 264047 RMD160 878d012915196794c8b91cbd5ee8651a881fb2
 DIST firefox-11.0-zh-TW.xpi 264951 RMD160 535675398aca6ac380f78367eb16ff9b2f6ad5fc SHA1 91fdc91fe632265ae5f3a88031b293371f3d8c7c SHA256 2e6f4dbf5495c400dd0b8bcb6760ed8d2036b502f082d04ff84c3d4c2264e264
 DIST firefox-11.0-zu.xpi 252923 RMD160 0b5feba4d11edec5edc7c60c3183e41e4ebc49cd SHA1 355a940a85d52481147b11b9b35dd9c09506b6d6 SHA256 425554cc1aa1664446167d6e244722fba4eb87de6cce5fcfb8e2a1c20fa63611
 DIST firefox-bin_i686-10.0.2.tar.bz2 17161122 RMD160 e3fce6dd99291992404cad53eabc4f88e58405a5 SHA1 ac20698ca1152dbde724553652b7ecc1ecfc4c00 SHA256 83b13b3b00bfd146f40c9795112582ebb10db6a75b5e971065283f51d7ea7aeb
+DIST firefox-bin_i686-10.0.3.tar.bz2 17295626 RMD160 79e8e7134545cf7d6a66ff97fc4a8298054c0c1d SHA1 6165f2995ec9d9b500298c94c48580e3a252ad41 SHA256 bb62a40167699961e8acf0e658cfb0b759a6f3d96f6db4e658f4fdc8bd1f72cf
 DIST firefox-bin_i686-11.0.tar.bz2 17693756 RMD160 6e8dc0781d963434178abb588f6c297482634842 SHA1 96a44eeb3076b4343b55cb21bfd7cd6fc59f5b05 SHA256 26683b58136972565d05a6891687a5852c0a624f312d36d2e857bb9068549fb2
 DIST firefox-bin_x86_64-10.0.2.tar.bz2 18876985 RMD160 b7884e5f83ab22677f55270fc9122c3e34149043 SHA1 37afae1f49427f3afa2c2a0050a26399c805991f SHA256 5d55d50340e4315915662638fd5ebb9e6b2fc09ff725b668621ed0e46d71cbbe
+DIST firefox-bin_x86_64-10.0.3.tar.bz2 18994450 RMD160 b5b46452da44a267ef847177b37ca9baa479e3d4 SHA1 7994194ed06a1bb4e38c3a2180f557323c5ac6de SHA256 c4ae7a11d10b28645bb06d4e7462f69e272896c5acca263e12ec848ed1925fb9
 DIST firefox-bin_x86_64-11.0.tar.bz2 19435299 RMD160 dc644c60ebcfbf4a2978f9392fc4e8b2ef5c21fc SHA1 299c39757974876a28ed504794f74f865275be01 SHA256 ed1a5a1d6abf4b7a2cb6bb5c4dd77c8364eae46bbc7f65751a9c07998286a046
diff --git a/www-client/firefox-bin/firefox-bin-10.0.3.ebuild b/www-client/firefox-bin/firefox-bin-10.0.3.ebuild
new file mode 100644
index 000000000000..59d24cbf7def
--- /dev/null
+++ b/www-client/firefox-bin/firefox-bin-10.0.3.ebuild
@@ -0,0 +1,145 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-client/firefox-bin/firefox-bin-10.0.3.ebuild,v 1.1 2012/03/21 18:22:35 jdhore Exp $
+
+EAPI="4"
+MOZ_ESR="1"
+
+# Can be updated using scripts/get_langs.sh from mozilla overlay
+MOZ_LANGS=(af ak ar as ast be bg bn-BD bn-IN br bs ca cs csb cy da de el en
+en-GB en-US en-ZA eo es-AR es-CL es-ES es-MX et eu fa fi fr fy-NL ga-IE gd gl
+gu-IN he hi-IN hr hu hy-AM id is it ja kk kn ko ku lg lt lv mai mk ml mr nb-NO
+nl nn-NO nso or pa-IN pl pt-BR pt-PT rm ro ru si sk sl son sq sr sv-SE ta ta-LK
+te th tr uk vi zh-CN zh-TW zu)
+
+# Convert the ebuild version to the upstream mozilla version, used by mozlinguas
+MOZ_PV="${PV/_beta/b}" # Handle beta for SRC_URI
+MOZ_PV="${MOZ_PV/_rc/rc}" # Handle rc for SRC_URI
+MOZ_PN="${PN/-bin}"
+
+if [[ ${MOZ_ESR} == 1 ]]; then
+	# ESR releases have slightly version numbers
+	MOZ_PV="${MOZ_PV}esr"
+fi
+
+MOZ_P="${MOZ_PN}-${MOZ_PV}"
+
+# Upstream ftp release URI that's used by mozlinguas.eclass
+# We don't use the http mirror because it deletes old tarballs.
+MOZ_FTP_URI="ftp://ftp.mozilla.org/pub/mozilla.org/${MOZ_PN}/releases/"
+
+inherit eutils multilib pax-utils fdo-mime gnome2-utils mozlinguas nsplugins
+
+DESCRIPTION="Firefox Web Browser"
+MOZ_FTP_URI="ftp://ftp.mozilla.org/pub/mozilla.org/${MOZ_PN}/releases"
+SRC_URI="${SRC_URI}
+	amd64? ( ${MOZ_FTP_URI}/${MOZ_PV}/linux-x86_64/en-US/${MOZ_P}.tar.bz2 -> ${PN}_x86_64-${PV}.tar.bz2 )
+	x86? ( ${MOZ_FTP_URI}/${MOZ_PV}/linux-i686/en-US/${MOZ_P}.tar.bz2 -> ${PN}_i686-${PV}.tar.bz2 )"
+HOMEPAGE="http://www.mozilla.com/firefox"
+RESTRICT="strip mirror binchecks"
+
+KEYWORDS="-* ~amd64 ~x86"
+SLOT="0"
+LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
+IUSE="startup-notification"
+
+DEPEND="app-arch/unzip"
+RDEPEND="dev-libs/dbus-glib
+	virtual/freedesktop-icon-theme
+	x11-libs/libXrender
+	x11-libs/libXt
+	x11-libs/libXmu
+
+	>=x11-libs/gtk+-2.2:2
+	>=media-libs/alsa-lib-1.0.16
+"
+
+S="${WORKDIR}/${MOZ_PN}"
+
+src_unpack() {
+	unpack ${A}
+
+	# Unpack language packs
+	mozlinguas_src_unpack
+}
+
+src_install() {
+	declare MOZILLA_FIVE_HOME=/opt/${MOZ_PN}
+
+	# Install icon and .desktop for menu entry
+	newicon "${S}"/chrome/icons/default/default48.png ${PN}-icon.png
+	domenu "${FILESDIR}"/${PN}.desktop
+
+	# Add StartupNotify=true bug 237317
+	if use startup-notification; then
+		echo "StartupNotify=true" >> "${D}"/usr/share/applications/${PN}.desktop
+	fi
+
+	# Install firefox in /opt
+	dodir ${MOZILLA_FIVE_HOME%/*}
+	mv "${S}" "${D}"${MOZILLA_FIVE_HOME} || die
+
+	# Fix prefs that make no sense for a system-wide install
+	insinto ${MOZILLA_FIVE_HOME}/defaults/pref/
+	doins "${FILESDIR}"/${PN}-prefs.js || die
+
+	# Install language packs
+	mozlinguas_src_install
+
+	local LANG=${linguas%% *}
+	if [[ -n ${LANG} && ${LANG} != "en" ]]; then
+		elog "Setting default locale to ${LANG}"
+		echo "pref(\"general.useragent.locale\", \"${LANG}\");" \
+			>> "${D}${MOZILLA_FIVE_HOME}"/defaults/pref/${PN}-prefs.js || \
+			die "sed failed to change locale"
+	fi
+
+	# Create /usr/bin/firefox-bin
+	dodir /usr/bin/
+	cat <<-EOF >"${D}"/usr/bin/${PN}
+	#!/bin/sh
+	unset LD_PRELOAD
+	LD_LIBRARY_PATH="/opt/firefox/"
+	GTK_PATH=/usr/lib/gtk-2.0/
+	exec /opt/${MOZ_PN}/${MOZ_PN} "\$@"
+	EOF
+	fperms 0755 /usr/bin/${PN}
+
+	# revdep-rebuild entry
+	insinto /etc/revdep-rebuild
+	doins "${FILESDIR}"/10${PN} || die
+
+	# Plugins dir
+	share_plugins_dir
+
+	# Required in order to use plugins and even run firefox on hardened.
+	pax-mark mr "${ED}"/${MOZILLA_FIVE_HOME}/{firefox,firefox-bin,plugin-container}
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	if ! has_version 'gnome-base/gconf' || ! has_version 'gnome-base/orbit' \
+		|| ! has_version 'net-misc/curl'; then
+		einfo
+		einfo "For using the crashreporter, you need gnome-base/gconf,"
+		einfo "gnome-base/orbit and net-misc/curl emerged."
+		einfo
+	fi
+	if has_version 'net-misc/curl[nss]'; then
+		einfo
+		einfo "Crashreporter won't be able to send reports"
+		einfo "if you have curl emerged with the nss USE-flag"
+		einfo
+	fi
+
+	# Update mimedb for the new .desktop file
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/www-client/google-chrome/Manifest b/www-client/google-chrome/Manifest
index 18863fbb4b06..004c985f66d2 100644
--- a/www-client/google-chrome/Manifest
+++ b/www-client/google-chrome/Manifest
@@ -1,6 +1,6 @@
 DIST google-chrome-beta_18.0.1025.113-r127419_amd64.deb 27095944 RMD160 111279f0417641646cc2bad30f632343ce7b0588 SHA1 3a9562b0a1cd1d9de1ff2cf973a991fa8d71be5c SHA256 671a7f6eb6b2e7ea40eb898c81588edfc82bf1f10f639350723635127ffb5257
 DIST google-chrome-beta_18.0.1025.113-r127419_i386.deb 31096984 RMD160 cb6402f6415e51cb1d1519afd595d2282f206118 SHA1 dab4523c6bf4bbd4359baabf8ac682d7aad78512 SHA256 8256cf6f933916b85401fe24afbdcaca4c2d2c72d96c786c4b88aa43e9c363cc
-DIST google-chrome-stable_17.0.963.79-r125985_amd64.deb 26547084 RMD160 2d3bb298ea9a1f4eceb623969e047d200d1a90dc SHA1 9e291e46eab3190dc04b29f6138a27fea8232f3c SHA256 cc425c5be1ce8d8f004f2efc25dec6817516addd9fd9c8e09b0b06b1d4773f7b
-DIST google-chrome-stable_17.0.963.79-r125985_i386.deb 30647318 RMD160 b512da5be898cf5694bcb1f6369b3ffcfdf263ec SHA1 8650652bb7f4e36d80627e48a5d6006fd25b778d SHA256 c8eba1e542f6bd6341fe3861fc999515c568ffbc8bdf36f828787d78cea2de51
+DIST google-chrome-stable_17.0.963.83-r127885_amd64.deb 26554974 RMD160 d33d97e2d50309a0fcb503ea0813c6b9533f7ccb SHA1 4eea8a63bee82a0eb449cea25a3adcecfdd04128 SHA256 e81db2ad3a7d05efdca2f694d158eacf2dc6f424637efa5f7d950d7ea189cfd2
+DIST google-chrome-stable_17.0.963.83-r127885_i386.deb 30783940 RMD160 179e5ad1cf17b2c24f9b805c2f404bc8bfecf5b1 SHA1 3ea3520146e654b6f35d97633bb71f8215b5242b SHA256 fbbf356bd54afa96f8dba5663e59a1417f4f3f3853ecb55f9b5411a6a30ed499
 DIST google-chrome-unstable_19.0.1068.1-r126852_amd64.deb 31358714 RMD160 f810b9ae43c65bc5e5f7be0eadf3da8ee636cb0a SHA1 0086feb3315740a2da0a507dfb84ef506d9903b7 SHA256 6e727f807f3a3c21655dad1618cf8ca14bfcaa4eb3e4352ed56289d8ed1f87c0
 DIST google-chrome-unstable_19.0.1068.1-r126852_i386.deb 31627508 RMD160 56df21959a2e60644ca7252a71f3a282e58b57e0 SHA1 505283130bc4b621dc2d9d0da86d72c9af4313b8 SHA256 b6b5bce5529c04d82bf28ab66b35b56eb8c8c1440b59ccc6819a5e80235af0df
diff --git a/www-client/google-chrome/google-chrome-17.0.963.79_p125985.ebuild b/www-client/google-chrome/google-chrome-17.0.963.83_p127885.ebuild
similarity index 98%
rename from www-client/google-chrome/google-chrome-17.0.963.79_p125985.ebuild
rename to www-client/google-chrome/google-chrome-17.0.963.83_p127885.ebuild
index 107af755fcd2..0a7bf19497a3 100644
--- a/www-client/google-chrome/google-chrome-17.0.963.79_p125985.ebuild
+++ b/www-client/google-chrome/google-chrome-17.0.963.83_p127885.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/google-chrome/google-chrome-17.0.963.79_p125985.ebuild,v 1.1 2012/03/11 02:35:46 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/google-chrome/google-chrome-17.0.963.83_p127885.ebuild,v 1.1 2012/03/22 01:16:35 floppym Exp $
 
 EAPI="4"
 
diff --git a/www-client/leechcraft-deadlyrics/Manifest b/www-client/leechcraft-deadlyrics/Manifest
index 82981786c7aa..4eb4c41f47fc 100644
--- a/www-client/leechcraft-deadlyrics/Manifest
+++ b/www-client/leechcraft-deadlyrics/Manifest
@@ -1,3 +1,3 @@
 DIST leechcraft-0.4.99.tar.xz 4601736 RMD160 343e64a430cd55f401989b1c89a74a9c2ddf1e33 SHA1 c8275ea635d7ea579b95a70e64372658928752f7 SHA256 967ca3a9b942d71da7f4818ba912f12b386b553fe4abded04c7d1956473e4e42
-DIST leechcraft-0.5.0.tar.xz 4691312 RMD160 4ea82848fe59fcd1159fa835dfb94ff81775f964 SHA1 0d01a9b38fd1ce136d678803a1270538fb8e3cc4 SHA256 ef0802442b803079dc491f73ff0294cb8560d86fbea44c8e57b3d54fdf3b88fa
-DIST leechcraft-0.5.60.tar.xz 2048000 RMD160 505a90f631779a1918ea814602288732b4f8af89 SHA1 b03ce9bb160c00c6be2f50af4e061c5d7777d630 SHA256 b7ee7aff4b07fa383da169346979701f4a428fc29d4e8b77a31f27561b025baf
+DIST leechcraft-0.5.0.tar.xz 7240 RMD160 41109d2b24cf188f31bafc9d65950ecb223f1fb7 SHA1 e32a08d9926a8351fcdbc13649e0fe83bbefb84a SHA256 762751d75d2bfa76656b8a88feae193af3c9467f74749ba182212bbe72eea1fc
+DIST leechcraft-0.5.60.tar.xz 4743936 RMD160 e845b9f9e7b0bdebd2c99822ffd3e15c019f6051 SHA1 2941679520e6871372eac31d1e683615a8dd64e6 SHA256 477d8fc54167798337e64324575d12cf1cace4d6502bb14d892edd2ed4b5a7f4
diff --git a/www-client/leechcraft-poshuku/Manifest b/www-client/leechcraft-poshuku/Manifest
index 82981786c7aa..4eb4c41f47fc 100644
--- a/www-client/leechcraft-poshuku/Manifest
+++ b/www-client/leechcraft-poshuku/Manifest
@@ -1,3 +1,3 @@
 DIST leechcraft-0.4.99.tar.xz 4601736 RMD160 343e64a430cd55f401989b1c89a74a9c2ddf1e33 SHA1 c8275ea635d7ea579b95a70e64372658928752f7 SHA256 967ca3a9b942d71da7f4818ba912f12b386b553fe4abded04c7d1956473e4e42
-DIST leechcraft-0.5.0.tar.xz 4691312 RMD160 4ea82848fe59fcd1159fa835dfb94ff81775f964 SHA1 0d01a9b38fd1ce136d678803a1270538fb8e3cc4 SHA256 ef0802442b803079dc491f73ff0294cb8560d86fbea44c8e57b3d54fdf3b88fa
-DIST leechcraft-0.5.60.tar.xz 2048000 RMD160 505a90f631779a1918ea814602288732b4f8af89 SHA1 b03ce9bb160c00c6be2f50af4e061c5d7777d630 SHA256 b7ee7aff4b07fa383da169346979701f4a428fc29d4e8b77a31f27561b025baf
+DIST leechcraft-0.5.0.tar.xz 7240 RMD160 41109d2b24cf188f31bafc9d65950ecb223f1fb7 SHA1 e32a08d9926a8351fcdbc13649e0fe83bbefb84a SHA256 762751d75d2bfa76656b8a88feae193af3c9467f74749ba182212bbe72eea1fc
+DIST leechcraft-0.5.60.tar.xz 4743936 RMD160 e845b9f9e7b0bdebd2c99822ffd3e15c019f6051 SHA1 2941679520e6871372eac31d1e683615a8dd64e6 SHA256 477d8fc54167798337e64324575d12cf1cace4d6502bb14d892edd2ed4b5a7f4
diff --git a/www-client/leechcraft-vgrabber/Manifest b/www-client/leechcraft-vgrabber/Manifest
index 82981786c7aa..4eb4c41f47fc 100644
--- a/www-client/leechcraft-vgrabber/Manifest
+++ b/www-client/leechcraft-vgrabber/Manifest
@@ -1,3 +1,3 @@
 DIST leechcraft-0.4.99.tar.xz 4601736 RMD160 343e64a430cd55f401989b1c89a74a9c2ddf1e33 SHA1 c8275ea635d7ea579b95a70e64372658928752f7 SHA256 967ca3a9b942d71da7f4818ba912f12b386b553fe4abded04c7d1956473e4e42
-DIST leechcraft-0.5.0.tar.xz 4691312 RMD160 4ea82848fe59fcd1159fa835dfb94ff81775f964 SHA1 0d01a9b38fd1ce136d678803a1270538fb8e3cc4 SHA256 ef0802442b803079dc491f73ff0294cb8560d86fbea44c8e57b3d54fdf3b88fa
-DIST leechcraft-0.5.60.tar.xz 2048000 RMD160 505a90f631779a1918ea814602288732b4f8af89 SHA1 b03ce9bb160c00c6be2f50af4e061c5d7777d630 SHA256 b7ee7aff4b07fa383da169346979701f4a428fc29d4e8b77a31f27561b025baf
+DIST leechcraft-0.5.0.tar.xz 7240 RMD160 41109d2b24cf188f31bafc9d65950ecb223f1fb7 SHA1 e32a08d9926a8351fcdbc13649e0fe83bbefb84a SHA256 762751d75d2bfa76656b8a88feae193af3c9467f74749ba182212bbe72eea1fc
+DIST leechcraft-0.5.60.tar.xz 4743936 RMD160 e845b9f9e7b0bdebd2c99822ffd3e15c019f6051 SHA1 2941679520e6871372eac31d1e683615a8dd64e6 SHA256 477d8fc54167798337e64324575d12cf1cace4d6502bb14d892edd2ed4b5a7f4
diff --git a/www-misc/leechcraft-seekthru/Manifest b/www-misc/leechcraft-seekthru/Manifest
index 82981786c7aa..4eb4c41f47fc 100644
--- a/www-misc/leechcraft-seekthru/Manifest
+++ b/www-misc/leechcraft-seekthru/Manifest
@@ -1,3 +1,3 @@
 DIST leechcraft-0.4.99.tar.xz 4601736 RMD160 343e64a430cd55f401989b1c89a74a9c2ddf1e33 SHA1 c8275ea635d7ea579b95a70e64372658928752f7 SHA256 967ca3a9b942d71da7f4818ba912f12b386b553fe4abded04c7d1956473e4e42
-DIST leechcraft-0.5.0.tar.xz 4691312 RMD160 4ea82848fe59fcd1159fa835dfb94ff81775f964 SHA1 0d01a9b38fd1ce136d678803a1270538fb8e3cc4 SHA256 ef0802442b803079dc491f73ff0294cb8560d86fbea44c8e57b3d54fdf3b88fa
-DIST leechcraft-0.5.60.tar.xz 2048000 RMD160 505a90f631779a1918ea814602288732b4f8af89 SHA1 b03ce9bb160c00c6be2f50af4e061c5d7777d630 SHA256 b7ee7aff4b07fa383da169346979701f4a428fc29d4e8b77a31f27561b025baf
+DIST leechcraft-0.5.0.tar.xz 7240 RMD160 41109d2b24cf188f31bafc9d65950ecb223f1fb7 SHA1 e32a08d9926a8351fcdbc13649e0fe83bbefb84a SHA256 762751d75d2bfa76656b8a88feae193af3c9467f74749ba182212bbe72eea1fc
+DIST leechcraft-0.5.60.tar.xz 4743936 RMD160 e845b9f9e7b0bdebd2c99822ffd3e15c019f6051 SHA1 2941679520e6871372eac31d1e683615a8dd64e6 SHA256 477d8fc54167798337e64324575d12cf1cace4d6502bb14d892edd2ed4b5a7f4
diff --git a/www-plugins/gnash/gnash-0.8.10-r2.ebuild b/www-plugins/gnash/gnash-0.8.10-r2.ebuild
index 481475dcd5d0..831034c75720 100644
--- a/www-plugins/gnash/gnash-0.8.10-r2.ebuild
+++ b/www-plugins/gnash/gnash-0.8.10-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-plugins/gnash/gnash-0.8.10-r2.ebuild,v 1.3 2012/03/15 12:15:37 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-plugins/gnash/gnash-0.8.10-r2.ebuild,v 1.4 2012/03/21 16:47:06 tomka Exp $
 
 EAPI=4
 CMAKE_REQUIRED="never"
@@ -26,7 +26,7 @@ fi
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 ~sparc x86"
 IUSE="X +agg cairo cygnal dbus directfb doc dump egl fbcon +ffmpeg gconf gnome gstreamer gtk kde lirc mysql +nls nsplugin opengl openvg python sdl +sdl-sound ssh ssl test vaapi"
 REQUIRED_USE="dump? ( agg ffmpeg )
 	fbcon? ( agg )
diff --git a/www-servers/gatling/files/gatling.initd-2 b/www-servers/gatling/files/gatling.initd-2
new file mode 100644
index 000000000000..0d5c5fcd4c19
--- /dev/null
+++ b/www-servers/gatling/files/gatling.initd-2
@@ -0,0 +1,63 @@
+#!/sbin/runscript
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+description="Gatling high performance web server init script"
+extra_started_commands="reload"
+
+depend() { 
+	need net
+}
+
+checkconfig() {
+	# Verify UID is valid for running process.
+	if [[ ! $(id ${GATLING_UID} 2>/dev/null) ]]; then
+		ewarn "User ${GATLING_UID} not found!"
+		return 1
+	fi
+
+	# Set gatling run opts
+	if yesno ${VHOST};then VHOST=-v;else VHOST=-V;fi
+	if yesno ${SSL};then SSL=-e;else SSL=-E;fi
+	if yesno ${DIR_INDEXING};then DIR_INDEXING=-d;else DIR_INDEXING=-D;fi
+	if yesno ${FTP}; then FTP=-f;else FTP=-F;fi
+	if yesno ${FTP_AUTH}; then FTP_AUTH=-l;else unset FTP_AUTH;fi
+	if yesno ${FTP_UP};then unset FTP_UP;else FTP_UP=-U;fi
+        if yesno ${TRANS_PROXY};then TRANS_PROXY=-t;else unset TRANS_PROXY;fi
+}
+
+start() {
+	checkconfig || return 1
+
+	ebegin "Starting gatling"
+	start-stop-daemon --start --quiet --background --make-pidfile --pidfile ${PID} \
+--name gatling --exec /usr/bin/gatling -- -T ${HTTP_TIMEOUT} -i ${IP} -p ${PORT} -P ${PREFETCH} \
+${VHOST} -c ${ROOTDIR} ${DIR_INDEXING} ${TRANS_PROXY} -u ${GATLING_UID} ${FTP} -T ${FTP_TIMEOUT} \
+${FTP_AUTH} ${FTP_UPLOADS} 
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping gatling"
+	start-stop-daemon --quiet --stop --pidfile ${PID} 
+	eend $?
+}
+
+reload() {
+        if ! service_started "${SVCNAME}" ; then
+                eerror "${SVCNAME} isn't running"
+                return 1
+        fi
+
+	checkconfig || return 1
+
+	ebegin "Sending gatling the HUP signal"
+	start-stop-daemon --quiet --signal HUP --pidfile ${PID}
+
+	ebegin "Restarting gatling server"
+        start-stop-daemon --start --quiet --background --make-pidfile --pidfile ${PID} \
+--name gatling --exec /usr/bin/gatling -- -T ${HTTP_TIMEOUT} -i ${IP} -p ${PORT} -P ${PREFETCH} \
+${VHOST} -c ${ROOTDIR} ${DIR_INDEXING} ${TRANS_PROXY} -u ${GATLING_UID} ${FTP} -T ${FTP_TIMEOUT} \
+${FTP_AUTH} ${FTP_UPLOADS}
+        eend $?
+}
diff --git a/www-servers/gatling/files/gentoo-vars.patch b/www-servers/gatling/files/gentoo-vars.patch
deleted file mode 100644
index 349e9f81f4c9..000000000000
--- a/www-servers/gatling/files/gentoo-vars.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- GNUmakefile.org	2008-05-12 13:59:01.000000000 +0200
-+++ GNUmakefile	2008-05-12 15:04:17.000000000 +0200
-@@ -1,6 +1,6 @@
- #DEBUG=1
- ZLIB=1
--prefix=/opt/diet
-+prefix=/usr
- BINDIR=${prefix}/bin
- MANDIR=${prefix}/man
- man1dir=$(MANDIR)/man1
-@@ -14,8 +14,7 @@
- CROSS=
- #CROSS=i686-mingw32-
- CC=$(CROSS)gcc
--CFLAGS=-pipe -Wall
--LDFLAGS=
-+CFLAGS+=-pipe -Wall -I/usr/include/libowfat
- 
- path = $(subst :, ,$(PATH))
- diet_path = $(foreach dir,$(path),$(wildcard $(dir)/diet))
diff --git a/www-servers/gatling/gatling-0.12-r2.ebuild b/www-servers/gatling/gatling-0.12-r2.ebuild
new file mode 100644
index 000000000000..be08408c7466
--- /dev/null
+++ b/www-servers/gatling/gatling-0.12-r2.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/www-servers/gatling/gatling-0.12-r2.ebuild,v 1.1 2012/03/22 00:39:53 patrick Exp $
+
+EAPI="4"
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="High performance web server"
+HOMEPAGE="http://www.fefe.de/gatling/"
+SRC_URI="http://dl.fefe.de/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="ssl diet"
+
+DEPEND=">=dev-libs/libowfat-0.25
+	diet? ( dev-libs/dietlibc )
+	ssl? ( dev-libs/openssl )"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	rm Makefile  # leaves GNUmakefile
+	epatch "${FILESDIR}/${P}-FLAGS.patch"
+}
+
+src_compile() {
+	local diet_conf='DIET=env'
+	use diet && diet_conf=
+
+	local targets=gatling
+	use ssl && targets+=' tlsgatling'
+
+	emake CC="$(tc-getCC)" ${diet_conf} ${targets} \
+		|| die "emake ${targets} failed"
+}
+
+src_install() {
+	doman gatling.1 || die "installing manpage failed"
+
+	newconfd "${FILESDIR}/gatling.confd" gatling || die
+	newinitd "${FILESDIR}/gatling.initd-2" gatling || die
+	dodoc README.{ftp,http} || die "installing docs failed"
+
+	dobin gatling || die "installing gatling binary failed"
+	use ssl && {
+		dobin tlsgatling || die "installing tlsgatling binary failed"
+	}
+}
+
+pkg_setup() {
+	ebegin "Creating gatling user and group"
+	enewgroup gatling
+	enewuser ${PN} -1 -1 /var/www/localhost ${PN}
+}
diff --git a/www-servers/lighttpd/metadata.xml b/www-servers/lighttpd/metadata.xml
index 11a4bc56ab8c..63cf2a4ed85e 100644
--- a/www-servers/lighttpd/metadata.xml
+++ b/www-servers/lighttpd/metadata.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>www-servers</herd>
 	<maintainer>
 		<email>wired@gentoo.org</email>
 		<name>Alex Alexander</name>
diff --git a/www-servers/mini_httpd/metadata.xml b/www-servers/mini_httpd/metadata.xml
index 87c085844c38..a40624fba8f0 100644
--- a/www-servers/mini_httpd/metadata.xml
+++ b/www-servers/mini_httpd/metadata.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>www-servers</herd>
+<maintainer>
+	<email>maintainer-needed@gentoo.org</email>
+</maintainer>
 </pkgmetadata>
diff --git a/www-servers/monkeyd/Manifest b/www-servers/monkeyd/Manifest
index e5f746b00daf..edc124bf1aad 100644
--- a/www-servers/monkeyd/Manifest
+++ b/www-servers/monkeyd/Manifest
@@ -1,4 +1,2 @@
 DIST monkey-0.31.0.tar.gz 322931 RMD160 dcece1e034e76e115a48c2098f9c47ace6c50140 SHA1 fc1d978a2c6a062a45179de765d9d1448bc6ec9e SHA256 a804c32b02ff59e3660639e793a5bced737901fdb19f1ba7be7f37133bc14808
-DIST monkey-0.32.0.tar.gz 324079 RMD160 a187f7a2053501607f9eb738e1aea2b3a8ad22e6 SHA1 e2afb7b38a2b578407efd6ce84f9cb5e87bcff20 SHA256 5408612ce21f82966ac10d2606bacaaaa877869c56a6cc174e093a88708ac68f
 DIST monkey-0.33.0.tar.gz 340670 RMD160 4a7fb8deaf3e6c3d382c7a899bf47c5bfe27d0f0 SHA1 f9325eb4a666bd08a2eb6b58294cc348c0c91c59 SHA256 39aaf1c8356dae20abc2ca27262772b00775fa013c12ed284ddf72c4599aca8d
-DIST monkey-0.9.1.tar.gz 84389 RMD160 71fc6e81aa755b5b5f449b213181d1c90ca4a9db SHA1 e54b870c0f597cdfc164e800246ed8445ce6d5fc SHA256 4fe2dbc41d5de1415a07ff9eae442be7ac42e64fe6b3d17d098849753744fc7a
diff --git a/www-servers/monkeyd/metadata.xml b/www-servers/monkeyd/metadata.xml
index bf4811e274e0..a40624fba8f0 100644
--- a/www-servers/monkeyd/metadata.xml
+++ b/www-servers/monkeyd/metadata.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>www-servers</herd>
+<maintainer>
+	<email>maintainer-needed@gentoo.org</email>
+</maintainer>
 </pkgmetadata>
diff --git a/www-servers/monkeyd/monkeyd-0.32.0.ebuild b/www-servers/monkeyd/monkeyd-0.32.0.ebuild
deleted file mode 100644
index 1f7f5082185c..000000000000
--- a/www-servers/monkeyd/monkeyd-0.32.0.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/monkeyd/monkeyd-0.32.0.ebuild,v 1.2 2012/03/18 18:00:00 armin76 Exp $
-
-EAPI="4"
-
-inherit toolchain-funcs depend.php multilib
-
-WEBROOT=/var/www/localhost
-
-MY_P="${PN/d}-${PV}"
-DESCRIPTION="A small, fast, and scalable web server"
-HOMEPAGE="http://www.monkey-project.com/"
-SRC_URI="http://monkey-project.com/releases/${PV:0:4}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~mips ~ppc ~x86"
-IUSE="php"
-
-RDEPEND="php? ( virtual/httpd-php )"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	use php && require_php_cgi
-}
-
-src_prepare() {
-	# Don't install the banana script, it is broken as is anyway and the
-	# functionality is provided by the ${FILESDIR}/monkeyd.init.d script.
-	sed -i '/install -m 755 bin\/banana/d' configure || die "sed banana"
-
-	# Don't explicitly strip files
-	sed -i -e '/$STRIP /d' -e 's/install -s -m 644/install -m 755/' configure || die
-}
-
-src_configure() {
-	# Non-autotools configure
-	./configure \
-		--prefix=/usr \
-		--bindir=/usr/bin \
-		--datadir=${WEBROOT}/htdocs \
-		--logdir=/var/log/${PN} \
-		--mandir=/usr/share/man \
-		--plugdir=/usr/$(get_libdir)/monkeyd/plugins \
-		--sysconfdir=/etc/${PN} \
-		|| die
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
-}
-
-src_install() {
-	default
-
-	if use php ; then
-		sed -i -e '/^#AddScript application\/x-httpd-php/s:^#::' "${D}"/etc/monkeyd/monkey.conf || die
-		sed -i -e 's:/home/my_home/php/bin/php:/usr/bin/php-cgi:' "${D}"/etc/monkeyd/monkey.conf || die
-	fi
-
-	mv "${D}"${WEBROOT}/htdocs/{index,index-monkey}.html
-
-	sed -i -e "s:/var/log/monkeyd/monkey.pid:/var/run/monkey.pid:" "${D}"/etc/monkeyd/monkey.conf || die
-	newinitd "${FILESDIR}"/monkeyd.init.d monkeyd
-	newconfd "${FILESDIR}"/monkeyd.conf.d monkeyd
-}
diff --git a/www-servers/monkeyd/monkeyd-0.9.1.ebuild b/www-servers/monkeyd/monkeyd-0.9.1.ebuild
deleted file mode 100644
index de235264abf4..000000000000
--- a/www-servers/monkeyd/monkeyd-0.9.1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/monkeyd/monkeyd-0.9.1.ebuild,v 1.11 2012/03/18 18:00:00 armin76 Exp $
-
-inherit eutils toolchain-funcs depend.php
-
-WEBROOT=/var/www/localhost
-
-MY_P="${PN/d}-${PV}"
-DESCRIPTION="fast, efficient, (REALLY) small, and easy to configure web server"
-HOMEPAGE="http://monkeyd.sourceforge.net/"
-SRC_URI="http://monkeyd.sourceforge.net/versions/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~mips ppc x86"
-IUSE="php"
-
-RDEPEND="php? ( virtual/httpd-php )"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	use php && require_php_cgi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/monkeyd-dont-strip-configure.patch"
-	sed -i '/install -m 755 bin\/banana/d' configure || die "sed banana"
-}
-
-src_compile() {
-	# monkey has it's own funky script ... cant use econf
-	env STRIP=true \
-	./configure \
-		--prefix=/usr \
-		--bindir=/usr/bin \
-		--cgibin=${WEBROOT}/cgi-bin \
-		--sysconfdir=/etc/${PN} \
-		--datadir=${WEBROOT}/htdocs \
-		--logdir=/var/log/${PN} \
-		--lang=en \
-		|| die
-	# Don't install the banana script, it is broken as is anyway and the
-	# functionality is provided by the ${FILESDIR}/monkeyd.init.d script.
-	sed -i '/install -m 755 bin\/banana/d' Makefile
-	emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die "emake failed"
-}
-
-src_install() {
-	make \
-		PREFIX="${D}"/usr \
-		BINDIR="${D}"/usr/bin \
-		CGIBIN="${D}"${WEBROOT}/cgi-bin \
-		SYSCONFDIR="${D}"/etc/${PN} \
-		DATADIR="${D}"${WEBROOT}/htdocs \
-		LOGDIR="${D}"/var/log/${PN} \
-		install \
-		|| die "make install failed"
-
-	if use php ; then
-		dosed '/^#AddScript application\/x-httpd-php/s:^#::' /etc/monkeyd/monkey.conf
-		dosed 's:/home/my_home/php/bin/php:/usr/bin/php-cgi:' /etc/monkeyd/monkey.conf
-	fi
-
-	[[ -e ${WEBROOT}/htdocs/index.html ]] && \
-		mv "${D}"${WEBROOT}/htdocs/{index,index-monkey}.html
-
-	dosed "s:/var/log/monkeyd/monkey.pid:/var/run/monkey.pid:" /etc/monkeyd/monkey.conf
-	newinitd "${FILESDIR}"/monkeyd.init.d monkeyd
-	newconfd "${FILESDIR}"/monkeyd.conf.d monkeyd
-	dodoc README MODULES *.txt
-}
diff --git a/www-servers/pound/metadata.xml b/www-servers/pound/metadata.xml
index a1eaaa25c232..53e967f5e386 100644
--- a/www-servers/pound/metadata.xml
+++ b/www-servers/pound/metadata.xml
@@ -1,15 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>www-servers</herd>
-  <longdescription lang="en">The Pound program is a reverse proxy, load balancer
+<maintainer>
+	<email>maintainer-needed@gentoo.org</email>
+</maintainer>
+<longdescription lang="en">The Pound program is a reverse proxy, load balancer
   and HTTPS front-end for Web server(s). Pound was developed to enable
   distributing the load among several Web-servers and to allow for a convenient
   SSL wrapper for those Web servers that do not offer it natively. Pound is
   distributed under the GPL - no warranty, it's free to use, copy and give away.
-  </longdescription>
-  <use>
+</longdescription>
+<use>
 	  <flag name='dynscaler'>Enable dynamic rescaling of back-end
 		  priorities</flag>
-  </use>
+</use>
 </pkgmetadata>
diff --git a/www-servers/publicfile/metadata.xml b/www-servers/publicfile/metadata.xml
index ef7d97e03268..a40624fba8f0 100644
--- a/www-servers/publicfile/metadata.xml
+++ b/www-servers/publicfile/metadata.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>www-servers</herd>
+<maintainer>
+	<email>maintainer-needed@gentoo.org</email>
+</maintainer>
 </pkgmetadata>
diff --git a/www-servers/spawn-fcgi/metadata.xml b/www-servers/spawn-fcgi/metadata.xml
index de5ce14a73a4..194c680ae2ff 100644
--- a/www-servers/spawn-fcgi/metadata.xml
+++ b/www-servers/spawn-fcgi/metadata.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>www-servers</herd>
+<maintainer>
+	<email>maintainer-needed@gentoo.org</email>
+</maintainer>
 <longdescription lang="en">
   spawn-fcgi is used to spawn FastCGI applications
 
diff --git a/www-servers/thttpd/metadata.xml b/www-servers/thttpd/metadata.xml
index 87c085844c38..d67a15ac1284 100644
--- a/www-servers/thttpd/metadata.xml
+++ b/www-servers/thttpd/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>www-servers</herd>
+<maintainer>
+	<email>blueness@gentoo.org</email>
+	<name>Anthony G. Basile</name>
+</maintainer>
 </pkgmetadata>
diff --git a/www-servers/varnish/Manifest b/www-servers/varnish/Manifest
index 45cecc0d7799..6aefebde36d6 100644
--- a/www-servers/varnish/Manifest
+++ b/www-servers/varnish/Manifest
@@ -1,4 +1,2 @@
 DIST varnish-2.0.4.tar.gz 786945 RMD160 93f94555f42205ff5f324e76acb121c8da71f6e9 SHA1 7a7b1ce657b64c89025d61983b84d6ebf88dfbb2 SHA256 7ee6c66cdafda86a9d32169e5b773c57ba05e1f556b5c99585964e8f2985ae3e
-DIST varnish-2.1.5.tar.gz 1530856 RMD160 4619d4be920504388325f06afdbea9b40f5a806a SHA1 5c413ee7c4267d9fd4713fbff059d1be5fbba60f SHA256 2d8049be14ada035d0e3a54c2b519143af40d03d917763cf72d53d8188e5ef83
-DIST varnish-3.0.1.tar.gz 2123838 RMD160 fc68d6b509253af151858216312ff90bc46d76f8 SHA1 f56457c8b7276ed954c5170dac17ba7abd144eb6 SHA256 385807737777a392520c5334bb114f9fc0e5f8dbf5cc48b420baf5b0478eb279
 DIST varnish-3.0.2.tar.gz 1977852 RMD160 6093839815ba72107fa2b52f0a198167a3a6b79b SHA1 906f1536cb7e728d18d9425677907ae723943df7 SHA256 973f60625e9690e0989e1bbc73c37ea53fc6291b8f7b03d617b76f8084a4a243
diff --git a/www-servers/varnish/metadata.xml b/www-servers/varnish/metadata.xml
index 86e5e5315cb3..3bb61ff04e6f 100644
--- a/www-servers/varnish/metadata.xml
+++ b/www-servers/varnish/metadata.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>www-servers</herd>
+<maintainer>
+	<email>maintainer-needed@gentoo.org</email>
+</maintainer>
 	<use>
 		<flag name="tools">Build additional tools: varnishhist, varnishstat, varnishtop, varnishsizes</flag>
 	</use>
diff --git a/www-servers/varnish/varnish-2.1.5.ebuild b/www-servers/varnish/varnish-2.1.5.ebuild
deleted file mode 100644
index 782a539f7a5f..000000000000
--- a/www-servers/varnish/varnish-2.1.5.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/varnish/varnish-2.1.5.ebuild,v 1.3 2011/12/14 22:48:29 radhermit Exp $
-
-EAPI="3"
-
-inherit eutils autotools
-
-DESCRIPTION="Varnish is a state-of-the-art, high-performance HTTP accelerator."
-HOMEPAGE="http://www.varnish-cache.org/"
-SRC_URI="http://repo.varnish-cache.org/source/${P}.tar.gz"
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc"
-
-CDEPEND="dev-libs/libpcre"
-#varnish compiles stuff at run time
-RDEPEND="${CDEPEND}
-	sys-devel/gcc"
-DEPEND="${CDEPEND}
-	dev-python/docutils
-	dev-util/pkgconfig"
-
-RESTRICT="test" #315725
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.1.4-virtual-ncsa.patch
-	eautoreconf
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	newinitd "${FILESDIR}"/varnishd.initd varnishd || die
-	newconfd "${FILESDIR}"/varnishd.confd varnishd || die
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/varnishd.logrotate" varnishd
-
-	dodir /var/log/varnish
-
-	use doc && dohtml -r "doc/sphinx/=build/html/"
-}
-
-pkg_postinst () {
-	elog "No demo-/sample-configfile is included in the distribution -"
-	elog "please read the man-page for more info."
-	elog "A sample (localhost:8080 -> localhost:80) for gentoo is given in"
-	elog "   /etc/conf.d/varnishd"
-	echo
-	ewarn "Varnish 2.1.x introduces VCL changes wrt. 2.0.x. See also"
-	ewarn "http://www.varnish-cache.org/docs/2.1/reference/vcl.html"
-}
diff --git a/www-servers/varnish/varnish-3.0.1.ebuild b/www-servers/varnish/varnish-3.0.1.ebuild
deleted file mode 100644
index 933d647d970b..000000000000
--- a/www-servers/varnish/varnish-3.0.1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/varnish/varnish-3.0.1.ebuild,v 1.3 2011/12/14 22:48:29 radhermit Exp $
-
-EAPI="4"
-
-DESCRIPTION="Varnish is a state-of-the-art, high-performance HTTP accelerator."
-HOMEPAGE="http://www.varnish-cache.org/"
-SRC_URI="http://repo.varnish-cache.org/source/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc static-libs"
-
-CDEPEND="dev-libs/libpcre"
-#varnish compiles stuff at run time
-RDEPEND="${CDEPEND}
-	sys-devel/gcc"
-DEPEND="${CDEPEND}
-	dev-python/docutils
-	dev-util/pkgconfig"
-
-RESTRICT="test" #315725
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	newinitd "${FILESDIR}"/varnishd.initd varnishd
-	newconfd "${FILESDIR}"/varnishd.confd varnishd
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/varnishd.logrotate" varnishd
-
-	dodir /var/log/varnish
-
-	use doc && dohtml -r "doc/sphinx/=build/html/"
-}
-
-pkg_postinst () {
-	elog "No demo-/sample-configfile is included in the distribution -"
-	elog "please read the man-page for more info."
-	elog "A sample (localhost:8080 -> localhost:80) for gentoo is given in"
-	elog "   /etc/conf.d/varnishd"
-}
diff --git a/www-servers/varnish/varnish-3.0.2.ebuild b/www-servers/varnish/varnish-3.0.2.ebuild
deleted file mode 100644
index a46c04c22a9d..000000000000
--- a/www-servers/varnish/varnish-3.0.2.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-servers/varnish/varnish-3.0.2.ebuild,v 1.4 2011/12/14 22:48:29 radhermit Exp $
-
-EAPI="4"
-
-inherit autotools-utils
-
-DESCRIPTION="Varnish is a state-of-the-art, high-performance HTTP accelerator"
-HOMEPAGE="http://www.varnish-cache.org/"
-SRC_URI="http://repo.varnish-cache.org/source/${P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc static-libs"
-
-CDEPEND="dev-libs/libpcre"
-#varnish compiles stuff at run time
-RDEPEND="${CDEPEND}
-	sys-devel/gcc"
-DEPEND="${CDEPEND}
-	dev-python/docutils
-	dev-util/pkgconfig"
-
-RESTRICT="test" #315725
-
-DOCS=( README doc/changes.rst )
-
-src_install() {
-	autotools-utils_src_install
-
-	newinitd "${FILESDIR}"/varnishd.initd varnishd
-	newconfd "${FILESDIR}"/varnishd.confd varnishd
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/varnishd.logrotate" varnishd
-
-	dodir /var/log/varnish
-
-	use doc && dohtml -r "doc/sphinx/=build/html/"
-}
-
-pkg_postinst () {
-	elog "No demo-/sample-configfile is included in the distribution -"
-	elog "please read the man-page for more info."
-	elog "A sample (localhost:8080 -> localhost:80) for gentoo is given in"
-	elog "   /etc/conf.d/varnishd"
-}
diff --git a/www-servers/webfs/metadata.xml b/www-servers/webfs/metadata.xml
index 87c085844c38..a40624fba8f0 100644
--- a/www-servers/webfs/metadata.xml
+++ b/www-servers/webfs/metadata.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>www-servers</herd>
+<maintainer>
+	<email>maintainer-needed@gentoo.org</email>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-drivers/ati-drivers/ati-drivers-12.2.ebuild b/x11-drivers/ati-drivers/ati-drivers-12.2.ebuild
index 152274bbad15..0297682e20fc 100644
--- a/x11-drivers/ati-drivers/ati-drivers-12.2.ebuild
+++ b/x11-drivers/ati-drivers/ati-drivers-12.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-12.2.ebuild,v 1.1 2012/03/09 00:32:08 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/ati-drivers/ati-drivers-12.2.ebuild,v 1.2 2012/03/21 12:00:51 ago Exp $
 
 EAPI=4
 
@@ -20,7 +20,7 @@ fi
 IUSE="debug +modules multilib pax_kernel qt4"
 
 LICENSE="AMD GPL-2 QPL-1.0 as-is"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 SLOT="1"
 
 RDEPEND="